Create new Autofill tables as part of DB migration.

components/autofill/core/browser/webdata/autofill_table.cc

 // Copyright 2013 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/autofill/core/browser/webdata/autofill_table.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <map>
@@ skipping 362 matching lines @@
 }
 
 AutofillTable* AutofillTable::FromWebDatabase(WebDatabase* db) {
   return static_cast<AutofillTable*>(db->GetTable(GetKey()));
 }
 
 WebDatabaseTable::TypeKey AutofillTable::GetTypeKey() const {
   return GetKey();
 }
 
-bool AutofillTable::Init(sql::Connection* db, sql::MetaTable* meta_table) {
-  WebDatabaseTable::Init(db, meta_table);
+bool AutofillTable::CreateTablesIfNecessary() {
   return (InitMainTable() && InitCreditCardsTable() && InitProfilesTable() &&
           InitProfileNamesTable() && InitProfileEmailsTable() &&
           InitProfilePhonesTable() && InitProfileTrashTable());
 }
 
 bool AutofillTable::IsSyncable() {
   return true;
 }
 
 bool AutofillTable::MigrateToVersion(int version,
@@ skipping 928 matching lines @@
     if (!db_->Execute("CREATE TABLE autofill_profiles_trash ( "
                       "guid VARCHAR)")) {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }
 
 bool AutofillTable::MigrateToVersion22ClearAutofillEmptyValueElements() {
+  if (!db_->DoesTableExist("autofill") &&
+      (!db_->Execute("CREATE TABLE autofill ("
+                     "  name VARCHAR,"
+                     "  value VARCHAR,"
+                     "  value_lower VARCHAR,"
+                     "  pair_id INTEGER PRIMARY KEY,"
+                     "  count INTEGER DEFAULT 1)") ||
+       !db_->Execute("CREATE INDEX autofill_name ON autofill (name)") ||
+       !db_->Execute("CREATE INDEX autofill_name_value_lower ON"
+                     "  autofill (name, value_lower)") ||
+       !db_->Execute("CREATE TABLE autofill_dates ("
+                     "  pair_id INTEGER DEFAULT 0,"
+                     "  date_created INTEGER DEFAULT 0)") ||
+       !db_->Execute("CREATE INDEX autofill_dates_pair_id ON"
+                     "  autofill (pair_id)")))
+    return false;
+
+
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT pair_id FROM autofill WHERE TRIM(value) = \"\""));
   if (!s.is_valid())
     return false;
 
   std::set<int64> ids;
   while (s.Step())
     ids.insert(s.ColumnInt64(0));
   if (!s.Succeeded())
     return false;
@@ skipping 36 matching lines @@
 // Because this case does not roll back the complete set of SQL
 // transactions properly in case of failure (that is, it does not
 // roll back the table initialization done above), the incoherent
 // profile will now see itself as being at version 22 -- but include a
 // fully initialized credit_cards table.  Every time Chrome runs, it
 // will try to update the web database and fail at this step, unless
 // we allow for the faulty assumption described above by checking for
 // the existence of the columns only AFTER we've executed the commands
 // to add them.
 bool AutofillTable::MigrateToVersion23AddCardNumberEncryptedColumn() {
+  if (!db_->DoesTableExist("autofill_profiles") &&
+      (!db_->Execute("CREATE TABLE autofill_profiles ( "
+                     "label VARCHAR, "
+                     "unique_id INTEGER PRIMARY KEY, "
+                     "first_name VARCHAR, "
+                     "middle_name VARCHAR, "
+                     "last_name VARCHAR, "
+                     "email VARCHAR, "
+                     "company_name VARCHAR, "
+                     "address_line_1 VARCHAR, "
+                     "address_line_2 VARCHAR, "
+                     "city VARCHAR, "
+                     "state VARCHAR, "
+                     "zipcode VARCHAR, "
+                     "country VARCHAR, "
+                     "phone VARCHAR, "
+                     "fax VARCHAR)") ||
+       !db_->Execute("CREATE INDEX autofill_profiles_label_index"
+                     "  ON autofill_profiles (label)")))
+    return false;
+
+  if (!db_->DoesTableExist("credit_cards") &&
+      (!db_->Execute("CREATE TABLE credit_cards ( "
+                     "label VARCHAR, "
+                     "unique_id INTEGER PRIMARY KEY, "
+                     "name_on_card VARCHAR, "
+                     "type VARCHAR, "
+                     "card_number VARCHAR, "
+                     "expiration_month INTEGER, "
+                     "expiration_year INTEGER, "
+                     "verification_code VARCHAR, "
+                     "billing_address VARCHAR, "
+                     "shipping_address VARCHAR)") ||
+       !db_->Execute("CREATE INDEX credit_cards_label_index"
+                     "  ON credit_cards (label)")))
+    return false;
+
   if (!db_->DoesColumnExist("credit_cards", "card_number_encrypted")) {
     if (!db_->Execute("ALTER TABLE credit_cards ADD COLUMN "
                       "card_number_encrypted BLOB DEFAULT NULL")) {
-      LOG(WARNING) << "Could not add card_number_encrypted to "
-                      "credit_cards table.";
       return false;
     }
   }
 
   if (!db_->DoesColumnExist("credit_cards", "verification_code_encrypted")) {
     if (!db_->Execute("ALTER TABLE credit_cards ADD COLUMN "
                       "verification_code_encrypted BLOB DEFAULT NULL")) {
-      LOG(WARNING) << "Could not add verification_code_encrypted to "
-                      "credit_cards table.";
       return false;
     }
   }
 
   return true;
 }
 
 // One-time cleanup for http://crbug.com/38364 - In the presence of
 // multi-byte UTF-8 characters, that bug could cause Autofill strings
 // to grow larger and more corrupt with each save.  The cleanup removes
@@ skipping 303 matching lines @@
   }
 
   return true;
 }
 
 // Test the existence of the |first_name| column as an indication that
 // we need a migration.  It is possible that the new |autofill_profiles|
 // schema is in place because the table was newly created when migrating
 // from a pre-version-22 database.
 bool AutofillTable::MigrateToVersion33ProfilesBasedOnFirstName() {
+  if (!db_->DoesTableExist("autofill_profile_names") &&
+      !db_->Execute("CREATE TABLE autofill_profile_names ( "
+                    "guid VARCHAR, "
+                    "first_name VARCHAR, "
+                    "middle_name VARCHAR, "
+                    "last_name VARCHAR)"))
+    return false;
+
+  if (!db_->DoesTableExist("autofill_profile_emails") &&
+      !db_->Execute("CREATE TABLE autofill_profile_emails ( "
+                    "guid VARCHAR, "
+                    "email VARCHAR)"))
+    return false;
+
+  if (!db_->DoesTableExist("autofill_profile_phones") &&
+      !db_->Execute("CREATE TABLE autofill_profile_phones ( "
+                    "guid VARCHAR, "
+                    "type INTEGER DEFAULT 0, "
+                    "number VARCHAR)"))
+    return false;
+
   if (db_->DoesColumnExist("autofill_profiles", "first_name")) {
     // Create autofill_profiles_temp table that will receive the data.
     if (!db_->DoesTableExist("autofill_profiles_temp")) {
       if (!db_->Execute("CREATE TABLE autofill_profiles_temp ( "
                         "guid VARCHAR PRIMARY KEY, "
                         "company_name VARCHAR, "
                         "address_line_1 VARCHAR, "
                         "address_line_2 VARCHAR, "
                         "city VARCHAR, "
                         "state VARCHAR, "
@@ skipping 137 matching lines @@
 bool AutofillTable::MigrateToVersion35GreatBritainCountryCodes() {
   sql::Statement s(db_->GetUniqueStatement(
       "UPDATE autofill_profiles SET country_code=\"GB\" "
       "WHERE country_code=\"UK\""));
 
   return s.Run();
 }
 
 // Merge and cull older profiles where possible.
 bool AutofillTable::MigrateToVersion37MergeAndCullOlderProfiles() {
+  if (!db_->DoesTableExist("autofill_profiles_trash") &&
+      !db_->Execute("CREATE TABLE autofill_profiles_trash (guid VARCHAR)"))
+    return false;
+
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT guid, date_modified FROM autofill_profiles"));
 
   // Accumulate the good profiles.
   std::vector<AutofillProfile> accumulated_profiles;
   std::vector<AutofillProfile*> accumulated_profiles_p;
   std::map<std::string, int64> modification_map;
   while (s.Step()) {
     std::string guid = s.ColumnString(0);
     int64 date_modified = s.ColumnInt64(1);
@@ skipping 286 matching lines @@
       !db_->Execute("CREATE INDEX autofill_name_value_lower ON "
                     "autofill (name, value_lower)")) {
     return false;
   }
 
 
   return transaction.Commit();
 }
 
 }  // namespace autofill