aboutsummaryrefslogtreecommitdiff
path: root/src/ca/scasql.cpp
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-04-18 21:09:37 -0400
committerBob Arnson <bob@firegiant.com>2021-04-18 21:12:50 -0400
commit594bb035b8f27d341c982dc0754589a447b9abd6 (patch)
treebb13b0a6d5e03fc5ff406a18682a1e9c0c170aa1 /src/ca/scasql.cpp
parentbabe3697ec562d6f93f209e23dc03ba77fa57805 (diff)
downloadwix-594bb035b8f27d341c982dc0754589a447b9abd6.tar.gz
wix-594bb035b8f27d341c982dc0754589a447b9abd6.tar.bz2
wix-594bb035b8f27d341c982dc0754589a447b9abd6.zip
Add `Wix4` table prefixes.
Per https://github.com/wixtoolset/issues/issues/5933.
Diffstat (limited to 'src/ca/scasql.cpp')
-rw-r--r--src/ca/scasql.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ca/scasql.cpp b/src/ca/scasql.cpp
index 5e3edd1c..b0216950 100644
--- a/src/ca/scasql.cpp
+++ b/src/ca/scasql.cpp
@@ -67,21 +67,21 @@ static HRESULT ConfigureSqlData(
67 SCA_SQLSTR* psssList = NULL; 67 SCA_SQLSTR* psssList = NULL;
68 68
69 // check for the prerequsite tables 69 // check for the prerequsite tables
70 if (S_OK != WcaTableExists(L"SqlDatabase")) 70 if (S_OK != WcaTableExists(L"Wix4SqlDatabase"))
71 { 71 {
72 WcaLog(LOGMSG_VERBOSE, "skipping SQL CustomAction, no SqlDatabase table"); 72 WcaLog(LOGMSG_VERBOSE, "skipping SQL CustomAction, no Wix4SqlDatabase table");
73 ExitFunction1(hr = S_FALSE); 73 ExitFunction1(hr = S_FALSE);
74 } 74 }
75 75
76 // read tables 76 // read tables
77 hr = ScaDbsRead(&psdList, saAction); 77 hr = ScaDbsRead(&psdList, saAction);
78 ExitOnFailure(hr, "failed to read SqlDatabase table"); 78 ExitOnFailure(hr, "failed to read Wix4SqlDatabase table");
79 79
80 hr = ScaSqlStrsRead(&psssList, saAction); 80 hr = ScaSqlStrsRead(&psssList, saAction);
81 ExitOnFailure(hr, "failed to read SqlStrings table"); 81 ExitOnFailure(hr, "failed to read Wix4SqlString table");
82 82
83 hr = ScaSqlStrsReadScripts(&psssList, saAction); 83 hr = ScaSqlStrsReadScripts(&psssList, saAction);
84 ExitOnFailure(hr, "failed to read SqlScripts table"); 84 ExitOnFailure(hr, "failed to read Wix4SqlScript table");
85 85
86 if (SCA_ACTION_UNINSTALL == saAction) 86 if (SCA_ACTION_UNINSTALL == saAction)
87 { 87 {