Change TableDefinition to have TupleDefinition instead of TupleDefinitionName.

author: Sean Hall <r.sean.hall@gmail.com> 2020-04-13 11:36:20 +1000
committer: Sean Hall <r.sean.hall@gmail.com> 2020-04-13 20:28:02 +1000
commit: d0d447ad64afdd5956856c4c6b6599f69a522d6b (patch)
tree: c5ba6602e76170004aefb83c8950bb9bc8f0ef08 /src
parent: 45e58d750f54c0b7713bcb74792aef4bdb7197cb (diff)
download: wix-d0d447ad64afdd5956856c4c6b6599f69a522d6b.tar.gz
wix-d0d447ad64afdd5956856c4c6b6599f69a522d6b.tar.bz2
wix-d0d447ad64afdd5956856c4c6b6599f69a522d6b.zip
3 files changed, 209 insertions, 210 deletions
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
index 5a9d2f20..7c4a3e9d 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
@@ -22,14 +22,15 @@ namespace WixToolset.Data.WindowsInstaller
        /// Creates a table definition.
        /// </summary>
        /// <param name="name">Name of table to create.</param>
+        /// <param name="tupleDefinition">Optional tuple definition for this table.</param>
        /// <param name="columns">Column definitions for the table.</param>
        /// <param name="unreal">Flag if table is unreal.</param>
-        /// <param name="tupleDefinitionName">Optional name of tuple definition for this table.</param>
        /// <param name="tupleIdIsPrimaryKey">Whether the primary key is the id of the tuple definition associated with this table.</param>
-        public TableDefinition(string name, IEnumerable<ColumnDefinition> columns, bool unreal = false, string tupleDefinitionName = null, bool? tupleIdIsPrimaryKey = null)
+        public TableDefinition(string name, IntermediateTupleDefinition tupleDefinition, IEnumerable<ColumnDefinition> columns, bool unreal = false, bool tupleIdIsPrimaryKey = false)
        {
            this.Name = name;
-            this.TupleDefinitionName = tupleDefinitionName ?? name;
+            this.TupleDefinition = tupleDefinition;
+            this.TupleIdIsPrimaryKey = tupleIdIsPrimaryKey;
            this.Unreal = unreal;
            this.Columns = columns?.ToArray();
@@ -37,7 +38,6 @@ namespace WixToolset.Data.WindowsInstaller
            {
                throw new ArgumentOutOfRangeException(nameof(columns));
            }
-            this.TupleIdIsPrimaryKey = tupleIdIsPrimaryKey ?? DeriveTupleIdIsPrimaryKey(this.Columns);
        }
        /// <summary>
@@ -47,10 +47,10 @@ namespace WixToolset.Data.WindowsInstaller
        public string Name { get; }
        /// <summary>
-        /// Gets the name of the tuple definition associated with this table.
+        /// Gets the tuple definition associated with this table.
        /// </summary>
-        /// <value>Name of the tuple definition.</value>
+        /// <value>The tuple definition.</value>
-        public string TupleDefinitionName { get; }
+        public IntermediateTupleDefinition TupleDefinition { get; }
        /// <summary>
        /// Gets if the table is unreal.
@@ -130,9 +130,7 @@ namespace WixToolset.Data.WindowsInstaller
        {
            var empty = reader.IsEmptyElement;
            string name = null;
-            string tupleDefinitionName = null;
            var unreal = false;
-            bool? tupleIdIsPrimaryKey = null;
            while (reader.MoveToNextAttribute())
            {
@@ -141,12 +139,6 @@ namespace WixToolset.Data.WindowsInstaller
                    case "name":
                        name = reader.Value;
                        break;
-                    case "tupleDefinitionName":
-                        tupleDefinitionName = reader.Value;
-                        break;
-                    case "tupleIdIsPrimaryKey":
-                        tupleIdIsPrimaryKey = reader.Value.Equals("yes");
-                        break;
                    case "unreal":
                        unreal = reader.Value.Equals("yes");
                        break;
@@ -203,7 +195,7 @@ namespace WixToolset.Data.WindowsInstaller
                }
            }
-            return new TableDefinition(name, columns.ToArray(), unreal, tupleDefinitionName, tupleIdIsPrimaryKey);
+            return new TableDefinition(name, null, columns.ToArray(), unreal);
        }
        /// <summary>
@@ -228,14 +220,5 @@ namespace WixToolset.Data.WindowsInstaller
            writer.WriteEndElement();
        }
-        private static bool DeriveTupleIdIsPrimaryKey(ColumnDefinition[] columns)
-        {
-            return columns[0].PrimaryKey &&
-                   columns[0].Type == ColumnType.String &&
-                   columns[0].Category == ColumnCategory.Identifier &&
-                   !columns[0].Name.EndsWith("_") &&
-                   (columns.Length == 1 || !columns.Skip(1).Any(t => t.PrimaryKey));
-        }
    }
 }
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
index e1119a68..91385d74 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
@@ -77,19 +77,6 @@ namespace WixToolset.Data.WindowsInstaller
        public bool TryGet(string tableName, out TableDefinition table) => this.collection.TryGetValue(tableName, out table);
        /// <summary>
-        /// Load a table definition collection from an XmlReader.
-        /// </summary>
-        /// <param name="reader">Reader to get data from.</param>
-        /// <param name="suppressSchema">Suppress xml schema validation while loading.</param>
-        /// <returns>The TableDefinitionCollection represented by the xml.</returns>
-        public static TableDefinitionCollection Load(XmlReader reader)
-        {
-            reader.MoveToContent();
-            return Read(reader);
-        }
-        /// <summary>
        /// Adds a table definition to the collection.
        /// </summary>
        /// <param name="tableDefinition">Table definition to add to the collection.</param>
