Add billing address to credit cards.

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 <stdint.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 132 matching lines @@
   s->BindString16(index++, GetInfo(credit_card, CREDIT_CARD_NAME_FULL));
   s->BindString16(index++, GetInfo(credit_card, CREDIT_CARD_EXP_MONTH));
   s->BindString16(index++, GetInfo(credit_card, CREDIT_CARD_EXP_4_DIGIT_YEAR));
   BindEncryptedCardToColumn(s, index++,
                             credit_card.GetRawInfo(CREDIT_CARD_NUMBER));
 
   s->BindInt64(index++, credit_card.use_count());
   s->BindInt64(index++, credit_card.use_date().ToTimeT());
   s->BindInt64(index++, modification_date.ToTimeT());
   s->BindString(index++, credit_card.origin());
+  s->BindString(index++, credit_card.billing_address_id());
 }
 
 base::string16 UnencryptedCardFromColumn(const sql::Statement& s,
                                          int column_index) {
   base::string16 credit_card_number;
   int encrypted_number_len = s.ColumnByteLength(column_index);
   if (encrypted_number_len) {
     std::string encrypted_number;
     encrypted_number.resize(encrypted_number_len);
     memcpy(&encrypted_number[0], s.ColumnBlob(column_index),
@@ skipping 13 matching lines @@
   credit_card->SetRawInfo(CREDIT_CARD_NAME_FULL, s.ColumnString16(index++));
   credit_card->SetRawInfo(CREDIT_CARD_EXP_MONTH, s.ColumnString16(index++));
   credit_card->SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR,
                           s.ColumnString16(index++));
   credit_card->SetRawInfo(CREDIT_CARD_NUMBER,
                           UnencryptedCardFromColumn(s, index++));
   credit_card->set_use_count(s.ColumnInt64(index++));
   credit_card->set_use_date(Time::FromTimeT(s.ColumnInt64(index++)));
   credit_card->set_modification_date(Time::FromTimeT(s.ColumnInt64(index++)));
   credit_card->set_origin(s.ColumnString(index++));
+  credit_card->set_billing_address_id(s.ColumnString(index++));
 
   return credit_card;
 }
 
 bool AddAutofillProfileNamesToProfile(sql::Connection* db,
                                       AutofillProfile* profile) {
   // TODO(estade): update schema so that multiple names are not associated per
   // unique profile guid. Please refer https://crbug.com/497934.
   sql::Statement s(db->GetUniqueStatement(
       "SELECT guid, first_name, middle_name, last_name, full_name "
@@ skipping 251 matching lines @@
       return MigrateToVersion62AddUsageStatsForUnmaskedCards();
     case 63:
       *update_compatible_version = false;
       return MigrateToVersion63AddServerRecipientName();
     case 64:
       *update_compatible_version = false;
       return MigrateToVersion64AddUnmaskDate();
     case 65:
       *update_compatible_version = false;
       return MigrateToVersion65AddServerMetadataTables();
+    case 66:
+      *update_compatible_version = false;
+      return MigrateToVersion66AddCardBillingAddress();
   }
   return true;
 }
 
 bool AutofillTable::AddFormFieldValues(
     const std::vector<FormFieldData>& elements,
     std::vector<AutofillChange>* changes) {
   return AddFormFieldValuesTime(elements, changes, Time::Now());
 }
 
@@ skipping 661 matching lines @@
   sql::Statement s4(db_->GetUniqueStatement(
       "DELETE FROM autofill_profile_phones"));
 
   return s4.Run();
 }
 
 bool AutofillTable::AddCreditCard(const CreditCard& credit_card) {
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT INTO credit_cards"
       "(guid, name_on_card, expiration_month, expiration_year, "
-      " card_number_encrypted, use_count, use_date, date_modified, origin)"
-      "VALUES (?,?,?,?,?,?,?,?,?)"));
+      " card_number_encrypted, use_count, use_date, date_modified, origin,"
+      " billing_address_id)"
+      "VALUES (?,?,?,?,?,?,?,?,?,?)"));
   BindCreditCardToStatement(credit_card, Time::Now(), &s);
 
   if (!s.Run())
     return false;
 
   DCHECK_GT(db_->GetLastChangeCount(), 0);
   return true;
 }
 
 std::unique_ptr<CreditCard> AutofillTable::GetCreditCard(
     const std::string& guid) {
   DCHECK(base::IsValidGUID(guid));
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT guid, name_on_card, expiration_month, expiration_year, "
              "card_number_encrypted, use_count, use_date, date_modified, "
-             "origin "
+             "origin, billing_address_id "
       "FROM credit_cards "
       "WHERE guid = ?"));
   s.BindString(0, guid);
 
   if (!s.Step())
     return std::unique_ptr<CreditCard>();
 
   return CreditCardFromStatement(s);
 }
 
@@ skipping 263 matching lines @@
       GetCreditCard(credit_card.guid());
   if (!old_credit_card)
     return false;
 
   bool update_modification_date = *old_credit_card != credit_card;
 
   sql::Statement s(db_->GetUniqueStatement(
       "UPDATE credit_cards "
       "SET guid=?, name_on_card=?, expiration_month=?,"
           "expiration_year=?, card_number_encrypted=?, use_count=?, use_date=?,"
-          "date_modified=?, origin=?"
-      "WHERE guid=?"));
+          "date_modified=?, origin=?, billing_address_id=?"
+      "WHERE guid=?1"));
   BindCreditCardToStatement(
       credit_card,
       update_modification_date ? Time::Now() :
                                  old_credit_card->modification_date(),
       &s);
-  s.BindString(9, credit_card.guid());
 
   bool result = s.Run();
   DCHECK_GT(db_->GetLastChangeCount(), 0);
   return result;
 }
 
 bool AutofillTable::RemoveCreditCard(const std::string& guid) {
   DCHECK(base::IsValidGUID(guid));
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM credit_cards WHERE guid = ?"));
@@ skipping 216 matching lines @@
   if (!db_->DoesTableExist("credit_cards")) {
     if (!db_->Execute("CREATE TABLE credit_cards ( "
                       "guid VARCHAR PRIMARY KEY, "
                       "name_on_card VARCHAR, "
                       "expiration_month INTEGER, "
                       "expiration_year INTEGER, "
                       "card_number_encrypted BLOB, "
                       "date_modified INTEGER NOT NULL DEFAULT 0, "
                       "origin VARCHAR DEFAULT '', "
                       "use_count INTEGER NOT NULL DEFAULT 0, "
-                      "use_date INTEGER NOT NULL DEFAULT 0) ")) {
+                      "use_date INTEGER NOT NULL DEFAULT 0, "
+                      "billing_address_id VARCHAR) ")) {
       NOTREACHED();
       return false;
     }
   }
 
   return true;
 }
 
 bool AutofillTable::InitProfilesTable() {
   if (!db_->DoesTableExist("autofill_profiles")) {
@@ skipping 567 matching lines @@
     insert.BindString16(index++, profile.GetRawInfo(ADDRESS_HOME_COUNTRY));
     insert.BindString16(index++, profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
     insert.BindString(index++, profile.language_code());
     insert.Run();
     insert.Reset(true);
   }
 
   return transaction.Commit();
 }
 
+bool AutofillTable::MigrateToVersion66AddCardBillingAddress() {
+  // The default value for this column is null, but Connection::ColumnString()
+  // returns an empty string for that.
+  return db_->Execute(
+      "ALTER TABLE credit_cards ADD COLUMN billing_address_id VARCHAR");
+}
+
 }  // namespace autofill