Fix dependency table column names.
(More extensions to fix but in general, primary key column names do not repeat the table name. There's no benefit to including the `4` and some don't use a prefix either. I'll aim for consistency but not pedantic consistency.)
Bob Arnson committed
Dec 16, 2021 at 23:33 UTC
7d0391599aa451f774e2db76528df266abedb004
1 file changed
+5
-5
src/ext/Dependency/ca/wixdepca.cpp
+5
-5
@@ -6,14 +6,14 @@
6
#define INITIAL_STRINGDICT_SIZE 4
7
8
LPCWSTR vcsDependencyProviderQuery =
9
- L"SELECT `Wix4DependencyProvider`.`Wix4DependencyProvider`, `Wix4DependencyProvider`.`Component_`, `Wix4DependencyProvider`.`ProviderKey`, `Wix4DependencyProvider`.`Attributes` "
9
+ L"SELECT `Wix4DependencyProvider`.`WixDependencyProvider`, `Wix4DependencyProvider`.`Component_`, `Wix4DependencyProvider`.`ProviderKey`, `Wix4DependencyProvider`.`Attributes` "
10
L"FROM `Wix4DependencyProvider`";
11
enum eDependencyProviderQuery { dpqId = 1, dpqComponent, dpqProviderKey, dpqAttributes };
12
13
LPCWSTR vcsDependencyQuery =
14
- L"SELECT `Wix4Dependency`.`Wix4Dependency`, `Wix4DependencyProvider`.`Component_`, `Wix4Dependency`.`ProviderKey`, `Wix4Dependency`.`MinVersion`, `Wix4Dependency`.`MaxVersion`, `Wix4Dependency`.`Attributes` "
14
+ L"SELECT `Wix4Dependency`.`WixDependency`, `Wix4DependencyProvider`.`Component_`, `Wix4Dependency`.`ProviderKey`, `Wix4Dependency`.`MinVersion`, `Wix4Dependency`.`MaxVersion`, `Wix4Dependency`.`Attributes` "
15
L"FROM `Wix4DependencyProvider`, `Wix4Dependency`, `Wix4DependencyRef` "
16
- L"WHERE `Wix4Dependency`.`Wix4Dependency` = `Wix4DependencyRef`.`Wix4Dependency_` AND `Wix4DependencyProvider`.`Wix4DependencyProvider` = `Wix4DependencyRef`.`Wix4DependencyProvider_`";
16
+ L"WHERE `Wix4Dependency`.`WixDependency` = `Wix4DependencyRef`.`WixDependency_` AND `Wix4DependencyProvider`.`WixDependencyProvider` = `Wix4DependencyRef`.`WixDependencyProvider_`";
17
enum eDependencyComponentQuery { dqId = 1, dqComponent, dqProviderKey, dqMinVersion, dqMaxVersion, dqAttributes };
18
19
static HRESULT EnsureRequiredDependencies(
@@ -159,7 +159,7 @@ static HRESULT EnsureRequiredDependencies(
159
while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
160
{
161
hr = WcaGetRecordString(hRec, dqId, &sczId);
162
- ExitOnFailure(hr, "Failed to get Wix4Dependency.Wix4Dependency.");
162
+ ExitOnFailure(hr, "Failed to get Wix4Dependency.WixDependency.");
163
164
hr = WcaGetRecordString(hRec, dqComponent, &sczComponent);
165
ExitOnFailure(hr, "Failed to get Wix4DependencyProvider.Component_.");
@@ -317,7 +317,7 @@ static HRESULT EnsureAbsentDependents(
317
while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
318
{
319
hr = WcaGetRecordString(hRec, dpqId, &sczId);
320
- ExitOnFailure(hr, "Failed to get Wix4DependencyProvider.Wix4DependencyProvider.");
320
+ ExitOnFailure(hr, "Failed to get Wix4DependencyProvider.WixDependencyProvider.");
321
322
hr = WcaGetRecordString(hRec, dpqComponent, &sczComponent);
323
ExitOnFailure(hr, "Failed to get Wix4DependencyProvider.Component.");