Commit 35b72bf2 authored by Xunran Ding's avatar Xunran Ding Committed by Commit Bot

fixup! Qualify const char[] sql queries with |static|

Bug: 855465
Change-Id: I1736e5d83494341e068e4aeffeea535d624f3dd4
Reviewed-on: https://chromium-review.googlesource.com/1168944Reviewed-by: default avatarVictor Costan <pwnall@chromium.org>
Reviewed-by: default avatarCathy Li <chili@chromium.org>
Commit-Queue: Xunran Ding <xunran.ding@samsung.com>
Cr-Commit-Position: refs/heads/master@{#582080}
parent c0273bf9
...@@ -119,7 +119,7 @@ bool CreateLatestSchema(sql::Database* db) { ...@@ -119,7 +119,7 @@ bool CreateLatestSchema(sql::Database* db) {
int MigrateFromVersion1To2(sql::Database* db, sql::MetaTable* meta_table) { int MigrateFromVersion1To2(sql::Database* db, sql::MetaTable* meta_table) {
const int target_version = 2; const int target_version = 2;
const int target_compatible_version = 1; const int target_compatible_version = 1;
const char kVersion1ToVersion2MigrationSql[] = static const char kVersion1ToVersion2MigrationSql[] =
// Rename the existing items table. // Rename the existing items table.
"ALTER TABLE prefetch_items RENAME TO prefetch_items_old; " "ALTER TABLE prefetch_items RENAME TO prefetch_items_old; "
// Creates the new items table. // Creates the new items table.
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
namespace { namespace {
size_t CountSQLItemsOfType(sql::Database* db, const char* type) { size_t CountSQLItemsOfType(sql::Database* db, const char* type) {
const char kTypeSQL[] = "SELECT COUNT(*) FROM sqlite_master WHERE type = ?"; static const char kTypeSQL[] =
"SELECT COUNT(*) FROM sqlite_master WHERE type = ?";
sql::Statement s(db->GetUniqueStatement(kTypeSQL)); sql::Statement s(db->GetUniqueStatement(kTypeSQL));
s.BindCString(0, type); s.BindCString(0, type);
EXPECT_TRUE(s.Step()); EXPECT_TRUE(s.Step());
...@@ -38,7 +39,8 @@ bool GetPageSize(sql::Database* db, int* page_size) { ...@@ -38,7 +39,8 @@ bool GetPageSize(sql::Database* db, int* page_size) {
// Get |name|'s root page number in the database. // Get |name|'s root page number in the database.
bool GetRootPage(sql::Database* db, const char* name, int* page_number) { bool GetRootPage(sql::Database* db, const char* name, int* page_number) {
const char kPageSql[] = "SELECT rootpage FROM sqlite_master WHERE name = ?"; static const char kPageSql[] =
"SELECT rootpage FROM sqlite_master WHERE name = ?";
sql::Statement s(db->GetUniqueStatement(kPageSql)); sql::Statement s(db->GetUniqueStatement(kPageSql));
s.BindString(0, name); s.BindString(0, name);
if (!s.Step()) if (!s.Step())
...@@ -210,7 +212,7 @@ size_t CountTableColumns(sql::Database* db, const char* table) { ...@@ -210,7 +212,7 @@ size_t CountTableColumns(sql::Database* db, const char* table) {
// TODO(shess): sql::Database::QuoteForSQL() would make sense. // TODO(shess): sql::Database::QuoteForSQL() would make sense.
std::string quoted_table; std::string quoted_table;
{ {
const char kQuoteSQL[] = "SELECT quote(?)"; static const char kQuoteSQL[] = "SELECT quote(?)";
sql::Statement s(db->GetUniqueStatement(kQuoteSQL)); sql::Statement s(db->GetUniqueStatement(kQuoteSQL));
s.BindCString(0, table); s.BindCString(0, table);
EXPECT_TRUE(s.Step()); EXPECT_TRUE(s.Step());
......
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