From 0016b37f80e0d1d1fa5c2ab803042456eafbb9e8 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 6 Sep 2020 21:23:24 -0400 Subject: Replace BinaryKey with BinaryRef and FileKey with FileRef. --- src/wixext/SqlCompiler.cs | 16 +- src/wixext/WixToolset.Sql.wixext.csproj | 1 - src/wixext/sql.xsd | 342 -------------------------------- 3 files changed, 8 insertions(+), 351 deletions(-) delete mode 100644 src/wixext/sql.xsd 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 int attributes = 0; var rollbackAttribute = false; var nonRollbackAttribute = false; - string binary = null; + string binaryRef = null; var sequence = CompilerConstants.IntegerNotSet; string user = null; @@ -460,9 +460,9 @@ namespace WixToolset.Sql case "Id": id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); break; - case "BinaryKey": - binary = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binary); + case "BinaryRef": + binaryRef = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryRef); break; case "Sequence": sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, short.MaxValue); @@ -575,12 +575,12 @@ namespace WixToolset.Sql if (null == id) { - id = this.ParseHelper.CreateIdentifier("ssc", componentId, binary, sqlDb); + id = this.ParseHelper.CreateIdentifier("ssc", componentId, binaryRef, sqlDb); } - if (null == binary) + if (null == binaryRef) { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryKey")); + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryRef")); } if (null == sqlDb) @@ -604,7 +604,7 @@ namespace WixToolset.Sql { SqlDbRef = sqlDb, ComponentRef = componentId, - ScriptBinaryRef = binary, + ScriptBinaryRef = binaryRef, UserRef = user, Attributes = attributes, }); diff --git a/src/wixext/WixToolset.Sql.wixext.csproj b/src/wixext/WixToolset.Sql.wixext.csproj index 73c7a4e5..01ab5504 100644 --- a/src/wixext/WixToolset.Sql.wixext.csproj +++ b/src/wixext/WixToolset.Sql.wixext.csproj @@ -13,7 +13,6 @@ - diff --git a/src/wixext/sql.xsd b/src/wixext/sql.xsd deleted file mode 100644 index 161607c9..00000000 --- a/src/wixext/sql.xsd +++ /dev/null @@ -1,342 +0,0 @@ - - - - - - - - The source code schema for the WiX Toolset SQL Server Extension. - - - - - - - - - - - - - - - Nesting SqlDatabase under a Component element will result in a SqlDatabase being installed to the machine as the package is installed. - - Nesting SqlDatabase under Product, Fragment, or Module - results in a database "locator" record being created in - the SqlDatabase table. This means that the database - itself is neither installed nor uninstalled by the MSI - package. It does make the database available for referencing - from a SqlString or SqlScript record. This allows MSI to install - SqlScripts or SqlStrings to already existing databases on the machine. - The install will fail if the database does not exist in these cases. - - - The User attribute references credentials specified in a User element. - If a user is not specified then Windows Authentication will be used by default - using the credentials of the user performing the install to execute sql - strings, etc. - - - - - - SQL Database - - - - - - - - - - - - - - - - - - - The name of the database. The value can be a literal value or derived from a - Property element using the Formatted - syntax. - - - - - - - - - - - Specifies whether to create the database when the associated component is reinstalled. Setting CreateOnInstall to yes does not imply CreateOnReinstall is set to yes. CreateOnReinstall must be set in addition to CreateOnInstall for it to be created during both install and reinstall. - - - - - - - - - - - Specifies whether to drop the database when the associated component is reinstalled. Setting DropOnInstall to yes does not imply DropOnReinstall is set to yes. DropOnReinstall must be set in addition to DropOnInstall for it to be dropped during both install and reinstall. - - - - - - - - - - - - - - - File specification for a Sql database. - - - - - ID of the file specification. - - - - - Specifies the logical name for the database file. - - - - - Specifies the operating-system file name for the database file. - - - - - - Specifies the size of the database file. The GB, MB and KB suffixes can be used to specify gigabytes, - megabytes or kilobytes. The default is megabytes if no suffix is specified. When a Size is not - supplied for a database file, SQL Server uses the size of the primary file in the model database. - - - - - - - Specifies the maximum size to which the database file can grow. The GB, MB and KB suffixes can be used to - to specify gigabytes, megabytes or kilobytes. The default is megabytes if no suffix is specified. If - MaxSize is not specified, the file will grow until the disk is full. - - - - - - - Specifies the growth increment of the database file. The GB, MB and KB and % suffixes can be used to - specify gigabytes, megabytes, kilobytes or a percentage of the current file size to grow. The default is - megabytes if no suffix is specified. The default value is 10% if GrowthSize is not specified, and the - minimum value is 64 KB. The GrowthSize setting for a file cannot exceed the MaxSize setting. - - - - - - - - - File specification for a Sql database. - - - - - ID of the log file specification. - - - - - Specifies the logical name for the log file. - - - - - Specifies the operating-system file name for the log file. - - - - - - Specifies the size of the log file. The GB, MB and KB suffixes can be used to specify gigabytes, - megabytes or kilobytes. The default is megabytes if no suffix is specified. When a Size is not - supplied for a log file, SQL Server makes the file 1 MB. - - - - - - - Specifies the maximum size to which the log file can grow. The GB, MB and KB suffixes can be used to - to specify gigabytes, megabytes or kilobytes. The default is megabytes if no suffix is specified. If - MaxSize is not specified, the file will grow until the disk is full. - - - - - - - Specifies the growth increment of the log file. The GB, MB and KB and % suffixes can be used to - specify gigabytes, megabytes, kilobytes or a percentage of the current file size to grow. The default is - megabytes if no suffix is specified. The default value is 10% if GrowthSize is not specified, and the - minimum value is 64 KB. The GrowthSize setting for a file cannot exceed the MaxSize setting. - - - - - - - - - - - - SQL Script - - - - - - required when not child of SqlDatabase - - - - - - - Reference to Binary stream that contains the SQL script to execute. - - - - - Specifies to execute the script when the associated component is installed. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - - - - - Specifies whether to execute the script when the associated component is reinstalled. Setting ExecuteOnInstall to yes does not imply ExecuteOnReinstall is set to yes. ExecuteOnReinstall must be set in addition to ExecuteOnInstall for it to be executed during both install and reinstall. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - - - - - Specifies to execute the script when the associated component is uninstalled. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - - - - - Specifies whether to execute the script on rollback if an attempt is made to install the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. - - - - - Specifies whether to execute the script on rollback if an attempt is made to reinstall the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. - - - - - Specifies whether to execute the script on rollback if an attempt is made to uninstall the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. - - - - - Continue executing scripts even if this one fails. - - - - - Specifes the order to run the SQL Scripts. It is recommended that rollback scripts be scheduled before their complementary execution script. This order is also relative across the SqlString element. - - - - - - - - - - - SQL String - - - - - - - - - - - - - Specifies to execute the string when the associated component is installed. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - - - - - - Specifies whether to execute the string when the associated component is reinstalled. Setting ExecuteOnInstall to yes does not imply ExecuteOnReinstall is set to yes. ExecuteOnReinstall must be set in addition to ExecuteOnInstall for it to be executed during both install and reinstall. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - - - - - - Specifies to execute the string when the associated component is uninstalled. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - - - - - Specifies whether to execute the string on rollback if an attempt is made to install the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. - - - - - Specifies whether to execute the string on rollback if an attempt is made to reinstall the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. - - - - - Specifies whether to execute the string on rollback if an attempt is made to uninstall the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. - - - - - Continue executing strings even if this one fails. - - - - - Specifes the order to run the SQL Strings. It is recommended that rollback strings be scheduled before their complementary execution string. This order is also relative across the SqlScript element. - - - - - - - - Values of this type will either be "yes" or "no". - - - - - - - - -- cgit v1.2.3-55-g6feb