diff --git a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
index 11b884bd..be59b844 100644
--- a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
+++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
@@ -6,18 +6,19 @@ namespace WixToolset.Data.WindowsInstaller
    {
        public static readonly TableDefinition ActionText = new TableDefinition(
            "ActionText",
+            TupleDefinitions.ActionText,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of action to be described.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Localized description displayed in progress dialog and log when action is executing."),
                new ColumnDefinition("Template", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Template, description: "Optional localized format template used to format action data records for display during action execution.", modularizeType: ColumnModularizeType.Property),
            },
-            tupleDefinitionName: TupleDefinitions.ActionText.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition AdminExecuteSequence = new TableDefinition(
            "AdminExecuteSequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of action to invoke, either in the engine or the handler DLL."),
@@ -29,18 +30,19 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition Condition = new TableDefinition(
            "Condition",
+            TupleDefinitions.Condition,
            new[]
            {
                new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Reference to a Feature entry in Feature table."),
                new ColumnDefinition("Level", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "New selection Level to set in Feature table if Condition evaluates to TRUE."),
                new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Expression evaluated to determine if Level in the Feature table is to change.", forceLocalizable: true),
            },
-            tupleDefinitionName: TupleDefinitions.Condition.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition AdminUISequence = new TableDefinition(
            "AdminUISequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of action to invoke, either in the engine or the handler DLL."),
@@ -52,6 +54,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition AdvtExecuteSequence = new TableDefinition(
            "AdvtExecuteSequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of action to invoke, either in the engine or the handler DLL."),
@@ -63,6 +66,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition AdvtUISequence = new TableDefinition(
            "AdvtUISequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of action to invoke, either in the engine or the handler DLL."),
@@ -74,6 +78,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition AppId = new TableDefinition(
            "AppId",
+            TupleDefinitions.AppId,
            new[]
            {
                new ColumnDefinition("AppId", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid),
@@ -84,34 +89,34 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("ActivateAtStorage", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1),
                new ColumnDefinition("RunAsInteractiveUser", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1),
            },
-            tupleDefinitionName: TupleDefinitions.AppId.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition AppSearch = new TableDefinition(
            "AppSearch",
+            TupleDefinitions.AppSearch,
            new[]
            {
                new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The property associated with a Signature", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Signature;RegLocator;IniLocator;DrLocator;CompLocator", keyColumn: 1, description: "The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.AppSearch.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Property = new TableDefinition(
            "Property",
+            TupleDefinitions.Property,
            new[]
            {
                new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of property, uppercase if settable by launcher or loader.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "String value for property.  Never null or empty."),
            },
-            tupleDefinitionName: TupleDefinitions.Property.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition BBControl = new TableDefinition(
            "BBControl",
+            TupleDefinitions.BBControl,
            new[]
            {
                new ColumnDefinition("Billboard_", ColumnType.String, 50, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Billboard", keyColumn: 1, description: "External key to the Billboard table, name of the billboard.", modularizeType: ColumnModularizeType.Column),
@@ -124,12 +129,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied to this control."),
                new ColumnDefinition("Text", ColumnType.Localized, 50, primaryKey: false, nullable: true, ColumnCategory.Text, description: "A string used to set the initial text contained within a control (if appropriate)."),
            },
-            tupleDefinitionName: TupleDefinitions.BBControl.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Billboard = new TableDefinition(
            "Billboard",
+            TupleDefinitions.Billboard,
            new[]
            {
                new ColumnDefinition("Billboard", ColumnType.String, 50, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of the billboard.", modularizeType: ColumnModularizeType.Column),
@@ -137,12 +142,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Action", ColumnType.String, 50, primaryKey: false, nullable: true, ColumnCategory.Identifier, description: "The name of an action. The billboard is displayed during the progress messages received from this action."),
                new ColumnDefinition("Ordering", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "A positive integer. If there is more than one billboard corresponding to an action they will be shown in the order defined by this column."),
            },
-            tupleDefinitionName: TupleDefinitions.Billboard.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Feature = new TableDefinition(
            "Feature",
+            TupleDefinitions.Feature,
            new[]
            {
                new ColumnDefinition("Feature", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key used to identify a particular feature record."),
@@ -154,23 +159,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.UpperCase, keyTable: "Directory", keyColumn: 1, description: "The name of the Directory that can be configured by the UI. A non-null value will enable the browse button.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "0;1;2;4;5;6;8;9;10;16;17;18;20;21;22;24;25;26;32;33;34;36;37;38;48;49;50;52;53;54", description: "Feature attributes"),
            },
-            tupleDefinitionName: TupleDefinitions.Feature.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Binary = new TableDefinition(
            "Binary",
+            TupleDefinitions.Binary,
            new[]
            {
                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique key identifying the binary data.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Data", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "The unformatted binary data."),
            },
-            tupleDefinitionName: TupleDefinitions.Binary.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition BindImage = new TableDefinition(
            "BindImage",
+            null,
            new[]
            {
                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "The index into the File table. This must be an executable file.", modularizeType: ColumnModularizeType.Column),
@@ -181,6 +186,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition File = new TableDefinition(
            "File",
+            TupleDefinitions.File,
            new[]
            {
                new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token, must match identifier in cabinet.  For uncompressed files, this field is ignored.", modularizeType: ColumnModularizeType.Column),
@@ -194,33 +200,33 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("DiskId", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 32767, description: "Disk identifier for the file.", unreal: true),
                new ColumnDefinition("Source", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "Path to source of file.", unreal: true),
            },
-            tupleDefinitionName: TupleDefinitions.File.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition CCPSearch = new TableDefinition(
            "CCPSearch",
+            TupleDefinitions.CCPSearch,
            new[]
            {
                new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Signature;RegLocator;IniLocator;DrLocator;CompLocator", keyColumn: 1, description: "The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables."),
            },
-            tupleDefinitionName: TupleDefinitions.CCPSearch.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition CheckBox = new TableDefinition(
            "CheckBox",
+            TupleDefinitions.CheckBox,
            new[]
            {
                new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A named property to be tied to the item.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Value", ColumnType.String, 64, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value string associated with the item.", modularizeType: ColumnModularizeType.Property),
            },
-            tupleDefinitionName: TupleDefinitions.CheckBox.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Class = new TableDefinition(
            "Class",
+            TupleDefinitions.Class,
            new[]
            {
                new ColumnDefinition("CLSID", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid, description: "The CLSID of an OLE factory."),
@@ -237,12 +243,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational."),
                new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, maxValue: 32767, description: "Class registration attributes."),
            },
-            tupleDefinitionName: TupleDefinitions.Class.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Component = new TableDefinition(
            "Component",
+            TupleDefinitions.Component,
            new[]
            {
                new ColumnDefinition("Component", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key used to identify a particular component record.", modularizeType: ColumnModularizeType.Column),
@@ -252,23 +258,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "A conditional statement that will disable this component if the specified condition evaluates to the 'True' state. If a component is disabled, it will not be installed, regardless of the 'Action' state associated with the component.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
                new ColumnDefinition("KeyPath", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File;Registry;ODBCDataSource", keyColumn: 1, description: "Either the primary key into the File table, Registry table, or ODBCDataSource table. This extract path is stored when the component is installed, and is used to detect the presence of the component and to return the path to it.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.Component.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Icon = new TableDefinition(
            "Icon",
+            TupleDefinitions.Icon,
            new[]
            {
                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. Name of the icon file.", modularizeType: ColumnModularizeType.Icon),
                new ColumnDefinition("Data", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "Binary stream. The binary icon data in PE (.DLL or .EXE) or icon (.ICO) format."),
            },
-            tupleDefinitionName: TupleDefinitions.Icon.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition ProgId = new TableDefinition(
            "ProgId",
+            TupleDefinitions.ProgId,
            new[]
            {
                new ColumnDefinition("ProgId", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "The Program Identifier. Primary key."),
@@ -278,12 +284,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Icon_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Icon", keyColumn: 1, description: "Optional foreign key into the Icon Table, specifying the icon file associated with this ProgId. Will be written under the DefaultIcon key.", modularizeType: ColumnModularizeType.Icon),
                new ColumnDefinition("IconIndex", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -32767, maxValue: 32767, description: "Optional icon index."),
            },
-            tupleDefinitionName: TupleDefinitions.ProgId.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ComboBox = new TableDefinition(
            "ComboBox",
+            TupleDefinitions.ComboBox,
            new[]
            {
                new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A named property to be tied to this item. All the items tied to the same property become part of the same combobox.", modularizeType: ColumnModularizeType.Column),
@@ -291,47 +297,47 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Value", ColumnType.String, 64, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The value string associated with this item. Selecting the line will set the associated property to this value.", modularizeType: ColumnModularizeType.Property, forceLocalizable: true),
                new ColumnDefinition("Text", ColumnType.Localized, 64, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.", modularizeType: ColumnModularizeType.Property),
            },
-            tupleDefinitionName: TupleDefinitions.ComboBox.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition CompLocator = new TableDefinition(
            "CompLocator",
+            TupleDefinitions.CompLocator,
            new[]
            {
                new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("ComponentId", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Guid, description: "A string GUID unique to this component, version, and language."),
                new ColumnDefinition("Type", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "A boolean value that determines if the registry value is a filename or a directory location."),
            },
-            tupleDefinitionName: TupleDefinitions.CompLocator.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Complus = new TableDefinition(
            "Complus",
+            TupleDefinitions.Complus,
            new[]
            {
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key referencing Component that controls the ComPlus component.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("ExpType", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "ComPlus component attributes."),
            },
-            tupleDefinitionName: TupleDefinitions.Complus.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Directory = new TableDefinition(
            "Directory",
+            TupleDefinitions.Directory,
            new[]
            {
                new ColumnDefinition("Directory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique identifier for directory entry, primary key. If a property by this name is defined, it contains the full path to the directory.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Directory_Parent", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Reference to the entry in this table specifying the default parent directory. A record parented to itself or with a Null parent represents a root of the install tree.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("DefaultDir", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.DefaultDir, description: "The default sub-path under parent's path."),
            },
-            tupleDefinitionName: TupleDefinitions.Directory.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Control = new TableDefinition(
            "Control",
+            TupleDefinitions.Control,
            new[]
            {
                new ColumnDefinition("Dialog_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Dialog", keyColumn: 1, description: "External key to the Dialog table, name of the dialog.", modularizeType: ColumnModularizeType.Column),
@@ -347,12 +353,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Control_Next", ColumnType.String, 50, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Control", keyColumn: 2, description: "The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!"),
                new ColumnDefinition("Help", ColumnType.Localized, 50, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The help strings used with the button. The text is optional. "),
            },
-            tupleDefinitionName: TupleDefinitions.Control.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Dialog = new TableDefinition(
            "Dialog",
+            TupleDefinitions.Dialog,
            new[]
            {
                new ColumnDefinition("Dialog", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of the dialog.", modularizeType: ColumnModularizeType.Column),
@@ -366,12 +372,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Control_Default", ColumnType.String, 50, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Control", keyColumn: 2, description: "Defines the default control. Hitting return is equivalent to pushing this button."),
                new ColumnDefinition("Control_Cancel", ColumnType.String, 50, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Control", keyColumn: 2, description: "Defines the cancel control. Hitting escape or clicking on the close icon on the dialog is equivalent to pushing this button."),
            },
-            tupleDefinitionName: TupleDefinitions.Dialog.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition ControlCondition = new TableDefinition(
            "ControlCondition",
+            TupleDefinitions.ControlCondition,
            new[]
            {
                new ColumnDefinition("Dialog_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Dialog", keyColumn: 1, description: "A foreign key to the Dialog table, name of the dialog.", modularizeType: ColumnModularizeType.Column),
@@ -379,12 +385,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Action", ColumnType.String, 50, primaryKey: true, nullable: false, ColumnCategory.Unknown, possibilities: "Default;Disable;Enable;Hide;Show", description: "The desired action to be taken on the specified control."),
                new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Condition, description: "A standard conditional statement that specifies under which conditions the action should be triggered.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
            },
-            tupleDefinitionName: TupleDefinitions.ControlCondition.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ControlEvent = new TableDefinition(
            "ControlEvent",
+            TupleDefinitions.ControlEvent,
            new[]
            {
                new ColumnDefinition("Dialog_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Dialog", keyColumn: 1, description: "A foreign key to the Dialog table, name of the dialog.", modularizeType: ColumnModularizeType.Column),
@@ -394,23 +400,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: true, nullable: true, ColumnCategory.Condition, description: "A standard conditional statement that specifies under which conditions an event should be triggered.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
                new ColumnDefinition("Ordering", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "An integer used to order several events tied to the same control. Can be left blank."),
            },
-            tupleDefinitionName: TupleDefinitions.ControlEvent.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition CreateFolder = new TableDefinition(
            "CreateFolder",
+            TupleDefinitions.CreateFolder,
            new[]
            {
                new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Primary key, could be foreign key into the Directory table.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.CreateFolder.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition CustomAction = new TableDefinition(
            "CustomAction",
+            TupleDefinitions.CustomAction,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, name of action, normally appears in sequence table unless private use.", modularizeType: ColumnModularizeType.Column),
@@ -419,12 +425,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Target", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Excecution parameter, depends on the type of custom action", modularizeType: ColumnModularizeType.Property, forceLocalizable: true),
                new ColumnDefinition("ExtendedType", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A numeric custom action type that extends code type or option flags of the Type column."),
            },
-            tupleDefinitionName: TupleDefinitions.CustomAction.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition DrLocator = new TableDefinition(
            "DrLocator",
+            TupleDefinitions.DrLocator,
            new[]
            {
                new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The Signature_ represents a unique file signature and is also the foreign key in the Signature table.", modularizeType: ColumnModularizeType.Column),
@@ -432,12 +438,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: true, nullable: true, ColumnCategory.AnyPath, description: "The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("Depth", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0."),
            },
-            tupleDefinitionName: TupleDefinitions.DrLocator.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition DuplicateFile = new TableDefinition(
            "DuplicateFile",
+            TupleDefinitions.DuplicateFile,
            new[]
            {
                new ColumnDefinition("FileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key used to identify a particular file entry", modularizeType: ColumnModularizeType.Column),
@@ -446,12 +452,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("DestName", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Filename, description: "Filename to be given to the duplicate file."),
                new ColumnDefinition("DestFolder", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, description: "Name of a property whose value is assumed to resolve to the full pathname to a destination folder.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.DuplicateFile.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Environment = new TableDefinition(
            "Environment",
+            TupleDefinitions.Environment,
            new[]
            {
                new ColumnDefinition("Environment", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique identifier for the environmental variable setting", modularizeType: ColumnModularizeType.Column),
@@ -459,23 +465,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Value", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value to set in the environmental settings.", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the environmental value.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.Environment.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Error = new TableDefinition(
            "Error",
+            TupleDefinitions.Error,
            new[]
            {
                new ColumnDefinition("Error", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "Integer error number, obtained from header file IError(...) macros."),
                new ColumnDefinition("Message", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Template, description: "Error formatting template, obtained from user ed. or localizers.", modularizeType: ColumnModularizeType.Property, useCData: true),
            },
-            tupleDefinitionName: TupleDefinitions.Error.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition EventMapping = new TableDefinition(
            "EventMapping",
+            TupleDefinitions.EventMapping,
            new[]
            {
                new ColumnDefinition("Dialog_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Dialog", keyColumn: 1, description: "A foreign key to the Dialog table, name of the Dialog.", modularizeType: ColumnModularizeType.Column),
@@ -483,12 +489,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Event", ColumnType.String, 50, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "An identifier that specifies the type of the event that the control subscribes to."),
                new ColumnDefinition("Attribute", ColumnType.String, 50, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "The name of the control attribute, that is set when this event is received."),
            },
-            tupleDefinitionName: TupleDefinitions.EventMapping.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Extension = new TableDefinition(
            "Extension",
+            TupleDefinitions.Extension,
            new[]
            {
                new ColumnDefinition("Extension", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "The extension associated with the table row."),
@@ -497,58 +503,58 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("MIME_", ColumnType.String, 64, primaryKey: false, nullable: true, ColumnCategory.Text, keyTable: "MIME", keyColumn: 1, description: "Optional Context identifier, typically \"type/format\" associated with the extension"),
                new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational."),
            },
-            tupleDefinitionName: TupleDefinitions.Extension.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MIME = new TableDefinition(
            "MIME",
+            TupleDefinitions.MIME,
            new[]
            {
                new ColumnDefinition("ContentType", ColumnType.String, 64, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Primary key. Context identifier, typically \"type/format\"."),
                new ColumnDefinition("Extension_", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, keyTable: "Extension", keyColumn: 1, description: "Optional associated extension (without dot)"),
                new ColumnDefinition("CLSID", ColumnType.String, 38, primaryKey: false, nullable: true, ColumnCategory.Guid, description: "Optional associated CLSID."),
            },
-            tupleDefinitionName: TupleDefinitions.MIME.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition FeatureComponents = new TableDefinition(
            "FeatureComponents",
+            TupleDefinitions.FeatureComponents,
            new[]
            {
                new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Foreign key into Feature table."),
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into Component table.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.FeatureComponents.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition FileSFPCatalog = new TableDefinition(
            "FileSFPCatalog",
+            TupleDefinitions.FileSFPCatalog,
            new[]
            {
                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File associated with the catalog", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("SFPCatalog_", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Filename, keyTable: "SFPCatalog", keyColumn: 1, description: "Catalog associated with the file"),
            },
-            tupleDefinitionName: TupleDefinitions.FileSFPCatalog.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition SFPCatalog = new TableDefinition(
            "SFPCatalog",
+            TupleDefinitions.SFPCatalog,
            new[]
            {
                new ColumnDefinition("SFPCatalog", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Filename, description: "File name for the catalog."),
                new ColumnDefinition("Catalog", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "SFP Catalog"),
                new ColumnDefinition("Dependency", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Parent catalog - only used by SFP", modularizeType: ColumnModularizeType.Property),
            },
-            tupleDefinitionName: TupleDefinitions.SFPCatalog.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Font = new TableDefinition(
            "Font",
+            null,
            new[]
            {
                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Primary key, foreign key into File table referencing font file.", modularizeType: ColumnModularizeType.Column),
@@ -559,6 +565,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition IniFile = new TableDefinition(
            "IniFile",
+            TupleDefinitions.IniFile,
            new[]
            {
                new ColumnDefinition("IniFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -570,12 +577,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Action", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "0;1;3", description: "The type of modification to be made, one of iifEnum"),
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .INI value.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.IniFile.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition IniLocator = new TableDefinition(
            "IniLocator",
+            TupleDefinitions.IniLocator,
            new[]
            {
                new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.", modularizeType: ColumnModularizeType.Column),
@@ -585,12 +592,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Field", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "The field in the .INI line. If Field is null or 0 the entire line is read."),
                new ColumnDefinition("Type", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2, description: "An integer value that determines if the .INI value read is a filename or a directory location or to be used as is w/o interpretation."),
            },
-            tupleDefinitionName: TupleDefinitions.IniLocator.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition InstallExecuteSequence = new TableDefinition(
            "InstallExecuteSequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of action to invoke, either in the engine or the handler DLL."),
@@ -602,6 +609,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition InstallUISequence = new TableDefinition(
            "InstallUISequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of action to invoke, either in the engine or the handler DLL."),
@@ -613,28 +621,29 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition IsolatedComponent = new TableDefinition(
            "IsolatedComponent",
+            TupleDefinitions.IsolatedComponent,
            new[]
            {
                new ColumnDefinition("Component_Shared", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Key to Component table item to be isolated", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Component_Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Key to Component table item for application", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.IsolatedComponent.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition LaunchCondition = new TableDefinition(
            "LaunchCondition",
+            TupleDefinitions.LaunchCondition,
            new[]
            {
                new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Condition, description: "Expression which must evaluate to TRUE in order for install to commence.", forceLocalizable: true),
                new ColumnDefinition("Description", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Localizable text to display when condition fails and install must abort."),
            },
-            tupleDefinitionName: TupleDefinitions.LaunchCondition.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ListBox = new TableDefinition(
            "ListBox",
+            TupleDefinitions.ListBox,
            new[]
            {
                new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A named property to be tied to this item. All the items tied to the same property become part of the same listbox.", modularizeType: ColumnModularizeType.Column),
@@ -642,12 +651,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Value", ColumnType.String, 64, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The value string associated with this item. Selecting the line will set the associated property to this value.", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("Text", ColumnType.Localized, 64, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value."),
            },
-            tupleDefinitionName: TupleDefinitions.ListBox.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ListView = new TableDefinition(
            "ListView",
+            TupleDefinitions.ListView,
            new[]
            {
                new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A named property to be tied to this item. All the items tied to the same property become part of the same listview.", modularizeType: ColumnModularizeType.Column),
@@ -656,12 +665,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Text", ColumnType.Localized, 64, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "The name of the icon to be displayed with the icon. The binary information is looked up from the Binary Table.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.ListView.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition LockPermissions = new TableDefinition(
            "LockPermissions",
+            TupleDefinitions.LockPermissions,
            new[]
            {
                new ColumnDefinition("LockObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Foreign key into Registry or File table", modularizeType: ColumnModularizeType.Column),
@@ -670,12 +679,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("User", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "User for permissions to be set.  (usually a property)", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permission Access mask.  Full Control = 268435456 (GENERIC_ALL = 0x10000000)"),
            },
-            tupleDefinitionName: TupleDefinitions.LockPermissions.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MsiLockPermissionsEx = new TableDefinition(
            "MsiLockPermissionsEx",
+            TupleDefinitions.MsiLockPermissionsEx,
            new[]
            {
                new ColumnDefinition("MsiLockPermissionsEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -684,12 +693,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("SDDLText", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.FormattedSDDLText, description: "String to indicate permissions to be applied to the LockObject", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Expression which must evaluate to TRUE in order for this set of permissions to be applied", modularizeType: ColumnModularizeType.Property),
            },
-            tupleDefinitionName: TupleDefinitions.MsiLockPermissionsEx.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Media = new TableDefinition(
            "Media",
+            TupleDefinitions.Media,
            new[]
            {
                new ColumnDefinition("DiskId", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 32767, description: "Primary key, integer to determine sort order for table."),
@@ -699,12 +708,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("VolumeLabel", ColumnType.String, 32, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The label attributed to the volume."),
                new ColumnDefinition("Source", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Property, description: "The property defining the location of the cabinet file."),
            },
-            tupleDefinitionName: TupleDefinitions.Media.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MoveFile = new TableDefinition(
            "MoveFile",
+            TupleDefinitions.MoveFile,
            new[]
            {
                new ColumnDefinition("FileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key that uniquely identifies a particular MoveFile record", modularizeType: ColumnModularizeType.Column),
@@ -715,12 +724,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("DestFolder", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of a property whose value is assumed to resolve to the full path to the destination directory", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Options", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Integer value specifying the MoveFile operating mode, one of imfoEnum"),
            },
-            tupleDefinitionName: TupleDefinitions.MoveFile.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition MsiAssembly = new TableDefinition(
            "MsiAssembly",
+            TupleDefinitions.Assembly,
            new[]
            {
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into Component table.", modularizeType: ColumnModularizeType.Column),
@@ -729,35 +738,35 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("File_Application", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Foreign key into File table, denoting the application context for private assemblies. Null for global assemblies.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Assembly attributes"),
            },
-            tupleDefinitionName: TupleDefinitions.Assembly.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MsiAssemblyName = new TableDefinition(
            "MsiAssemblyName",
+            TupleDefinitions.MsiAssemblyName,
            new[]
            {
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into Component table.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "The name part of the name-value pairs for the assembly name."),
                new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "The value part of the name-value pairs for the assembly name."),
            },
-            tupleDefinitionName: TupleDefinitions.MsiAssemblyName.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MsiDigitalCertificate = new TableDefinition(
            "MsiDigitalCertificate",
+            TupleDefinitions.MsiDigitalCertificate,
            new[]
            {
                new ColumnDefinition("DigitalCertificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A unique identifier for the row"),
                new ColumnDefinition("CertData", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "A certificate context blob for a signer certificate"),
            },
-            tupleDefinitionName: TupleDefinitions.MsiDigitalCertificate.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition MsiDigitalSignature = new TableDefinition(
            "MsiDigitalSignature",
+            TupleDefinitions.MsiDigitalSignature,
            new[]
            {
                new ColumnDefinition("Table", ColumnType.String, 32, primaryKey: true, nullable: false, ColumnCategory.Unknown, possibilities: "Media", description: "Reference to another table name (only Media table is supported)"),
@@ -765,12 +774,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("DigitalCertificate_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "MsiDigitalCertificate", keyColumn: 1, description: "Foreign key to MsiDigitalCertificate table identifying the signer certificate"),
                new ColumnDefinition("Hash", ColumnType.Object, 0, primaryKey: false, nullable: true, ColumnCategory.Binary, description: "The encoded hash blob from the digital signature"),
            },
-            tupleDefinitionName: TupleDefinitions.MsiDigitalSignature.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MsiEmbeddedChainer = new TableDefinition(
            "MsiEmbeddedChainer",
+            TupleDefinitions.MsiEmbeddedChainer,
            new[]
            {
                new ColumnDefinition("MsiEmbeddedChainer", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key for the table.", modularizeType: ColumnModularizeType.Column),
@@ -779,12 +788,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Source", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.CustomSource, description: "The location of the executable file for the user-defined function.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Type", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "2;18;50", description: "The functions listed in the MsiEmbeddedChainer table are described using the following custom action numeric types."),
            },
-            tupleDefinitionName: TupleDefinitions.MsiEmbeddedChainer.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition MsiEmbeddedUI = new TableDefinition(
            "MsiEmbeddedUI",
+            TupleDefinitions.MsiEmbeddedUI,
            new[]
            {
                new ColumnDefinition("MsiEmbeddedUI", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key for the table.", modularizeType: ColumnModularizeType.Column),
@@ -793,12 +802,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("MessageFilter", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the types of messages that are sent to the user interface DLL."),
                new ColumnDefinition("Data", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "This column contains binary information."),
            },
-            tupleDefinitionName: TupleDefinitions.MsiEmbeddedUI.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition MsiFileHash = new TableDefinition(
            "MsiFileHash",
+            TupleDefinitions.MsiFileHash,
            new[]
            {
                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Primary key, foreign key into File table referencing file with this hash", modularizeType: ColumnModularizeType.Column),
@@ -808,92 +817,92 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("HashPart3", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Size of file in bytes (long integer)."),
                new ColumnDefinition("HashPart4", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Size of file in bytes (long integer)."),
            },
-            tupleDefinitionName: TupleDefinitions.MsiFileHash.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition MsiPackageCertificate = new TableDefinition(
            "MsiPackageCertificate",
+            TupleDefinitions.MsiPackageCertificate,
            new[]
            {
                new ColumnDefinition("PackageCertificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. A unique identifier for the row."),
                new ColumnDefinition("DigitalCertificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "MsiDigitalCertificate", keyColumn: 1, description: "Foreign key to MsiDigitalCertificate table identifying the signer certificate."),
            },
-            tupleDefinitionName: TupleDefinitions.MsiPackageCertificate.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MsiPatchCertificate = new TableDefinition(
            "MsiPatchCertificate",
+            TupleDefinitions.MsiPatchCertificate,
            new[]
            {
                new ColumnDefinition("PatchCertificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. A unique identifier for the row."),
                new ColumnDefinition("DigitalCertificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "MsiDigitalCertificate", keyColumn: 1, description: "Foreign key to MsiDigitalCertificate table identifying the signer certificate."),
            },
-            tupleDefinitionName: TupleDefinitions.MsiPatchCertificate.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MsiPatchHeaders = new TableDefinition(
            "MsiPatchHeaders",
+            TupleDefinitions.MsiPatchHeaders,
            new[]
            {
                new ColumnDefinition("StreamRef", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. A unique identifier for the row."),
                new ColumnDefinition("Header", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "Binary stream. The patch header, used for patch validation."),
            },
-            tupleDefinitionName: TupleDefinitions.MsiPatchHeaders.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition PatchMetadata = new TableDefinition(
            "PatchMetadata",
+            TupleDefinitions.PatchMetadata,
            new[]
            {
                new ColumnDefinition("Company", ColumnType.String, 72, primaryKey: true, nullable: true, ColumnCategory.Identifier, description: "Primary key. The name of the company."),
                new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. The name of the property."),
                new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Non-null, non-empty value of the metadata property."),
            },
-            tupleDefinitionName: TupleDefinitions.PatchMetadata.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MsiPatchMetadata = new TableDefinition(
            "MsiPatchMetadata",
+            TupleDefinitions.MsiPatchMetadata,
            new[]
            {
                new ColumnDefinition("Company", ColumnType.String, 72, primaryKey: true, nullable: true, ColumnCategory.Unknown),
                new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown),
                new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
-            tupleDefinitionName: TupleDefinitions.MsiPatchMetadata.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MsiPatchOldAssemblyFile = new TableDefinition(
            "MsiPatchOldAssemblyFile",
+            TupleDefinitions.MsiPatchOldAssemblyFile,
            new[]
            {
                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Foreign key into File table. Patch-only table.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "MsiPatchOldAssemblyName", keyColumn: 1, description: "Foreign key into MsiPatchOldAssemblyName table.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.MsiPatchOldAssemblyFile.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MsiPatchOldAssemblyName = new TableDefinition(
            "MsiPatchOldAssemblyName",
+            TupleDefinitions.MsiPatchOldAssemblyName,
            new[]
            {
                new ColumnDefinition("Assembly", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A unique identifier for the row.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "The name part of the name-value pairs for the assembly name. This represents the old name for the assembly."),
                new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "The value part of the name-value pairs for the assembly name. This represents the old name for the assembly."),
            },
-            tupleDefinitionName: TupleDefinitions.MsiPatchOldAssemblyName.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition PatchSequence = new TableDefinition(
            "PatchSequence",
+            TupleDefinitions.PatchSequence,
            new[]
            {
                new ColumnDefinition("PatchFamily", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. The name of the family for the patch."),
@@ -901,12 +910,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Sequence", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Sequence information in version (x.x.x.x) format."),
                new ColumnDefinition("Supersede", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Indicates that this patch supersedes earlier patches."),
            },
-            tupleDefinitionName: TupleDefinitions.PatchSequence.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition MsiPatchSequence = new TableDefinition(
            "MsiPatchSequence",
+            TupleDefinitions.MsiPatchSequence,
            new[]
            {
                new ColumnDefinition("PatchFamily", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -914,24 +923,24 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Sequence", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Unknown),
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
-            tupleDefinitionName: TupleDefinitions.MsiPatchSequence.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ODBCAttribute = new TableDefinition(
            "ODBCAttribute",
+            TupleDefinitions.ODBCAttribute,
            new[]
            {
                new ColumnDefinition("Driver_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ODBCDriver", keyColumn: 1, description: "Reference to ODBC driver in ODBCDriver table", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Attribute", ColumnType.String, 40, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Name of ODBC driver attribute"),
                new ColumnDefinition("Value", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Value for ODBC driver attribute"),
            },
-            tupleDefinitionName: TupleDefinitions.ODBCAttribute.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ODBCDriver = new TableDefinition(
            "ODBCDriver",
+            TupleDefinitions.ODBCDriver,
            new[]
            {
                new ColumnDefinition("Driver", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized.internal token for driver", modularizeType: ColumnModularizeType.Column),
@@ -940,12 +949,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Reference to key driver file", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("File_Setup", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Optional reference to key driver setup DLL", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.ODBCDriver.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition ODBCDataSource = new TableDefinition(
            "ODBCDataSource",
+            TupleDefinitions.ODBCDataSource,
            new[]
            {
                new ColumnDefinition("DataSource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized.internal token for data source", modularizeType: ColumnModularizeType.Column),
@@ -954,24 +963,24 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("DriverDescription", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Reference to driver description, may be existing driver"),
                new ColumnDefinition("Registration", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Registration option: 0=machine, 1=user, others t.b.d."),
            },
-            tupleDefinitionName: TupleDefinitions.ODBCDataSource.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition ODBCSourceAttribute = new TableDefinition(
            "ODBCSourceAttribute",
+            TupleDefinitions.ODBCSourceAttribute,
            new[]
            {
                new ColumnDefinition("DataSource_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ODBCDataSource", keyColumn: 1, description: "Reference to ODBC data source in ODBCDataSource table", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Attribute", ColumnType.String, 32, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Name of ODBC data source attribute"),
                new ColumnDefinition("Value", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Value for ODBC data source attribute"),
            },
-            tupleDefinitionName: TupleDefinitions.ODBCSourceAttribute.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ODBCTranslator = new TableDefinition(
            "ODBCTranslator",
+            TupleDefinitions.ODBCTranslator,
            new[]
            {
                new ColumnDefinition("Translator", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized.internal token for translator", modularizeType: ColumnModularizeType.Column),
@@ -980,12 +989,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Reference to key translator file", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("File_Setup", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Optional reference to key translator setup DLL", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.ODBCTranslator.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Patch = new TableDefinition(
            "Patch",
+            TupleDefinitions.Patch,
            new[]
            {
                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token, foreign key to File table, must match identifier in cabinet.", modularizeType: ColumnModularizeType.Column),
@@ -995,23 +1004,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Header", ColumnType.Object, 0, primaryKey: false, nullable: true, ColumnCategory.Binary, description: "Binary stream. The patch header, used for patch validation."),
                new ColumnDefinition("StreamRef_", ColumnType.String, 38, primaryKey: false, nullable: true, ColumnCategory.Identifier, description: "Identifier. Foreign key to the StreamRef column of the MsiPatchHeaders table."),
            },
-            tupleDefinitionName: TupleDefinitions.Patch.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition PatchPackage = new TableDefinition(
            "PatchPackage",
+            TupleDefinitions.PatchPackage,
            new[]
            {
                new ColumnDefinition("PatchId", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid, description: "A unique string GUID representing this patch."),
                new ColumnDefinition("Media_", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "Foreign key to DiskId column of Media table. Indicates the disk containing the patch package."),
            },
-            tupleDefinitionName: TupleDefinitions.PatchPackage.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition PublishComponent = new TableDefinition(
            "PublishComponent",
+            TupleDefinitions.PublishComponent,
            new[]
            {
                new ColumnDefinition("ComponentId", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid, description: "A string GUID that represents the component id that will be requested by the alien product."),
@@ -1020,12 +1029,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("AppData", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "This is localisable Application specific data that can be associated with a Qualified Component."),
                new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Foreign key into the Feature table."),
            },
-            tupleDefinitionName: TupleDefinitions.PublishComponent.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition RadioButton = new TableDefinition(
            "RadioButton",
+            TupleDefinitions.RadioButton,
            new[]
            {
                new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A named property to be tied to this radio button. All the buttons tied to the same property become part of the same group.", modularizeType: ColumnModularizeType.Column),
@@ -1038,12 +1047,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Text", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The visible title to be assigned to the radio button."),
                new ColumnDefinition("Help", ColumnType.Localized, 50, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The help strings used with the button. The text is optional."),
            },
-            tupleDefinitionName: TupleDefinitions.RadioButton.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Registry = new TableDefinition(
            "Registry",
+            TupleDefinitions.Registry,
            new[]
            {
                new ColumnDefinition("Registry", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1053,12 +1062,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The registry value.", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the registry value.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.Registry.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition RegLocator = new TableDefinition(
            "RegLocator",
+            TupleDefinitions.RegLocator,
            new[]
            {
                new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table. If the type is 0, the registry values refers a directory, and _Signature is not a foreign key.", modularizeType: ColumnModularizeType.Column),
@@ -1067,12 +1076,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The registry value name.", modularizeType: ColumnModularizeType.Property, forceLocalizable: true),
                new ColumnDefinition("Type", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 18, description: "An integer value that determines if the registry value is a filename or a directory location or to be used as is w/o interpretation."),
            },
-            tupleDefinitionName: TupleDefinitions.RegLocator.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition RemoveFile = new TableDefinition(
            "RemoveFile",
+            TupleDefinitions.RemoveFile,
            new[]
            {
                new ColumnDefinition("FileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key used to identify a particular file entry", modularizeType: ColumnModularizeType.Column),
@@ -1081,12 +1090,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("DirProperty", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of a property whose value is assumed to resolve to the full pathname to the folder of the file to be removed.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "1;2;3", description: "Installation option, one of iimEnum."),
            },
-            tupleDefinitionName: TupleDefinitions.RemoveFile.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition RemoveIniFile = new TableDefinition(
            "RemoveIniFile",
+            null,
            new[]
            {
                new ColumnDefinition("RemoveIniFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1103,6 +1112,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition RemoveRegistry = new TableDefinition(
            "RemoveRegistry",
+            TupleDefinitions.RemoveRegistry,
            new[]
            {
                new ColumnDefinition("RemoveRegistry", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1111,12 +1121,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The registry value name.", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the deletion of the registry value.", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.RemoveRegistry.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition ReserveCost = new TableDefinition(
            "ReserveCost",
+            TupleDefinitions.ReserveCost,
            new[]
            {
                new ColumnDefinition("ReserveKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key that uniquely identifies a particular ReserveCost record", modularizeType: ColumnModularizeType.Column),
@@ -1125,12 +1135,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("ReserveLocal", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Disk space to reserve if linked component is installed locally."),
                new ColumnDefinition("ReserveSource", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Disk space to reserve if linked component is installed to run from the source location."),
            },
-            tupleDefinitionName: TupleDefinitions.ReserveCost.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition SelfReg = new TableDefinition(
            "SelfReg",
+            null,
            new[]
            {
                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Foreign key into the File table denoting the module that needs to be registered.", modularizeType: ColumnModularizeType.Column),
@@ -1141,6 +1151,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition ServiceControl = new TableDefinition(
            "ServiceControl",
+            TupleDefinitions.ServiceControl,
            new[]
            {
                new ColumnDefinition("ServiceControl", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1150,12 +1161,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Wait", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Boolean for whether to wait for the service to fully start"),
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Required foreign key into the Component Table that controls the startup of the service", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.ServiceControl.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition ServiceInstall = new TableDefinition(
            "ServiceInstall",
+            TupleDefinitions.ServiceInstall,
            new[]
            {
                new ColumnDefinition("ServiceInstall", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1172,12 +1183,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Required foreign key into the Component Table that controls the startup of the service", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Description", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description of service.", modularizeType: ColumnModularizeType.Property),
            },
-            tupleDefinitionName: TupleDefinitions.ServiceInstall.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition MsiServiceConfig = new TableDefinition(
            "MsiServiceConfig",
+            TupleDefinitions.MsiServiceConfig,
            new[]
            {
                new ColumnDefinition("MsiServiceConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1187,12 +1198,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Argument", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Argument(s) for service configuration. Value depends on the content of the ConfigType field"),
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Required foreign key into the Component Table that controls the configuration of the service", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.MsiServiceConfig.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition MsiServiceConfigFailureActions = new TableDefinition(
            "MsiServiceConfigFailureActions",
+            TupleDefinitions.MsiServiceConfigFailureActions,
            new[]
            {
                new ColumnDefinition("MsiServiceConfigFailureActions", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -1205,12 +1216,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("DelayActions", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "A list of delays (time in milli-seconds), separated by [~] delmiters, to wait before taking the corresponding Action. Terminate with [~][~]"),
                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Required foreign key into the Component Table that controls the configuration of failure actions for the service", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.MsiServiceConfigFailureActions.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Shortcut = new TableDefinition(
            "Shortcut",
+            TupleDefinitions.Shortcut,
            new[]
            {
                new ColumnDefinition("Shortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1230,12 +1241,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("DescriptionResourceDLL", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The Formatted string providing the full path to the language neutral file containing the MUI Manifest.", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("DescriptionResourceId", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "The description name index for the shortcut. This must be a non-negative number."),
            },
-            tupleDefinitionName: TupleDefinitions.Shortcut.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition MsiShortcutProperty = new TableDefinition(
            "MsiShortcutProperty",
+            TupleDefinitions.MsiShortcutProperty,
            new[]
            {
                new ColumnDefinition("MsiShortcutProperty", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -1243,12 +1254,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("PropertyKey", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Canonical string representation of the Property Key being set", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("PropVariantValue", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "String representation of the value in the property", modularizeType: ColumnModularizeType.Property),
            },
-            tupleDefinitionName: TupleDefinitions.MsiShortcutProperty.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Signature = new TableDefinition(
            "Signature",
+            TupleDefinitions.Signature,
            new[]
            {
                new ColumnDefinition("Signature", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The table key. The Signature represents a unique file signature.", modularizeType: ColumnModularizeType.Column),
@@ -1261,12 +1272,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("MaxDate", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "The maximum creation date of the file."),
                new ColumnDefinition("Languages", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Language, description: "The languages supported by the file."),
            },
-            tupleDefinitionName: TupleDefinitions.Signature.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition TextStyle = new TableDefinition(
            "TextStyle",
+            TupleDefinitions.TextStyle,
            new[]
            {
                new ColumnDefinition("TextStyle", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of the style. The primary key of this table. This name is embedded in the texts to indicate a style change."),
@@ -1275,12 +1286,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Color", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 16777215, description: "A long integer indicating the color of the string in the RGB format (Red, Green, Blue each 0-255, RGB = R + 256*G + 256^2*B)."),
                new ColumnDefinition("StyleBits", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 15, description: "A combination of style bits."),
            },
-            tupleDefinitionName: TupleDefinitions.TextStyle.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition TypeLib = new TableDefinition(
            "TypeLib",
+            TupleDefinitions.TypeLib,
            new[]
            {
                new ColumnDefinition("LibID", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid, description: "The GUID that represents the library."),
@@ -1292,23 +1303,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Required foreign key into the Feature Table, specifying the feature to validate or install in order for the type library to be operational."),
                new ColumnDefinition("Cost", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "The cost associated with the registration of the typelib. This column is currently optional."),
            },
-            tupleDefinitionName: TupleDefinitions.TypeLib.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition UIText = new TableDefinition(
            "UIText",
+            TupleDefinitions.UIText,
            new[]
            {
                new ColumnDefinition("Key", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A unique key that identifies the particular string."),
                new ColumnDefinition("Text", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The localized version of the string."),
            },
-            tupleDefinitionName: TupleDefinitions.UIText.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition Upgrade = new TableDefinition(
            "Upgrade",
+            TupleDefinitions.Upgrade,
            new[]
            {
                new ColumnDefinition("UpgradeCode", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid, description: "The UpgradeCode GUID belonging to the products in this set."),
@@ -1319,12 +1330,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Remove", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The list of features to remove when uninstalling a product from this set.  The default is \"ALL\"."),
                new ColumnDefinition("ActionProperty", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.UpperCase, description: "The property to set when a product in this set is found."),
            },
-            tupleDefinitionName: TupleDefinitions.Upgrade.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Verb = new TableDefinition(
            "Verb",
+            TupleDefinitions.Verb,
            new[]
            {
                new ColumnDefinition("Extension_", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "Extension", keyColumn: 1, description: "The extension associated with the table row."),
@@ -1333,12 +1344,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Command", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The command text.", modularizeType: ColumnModularizeType.Property),
                new ColumnDefinition("Argument", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Optional value for the command arguments.", modularizeType: ColumnModularizeType.Property),
            },
-            tupleDefinitionName: TupleDefinitions.Verb.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ModuleAdminExecuteSequence = new TableDefinition(
            "ModuleAdminExecuteSequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 64, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Action to insert", modularizeType: ColumnModularizeType.Column),
@@ -1352,6 +1363,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition ModuleAdminUISequence = new TableDefinition(
            "ModuleAdminUISequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 64, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Action to insert", modularizeType: ColumnModularizeType.Column),
@@ -1365,6 +1377,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition ModuleAdvtExecuteSequence = new TableDefinition(
            "ModuleAdvtExecuteSequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 64, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Action to insert", modularizeType: ColumnModularizeType.Column),
@@ -1378,6 +1391,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition ModuleAdvtUISequence = new TableDefinition(
            "ModuleAdvtUISequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 64, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Action to insert", modularizeType: ColumnModularizeType.Column),
@@ -1391,30 +1405,31 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition ModuleComponents = new TableDefinition(
            "ModuleComponents",
+            TupleDefinitions.ModuleComponents,
            new[]
            {
                new ColumnDefinition("Component", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component contained in the module.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("ModuleID", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ModuleSignature", keyColumn: 1, description: "Module containing the component.", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Language", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, keyTable: "ModuleSignature", keyColumn: 2, description: "Default language ID for module (may be changed by transform).", forceLocalizable: true),
            },
-            tupleDefinitionName: TupleDefinitions.ModuleComponents.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ModuleSignature = new TableDefinition(
            "ModuleSignature",
+            TupleDefinitions.ModuleSignature,
            new[]
            {
                new ColumnDefinition("ModuleID", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Module identifier (String.GUID).", modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Language", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, description: "Default decimal language of module.", forceLocalizable: true),
                new ColumnDefinition("Version", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Version, description: "Version of the module."),
            },
-            tupleDefinitionName: TupleDefinitions.ModuleSignature.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ModuleConfiguration = new TableDefinition(
            "ModuleConfiguration",
+            TupleDefinitions.ModuleConfiguration,
            new[]
            {
                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique identifier for this row."),
@@ -1428,12 +1443,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("HelpLocation", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Filename or namespace of the context-sensitive help for this item."),
                new ColumnDefinition("HelpKeyword", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Keyword index into the HelpLocation for this item."),
            },
-            tupleDefinitionName: TupleDefinitions.ModuleConfiguration.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition ModuleDependency = new TableDefinition(
            "ModuleDependency",
+            TupleDefinitions.ModuleDependency,
            new[]
            {
                new ColumnDefinition("ModuleID", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ModuleSignature", keyColumn: 1, description: "Module requiring the dependency.", modularizeType: ColumnModularizeType.Column),
@@ -1442,12 +1457,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("RequiredLanguage", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, description: "LanguageID of the required module.", forceLocalizable: true),
                new ColumnDefinition("RequiredVersion", ColumnType.String, 32, primaryKey: false, nullable: true, ColumnCategory.Version, description: "Version of the required version."),
            },
-            tupleDefinitionName: TupleDefinitions.ModuleDependency.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ModuleExclusion = new TableDefinition(
            "ModuleExclusion",
+            TupleDefinitions.ModuleExclusion,
            new[]
            {
                new ColumnDefinition("ModuleID", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ModuleSignature", keyColumn: 1, description: "String.GUID of module with exclusion requirement.", modularizeType: ColumnModularizeType.Column),
@@ -1457,22 +1472,22 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("ExcludedMinVersion", ColumnType.String, 32, primaryKey: false, nullable: true, ColumnCategory.Version, description: "Minimum version of excluded module."),
                new ColumnDefinition("ExcludedMaxVersion", ColumnType.String, 32, primaryKey: false, nullable: true, ColumnCategory.Version, description: "Maximum version of excluded module."),
            },
-            tupleDefinitionName: TupleDefinitions.ModuleExclusion.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ModuleIgnoreTable = new TableDefinition(
            "ModuleIgnoreTable",
+            TupleDefinitions.ModuleIgnoreTable,
            new[]
            {
                new ColumnDefinition("Table", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Table name to ignore during merge operation."),
            },
-            tupleDefinitionName: TupleDefinitions.ModuleIgnoreTable.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition ModuleInstallExecuteSequence = new TableDefinition(
            "ModuleInstallExecuteSequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 64, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Action to insert", modularizeType: ColumnModularizeType.Column),
@@ -1486,6 +1501,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition ModuleInstallUISequence = new TableDefinition(
            "ModuleInstallUISequence",
+            null,
            new[]
            {
                new ColumnDefinition("Action", ColumnType.String, 64, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Action to insert", modularizeType: ColumnModularizeType.Column),
@@ -1499,6 +1515,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition ModuleSubstitution = new TableDefinition(
            "ModuleSubstitution",
+            TupleDefinitions.ModuleSubstitution,
            new[]
            {
                new ColumnDefinition("Table", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Table containing the data to be modified."),
@@ -1506,23 +1523,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Column", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Column containing the data to be modified."),
                new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Template for modification data."),
            },
-            tupleDefinitionName: TupleDefinitions.ModuleSubstitution.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition Properties = new TableDefinition(
            "Properties",
+            TupleDefinitions.Properties,
            new[]
            {
                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Primary key, non-localized token"),
                new ColumnDefinition("Value", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Value of the property"),
            },
-            tupleDefinitionName: TupleDefinitions.Properties.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ImageFamilies = new TableDefinition(
            "ImageFamilies",
+            TupleDefinitions.ImageFamilies,
            new[]
            {
                new ColumnDefinition("Family", ColumnType.String, 8, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Primary key"),
@@ -1532,12 +1549,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("DiskPrompt", ColumnType.String, 128, primaryKey: false, nullable: true, ColumnCategory.Text, forceLocalizable: true),
                new ColumnDefinition("VolumeLabel", ColumnType.String, 32, primaryKey: false, nullable: true, ColumnCategory.Text),
            },
-            tupleDefinitionName: TupleDefinitions.ImageFamilies.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition UpgradedImages = new TableDefinition(
            "UpgradedImages",
+            TupleDefinitions.UpgradedImages,
            new[]
            {
                new ColumnDefinition("Upgraded", ColumnType.String, 13, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Primary key"),
@@ -1546,23 +1563,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("SymbolPaths", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text),
                new ColumnDefinition("Family", ColumnType.String, 8, primaryKey: false, nullable: false, ColumnCategory.Text, keyTable: "ImageFamilies", keyColumn: 1, description: "Foreign key, Family to which this image belongs"),
            },
-            tupleDefinitionName: TupleDefinitions.UpgradedImages.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition UpgradedFilesToIgnore = new TableDefinition(
            "UpgradedFilesToIgnore",
+            TupleDefinitions.UpgradedFilesToIgnore,
            new[]
            {
                new ColumnDefinition("Upgraded", ColumnType.String, 13, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "UpgradedImages", keyColumn: 1, description: "Foreign key, Upgraded image"),
                new ColumnDefinition("FTK", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "File", keyColumn: 1, description: "Foreign key, File to ignore", modularizeType: ColumnModularizeType.Column),
            },
-            tupleDefinitionName: TupleDefinitions.UpgradedFilesToIgnore.Name,
            tupleIdIsPrimaryKey: false
        );
-        public static readonly TableDefinition UpgradedFiles_OptionalData = new TableDefinition(
+        public static readonly TableDefinition UpgradedFilesOptionalData = new TableDefinition(
            "UpgradedFiles_OptionalData",
+            TupleDefinitions.UpgradedFilesOptionalData,
            new[]
            {
                new ColumnDefinition("Upgraded", ColumnType.String, 13, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "UpgradedImages", keyColumn: 1, description: "Foreign key, Upgraded image"),
@@ -1571,12 +1588,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("AllowIgnoreOnPatchError", ColumnType.Number, 0, primaryKey: false, nullable: true, ColumnCategory.Integer),
                new ColumnDefinition("IncludeWholeFile", ColumnType.Number, 0, primaryKey: false, nullable: true, ColumnCategory.Integer),
            },
-            tupleDefinitionName: TupleDefinitions.UpgradedFilesOptionalData.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition TargetImages = new TableDefinition(
            "TargetImages",
+            TupleDefinitions.TargetImages,
            new[]
            {
                new ColumnDefinition("Target", ColumnType.String, 13, primaryKey: true, nullable: false, ColumnCategory.Text),
@@ -1587,12 +1604,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("ProductValidateFlags", ColumnType.String, 16, primaryKey: false, nullable: true, ColumnCategory.Text),
                new ColumnDefinition("IgnoreMissingSrcFiles", ColumnType.Number, 0, primaryKey: false, nullable: false, ColumnCategory.Integer),
            },
-            tupleDefinitionName: TupleDefinitions.TargetImages.Name,
            tupleIdIsPrimaryKey: false
        );
-        public static readonly TableDefinition TargetFiles_OptionalData = new TableDefinition(
+        public static readonly TableDefinition TargetFilesOptionalData = new TableDefinition(
            "TargetFiles_OptionalData",
+            TupleDefinitions.TargetFilesOptionalData,
            new[]
            {
                new ColumnDefinition("Target", ColumnType.String, 13, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "TargetImages", keyColumn: 1, description: "Foreign key, Target image"),
@@ -1602,12 +1619,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("IgnoreLengths", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text),
                new ColumnDefinition("RetainOffsets", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text),
            },
-            tupleDefinitionName: TupleDefinitions.TargetFilesOptionalData.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition FamilyFileRanges = new TableDefinition(
            "FamilyFileRanges",
+            TupleDefinitions.FamilyFileRanges,
            new[]
            {
                new ColumnDefinition("Family", ColumnType.String, 8, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "ImageFamilies", keyColumn: 1, description: "Foreign key, Family"),
@@ -1615,12 +1632,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("RetainOffsets", ColumnType.String, 128, primaryKey: false, nullable: false, ColumnCategory.Text),
                new ColumnDefinition("RetainLengths", ColumnType.String, 128, primaryKey: false, nullable: false, ColumnCategory.Text),
            },
-            tupleDefinitionName: TupleDefinitions.FamilyFileRanges.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition ExternalFiles = new TableDefinition(
            "ExternalFiles",
+            TupleDefinitions.ExternalFiles,
            new[]
            {
                new ColumnDefinition("Family", ColumnType.String, 8, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "ImageFamilies", keyColumn: 1, description: "Foreign key, Family"),
@@ -1632,12 +1649,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("RetainOffsets", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text),
                new ColumnDefinition("Order", ColumnType.Number, 0, primaryKey: false, nullable: false, ColumnCategory.Integer),
            },
-            tupleDefinitionName: TupleDefinitions.ExternalFiles.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixAction = new TableDefinition(
            "WixAction",
+            TupleDefinitions.WixAction,
            new[]
            {
                new ColumnDefinition("SequenceTable", ColumnType.String, 62, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -1649,12 +1666,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Overridable", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixAction.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBBControl = new TableDefinition(
            "WixBBControl",
+            null,
            new[]
            {
                new ColumnDefinition("Billboard_", ColumnType.String, 50, primaryKey: true, nullable: false, ColumnCategory.Unknown, modularizeType: ColumnModularizeType.Column),
@@ -1667,6 +1684,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition WixComplexReference = new TableDefinition(
            "WixComplexReference",
+            TupleDefinitions.WixComplexReference,
            new[]
            {
                new ColumnDefinition("Parent", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown, forceLocalizable: true),
@@ -1677,23 +1695,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixComplexReference.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixComponentGroup = new TableDefinition(
            "WixComponentGroup",
+            TupleDefinitions.WixComponentGroup,
            new[]
            {
                new ColumnDefinition("WixComponentGroup", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixComponentGroup.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixControl = new TableDefinition(
            "WixControl",
+            null,
            new[]
            {
                new ColumnDefinition("Dialog_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown, modularizeType: ColumnModularizeType.Column),
@@ -1706,18 +1724,19 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition WixCustomRow = new TableDefinition(
            "WixCustomRow",
+            TupleDefinitions.WixCustomRow,
            new[]
            {
                new ColumnDefinition("Table", ColumnType.String, 62, primaryKey: false, nullable: false, ColumnCategory.Unknown),
                new ColumnDefinition("FieldData", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixCustomRow.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixCustomTable = new TableDefinition(
            "WixCustomTable",
+            TupleDefinitions.WixCustomTable,
            new[]
            {
                new ColumnDefinition("Table", ColumnType.String, 62, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -1736,12 +1755,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("BootstrapperApplicationData", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixCustomTable.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixDirectory = new TableDefinition(
            "WixDirectory",
+            null,
            new[]
            {
                new ColumnDefinition("Directory_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown, modularizeType: ColumnModularizeType.Column),
@@ -1753,39 +1772,40 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition WixEnsureTable = new TableDefinition(
            "WixEnsureTable",
+            TupleDefinitions.WixEnsureTable,
            new[]
            {
                new ColumnDefinition("Table", ColumnType.String, 31, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixEnsureTable.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixFeatureGroup = new TableDefinition(
            "WixFeatureGroup",
+            TupleDefinitions.WixFeatureGroup,
            new[]
            {
                new ColumnDefinition("WixFeatureGroup", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixFeatureGroup.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixPatchFamilyGroup = new TableDefinition(
            "WixPatchFamilyGroup",
+            TupleDefinitions.WixPatchFamilyGroup,
            new[]
            {
                new ColumnDefinition("WixPatchFamilyGroup", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixPatchFamilyGroup.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixGroup = new TableDefinition(
            "WixGroup",
+            TupleDefinitions.WixGroup,
            new[]
            {
                new ColumnDefinition("ParentId", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key used to identify a particular record in a parent table."),
@@ -1794,24 +1814,24 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("ChildType", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown, description: "Primary key used to identify a particular child type in a child table."),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixGroup.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixFeatureModules = new TableDefinition(
            "WixFeatureModules",
+            TupleDefinitions.WixFeatureModules,
            new[]
            {
                new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Unknown),
                new ColumnDefinition("WixMerge_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixFeatureModules.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixFile = new TableDefinition(
            "WixFile",
+            null,
            new[]
            {
                new ColumnDefinition("File_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
@@ -1833,17 +1853,18 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition WixBindUpdatedFiles = new TableDefinition(
            "WixBindUpdatedFiles",
+            TupleDefinitions.WixBindUpdatedFiles,
            new[]
            {
                new ColumnDefinition("File_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBindUpdatedFiles.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBuildInfo = new TableDefinition(
            "WixBuildInfo",
+            TupleDefinitions.WixBuildInfo,
            new[]
            {
                new ColumnDefinition("WixVersion", ColumnType.String, 20, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Version number of WiX."),
@@ -1852,34 +1873,34 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("WixPdbFile", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Path to .wixpdb file, if supplied."),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBuildInfo.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixFragment = new TableDefinition(
            "WixFragment",
+            TupleDefinitions.WixFragment,
            new[]
            {
                new ColumnDefinition("WixFragment", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixFragment.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixInstanceComponent = new TableDefinition(
            "WixInstanceComponent",
+            TupleDefinitions.WixInstanceComponent,
            new[]
            {
                new ColumnDefinition("Component_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown, modularizeType: ColumnModularizeType.Column),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixInstanceComponent.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixInstanceTransforms = new TableDefinition(
            "WixInstanceTransforms",
+            TupleDefinitions.WixInstanceTransforms,
            new[]
            {
                new ColumnDefinition("Id", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -1889,12 +1910,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("UpgradeCode", ColumnType.String, 38, primaryKey: false, nullable: true, ColumnCategory.Guid),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixInstanceTransforms.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixMedia = new TableDefinition(
            "WixMedia",
+            null,
            new[]
            {
                new ColumnDefinition("DiskId_", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -1907,6 +1928,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition WixMediaTemplate = new TableDefinition(
            "WixMediaTemplate",
+            TupleDefinitions.WixMediaTemplate,
            new[]
            {
                new ColumnDefinition("CabinetTemplate", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
@@ -1917,12 +1939,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("MaximumCabinetSizeForLargeFileSplitting", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixMediaTemplate.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixMerge = new TableDefinition(
            "WixMerge",
+            TupleDefinitions.WixMerge,
            new[]
            {
                new ColumnDefinition("WixMerge", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -1935,12 +1957,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Feature_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixMerge.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixOrdering = new TableDefinition(
            "WixOrdering",
+            TupleDefinitions.WixOrdering,
            new[]
            {
                new ColumnDefinition("ItemType", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown, description: "Primary key used to identify the item in another table."),
@@ -1949,12 +1971,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("DependsOnId_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Reference to an entry in another table."),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixOrdering.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixDeltaPatchFile = new TableDefinition(
            "WixDeltaPatchFile",
+            TupleDefinitions.WixDeltaPatchFile,
            new[]
            {
                new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown, keyTable: "File", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
@@ -1965,12 +1987,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("SymbolPaths", ColumnType.Preserved, 0, primaryKey: false, nullable: true, ColumnCategory.Text),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixDeltaPatchFile.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixDeltaPatchSymbolPaths = new TableDefinition(
            "WixDeltaPatchSymbolPaths",
+            TupleDefinitions.WixDeltaPatchSymbolPaths,
            new[]
            {
                new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -1978,59 +2000,59 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("SymbolPaths", ColumnType.Preserved, 0, primaryKey: false, nullable: false, ColumnCategory.Text),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixDeltaPatchSymbolPaths.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixProperty = new TableDefinition(
            "WixProperty",
+            TupleDefinitions.WixProperty,
            new[]
            {
                new ColumnDefinition("Property_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Unknown, modularizeType: ColumnModularizeType.Column),
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixProperty.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixSimpleReference = new TableDefinition(
            "WixSimpleReference",
+            TupleDefinitions.WixSimpleReference,
            new[]
            {
                new ColumnDefinition("Table", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Unknown),
                new ColumnDefinition("PrimaryKeys", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixSimpleReference.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixSuppressAction = new TableDefinition(
            "WixSuppressAction",
+            TupleDefinitions.WixSuppressAction,
            new[]
            {
                new ColumnDefinition("SequenceTable", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown),
                new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixSuppressAction.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixSuppressModularization = new TableDefinition(
            "WixSuppressModularization",
+            TupleDefinitions.WixSuppressModularization,
            new[]
            {
                new ColumnDefinition("WixSuppressModularization", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixSuppressModularization.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixPatchBaseline = new TableDefinition(
            "WixPatchBaseline",
+            TupleDefinitions.WixPatchBaseline,
            new[]
            {
                new ColumnDefinition("WixPatchBaseline", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key used to identify sets of transforms in a patch."),
@@ -2038,24 +2060,24 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("ValidationFlags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Integer, description: "Patch transform validation flags for the associated patch baseline."),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixPatchBaseline.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixPatchRef = new TableDefinition(
            "WixPatchRef",
+            TupleDefinitions.WixPatchRef,
            new[]
            {
                new ColumnDefinition("Table", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Unknown),
                new ColumnDefinition("PrimaryKeys", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixPatchRef.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixPatchId = new TableDefinition(
            "WixPatchId",
+            TupleDefinitions.WixPatchId,
            new[]
            {
                new ColumnDefinition("ProductCode", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Unknown),
@@ -2064,23 +2086,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("ApiPatchingSymbolFlags", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 7),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixPatchId.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixPatchTarget = new TableDefinition(
            "WixPatchTarget",
+            TupleDefinitions.WixPatchTarget,
            new[]
            {
                new ColumnDefinition("ProductCode", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixPatchTarget.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixPatchMetadata = new TableDefinition(
            "WixPatchMetadata",
+            null,
            new[]
            {
                new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -2092,17 +2114,18 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition WixUI = new TableDefinition(
            "WixUI",
+            TupleDefinitions.WixUI,
            new[]
            {
                new ColumnDefinition("WixUI", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixUI.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixVariable = new TableDefinition(
            "WixVariable",
+            TupleDefinitions.WixVariable,
            new[]
            {
                new ColumnDefinition("WixVariable", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
@@ -2110,12 +2133,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixVariable.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundleContainer = new TableDefinition(
            "WixBundleContainer",
+            TupleDefinitions.WixBundleContainer,
            new[]
            {
                new ColumnDefinition("WixBundleContainer", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
@@ -2128,23 +2151,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("WorkingPath", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleContainer.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundlePayloadGroup = new TableDefinition(
            "WixBundlePayloadGroup",
+            TupleDefinitions.WixBundlePayloadGroup,
            new[]
            {
                new ColumnDefinition("WixBundlePayloadGroup", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundlePayloadGroup.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundlePayload = new TableDefinition(
            "WixBundlePayload",
+            TupleDefinitions.WixBundlePayload,
            new[]
            {
                new ColumnDefinition("WixBundlePayload", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
@@ -2171,12 +2194,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("ParentPackagePayload_", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundlePayload.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundlePatchTargetCode = new TableDefinition(
            "WixBundlePatchTargetCode",
+            TupleDefinitions.WixBundlePatchTargetCode,
            new[]
            {
                new ColumnDefinition("PackageId", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
@@ -2184,12 +2207,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundlePatchTargetCode.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBundle = new TableDefinition(
            "WixBundle",
+            TupleDefinitions.WixBundle,
            new[]
            {
                new ColumnDefinition("Version", ColumnType.String, 24, primaryKey: false, nullable: false, ColumnCategory.Unknown),
@@ -2217,12 +2240,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("PerMachine", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Only valid after binding."),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundle.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixApprovedExeForElevation = new TableDefinition(
            "WixApprovedExeForElevation",
+            TupleDefinitions.WixApprovedExeForElevation,
            new[]
            {
                new ColumnDefinition("Id", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
@@ -2231,35 +2254,35 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixApprovedExeForElevation.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundleUpdate = new TableDefinition(
            "WixBundleUpdate",
+            TupleDefinitions.WixBundleUpdate,
            new[]
            {
                new ColumnDefinition("Location", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleUpdate.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBootstrapperApplication = new TableDefinition(
            "WixBootstrapperApplication",
+            TupleDefinitions.WixBootstrapperApplication,
            new[]
            {
                new ColumnDefinition("Id", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBootstrapperApplication.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixUpdateRegistration = new TableDefinition(
            "WixUpdateRegistration",
+            TupleDefinitions.WixUpdateRegistration,
            new[]
            {
                new ColumnDefinition("Manufacturer", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
@@ -2269,46 +2292,46 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Classification", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixUpdateRegistration.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBundleCatalog = new TableDefinition(
            "WixBundleCatalog",
+            TupleDefinitions.WixBundleCatalog,
            new[]
            {
                new ColumnDefinition("WixBundleCatalog", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
                new ColumnDefinition("Payload_", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePayload", keyColumn: 1, description: "Reference to a payload entry in the WixBundlePayload table."),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleCatalog.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixChain = new TableDefinition(
            "WixChain",
+            TupleDefinitions.WixChain,
            new[]
            {
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied to the chain."),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixChain.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixChainItem = new TableDefinition(
            "WixChainItem",
+            TupleDefinitions.WixChainItem,
            new[]
            {
                new ColumnDefinition("Id", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixChainItem.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundleRollbackBoundary = new TableDefinition(
            "WixBundleRollbackBoundary",
+            TupleDefinitions.WixBundleRollbackBoundary,
            new[]
            {
                new ColumnDefinition("WixChainItem_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixChainItem", keyColumn: 1, description: "Reference to a WixChainItem entry in the WixChainItem table."),
@@ -2316,23 +2339,23 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Transaction", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleRollbackBoundary.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundlePackageGroup = new TableDefinition(
            "WixBundlePackageGroup",
+            TupleDefinitions.WixBundlePackageGroup,
            new[]
            {
                new ColumnDefinition("WixBundlePackageGroup", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundlePackageGroup.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundlePackage = new TableDefinition(
            "WixBundlePackage",
+            TupleDefinitions.WixBundlePackage,
            new[]
            {
                new ColumnDefinition("WixChainItem_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixChainItem", keyColumn: 1, description: "Reference to a WixChainItem entry in the WixChainItem table."),
@@ -2357,12 +2380,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("x64", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundlePackage.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundleExePackage = new TableDefinition(
            "WixBundleExePackage",
+            TupleDefinitions.WixBundleExePackage,
            new[]
            {
                new ColumnDefinition("WixBundlePackage_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table."),
@@ -2374,12 +2397,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("ExeProtocol", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleExePackage.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundleMsiPackage = new TableDefinition(
            "WixBundleMsiPackage",
+            TupleDefinitions.WixBundleMsiPackage,
            new[]
            {
                new ColumnDefinition("WixBundlePackage_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table."),
@@ -2392,12 +2415,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Manufacturer", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleMsiPackage.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundleMspPackage = new TableDefinition(
            "WixBundleMspPackage",
+            TupleDefinitions.WixBundleMspPackage,
            new[]
            {
                new ColumnDefinition("WixBundlePackage_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table."),
@@ -2407,12 +2430,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("PatchXml", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleMspPackage.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundleMsuPackage = new TableDefinition(
            "WixBundleMsuPackage",
+            TupleDefinitions.WixBundleMsuPackage,
            new[]
            {
                new ColumnDefinition("WixBundlePackage_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table."),
@@ -2420,12 +2443,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("MsuKB", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleMsuPackage.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundlePackageExitCode = new TableDefinition(
            "WixBundlePackageExitCode",
+            TupleDefinitions.WixBundlePackageExitCode,
            new[]
            {
                new ColumnDefinition("WixBundlePackage_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table for the parent Exe."),
@@ -2433,12 +2456,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Behavior", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Integer, minValue: 0, maxValue: 3),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundlePackageExitCode.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBundleMsiFeature = new TableDefinition(
            "WixBundleMsiFeature",
+            TupleDefinitions.WixBundleMsiFeature,
            new[]
            {
                new ColumnDefinition("WixBundlePackage_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table."),
@@ -2453,12 +2476,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleMsiFeature.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBundleMsiProperty = new TableDefinition(
            "WixBundleMsiProperty",
+            TupleDefinitions.WixBundleMsiProperty,
            new[]
            {
                new ColumnDefinition("WixBundlePackage_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table."),
@@ -2467,24 +2490,24 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleMsiProperty.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBundleSlipstreamMsp = new TableDefinition(
            "WixBundleSlipstreamMsp",
+            TupleDefinitions.WixBundleSlipstreamMsp,
            new[]
            {
                new ColumnDefinition("WixBundlePackage_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table for the parent Msi."),
                new ColumnDefinition("WixBundlePackage_Msp", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table for the referenced Msp."),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleSlipstreamMsp.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBundlePackageCommandLine = new TableDefinition(
            "WixBundlePackageCommandLine",
+            TupleDefinitions.WixBundlePackageCommandLine,
            new[]
            {
                new ColumnDefinition("WixBundlePackage_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table."),
@@ -2494,24 +2517,24 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Condition", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundlePackageCommandLine.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixRelatedBundle = new TableDefinition(
            "WixRelatedBundle",
+            TupleDefinitions.WixRelatedBundle,
            new[]
            {
                new ColumnDefinition("Id", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid),
                new ColumnDefinition("Action", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixRelatedBundle.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBundleRelatedPackage = new TableDefinition(
            "WixBundleRelatedPackage",
+            TupleDefinitions.WixBundleRelatedPackage,
            new[]
            {
                new ColumnDefinition("WixBundlePackage_", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table."),
@@ -2525,12 +2548,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("OnlyDetect", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleRelatedPackage.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition WixBundleVariable = new TableDefinition(
            "WixBundleVariable",
+            TupleDefinitions.WixBundleVariable,
            new[]
            {
                new ColumnDefinition("WixBundleVariable", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
@@ -2540,12 +2563,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Persisted", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixBundleVariable.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixBundleProperties = new TableDefinition(
            "WixBundleProperties",
+            null,
            new[]
            {
                new ColumnDefinition("DisplayName", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
@@ -2561,6 +2584,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition WixPackageFeatureInfo = new TableDefinition(
            "WixPackageFeatureInfo",
+            null,
            new[]
            {
                new ColumnDefinition("Package", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
@@ -2580,6 +2604,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition WixPackageProperties = new TableDefinition(
            "WixPackageProperties",
+            null,
            new[]
            {
                new ColumnDefinition("Package", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixBundlePackage", keyColumn: 1, description: "Reference to a chain package entry in the WixBundlePackage table."),
@@ -2607,6 +2632,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition WixPayloadProperties = new TableDefinition(
            "WixPayloadProperties",
+            null,
            new[]
            {
                new ColumnDefinition("Payload", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Identifier),
@@ -2623,6 +2649,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition Streams = new TableDefinition(
            "_Streams",
+            null,
            new[]
            {
                new ColumnDefinition("Name", ColumnType.String, 62, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -2634,17 +2661,18 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition SummaryInformation = new TableDefinition(
            "_SummaryInformation",
+            TupleDefinitions.SummaryInformation,
            new[]
            {
                new ColumnDefinition("PropertyId", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown),
                new ColumnDefinition("Value", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Unknown),
            },
-            tupleDefinitionName: TupleDefinitions.SummaryInformation.Name,
            tupleIdIsPrimaryKey: false
        );
        public static readonly TableDefinition TransformView = new TableDefinition(
            "_TransformView",
+            null,
            new[]
            {
                new ColumnDefinition("Table", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -2659,6 +2687,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition Validation = new TableDefinition(
            "_Validation",
+            null,
            new[]
            {
                new ColumnDefinition("Table", ColumnType.String, 32, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of table"),
@@ -2677,6 +2706,7 @@ namespace WixToolset.Data.WindowsInstaller
        public static readonly TableDefinition WixSearch = new TableDefinition(
            "WixSearch",
+            TupleDefinitions.WixSearch,
            new[]
            {
                new ColumnDefinition("WixSearch", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier),
@@ -2684,12 +2714,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixSearch.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixSearchRelation = new TableDefinition(
            "WixSearchRelation",
+            TupleDefinitions.WixSearchRelation,
            new[]
            {
                new ColumnDefinition("WixSearch_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixSearch", keyColumn: 1, description: "Reference to a WixSearch entry in the WixSearch table."),
@@ -2697,12 +2727,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.DoubleInteger),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixSearchRelation.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixFileSearch = new TableDefinition(
            "WixFileSearch",
+            TupleDefinitions.WixFileSearch,
            new[]
            {
                new ColumnDefinition("WixSearch_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixSearch", keyColumn: 1, description: "Reference to a WixSearch entry in the WixSearch table."),
@@ -2717,12 +2747,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.DoubleInteger),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixFileSearch.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixRegistrySearch = new TableDefinition(
            "WixRegistrySearch",
+            TupleDefinitions.WixRegistrySearch,
            new[]
            {
                new ColumnDefinition("WixSearch_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixSearch", keyColumn: 1, description: "Reference to a WixSearch entry in the WixSearch table."),
@@ -2732,12 +2762,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.DoubleInteger),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixRegistrySearch.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixComponentSearch = new TableDefinition(
            "WixComponentSearch",
+            TupleDefinitions.WixComponentSearch,
            new[]
            {
                new ColumnDefinition("WixSearch_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixSearch", keyColumn: 1, description: "Reference to a WixSearch entry in the WixSearch table."),
@@ -2746,12 +2776,12 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.DoubleInteger),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixComponentSearch.Name,
            tupleIdIsPrimaryKey: true
        );
        public static readonly TableDefinition WixProductSearch = new TableDefinition(
            "WixProductSearch",
+            TupleDefinitions.WixProductSearch,
            new[]
            {
                new ColumnDefinition("WixSearch_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixSearch", keyColumn: 1, description: "Reference to a WixSearch entry in the WixSearch table."),
@@ -2759,7 +2789,6 @@ namespace WixToolset.Data.WindowsInstaller
                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.DoubleInteger),
            },
            unreal: true,
-            tupleDefinitionName: TupleDefinitions.WixProductSearch.Name,
            tupleIdIsPrimaryKey: true
        );
@@ -2880,9 +2909,9 @@ namespace WixToolset.Data.WindowsInstaller
            ImageFamilies,
            UpgradedImages,
            UpgradedFilesToIgnore,
-            UpgradedFiles_OptionalData,
+            UpgradedFilesOptionalData,
            TargetImages,
-            TargetFiles_OptionalData,
+            TargetFilesOptionalData,
            FamilyFileRanges,
            ExternalFiles,
            WixAction,
author	Sean Hall <r.sean.hall@gmail.com>	2020-04-13 11:36:20 +1000
committer	Sean Hall <r.sean.hall@gmail.com>	2020-04-13 20:28:02 +1000
commit	d0d447ad64afdd5956856c4c6b6599f69a522d6b (patch)
tree	c5ba6602e76170004aefb83c8950bb9bc8f0ef08 /src
parent	45e58d750f54c0b7713bcb74792aef4bdb7197cb (diff)
download	wix-d0d447ad64afdd5956856c4c6b6599f69a522d6b.tar.gz wix-d0d447ad64afdd5956856c4c6b6599f69a522d6b.tar.bz2 wix-d0d447ad64afdd5956856c4c6b6599f69a522d6b.zip