To make it easier to associate tuples with tables...

...add TupleDefinitionName to TableDefinition.

1 files changed, 24 insertions, 2 deletions

diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
index 4738ac82..527199b2 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
@@ -27,18 +27,36 @@ namespace WixToolset.Data.WindowsInstaller
         public TableDefinition(string name, IEnumerable<ColumnDefinition> columns, bool unreal = false)
         {
             this.Name = name;
+            this.TupleDefinitionName = name;
             this.Unreal = unreal;
-
             this.Columns = columns.ToArray();
         }
 
         /// <summary>
+        /// Creates a table definition.
+        /// </summary>
+        /// <param name="name">Name of table to create.</param>
+        /// <param name="tupleDefinitionName">Optional name of tuple definition for this table.</param>
+        /// <param name="columns">Column definitions for the table.</param>
+        /// <param name="unreal">Flag if table is unreal.</param>
+        public TableDefinition(string name, string tupleDefinitionName, IEnumerable<ColumnDefinition> columns, bool unreal = false) : this(name, columns, unreal)
+        {
+            this.TupleDefinitionName = tupleDefinitionName ?? name;
+        }
+
+        /// <summary>
         /// Gets the name of the table.
         /// </summary>
         /// <value>Name of the table.</value>
         public string Name { get; private set; }
 
         /// <summary>
+        /// Gets the name of the tuple definition associated with this table.
+        /// </summary>
+        /// <value>Name of the tuple definition.</value>
+        public string TupleDefinitionName { get; private set; }
+
+        /// <summary>
         /// Gets if the table is unreal.
         /// </summary>
         /// <value>Flag if table is unreal.</value>
@@ -110,6 +128,7 @@ namespace WixToolset.Data.WindowsInstaller
         {
             var empty = reader.IsEmptyElement;
             string name = null;
+            string tupleDefinitionName = null;
             var unreal = false;
             var bootstrapperApplicationData = false;
 
@@ -120,6 +139,9 @@ namespace WixToolset.Data.WindowsInstaller
                     case "name":
                         name = reader.Value;
                         break;
+                    case "tupleDefinitionName":
+                        tupleDefinitionName = reader.Value;
+                        break;
                     case "unreal":
                         unreal = reader.Value.Equals("yes");
                         break;
@@ -176,7 +198,7 @@ namespace WixToolset.Data.WindowsInstaller
                 }
             }
 
-            return new TableDefinition(name, columns.ToArray(), unreal);
+            return new TableDefinition(name, tupleDefinitionName, columns.ToArray(), unreal);
         }
 
         /// <summary>