@joebigelow / wix-1 / commits / 0dfddf11

Add column tuples when created instead of after the table tuple creation

Rob Mensching committed Jun 4, 2020 at 10:24 UTC 0dfddf11df6d5c06b40bfaabca116dea7717e801

1 file changed +2 -6

src/WixToolset.Core/Compiler.cs

+2 -6

@@ -3873,7 +3873,7 @@ namespace WixToolset.Core

3873 attributes |= nullable ? WixCustomTableColumnTupleAttributes.Nullable : WixCustomTableColumnTupleAttributes.None;

3874 attributes |= columnUnreal ? WixCustomTableColumnTupleAttributes.Unreal : WixCustomTableColumnTupleAttributes.None;

3875

3876 - columns.Add(new WixCustomTableColumnTuple(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, columnName))

3876 + var column = this.Core.AddTuple(new WixCustomTableColumnTuple(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, columnName))

3877 {

3878 TableRef = tableId,

3879 Name = columnName,

@@ -3889,6 +3889,7 @@ namespace WixToolset.Core

3889 Modularize = modularization,

3890 Set = setValues,

3891 });

3892 + columns.Add(column);

3893 }

3894 break;

3895 case "Row":

@@ -3921,11 +3922,6 @@ namespace WixToolset.Core

3922 ColumnNames = columnNames,

3923 Unreal = unreal,

3924 });

3924 -

3925 - foreach (var column in columns)

3926 - {

3927 - this.Core.AddTuple(column);

3928 - }

3925 }

3926 }

3927 }