Add recipient name to server autofill profile database

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 553 matching lines @@
       return MigrateToVersion56AddProfileLanguageCodeForFormatting();
     case 57:
       *update_compatible_version = true;
       return MigrateToVersion57AddFullNameField();
     case 60:
       *update_compatible_version = false;
       return MigrateToVersion60AddServerCards();
     case 61:
       *update_compatible_version = false;
       return MigrateToVersion61AddUsageStats();
+    case 62:
+      *update_compatible_version = false;
+      return MigrateToVersion62AddServerRecipientName();
   }
   return true;
 }
 
 bool AutofillTable::AddFormFieldValues(
     const std::vector<FormFieldData>& elements,
     std::vector<AutofillChange>* changes) {
   return AddFormFieldValuesTime(elements, changes, Time::Now());
 }
 
@@ skipping 410 matching lines @@
   return s.Succeeded();
 }
 
 bool AutofillTable::GetAutofillServerProfiles(
     std::vector<AutofillProfile*>* profiles) {
   profiles->clear();
 
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT "
         "id,"
+        "recipient_name,"
         "company_name,"
         "street_address,"
         "address_1,"  // ADDRESS_HOME_STATE
         "address_2,"  // ADDRESS_HOME_CITY
         "address_3,"  // ADDRESS_HOME_DEPENDENT_LOCALITY
         "address_4,"  // Not supported in AutofillProfile yet.
         "postal_code,"  // ADDRESS_HOME_ZIP
         "sorting_code,"  // ADDRESS_HOME_SORTING_CODE
         "country_code,"  // ADDRESS_HOME_COUNTRY
         "language_code "
       "FROM server_addresses"));
 
   while (s.Step()) {
     int index = 0;
     scoped_ptr<AutofillProfile> profile(new AutofillProfile(
         AutofillProfile::SERVER_PROFILE, s.ColumnString(index++)));
 
+    profile->SetRawInfo(NAME_FULL, s.ColumnString16(index++));
     profile->SetRawInfo(COMPANY_NAME, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_STATE, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_CITY, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY,
                         s.ColumnString16(index++));
     index++;  // Skip address_4 which we haven't added to AutofillProfile yet.
     profile->SetRawInfo(ADDRESS_HOME_ZIP, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_SORTING_CODE, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(index++));
     profile->set_language_code(s.ColumnString(index++));
 
     profiles->push_back(profile.release());
   }
 
   return s.Succeeded();
 }
 
 void AutofillTable::SetAutofillServerProfiles(
     const std::vector<AutofillProfile>& profiles) {
   // Delete all old ones first.
   sql::Statement delete_old(db_->GetUniqueStatement(
       "DELETE FROM server_addresses"));
   delete_old.Run();
 
   sql::Statement insert(db_->GetUniqueStatement(
       "INSERT INTO server_addresses("
         "id,"
+        "recipient_name,"
         "company_name,"
         "street_address,"
         "address_1,"  // ADDRESS_HOME_STATE
         "address_2,"  // ADDRESS_HOME_CITY
         "address_3,"  // ADDRESS_HOME_DEPENDENT_LOCALITY
         "address_4,"  // Not supported in AutofillProfile yet.
         "postal_code,"  // ADDRESS_HOME_ZIP
         "sorting_code,"  // ADDRESS_HOME_SORTING_CODE
         "country_code,"  // ADDRESS_HOME_COUNTRY
         "language_code) "
-      "VALUES (?,?,?,?,?,?,?,?,?,?,?)"));
+      "VALUES (?,?,?,?,?,?,?,?,?,?,?,?)"));
   for (const auto& profile : profiles) {
     DCHECK(profile.record_type() == AutofillProfile::SERVER_PROFILE);
 
     int index = 0;
     insert.BindString(index++, profile.server_id());
+    insert.BindString16(index++, profile.GetRawInfo(NAME_FULL));
     insert.BindString16(index++, profile.GetRawInfo(COMPANY_NAME));
     insert.BindString16(index++,
                         profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS));
     insert.BindString16(index++, profile.GetRawInfo(ADDRESS_HOME_STATE));
     insert.BindString16(index++, profile.GetRawInfo(ADDRESS_HOME_CITY));
     insert.BindString16(index++,
                         profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY));
     index++;  // SKip address_4 which we haven't added to AutofillProfile yet.
     insert.BindString16(index++, profile.GetRawInfo(ADDRESS_HOME_ZIP));
     insert.BindString16(index++, profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE));
@@ skipping 661 matching lines @@
                       "card_number_encrypted VARCHAR)")) {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }
 
 bool AutofillTable::InitServerAddressesTable() {
   if (!db_->DoesTableExist("server_addresses")) {
+    // The space after language_code is necessary to make the schemas match

[Evan Stade, 2015/02/25 23:02:00]

I don't think this comment is super necessary. Other Init*Table functions
(except the server related ones) all have a space at the end of every line
without any comment, and anyone who tries to make a breaking change will be
gently informed by a test.

[brettw, 2015/02/26 18:54:28]

I kept it but pared it down a lot. When I was working on this file before I
"fixed" a few of these and broke stuff, so some comment seems good to me.

[Evan Stade, 2015/02/26 19:23:27]

right, but it seems unlikely people will see this comment when working on
"fixing" any other function in this file. So my preference would be adding a
more helpful error message when the test fails (if the test's current message is
not obvious enough).

just a nit, either way lgtm

+    // when creating a new table (where sqlite just saves our literal string
+    // provided here), and when we do the alter table to append the column
+    // in version 62 (where sqlite appends it to the string itself and adds
+    // the space). This makes the upgrade tests pass which just does a dumb
+    // string compare on the schemas.
     if (!db_->Execute("CREATE TABLE server_addresses ("
                       "id VARCHAR,"
                       "company_name VARCHAR,"
                       "street_address VARCHAR,"
                       "address_1 VARCHAR,"
                       "address_2 VARCHAR,"
                       "address_3 VARCHAR,"
                       "address_4 VARCHAR,"
                       "postal_code VARCHAR,"
                       "sorting_code VARCHAR,"
                       "country_code VARCHAR,"
-                      "language_code VARCHAR)")) {
+                      "language_code VARCHAR, "  // See comment above.
+                      "recipient_name VARCHAR)")) {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }
 
 bool AutofillTable::MigrateToVersion22ClearAutofillEmptyValueElements() {
   if (!db_->DoesTableExist("autofill") &&
       (!db_->Execute("CREATE TABLE autofill ("
@@ skipping 976 matching lines @@
   // Add use_date to credit_cards.
   if (!db_->DoesColumnExist("credit_cards", "use_date") &&
       !db_->Execute("ALTER TABLE credit_cards ADD COLUMN "
                     "use_date INTEGER NOT NULL DEFAULT 0")) {
     return false;
   }
 
   return transaction.Commit();
 }
 
+bool AutofillTable::MigrateToVersion62AddServerRecipientName() {
+  if (!db_->DoesColumnExist("server_addresses", "recipient_name") &&
+      !db_->Execute("ALTER TABLE server_addresses ADD COLUMN "
+                    "recipient_name VARCHAR")) {
+    return false;
+  }
+  return true;
+}
+
 }  // namespace autofill