From 32fb169d4c8f5065e43b1351cc3a5b4a3d528588 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 19 Dec 2021 00:01:29 -0500 Subject: Consistent-ify primary key column names. --- src/ext/Http/ca/snisslcert.cpp | 2 +- src/ext/Http/ca/wixhttpca.cpp | 6 +++--- src/ext/Http/wixext/HttpTableDefinitions.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/ext/Http') diff --git a/src/ext/Http/ca/snisslcert.cpp b/src/ext/Http/ca/snisslcert.cpp index 3a7336af..e9cafd66 100644 --- a/src/ext/Http/ca/snisslcert.cpp +++ b/src/ext/Http/ca/snisslcert.cpp @@ -85,7 +85,7 @@ static void SetSniSslCertSetKey( LPCWSTR vcsWixHttpSniSslCertQuery = -L"SELECT `Wix4HttpSniSslCert`.`Wix4HttpSniSslCert`, `Wix4HttpSniSslCert`.`Host`, `Wix4HttpSniSslCert`.`Port`, `Wix4HttpSniSslCert`.`Thumbprint`, `Wix4HttpSniSslCert`.`AppId`, `Wix4HttpSniSslCert`.`Store`, `Wix4HttpSniSslCert`.`HandleExisting`, `Wix4HttpSniSslCert`.`Component_` " +L"SELECT `WixHttpSniSslCert`, `Host`, `Port`, `Thumbprint`, `AppId`, `Store`, `HandleExisting`, `Component_` " L"FROM `Wix4HttpSniSslCert`"; enum eWixHttpSniSslCertQuery { hurqId = 1, hurqHost, hurqPort, hurqCertificateThumbprint, hurqAppId, hurqCertificateStore, hurqHandleExisting, hurqComponent }; diff --git a/src/ext/Http/ca/wixhttpca.cpp b/src/ext/Http/ca/wixhttpca.cpp index 8c846ffc..e24096bb 100644 --- a/src/ext/Http/ca/wixhttpca.cpp +++ b/src/ext/Http/ca/wixhttpca.cpp @@ -30,14 +30,14 @@ HTTPAPI_VERSION vcHttpVersion = HTTPAPI_VERSION_1; ULONG vcHttpFlags = HTTP_INITIALIZE_CONFIG; LPCWSTR vcsHttpUrlReservationQuery = - L"SELECT `Wix4HttpUrlReservation`.`Wix4HttpUrlReservation`, `Wix4HttpUrlReservation`.`HandleExisting`, `Wix4HttpUrlReservation`.`Sddl`, `Wix4HttpUrlReservation`.`Url`, `Wix4HttpUrlReservation`.`Component_` " + L"SELECT `WixHttpUrlReservation`, `HandleExisting`, `Sddl`, `Url`, `Component_` " L"FROM `Wix4HttpUrlReservation`"; enum eHttpUrlReservationQuery { hurqId = 1, hurqHandleExisting, hurqSDDL, hurqUrl, hurqComponent }; LPCWSTR vcsHttpUrlAceQuery = - L"SELECT `Wix4HttpUrlAce`.`SecurityPrincipal`, `Wix4HttpUrlAce`.`Rights` " + L"SELECT `SecurityPrincipal`, `Rights` " L"FROM `Wix4HttpUrlAce` " - L"WHERE `Wix4HttpUrlAce`.`Wix4HttpUrlReservation_`=?"; + L"WHERE `WixHttpUrlReservation_`=?"; enum eHttpUrlAceQuery { huaqSecurityPrincipal = 1, huaqRights }; /****************************************************************** diff --git a/src/ext/Http/wixext/HttpTableDefinitions.cs b/src/ext/Http/wixext/HttpTableDefinitions.cs index 431b9a33..421638a0 100644 --- a/src/ext/Http/wixext/HttpTableDefinitions.cs +++ b/src/ext/Http/wixext/HttpTableDefinitions.cs @@ -28,7 +28,7 @@ namespace WixToolset.Http HttpSymbolDefinitions.WixHttpUrlReservation, new[] { - new ColumnDefinition("Wix4HttpUrlReservation", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("WixHttpUrlReservation", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("HandleExisting", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2, description: "The behavior when trying to install a URL reservation and it already exists."), new ColumnDefinition("Sddl", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Security descriptor for the URL reservation.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Url", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "URL to be reserved.", modularizeType: ColumnModularizeType.Property), @@ -42,7 +42,7 @@ namespace WixToolset.Http HttpSymbolDefinitions.WixHttpUrlAce, new[] { - new ColumnDefinition("Wix4HttpUrlAce", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("WixHttpUrlAce", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("WixHttpUrlReservation_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "WixHttpUrlReservation", keyColumn: 1, description: "Foreign key into the WixHttpUrlReservation table.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("SecurityPrincipal", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The security principal for this ACE.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Rights", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1073741824, description: "The rights for this ACE."), -- cgit v1.2.3-55-g6feb