diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-24 14:05:08 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-25 12:48:19 -0700 |
| commit | 9787570331b511bab73ac8f4f38a3b8cfa053ca5 (patch) | |
| tree | 508155e2cf4f6bafeef2be1059da547291025352 /src/WixToolset.Data/WindowsInstaller/TableDefinition.cs | |
| parent | 2bcc21d5c2d27e578f59f905f6acd0979b78aa9d (diff) | |
| download | wix-9787570331b511bab73ac8f4f38a3b8cfa053ca5.tar.gz wix-9787570331b511bab73ac8f4f38a3b8cfa053ca5.tar.bz2 wix-9787570331b511bab73ac8f4f38a3b8cfa053ca5.zip | |
The Great Tuple to Symbol Rename (tm)
Diffstat (limited to 'src/WixToolset.Data/WindowsInstaller/TableDefinition.cs')
| -rw-r--r-- | src/WixToolset.Data/WindowsInstaller/TableDefinition.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs index 214544ca..504c89ce 100644 --- a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs +++ b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs | |||
| @@ -22,15 +22,15 @@ namespace WixToolset.Data.WindowsInstaller | |||
| 22 | /// Creates a table definition. | 22 | /// Creates a table definition. |
| 23 | /// </summary> | 23 | /// </summary> |
| 24 | /// <param name="name">Name of table to create.</param> | 24 | /// <param name="name">Name of table to create.</param> |
| 25 | /// <param name="tupleDefinition">Optional tuple definition for this table.</param> | 25 | /// <param name="symbolDefinition">Optional symbol definition for this table.</param> |
| 26 | /// <param name="columns">Column definitions for the table.</param> | 26 | /// <param name="columns">Column definitions for the table.</param> |
| 27 | /// <param name="unreal">Flag if table is unreal.</param> | 27 | /// <param name="unreal">Flag if table is unreal.</param> |
| 28 | /// <param name="tupleIdIsPrimaryKey">Whether the primary key is the id of the tuple definition associated with this table.</param> | 28 | /// <param name="symbolIdIsPrimaryKey">Whether the primary key is the id of the symbol definition associated with this table.</param> |
| 29 | public TableDefinition(string name, IntermediateTupleDefinition tupleDefinition, IEnumerable<ColumnDefinition> columns, bool unreal = false, bool tupleIdIsPrimaryKey = false, Type strongRowType = null) | 29 | public TableDefinition(string name, IntermediateSymbolDefinition symbolDefinition, IEnumerable<ColumnDefinition> columns, bool unreal = false, bool symbolIdIsPrimaryKey = false, Type strongRowType = null) |
| 30 | { | 30 | { |
| 31 | this.Name = name; | 31 | this.Name = name; |
| 32 | this.TupleDefinition = tupleDefinition; | 32 | this.SymbolDefinition = symbolDefinition; |
| 33 | this.TupleIdIsPrimaryKey = tupleIdIsPrimaryKey; | 33 | this.SymbolIdIsPrimaryKey = symbolIdIsPrimaryKey; |
| 34 | this.Unreal = unreal; | 34 | this.Unreal = unreal; |
| 35 | this.Columns = columns?.ToArray(); | 35 | this.Columns = columns?.ToArray(); |
| 36 | this.StrongRowType = strongRowType ?? typeof(Row); | 36 | this.StrongRowType = strongRowType ?? typeof(Row); |
| @@ -51,10 +51,10 @@ namespace WixToolset.Data.WindowsInstaller | |||
| 51 | public string Name { get; } | 51 | public string Name { get; } |
| 52 | 52 | ||
| 53 | /// <summary> | 53 | /// <summary> |
| 54 | /// Gets the tuple definition associated with this table. | 54 | /// Gets the symbol definition associated with this table. |
| 55 | /// </summary> | 55 | /// </summary> |
| 56 | /// <value>The tuple definition.</value> | 56 | /// <value>The symbol definition.</value> |
| 57 | public IntermediateTupleDefinition TupleDefinition { get; } | 57 | public IntermediateSymbolDefinition SymbolDefinition { get; } |
| 58 | 58 | ||
| 59 | /// <summary> | 59 | /// <summary> |
| 60 | /// Gets if the table is unreal. | 60 | /// Gets if the table is unreal. |
| @@ -69,10 +69,10 @@ namespace WixToolset.Data.WindowsInstaller | |||
| 69 | public ColumnDefinition[] Columns { get; } | 69 | public ColumnDefinition[] Columns { get; } |
| 70 | 70 | ||
| 71 | /// <summary> | 71 | /// <summary> |
| 72 | /// Gets if the primary key is the id of the tuple definition associated with this table. | 72 | /// Gets if the primary key is the id of the symbol definition associated with this table. |
| 73 | /// </summary> | 73 | /// </summary> |
| 74 | /// <value>Flag if table is unreal.</value> | 74 | /// <value>Flag if table is unreal.</value> |
| 75 | public bool TupleIdIsPrimaryKey { get; } | 75 | public bool SymbolIdIsPrimaryKey { get; } |
| 76 | 76 | ||
| 77 | private Type StrongRowType { get; } | 77 | private Type StrongRowType { get; } |
| 78 | 78 | ||
| @@ -162,9 +162,9 @@ namespace WixToolset.Data.WindowsInstaller | |||
| 162 | { | 162 | { |
| 163 | var empty = reader.IsEmptyElement; | 163 | var empty = reader.IsEmptyElement; |
| 164 | string name = null; | 164 | string name = null; |
| 165 | IntermediateTupleDefinition tupleDefinition = null; | 165 | IntermediateSymbolDefinition symbolDefinition = null; |
| 166 | var unreal = false; | 166 | var unreal = false; |
| 167 | var tupleIdIsPrimaryKey = false; | 167 | var symbolIdIsPrimaryKey = false; |
| 168 | Type strongRowType = null; | 168 | Type strongRowType = null; |
| 169 | 169 | ||
| 170 | while (reader.MoveToNextAttribute()) | 170 | while (reader.MoveToNextAttribute()) |
| @@ -187,8 +187,8 @@ namespace WixToolset.Data.WindowsInstaller | |||
| 187 | 187 | ||
| 188 | if (tableDefinitions.TryGet(name, out var tableDefinition)) | 188 | if (tableDefinitions.TryGet(name, out var tableDefinition)) |
| 189 | { | 189 | { |
| 190 | tupleDefinition = tableDefinition.TupleDefinition; | 190 | symbolDefinition = tableDefinition.SymbolDefinition; |
| 191 | tupleIdIsPrimaryKey = tableDefinition.TupleIdIsPrimaryKey; | 191 | symbolIdIsPrimaryKey = tableDefinition.SymbolIdIsPrimaryKey; |
| 192 | strongRowType = tableDefinition.StrongRowType; | 192 | strongRowType = tableDefinition.StrongRowType; |
| 193 | } | 193 | } |
| 194 | 194 | ||
| @@ -237,7 +237,7 @@ namespace WixToolset.Data.WindowsInstaller | |||
| 237 | } | 237 | } |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | return new TableDefinition(name, tupleDefinition, columns.ToArray(), unreal, tupleIdIsPrimaryKey, strongRowType); | 240 | return new TableDefinition(name, symbolDefinition, columns.ToArray(), unreal, symbolIdIsPrimaryKey, strongRowType); |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | /// <summary> | 243 | /// <summary> |
