From 594bb035b8f27d341c982dc0754589a447b9abd6 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 18 Apr 2021 21:09:37 -0400 Subject: Add `Wix4` table prefixes. Per https://github.com/wixtoolset/issues/issues/5933. --- src/ca/scasql.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ca/scasql.cpp') 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( SCA_SQLSTR* psssList = NULL; // check for the prerequsite tables - if (S_OK != WcaTableExists(L"SqlDatabase")) + if (S_OK != WcaTableExists(L"Wix4SqlDatabase")) { - WcaLog(LOGMSG_VERBOSE, "skipping SQL CustomAction, no SqlDatabase table"); + WcaLog(LOGMSG_VERBOSE, "skipping SQL CustomAction, no Wix4SqlDatabase table"); ExitFunction1(hr = S_FALSE); } // read tables hr = ScaDbsRead(&psdList, saAction); - ExitOnFailure(hr, "failed to read SqlDatabase table"); + ExitOnFailure(hr, "failed to read Wix4SqlDatabase table"); hr = ScaSqlStrsRead(&psssList, saAction); - ExitOnFailure(hr, "failed to read SqlStrings table"); + ExitOnFailure(hr, "failed to read Wix4SqlString table"); hr = ScaSqlStrsReadScripts(&psssList, saAction); - ExitOnFailure(hr, "failed to read SqlScripts table"); + ExitOnFailure(hr, "failed to read Wix4SqlScript table"); if (SCA_ACTION_UNINSTALL == saAction) { -- cgit v1.2.3-55-g6feb