Autofill i18n: Set postal code and state field labels based on the selected country.

chrome/browser/webdata/web_database.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/web_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <string>
 
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/tuple.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/autofill/autofill_country.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/notification_service.h"
@@ skipping 87 matching lines @@
 //                      standard entries in a contact information form.
 //
 //   guid               A guid string to uniquely identify the profile.
 //                      Added in version 31.
 //   company_name
 //   address_line_1
 //   address_line_2
 //   city
 //   state
 //   zipcode
-//   country
+//   country            The country name.  Deprecated, should be removed once
+//                      the stable channel reaches version 11.
+//   country_code
 //   date_modified      The date on which this profile was last modified.
 //                      Added in version 30.
 //
 // autofill_profile_names
 //                      This table contains the multi-valued name fields
 //                      associated with a profile.
 //
 //   guid               The guid string that identifies the profile to which
 //                      the name belongs.
 //   first_name
@@ skipping 45 matching lines @@
 
 using base::Time;
 
 namespace {
 
 typedef std::vector<Tuple3<int64, string16, string16> > AutofillElementList;
 
 // Current version number.  Note: when changing the current version number,
 // corresponding changes must happen in the unit tests, and new migration test
 // added.  See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|.
-const int kCurrentVersionNumber = 33;
-const int kCompatibleVersionNumber = 33;
+const int kCurrentVersionNumber = 34;
+const int kCompatibleVersionNumber = 34;
 
 // ID of the url column in keywords.
 const int kUrlIdPosition = 16;
 
 // Keys used in the meta table.
 const char* kDefaultSearchProviderKey = "Default Search Provider ID";
 const char* kBuiltinKeywordVersion = "Builtin Keyword Version";
 
 // The maximum length allowed for form data.
 const size_t kMaxDataLength = 1024;
@@ skipping 85 matching lines @@
   text = profile.GetFieldText(AutoFillType(ADDRESS_HOME_LINE2));
   s->BindString16(3, LimitDataSize(text));
   text = profile.GetFieldText(AutoFillType(ADDRESS_HOME_CITY));
   s->BindString16(4, LimitDataSize(text));
   text = profile.GetFieldText(AutoFillType(ADDRESS_HOME_STATE));
   s->BindString16(5, LimitDataSize(text));
   text = profile.GetFieldText(AutoFillType(ADDRESS_HOME_ZIP));
   s->BindString16(6, LimitDataSize(text));
   text = profile.GetFieldText(AutoFillType(ADDRESS_HOME_COUNTRY));
   s->BindString16(7, LimitDataSize(text));
-  s->BindInt64(8, Time::Now().ToTimeT());
+  std::string country_code = profile.CountryCode();
+  s->BindString(8, country_code);
+  s->BindInt64(9, Time::Now().ToTimeT());
 }
 
 AutoFillProfile* AutoFillProfileFromStatement(const sql::Statement& s) {
   AutoFillProfile* profile = new AutoFillProfile;
   profile->set_guid(s.ColumnString(0));
   DCHECK(guid::IsValidGUID(profile->guid()));
 
   profile->SetInfo(AutoFillType(COMPANY_NAME), s.ColumnString16(1));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_LINE1), s.ColumnString16(2));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_LINE2), s.ColumnString16(3));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_CITY), s.ColumnString16(4));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_STATE), s.ColumnString16(5));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_ZIP), s.ColumnString16(6));
