Adding a sync_guid field to TemplateURL. Adding appropriate database migration changes and tests.

chrome/browser/webdata/keyword_table.cc

 // Copyright (c) 2011 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 "chrome/browser/webdata/keyword_table.h"
 
 #include "app/sql/statement.h"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "googleurl/src/gurl.h"
 
 using base::Time;
 
 namespace {
 
 // ID of the url column in keywords.
-const int kUrlIdPosition = 17;
+const int kUrlIdPosition = 18;
 
 // Keys used in the meta table.
 const char* kDefaultSearchProviderKey = "Default Search Provider ID";
 const char* kBuiltinKeywordVersion = "Builtin Keyword Version";
 
 void BindURLToStatement(const TemplateURL& url, sql::Statement* s) {
   s->BindString(0, UTF16ToUTF8(url.short_name()));
   s->BindString(1, UTF16ToUTF8(url.keyword()));
   GURL favicon_url = url.GetFaviconURL();
   if (!favicon_url.is_valid()) {
@@ skipping 16 matching lines @@
   s->BindInt(9, url.show_in_default_list() ? 1 : 0);
   s->BindString(10, url.suggestions_url() ? url.suggestions_url()->url() :
                 std::string());
   s->BindInt(11, url.prepopulate_id());
   s->BindInt(12, url.autogenerate_keyword() ? 1 : 0);
   s->BindInt(13, url.logo_id());
   s->BindBool(14, url.created_by_policy());
   s->BindString(15, url.instant_url() ? url.instant_url()->url() :
                 std::string());
   s->BindInt64(16, url.last_modified().ToTimeT());
+  s->BindString(17, url.sync_guid());
 }
 }  // anonymous namespace
 
 KeywordTable::~KeywordTable() {}
 
 bool KeywordTable::Init() {
   if (!db_->DoesTableExist("keywords")) {
     if (!db_->Execute("CREATE TABLE keywords ("
                       "id INTEGER PRIMARY KEY,"
                       "short_name VARCHAR NOT NULL,"
                       "keyword VARCHAR NOT NULL,"
                       "favicon_url VARCHAR NOT NULL,"
                       "url VARCHAR NOT NULL,"
                       "show_in_default_list INTEGER,"
                       "safe_for_autoreplace INTEGER,"
                       "originating_url VARCHAR,"
                       "date_created INTEGER DEFAULT 0,"
                       "usage_count INTEGER DEFAULT 0,"
                       "input_encodings VARCHAR,"
                       "suggest_url VARCHAR,"
                       "prepopulate_id INTEGER DEFAULT 0,"
                       "autogenerate_keyword INTEGER DEFAULT 0,"
                       "logo_id INTEGER DEFAULT 0,"
                       "created_by_policy INTEGER DEFAULT 0,"
                       "instant_url VARCHAR,"
-                      "last_modified INTEGER DEFAULT 0)")) {
+                      "last_modified INTEGER DEFAULT 0,"
+                      "sync_guid VARCHAR)")) {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }
 
 bool KeywordTable::IsSyncable() {
   return true;
 }
 
 bool KeywordTable::AddKeyword(const TemplateURL& url) {
   DCHECK(url.id());
   // Be sure to change kUrlIdPosition if you add columns
   sql::Statement s(db_->GetCachedStatement(SQL_FROM_HERE,
       "INSERT INTO keywords "
       "(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, "
       "autogenerate_keyword, logo_id, created_by_policy, instant_url, "
-      "last_modified, id) VALUES "
-      "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"));
+      "last_modified, sync_guid, id) VALUES "
+      "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
   BindURLToStatement(url, &s);
   s.BindInt64(kUrlIdPosition, url.id());
   if (!s.Run()) {
     NOTREACHED();
     return false;
   }
@@ skipping 11 matching lines @@
   s.BindInt64(0, id);
   return s.Run();
 }
 
 bool KeywordTable::GetKeywords(std::vector<TemplateURL*>* urls) {
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT id, 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, autogenerate_keyword, logo_id, "
-      "created_by_policy, instant_url, last_modified "
+      "created_by_policy, instant_url, last_modified, sync_guid "
       "FROM keywords ORDER BY id ASC"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
   while (s.Step()) {
     TemplateURL* template_url = new TemplateURL();
     template_url->set_id(s.ColumnInt64(0));
 
     std::string tmp;
@@ skipping 32 matching lines @@
     template_url->set_autogenerate_keyword(s.ColumnInt(13) == 1);
 
     template_url->set_logo_id(s.ColumnInt(14));
 
     template_url->set_created_by_policy(s.ColumnBool(15));
 
     template_url->SetInstantURL(s.ColumnString(16), 0, 0);
 
     template_url->set_last_modified(Time::FromTimeT(s.ColumnInt64(17)));
 
+    template_url->set_sync_guid(s.ColumnString(18));
+
     urls->push_back(template_url);
   }
   return s.Succeeded();
 }
 
 bool KeywordTable::UpdateKeyword(const TemplateURL& url) {
   DCHECK(url.id());
   // Be sure to change kUrlIdPosition if you add columns
   sql::Statement s(db_->GetUniqueStatement(
       "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=?, autogenerate_keyword=?, "
-      "logo_id=?, created_by_policy=?, instant_url=?, last_modified=? "
-      "WHERE id=?"));
+      "logo_id=?, created_by_policy=?, instant_url=?, last_modified=?, "
+      "sync_guid=? WHERE id=?"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
   BindURLToStatement(url, &s);
   s.BindInt64(kUrlIdPosition, url.id());
   return s.Run();
 }
 
 bool KeywordTable::SetDefaultSearchProviderID(int64 id) {
@@ skipping 78 matching lines @@
   if (!db_->Execute("ALTER TABLE keywords_temp RENAME TO keywords"))
     return false;
 
   return true;
 }
 
 bool KeywordTable::MigrateToVersion38AddLastModifiedColumn() {
   return db_->Execute(
       "ALTER TABLE keywords ADD COLUMN last_modified INTEGER DEFAULT 0");
 }
+
+bool KeywordTable::MigrateToVersion39AddSyncGUIDColumn() {
+  return db_->Execute(
+      "ALTER TABLE keywords ADD COLUMN sync_guid VARCHAR");
+}