aboutsummaryrefslogtreecommitdiff
path: root/src/wixext/SqlCompiler.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext/SqlCompiler.cs')
-rw-r--r--src/wixext/SqlCompiler.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/wixext/SqlCompiler.cs b/src/wixext/SqlCompiler.cs
index bbcdc87d..534fcc27 100644
--- a/src/wixext/SqlCompiler.cs
+++ b/src/wixext/SqlCompiler.cs
@@ -447,7 +447,7 @@ namespace WixToolset.Sql
447 int attributes = 0; 447 int attributes = 0;
448 var rollbackAttribute = false; 448 var rollbackAttribute = false;
449 var nonRollbackAttribute = false; 449 var nonRollbackAttribute = false;
450 string binary = null; 450 string binaryRef = null;
451 var sequence = CompilerConstants.IntegerNotSet; 451 var sequence = CompilerConstants.IntegerNotSet;
452 string user = null; 452 string user = null;
453 453
@@ -460,9 +460,9 @@ namespace WixToolset.Sql
460 case "Id": 460 case "Id":
461 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); 461 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
462 break; 462 break;
463 case "BinaryKey": 463 case "BinaryRef":
464 binary = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 464 binaryRef = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
465 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binary); 465 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryRef);
466 break; 466 break;
467 case "Sequence": 467 case "Sequence":
468 sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, short.MaxValue); 468 sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, short.MaxValue);
@@ -575,12 +575,12 @@ namespace WixToolset.Sql
575 575
576 if (null == id) 576 if (null == id)
577 { 577 {
578 id = this.ParseHelper.CreateIdentifier("ssc", componentId, binary, sqlDb); 578 id = this.ParseHelper.CreateIdentifier("ssc", componentId, binaryRef, sqlDb);
579 } 579 }
580 580
581 if (null == binary) 581 if (null == binaryRef)
582 { 582 {
583 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryKey")); 583 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryRef"));
584 } 584 }
585 585
586 if (null == sqlDb) 586 if (null == sqlDb)
@@ -604,7 +604,7 @@ namespace WixToolset.Sql
604 { 604 {
605 SqlDbRef = sqlDb, 605 SqlDbRef = sqlDb,
606 ComponentRef = componentId, 606 ComponentRef = componentId,
607 ScriptBinaryRef = binary, 607 ScriptBinaryRef = binaryRef,
608 UserRef = user, 608 UserRef = user,
609 Attributes = attributes, 609 Attributes = attributes,
610 }); 610 });