Commit db4494fd authored by Josh Karlin's avatar Josh Karlin Committed by Commit Bot

[Project Code Inclusion] Use alternative table to get at names

Switch from 'sqlite_master' to list the names of tables to 'sqlite_schema'.

Bug: 1097286
Change-Id: Id2a7bfac2b5d12a4169fa350293c140b4f14578f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544024Reviewed-by: default avatarJustin DeWitt <dewittj@chromium.org>
Commit-Queue: Josh Karlin <jkarlin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828881}
parent 866b893a
...@@ -87,7 +87,7 @@ DatabaseTables ReadTables(sql::Database* db) { ...@@ -87,7 +87,7 @@ DatabaseTables ReadTables(sql::Database* db) {
DatabaseTables database_tables; DatabaseTables database_tables;
std::stringstream ss; std::stringstream ss;
sql::Statement table_names(db->GetUniqueStatement( sql::Statement table_names(db->GetUniqueStatement(
"SELECT name FROM sqlite_master WHERE type='table'")); "SELECT name FROM sqlite_schema WHERE type='table'"));
while (table_names.Step()) { while (table_names.Step()) {
const std::string table_name = table_names.ColumnString(0); const std::string table_name = table_names.ColumnString(0);
if (table_name == "meta" || base::StartsWith(table_name, "sqlite_")) if (table_name == "meta" || base::StartsWith(table_name, "sqlite_"))
...@@ -102,7 +102,7 @@ std::string TableSql(sql::Database* db, const std::string& table_name) { ...@@ -102,7 +102,7 @@ std::string TableSql(sql::Database* db, const std::string& table_name) {
DatabaseTables database_tables; DatabaseTables database_tables;
std::stringstream ss; std::stringstream ss;
sql::Statement table_sql(db->GetUniqueStatement( sql::Statement table_sql(db->GetUniqueStatement(
"SELECT sql FROM sqlite_master WHERE type='table' AND name=?")); "SELECT sql FROM sqlite_schema WHERE type='table' AND name=?"));
table_sql.BindString(0, table_name); table_sql.BindString(0, table_name);
if (!table_sql.Step()) if (!table_sql.Step())
return std::string(); return std::string();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment