Cache SearchEngineType of TemplateURL

components/search_engines/keyword_table.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/search_engines/keyword_table.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
@@ skipping 63 matching lines @@
     columns.push_back("image_url");
     columns.push_back("search_url_post_params");
     columns.push_back("suggest_url_post_params");
     columns.push_back("instant_url_post_params");
     columns.push_back("image_url_post_params");
   }
   if (version >= 53) {
     // Column added in version 53.
     columns.push_back("new_tab_url");
   }
+  if (version >= 66) {
+    // Column added in version 66.
+    columns.push_back("engine_type");
+  }
 
   return base::JoinString(columns, std::string(concatenated ? " || " : ", "));
 }
 
 
 // Inserts the data from |data| into |s|.  |s| is assumed to have slots for all
 // the columns in the keyword table.  |id_column| is the slot number to bind
 // |data|'s |id| to; |starting_column| is the slot number of the first of a
 // contiguous set of slots to bind all the other fields to.
 void BindURLToStatement(const TemplateURLData& data,
@@ skipping 33 matching lines @@
   s->BindInt64(starting_column + 14, data.last_modified.ToTimeT());
   s->BindString(starting_column + 15, data.sync_guid);
   s->BindString(starting_column + 16, alternate_urls);
   s->BindString(starting_column + 17, data.search_terms_replacement_key);
   s->BindString(starting_column + 18, data.image_url);
   s->BindString(starting_column + 19, data.search_url_post_params);
   s->BindString(starting_column + 20, data.suggestions_url_post_params);
   s->BindString(starting_column + 21, data.instant_url_post_params);
   s->BindString(starting_column + 22, data.image_url_post_params);
   s->BindString(starting_column + 23, data.new_tab_url);
+  s->BindInt(starting_column + 24, data.engine_type);
 }
 
 WebDatabaseTable::TypeKey GetKey() {
   // We just need a unique constant. Use the address of a static that
   // COMDAT folding won't touch in an optimizing linker.
   static int table_key = 0;
   return reinterpret_cast<void*>(&table_key);
 }
 
 }  // namespace
@@ skipping 31 matching lines @@
                    "instant_url VARCHAR,"
                    "last_modified INTEGER DEFAULT 0,"
                    "sync_guid VARCHAR,"
                    "alternate_urls VARCHAR,"
                    "search_terms_replacement_key VARCHAR,"
                    "image_url VARCHAR,"
                    "search_url_post_params VARCHAR,"
                    "suggest_url_post_params VARCHAR,"
                    "instant_url_post_params VARCHAR,"
                    "image_url_post_params VARCHAR,"
-                   "new_tab_url VARCHAR)");
+                   "new_tab_url VARCHAR,"
+                   "engine_type INTEGER DEFAULT -1)");
 }
 
 bool KeywordTable::IsSyncable() {
   return true;
 }
 
 bool KeywordTable::MigrateToVersion(int version,
                                     bool* update_compatible_version) {
   // Migrate if necessary.
   switch (version) {
     case 53:
       *update_compatible_version = true;
       return MigrateToVersion53AddNewTabURLColumn();
     case 59:
       *update_compatible_version = true;
       return MigrateToVersion59RemoveExtensionKeywords();
+    case 66:
+      *update_compatible_version = true;
+      return MigrateToVersion66AddEngineTypeColumn();
   }
 
   return true;
 }
 
 bool KeywordTable::PerformOperations(const Operations& operations) {
   sql::Transaction transaction(db_);
   if (!transaction.Begin())
     return false;
 
@@ skipping 67 matching lines @@
 bool KeywordTable::MigrateToVersion53AddNewTabURLColumn() {
   return db_->Execute("ALTER TABLE keywords ADD COLUMN new_tab_url "
                       "VARCHAR DEFAULT ''");
 }
 
 bool KeywordTable::MigrateToVersion59RemoveExtensionKeywords() {
   return db_->Execute("DELETE FROM keywords "
                       "WHERE url LIKE 'chrome-extension://%'");
 }
 
+bool KeywordTable::MigrateToVersion66AddEngineTypeColumn() {
+  return db_->Execute("ALTER TABLE keywords ADD COLUMN engine_type "
+                      "INTEGER DEFAULT -1");
+}
+
 // static
 bool KeywordTable::GetKeywordDataFromStatement(const sql::Statement& s,
                                                TemplateURLData* data) {
   DCHECK(data);
 
   data->SetShortName(s.ColumnString16(1));
   data->SetKeyword(s.ColumnString16(2));
   // Due to past bugs, we might have persisted entries with empty URLs.  Avoid
   // reading these out.  (GetKeywords() will delete these entries on return.)
   // NOTE: This code should only be needed as long as we might be reading such
@@ skipping 13 matching lines @@
   data->originating_url = GURL(s.ColumnString(6));
   data->show_in_default_list = s.ColumnBool(10);
   data->safe_for_autoreplace = s.ColumnBool(5);
   data->input_encodings = base::SplitString(
       s.ColumnString(9), ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   data->id = s.ColumnInt64(0);
   data->date_created = Time::FromTimeT(s.ColumnInt64(7));
   data->last_modified = Time::FromTimeT(s.ColumnInt64(15));
   data->created_by_policy = s.ColumnBool(13);
   data->usage_count = s.ColumnInt(8);
+  data->engine_type = static_cast<SearchEngineType>(s.ColumnInt(25));
   data->prepopulate_id = s.ColumnInt(12);
   data->sync_guid = s.ColumnString(16);
 
   data->alternate_urls.clear();
   base::JSONReader json_reader;
   std::unique_ptr<base::Value> value(
       json_reader.ReadToValue(s.ColumnString(17)));
   base::ListValue* alternate_urls_value;
   if (value.get() && value->GetAsList(&alternate_urls_value)) {
     std::string alternate_url;
     for (size_t i = 0; i < alternate_urls_value->GetSize(); ++i) {
       if (alternate_urls_value->GetString(i, &alternate_url))
         data->alternate_urls.push_back(alternate_url);
     }
   }
 
   data->search_terms_replacement_key = s.ColumnString(18);
 
   return true;
 }
 
 bool KeywordTable::AddKeyword(const TemplateURLData& data) {
   DCHECK(data.id);
   std::string query("INSERT INTO keywords (" + GetKeywordColumns() + ") "
                     "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,"
-                    "        ?)");
+                    "        ?,?)");
   sql::Statement s(db_->GetCachedStatement(SQL_FROM_HERE, query.c_str()));
   BindURLToStatement(data, &s, 0, 1);
 
   return s.Run();
 }
 
 bool KeywordTable::RemoveKeyword(TemplateURLID id) {
   DCHECK(id);
   sql::Statement s(db_->GetCachedStatement(
       SQL_FROM_HERE, "DELETE FROM keywords WHERE id = ?"));
   s.BindInt64(0, id);
 
   return s.Run();
 }
 
 bool KeywordTable::UpdateKeyword(const TemplateURLData& data) {
   DCHECK(data.id);
   sql::Statement s(db_->GetCachedStatement(
       SQL_FROM_HERE,
       "UPDATE keywords SET short_name=?, keyword=?, favicon_url=?, url=?, "
       "safe_for_autoreplace=?, originating_url=?, date_created=?, "
       "usage_count=?, input_encodings=?, show_in_default_list=?, "
       "suggest_url=?, prepopulate_id=?, created_by_policy=?, instant_url=?, "
       "last_modified=?, sync_guid=?, alternate_urls=?, "
       "search_terms_replacement_key=?, image_url=?, search_url_post_params=?, "
       "suggest_url_post_params=?, instant_url_post_params=?, "
-      "image_url_post_params=?, new_tab_url=? WHERE id=?"));
-  BindURLToStatement(data, &s, 24, 0);  // "24" binds id() as the last item.
+      "image_url_post_params=?, new_tab_url=?, engine_type=? WHERE id=?"));
+  BindURLToStatement(data, &s, 25, 0);  // "24" binds id() as the last item.

[Peter Kasting, 2016/05/17 04:43:04]

Nit: 24 -> 25

[Vitaly Baranov, 2016/06/03 15:31:45]

Done.

 
   return s.Run();
 }
 
 bool KeywordTable::GetKeywordAsString(TemplateURLID id,
                                       const std::string& table_name,
                                       std::string* result) {
   std::string query("SELECT " +
       ColumnsForVersion(WebDatabase::kCurrentVersionNumber, true) +
       " FROM " + table_name + " WHERE id=?");
@@ skipping 89 matching lines @@
     }
   }
 
   // Replace the old table with the new one.
   sql = "DROP TABLE " + name;
   if (!db_->Execute(sql.c_str()))
     return false;
   sql = "ALTER TABLE keywords_temp RENAME TO " + name;
   return db_->Execute(sql.c_str());
 }