diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-27 15:00:38 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-27 15:05:55 -0700 |
| commit | c57f5bc9caad2adf1b0fe8fedc1003e49e272080 (patch) | |
| tree | 849189fb1920619007d03a53d49d0a7e03b03066 /src/wixext/SqlCompiler.cs | |
| parent | bbbe36aed1ac5a1b27314a9f9658f49ef08fbb41 (diff) | |
| download | wix-c57f5bc9caad2adf1b0fe8fedc1003e49e272080.tar.gz wix-c57f5bc9caad2adf1b0fe8fedc1003e49e272080.tar.bz2 wix-c57f5bc9caad2adf1b0fe8fedc1003e49e272080.zip | |
The Great Tuple to Symbol Rename (tm)
Diffstat (limited to 'src/wixext/SqlCompiler.cs')
| -rw-r--r-- | src/wixext/SqlCompiler.cs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/wixext/SqlCompiler.cs b/src/wixext/SqlCompiler.cs index 22b533de..2c0f914a 100644 --- a/src/wixext/SqlCompiler.cs +++ b/src/wixext/SqlCompiler.cs | |||
| @@ -7,7 +7,7 @@ namespace WixToolset.Sql | |||
| 7 | using System.Xml.Linq; | 7 | using System.Xml.Linq; |
| 8 | using WixToolset.Data; | 8 | using WixToolset.Data; |
| 9 | using WixToolset.Extensibility; | 9 | using WixToolset.Extensibility; |
| 10 | using WixToolset.Sql.Tuples; | 10 | using WixToolset.Sql.Symbols; |
| 11 | 11 | ||
| 12 | /// <summary> | 12 | /// <summary> |
| 13 | /// The compiler for the WiX Toolset SQL Server Extension. | 13 | /// The compiler for the WiX Toolset SQL Server Extension. |
| @@ -319,7 +319,7 @@ namespace WixToolset.Sql | |||
| 319 | 319 | ||
| 320 | if (!this.Messaging.EncounteredError) | 320 | if (!this.Messaging.EncounteredError) |
| 321 | { | 321 | { |
| 322 | var tuple = section.AddTuple(new SqlDatabaseTuple(sourceLineNumbers, id) | 322 | var symbol = section.AddSymbol(new SqlDatabaseSymbol(sourceLineNumbers, id) |
| 323 | { | 323 | { |
| 324 | Server = server, | 324 | Server = server, |
| 325 | Instance = instance, | 325 | Instance = instance, |
| @@ -332,7 +332,7 @@ namespace WixToolset.Sql | |||
| 332 | 332 | ||
| 333 | if (0 != attributes) | 333 | if (0 != attributes) |
| 334 | { | 334 | { |
| 335 | tuple.Attributes = attributes; | 335 | symbol.Attributes = attributes; |
| 336 | } | 336 | } |
| 337 | } | 337 | } |
| 338 | } | 338 | } |
| @@ -408,7 +408,7 @@ namespace WixToolset.Sql | |||
| 408 | 408 | ||
| 409 | if (!this.Messaging.EncounteredError) | 409 | if (!this.Messaging.EncounteredError) |
| 410 | { | 410 | { |
| 411 | var tuple = section.AddTuple(new SqlFileSpecTuple(sourceLineNumbers, id) | 411 | var symbol = section.AddSymbol(new SqlFileSpecSymbol(sourceLineNumbers, id) |
| 412 | { | 412 | { |
| 413 | Name = name, | 413 | Name = name, |
| 414 | Filename = fileName, | 414 | Filename = fileName, |
| @@ -416,17 +416,17 @@ namespace WixToolset.Sql | |||
| 416 | 416 | ||
| 417 | if (null != size) | 417 | if (null != size) |
| 418 | { | 418 | { |
| 419 | tuple.Size = size; | 419 | symbol.Size = size; |
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | if (null != maxSize) | 422 | if (null != maxSize) |
| 423 | { | 423 | { |
| 424 | tuple.MaxSize = maxSize; | 424 | symbol.MaxSize = maxSize; |
| 425 | } | 425 | } |
| 426 | 426 | ||
| 427 | if (null != growthSize) | 427 | if (null != growthSize) |
| 428 | { | 428 | { |
| 429 | tuple.GrowthSize = growthSize; | 429 | symbol.GrowthSize = growthSize; |
| 430 | } | 430 | } |
| 431 | } | 431 | } |
| 432 | 432 | ||
| @@ -461,7 +461,7 @@ namespace WixToolset.Sql | |||
| 461 | break; | 461 | break; |
| 462 | case "BinaryKey": | 462 | case "BinaryKey": |
| 463 | binary = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); | 463 | binary = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); |
| 464 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Binary, binary); | 464 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binary); |
| 465 | break; | 465 | break; |
| 466 | case "Sequence": | 466 | case "Sequence": |
| 467 | sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, short.MaxValue); | 467 | sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, short.MaxValue); |
| @@ -472,7 +472,7 @@ namespace WixToolset.Sql | |||
| 472 | this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); | 472 | this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName)); |
| 473 | } | 473 | } |
| 474 | sqlDb = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); | 474 | sqlDb = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); |
| 475 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SqlTupleDefinitions.SqlDatabase, sqlDb); | 475 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SqlSymbolDefinitions.SqlDatabase, sqlDb); |
| 476 | break; | 476 | break; |
| 477 | case "User": | 477 | case "User": |
| 478 | user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); | 478 | user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); |
| @@ -599,7 +599,7 @@ namespace WixToolset.Sql | |||
| 599 | 599 | ||
| 600 | if (!this.Messaging.EncounteredError) | 600 | if (!this.Messaging.EncounteredError) |
| 601 | { | 601 | { |
| 602 | var tuple = section.AddTuple(new SqlScriptTuple(sourceLineNumbers, id) | 602 | var symbol = section.AddSymbol(new SqlScriptSymbol(sourceLineNumbers, id) |
| 603 | { | 603 | { |
| 604 | SqlDbRef = sqlDb, | 604 | SqlDbRef = sqlDb, |
| 605 | ComponentRef = componentId, | 605 | ComponentRef = componentId, |
| @@ -610,7 +610,7 @@ namespace WixToolset.Sql | |||
| 610 | 610 | ||
| 611 | if (CompilerConstants.IntegerNotSet != sequence) | 611 | if (CompilerConstants.IntegerNotSet != sequence) |
| 612 | { | 612 | { |
| 613 | tuple.Sequence = sequence; | 613 | symbol.Sequence = sequence; |
| 614 | } | 614 | } |
| 615 | } | 615 | } |
| 616 | } | 616 | } |
| @@ -735,7 +735,7 @@ namespace WixToolset.Sql | |||
| 735 | } | 735 | } |
| 736 | 736 | ||
| 737 | sqlDb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); | 737 | sqlDb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); |
| 738 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SqlTupleDefinitions.SqlDatabase, sqlDb); | 738 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SqlSymbolDefinitions.SqlDatabase, sqlDb); |
| 739 | break; | 739 | break; |
| 740 | case "User": | 740 | case "User": |
| 741 | user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); | 741 | user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); |
| @@ -779,7 +779,7 @@ namespace WixToolset.Sql | |||
| 779 | 779 | ||
| 780 | if (!this.Messaging.EncounteredError) | 780 | if (!this.Messaging.EncounteredError) |
| 781 | { | 781 | { |
| 782 | var tuple = section.AddTuple(new SqlStringTuple(sourceLineNumbers, id) | 782 | var symbol = section.AddSymbol(new SqlStringSymbol(sourceLineNumbers, id) |
| 783 | { | 783 | { |
| 784 | SqlDbRef = sqlDb, | 784 | SqlDbRef = sqlDb, |
| 785 | ComponentRef = componentId, | 785 | ComponentRef = componentId, |
| @@ -790,15 +790,15 @@ namespace WixToolset.Sql | |||
| 790 | 790 | ||
| 791 | if (CompilerConstants.IntegerNotSet != sequence) | 791 | if (CompilerConstants.IntegerNotSet != sequence) |
| 792 | { | 792 | { |
| 793 | tuple.Sequence = sequence; | 793 | symbol.Sequence = sequence; |
| 794 | } | 794 | } |
| 795 | } | 795 | } |
| 796 | } | 796 | } |
| 797 | 797 | ||
| 798 | private void AddReferenceToInstallSqlData(IntermediateSection section, SourceLineNumber sourceLineNumbers) | 798 | private void AddReferenceToInstallSqlData(IntermediateSection section, SourceLineNumber sourceLineNumbers) |
| 799 | { | 799 | { |
| 800 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "InstallSqlData"); | 800 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "InstallSqlData"); |
| 801 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "UninstallSqlData"); | 801 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "UninstallSqlData"); |
| 802 | } | 802 | } |
| 803 | } | 803 | } |
| 804 | } | 804 | } |
