diff options
| author | Bob Arnson <bob@firegiant.com> | 2021-12-19 00:01:29 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2021-12-19 14:12:31 -0500 |
| commit | 32fb169d4c8f5065e43b1351cc3a5b4a3d528588 (patch) | |
| tree | dfb5d8b061993386403b4e95d7bd5e77767d39bd /src/ext/Http/ca | |
| parent | 7d0391599aa451f774e2db76528df266abedb004 (diff) | |
| download | wix-32fb169d4c8f5065e43b1351cc3a5b4a3d528588.tar.gz wix-32fb169d4c8f5065e43b1351cc3a5b4a3d528588.tar.bz2 wix-32fb169d4c8f5065e43b1351cc3a5b4a3d528588.zip | |
Consistent-ify primary key column names.
Diffstat (limited to 'src/ext/Http/ca')
| -rw-r--r-- | src/ext/Http/ca/snisslcert.cpp | 2 | ||||
| -rw-r--r-- | src/ext/Http/ca/wixhttpca.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
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( | |||
| 85 | 85 | ||
| 86 | 86 | ||
| 87 | LPCWSTR vcsWixHttpSniSslCertQuery = | 87 | LPCWSTR vcsWixHttpSniSslCertQuery = |
| 88 | L"SELECT `Wix4HttpSniSslCert`.`Wix4HttpSniSslCert`, `Wix4HttpSniSslCert`.`Host`, `Wix4HttpSniSslCert`.`Port`, `Wix4HttpSniSslCert`.`Thumbprint`, `Wix4HttpSniSslCert`.`AppId`, `Wix4HttpSniSslCert`.`Store`, `Wix4HttpSniSslCert`.`HandleExisting`, `Wix4HttpSniSslCert`.`Component_` " | 88 | L"SELECT `WixHttpSniSslCert`, `Host`, `Port`, `Thumbprint`, `AppId`, `Store`, `HandleExisting`, `Component_` " |
| 89 | L"FROM `Wix4HttpSniSslCert`"; | 89 | L"FROM `Wix4HttpSniSslCert`"; |
| 90 | enum eWixHttpSniSslCertQuery { hurqId = 1, hurqHost, hurqPort, hurqCertificateThumbprint, hurqAppId, hurqCertificateStore, hurqHandleExisting, hurqComponent }; | 90 | enum eWixHttpSniSslCertQuery { hurqId = 1, hurqHost, hurqPort, hurqCertificateThumbprint, hurqAppId, hurqCertificateStore, hurqHandleExisting, hurqComponent }; |
| 91 | 91 | ||
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; | |||
| 30 | ULONG vcHttpFlags = HTTP_INITIALIZE_CONFIG; | 30 | ULONG vcHttpFlags = HTTP_INITIALIZE_CONFIG; |
| 31 | 31 | ||
| 32 | LPCWSTR vcsHttpUrlReservationQuery = | 32 | LPCWSTR vcsHttpUrlReservationQuery = |
| 33 | L"SELECT `Wix4HttpUrlReservation`.`Wix4HttpUrlReservation`, `Wix4HttpUrlReservation`.`HandleExisting`, `Wix4HttpUrlReservation`.`Sddl`, `Wix4HttpUrlReservation`.`Url`, `Wix4HttpUrlReservation`.`Component_` " | 33 | L"SELECT `WixHttpUrlReservation`, `HandleExisting`, `Sddl`, `Url`, `Component_` " |
| 34 | L"FROM `Wix4HttpUrlReservation`"; | 34 | L"FROM `Wix4HttpUrlReservation`"; |
| 35 | enum eHttpUrlReservationQuery { hurqId = 1, hurqHandleExisting, hurqSDDL, hurqUrl, hurqComponent }; | 35 | enum eHttpUrlReservationQuery { hurqId = 1, hurqHandleExisting, hurqSDDL, hurqUrl, hurqComponent }; |
| 36 | 36 | ||
| 37 | LPCWSTR vcsHttpUrlAceQuery = | 37 | LPCWSTR vcsHttpUrlAceQuery = |
| 38 | L"SELECT `Wix4HttpUrlAce`.`SecurityPrincipal`, `Wix4HttpUrlAce`.`Rights` " | 38 | L"SELECT `SecurityPrincipal`, `Rights` " |
| 39 | L"FROM `Wix4HttpUrlAce` " | 39 | L"FROM `Wix4HttpUrlAce` " |
| 40 | L"WHERE `Wix4HttpUrlAce`.`Wix4HttpUrlReservation_`=?"; | 40 | L"WHERE `WixHttpUrlReservation_`=?"; |
| 41 | enum eHttpUrlAceQuery { huaqSecurityPrincipal = 1, huaqRights }; | 41 | enum eHttpUrlAceQuery { huaqSecurityPrincipal = 1, huaqRights }; |
| 42 | 42 | ||
| 43 | /****************************************************************** | 43 | /****************************************************************** |