[LYN-4034] Asset Processor: Sqlite inclusivity fix (#7291)

* Update sqlite package for windows

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add assert to make sure sqlite header and lib version match

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update linux

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update Builting Package / Mac for Sqlite 3.37.2-rev1

Signed-off-by: spham <82231385+spham-amzn@users.noreply.github.com>

* Re-add newline at end of file

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Inclusivity: change sqlite_master to sqlite_schema alias

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

Co-authored-by: spham <82231385+spham-amzn@users.noreply.github.com>
monroegm-disable-blank-issue-2
amzn-mike 4 years ago committed by GitHub
parent 4f47f26249
commit c1b53f1284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -349,7 +349,7 @@ namespace AzToolsFramework
return false; return false;
} }
StatementPrototype stmt("SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name=:1;"); StatementPrototype stmt("SELECT COUNT(*) FROM sqlite_schema WHERE type='table' AND name=:1;");
Statement* execute = stmt.Prepare(m_db); // execute now belongs to stmt and will die when stmt leaves scope. Statement* execute = stmt.Prepare(m_db); // execute now belongs to stmt and will die when stmt leaves scope.
if (!execute->Prepared()) if (!execute->Prepared())
{ {
@ -501,7 +501,7 @@ namespace AzToolsFramework
// https://www.sqlite.org/c3ref/prepare.html ^^^^^^^^^ // https://www.sqlite.org/c3ref/prepare.html ^^^^^^^^^
int res = sqlite3_prepare_v2(db, m_parentPrototype->GetSqlText().c_str(), (int)m_parentPrototype->GetSqlText().length() + 1, &m_statement, NULL); int res = sqlite3_prepare_v2(db, m_parentPrototype->GetSqlText().c_str(), (int)m_parentPrototype->GetSqlText().length() + 1, &m_statement, NULL);
AZ_Assert(res == SQLITE_OK, "Statement::PrepareFirstTime: failed! %s ( prototype is '%s'). Error code returned is %d.", sqlite3_errmsg(db), m_parentPrototype->GetSqlText().c_str(), res); AZ_Assert(res == SQLITE_OK, "Statement::PrepareFirstTime: failed! %s ( prototype is '%s'). Error code returned is %d.", sqlite3_errmsg(db), m_parentPrototype->GetSqlText().c_str(), res);
return ((res == SQLITE_OK)&&(m_statement)); return ((res == SQLITE_OK)&&(m_statement));
} }
@ -703,7 +703,7 @@ namespace AzToolsFramework
int res = sqlite3_clear_bindings(m_statement); int res = sqlite3_clear_bindings(m_statement);
AZ_Assert(res == SQLITE_OK, "Statement::sqlite3_clear_bindings: failed!"); AZ_Assert(res == SQLITE_OK, "Statement::sqlite3_clear_bindings: failed!");
return (res == SQLITE_OK); return (res == SQLITE_OK);
} }
int Statement::GetNamedParamIdx(const char* name) int Statement::GetNamedParamIdx(const char* name)

Loading…
Cancel
Save