-  profile->SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY), s.ColumnString16(7));
-  // Intentionally skip column 8, which stores the profile's modification date.
+  // Intentionally skip column 7, which stores the localized country name.
+  profile->SetCountryCode(s.ColumnString(8));
+  // Intentionally skip column 9, which stores the profile's modification date.
 
   return profile;
 }
 
 void AddAutoFillProfileNameFromStatement(const sql::Statement& s,
                                       AutoFillProfile* profile) {
   DCHECK_EQ(profile->guid(), s.ColumnString(0));
   DCHECK(guid::IsValidGUID(profile->guid()));
 
   profile->SetInfo(AutoFillType(NAME_FIRST), s.ColumnString16(1));
@@ skipping 611 matching lines @@
   if (!db_.DoesTableExist("autofill_profiles")) {
     if (!db_.Execute("CREATE TABLE autofill_profiles ( "
                      "guid VARCHAR PRIMARY KEY, "
                      "company_name VARCHAR, "
                      "address_line_1 VARCHAR, "
                      "address_line_2 VARCHAR, "
                      "city VARCHAR, "
                      "state VARCHAR, "
                      "zipcode VARCHAR, "
                      "country VARCHAR, "
+                     "country_code VARCHAR, "
                      "date_modified INTEGER NOT NULL DEFAULT 0)")) {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }
 
 bool WebDatabase::InitAutoFillProfileNamesTable() {
   if (!db_.DoesTableExist("autofill_profile_names")) {
@@ skipping 880 matching lines @@
 
   if (s.Step())
     return RemoveFormElementForID(s.ColumnInt64(0));
   return false;
 }
 
 bool WebDatabase::AddAutoFillProfile(const AutoFillProfile& profile) {
   sql::Statement s(db_.GetUniqueStatement(
       "INSERT INTO autofill_profiles"
       "(guid, company_name, address_line_1, address_line_2, city, state,"
-      " zipcode, country, date_modified)"
-      "VALUES (?,?,?,?,?,?,?,?,?)"));
+      " zipcode, country, country_code, date_modified)"
+      "VALUES (?,?,?,?,?,?,?,?,?,?)"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
   BindAutoFillProfileToStatement(profile, &s);
 
   if (!s.Run()) {
     NOTREACHED();
     return false;
   }
 
   if (!s.Succeeded())
     return false;
 
   return AddAutoFillProfilePieces(profile.guid(), profile, &db_);
 }
 
 bool WebDatabase::GetAutoFillProfile(const std::string& guid,
                                      AutoFillProfile** profile) {
   DCHECK(guid::IsValidGUID(guid));
   DCHECK(profile);
   sql::Statement s(db_.GetUniqueStatement(
       "SELECT guid, company_name, address_line_1, address_line_2, city, state,"
-      " zipcode, country, date_modified "
+      " zipcode, country, country_code, date_modified "
       "FROM autofill_profiles "
       "WHERE guid=?"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
   s.BindString(0, guid);
   if (!s.Step())
     return false;
@@ skipping 101 matching lines @@
     return false;
 
   // Preserve appropriate modification dates by not updating unchanged profiles.
   scoped_ptr<AutoFillProfile> old_profile(tmp_profile);
   if (*old_profile == profile)
     return true;
 
   sql::Statement s(db_.GetUniqueStatement(
       "UPDATE autofill_profiles "
       "SET guid=?, company_name=?, address_line_1=?, address_line_2=?, "
-      "    city=?, state=?, zipcode=?, country=?, date_modified=? "
+      "    city=?, state=?, zipcode=?, country=?, country_code=?, "
+      "    date_modified=? "
       "WHERE guid=?"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
   BindAutoFillProfileToStatement(profile, &s);
-  s.BindString(9, profile.guid());
+  s.BindString(10, profile.guid());
   bool result = s.Run();
   DCHECK_GT(db_.GetLastChangeCount(), 0);
   if (!result)
     return result;
 
   // Remove the old names, emails, and phone/fax numbers.
   if (!RemoveAutoFillProfilePieces(profile.guid(), &db_))
     return false;
 
   return AddAutoFillProfilePieces(profile.guid(), profile, &db_);
@@ skipping 988 matching lines @@
           return sql::INIT_FAILURE;
         }
       }
 
       meta_table_.SetVersionNumber(33);
       meta_table_.SetCompatibleVersionNumber(
           std::min(33, kCompatibleVersionNumber));
 
       // FALL THROUGH
 
+    case 33:
+      // Test the existence of the |country_code| 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.
+      if (!db_.DoesColumnExist("autofill_profiles", "country_code")) {
+        if (!db_.Execute("ALTER TABLE autofill_profiles ADD COLUMN "
+                         "country_code VARCHAR")) {
+          LOG(WARNING) << "Unable to update web database to version 33.";
+          NOTREACHED();
+          return sql::INIT_FAILURE;
+        }
+
+        // Set all the |country_code| fields to match existing |country| values.
+        {
+          sql::Statement s(db_.GetUniqueStatement("SELECT guid, country "
+                                                  "FROM autofill_profiles"));
+
+          if (!s) {
+            LOG(WARNING) << "Unable to update web database to version 33.";
+            NOTREACHED();
+            return sql::INIT_FAILURE;
+          }
+
+          while (s.Step()) {
+            sql::Statement update_s(
+                db_.GetUniqueStatement("UPDATE autofill_profiles "
+                                       "SET country_code=? WHERE guid=?"));
+            if (!update_s) {
+              LOG(WARNING) << "Unable to update web database to version 33.";
+              NOTREACHED();
+              return sql::INIT_FAILURE;
+            }
+            string16 country = s.ColumnString16(1);
+            std::string app_locale = AutoFillCountry::ApplicationLocale();
+            update_s.BindString(0, AutoFillCountry::GetCountryCode(country,
+                                                                   app_locale));
+            update_s.BindString(1, s.ColumnString(0));
+
+            if (!update_s.Run()) {
+              LOG(WARNING) << "Unable to update web database to version 33.";
+              NOTREACHED();
+              return sql::INIT_FAILURE;
+            }
+          }
+        }
+      }
+
+      meta_table_.SetVersionNumber(34);
+      meta_table_.SetCompatibleVersionNumber(
+          std::min(34, kCompatibleVersionNumber));
+
+      // FALL THROUGH
+
     // Add successive versions here.  Each should set the version number and
     // compatible version number as appropriate, then fall through to the next
     // case.
 
     case kCurrentVersionNumber:
       // No migration needed.
       return sql::INIT_OK;
   }
 }