Add billing address to masked server 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 441 matching lines @@
       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();
+    case 67:
+      *update_compatible_version = false;
+      return MigrateToVersion67AddMaskedCardBillingAddress();
   }
   return true;
 }
 
 bool AutofillTable::AddFormFieldValues(
     const std::vector<FormFieldData>& elements,
     std::vector<AutofillChange>* changes) {
   return AddFormFieldValuesTime(elements, changes, Time::Now());
 }
 
@@ skipping 726 matching lines @@
       "SELECT "
       "card_number_encrypted, "  // 0
       "last_four,"     // 1
       "masked.id,"     // 2
       "metadata.use_count,"     // 3
       "metadata.use_date,"      // 4
       "type,"          // 5
       "status,"        // 6
       "name_on_card,"  // 7
       "exp_month,"     // 8
-      "exp_year "      // 9
+      "exp_year,"      // 9
+      "billing_address_id "     // 10
       "FROM masked_credit_cards masked "
       "LEFT OUTER JOIN unmasked_credit_cards USING (id) "
       "LEFT OUTER JOIN server_card_metadata metadata USING (id)"));
   while (s.Step()) {
     int index = 0;
 
     // If the card_number_encrypted field is nonempty, we can assume this card
     // is a full card, otherwise it's masked.
     base::string16 full_card_number = UnencryptedCardFromColumn(s, index++);
     base::string16 last_four = s.ColumnString16(index++);
@@ skipping 19 matching lines @@
       // autodectected type.
       card->SetTypeForMaskedCard(card_type.c_str());
     } else {
       DCHECK_EQ(CreditCard::GetCreditCardType(full_card_number), card_type);
     }
 
     card->SetServerStatus(ServerStatusStringToEnum(s.ColumnString(index++)));
     card->SetRawInfo(CREDIT_CARD_NAME_FULL, s.ColumnString16(index++));
     card->SetRawInfo(CREDIT_CARD_EXP_MONTH, s.ColumnString16(index++));
     card->SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, s.ColumnString16(index++));
+    card->set_billing_address_id(s.ColumnString(index++));
     credit_cards->push_back(card);
   }
 
   return s.Succeeded();
 }
 
 void AutofillTable::SetServerCreditCards(
     const std::vector<CreditCard>& credit_cards) {
   sql::Transaction transaction(db_);
   if (!transaction.Begin())
     return;
 
   // Delete all old values.
   sql::Statement masked_delete(db_->GetUniqueStatement(
       "DELETE FROM masked_credit_cards"));
   masked_delete.Run();
 
   sql::Statement masked_insert(db_->GetUniqueStatement(
       "INSERT INTO masked_credit_cards("
       "id,"            // 0
       "type,"          // 1
       "status,"        // 2
       "name_on_card,"  // 3
       "last_four,"     // 4
-      "exp_month,"     // 4
-      "exp_year) "     // 5
-      "VALUES (?,?,?,?,?,?,?)"));
+      "exp_month,"     // 5
+      "exp_year,"      // 6
+      "billing_address_id) "  // 7
+      "VALUES (?,?,?,?,?,?,?,?)"));
   for (const CreditCard& card : credit_cards) {
     DCHECK_EQ(CreditCard::MASKED_SERVER_CARD, card.record_type());
 
     masked_insert.BindString(0, card.server_id());
     masked_insert.BindString(1, card.type());
     masked_insert.BindString(2,
                              ServerStatusEnumToString(card.GetServerStatus()));
     masked_insert.BindString16(3, card.GetRawInfo(CREDIT_CARD_NAME_FULL));
     masked_insert.BindString16(4, card.LastFourDigits());
     masked_insert.BindString16(5, card.GetRawInfo(CREDIT_CARD_EXP_MONTH));
     masked_insert.BindString16(6,
                                card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR));
+    masked_insert.BindString(7, card.billing_address_id());
 
     masked_insert.Run();
     masked_insert.Reset(true);
 
     // Save the use count and use date of the card.
     UpdateServerCardUsageStats(card);
   }
 
   // Delete all items in the unmasked table that aren't in the new set.
   sql::Statement unmasked_delete(db_->GetUniqueStatement(
@@ skipping 90 matching lines @@
   s.BindInt64(0, profile.use_count());
   s.BindInt64(1, profile.use_date().ToInternalValue());
   s.BindString(2, profile.server_id());
   s.Run();
 
   transaction.Commit();
 
   return db_->GetLastChangeCount() > 0;
 }
 
+bool AutofillTable::UpdateServerCardBillingAddress(
+    const CreditCard& credit_card) {
+  DCHECK_NE(CreditCard::LOCAL_CARD, credit_card.record_type());
+
+  sql::Statement update(db_->GetUniqueStatement(
+      "UPDATE masked_credit_cards SET billing_address_id = ? "
+      "WHERE id = ?"));
+  update.BindString(0, credit_card.billing_address_id());
+  update.BindString(1, credit_card.server_id());
+  if (!update.Run())
+    return false;
+
+  return db_->GetLastChangeCount() > 0;
+}
+
 bool AutofillTable::ClearAllServerData() {
   sql::Transaction transaction(db_);
   if (!transaction.Begin())
     return false;  // Some error, nothing was changed.
 
   sql::Statement masked(db_->GetUniqueStatement(
       "DELETE FROM masked_credit_cards"));
   masked.Run();
   bool changed = db_->GetLastChangeCount() > 0;
 
@@ skipping 364 matching lines @@
 
 bool AutofillTable::InitMaskedCreditCardsTable() {
   if (!db_->DoesTableExist("masked_credit_cards")) {
     if (!db_->Execute("CREATE TABLE masked_credit_cards ("
                       "id VARCHAR,"
                       "status VARCHAR,"
                       "name_on_card VARCHAR,"
                       "type VARCHAR,"
                       "last_four VARCHAR,"
                       "exp_month INTEGER DEFAULT 0,"
-                      "exp_year INTEGER DEFAULT 0)")) {
+                      "exp_year INTEGER DEFAULT 0, "
+                      "billing_address_id VARCHAR)")) {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }
 
 bool AutofillTable::InitUnmaskedCreditCardsTable() {
   if (!db_->DoesTableExist("unmasked_credit_cards")) {
     if (!db_->Execute("CREATE TABLE unmasked_credit_cards ("
@@ skipping 482 matching lines @@
   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");
 }
 
+bool AutofillTable::MigrateToVersion67AddMaskedCardBillingAddress() {
+  // The default value for this column is null, but Connection::ColumnString()
+  // returns an empty string for that.
+  return db_->Execute(
+      "ALTER TABLE masked_credit_cards ADD COLUMN billing_address_id VARCHAR");
+}
+
 }  // namespace autofill