Autofill: Remove fax number completely.

chrome/browser/webdata/autofill_table.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/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 15 matching lines @@
 #include "chrome/common/guid.h"
 #include "sql/statement.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/form_field.h"
 
 using base::Time;
 using webkit_glue::FormField;
 
 namespace {
 
-// Constants for the |autofill_profile_phones| |type| column.
-enum AutofillPhoneType {
-  kAutofillPhoneNumber = 0,
-  kAutofillFaxNumber = 1
-};
-
 typedef std::vector<Tuple3<int64, string16, string16> > AutofillElementList;
 
 // TODO(dhollowa): Find a common place for this.  It is duplicated in
 // personal_data_manager.cc.
 template<typename T>
 T* address_of(T& v) {
   return &v;
 }
 
 // The maximum length allowed for form data.
@@ skipping 142 matching lines @@
                                        AutofillProfile* profile) {
   sql::Statement s(db->GetUniqueStatement(
       "SELECT guid, type, number "
       "FROM autofill_profile_phones "
       "WHERE guid=? AND type=?"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
   s.BindString(0, profile->guid());
-  s.BindInt(1, kAutofillPhoneNumber);
+  // Value used to be either [(0, phone), (1, fax)] but fax has been removed.
+  s.BindInt(1, 0);
 
   std::vector<string16> numbers;
   while (s.Step()) {
     DCHECK_EQ(profile->guid(), s.ColumnString(0));
     numbers.push_back(s.ColumnString16(2));
   }
   profile->SetMultiInfo(PHONE_HOME_WHOLE_NUMBER, numbers);
   return true;
 }
 
-bool AddAutofillProfileFaxesToProfile(sql::Connection* db,
-                                      AutofillProfile* profile) {
-  sql::Statement s(db->GetUniqueStatement(
-      "SELECT guid, type, number "
-      "FROM autofill_profile_phones "
-      "WHERE guid=? AND type=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-  s.BindString(0, profile->guid());
-  s.BindInt(1, kAutofillFaxNumber);
-
-  std::vector<string16> numbers;
-  while (s.Step()) {
-    DCHECK_EQ(profile->guid(), s.ColumnString(0));
-    numbers.push_back(s.ColumnString16(2));
-  }
-  profile->SetMultiInfo(PHONE_FAX_WHOLE_NUMBER, numbers);
-  return true;
-}
-
-
 bool AddAutofillProfileNames(const AutofillProfile& profile,
                              sql::Connection* db) {
   std::vector<string16> first_names;
   profile.GetMultiInfo(NAME_FIRST, &first_names);
   std::vector<string16> middle_names;
   profile.GetMultiInfo(NAME_MIDDLE, &middle_names);
   std::vector<string16> last_names;
   profile.GetMultiInfo(NAME_LAST, &last_names);
   DCHECK_EQ(first_names.size(), middle_names.size());
   DCHECK_EQ(middle_names.size(), last_names.size());
@@ skipping 41 matching lines @@
 
     if (!s.Run()) {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }
 
 bool AddAutofillProfilePhones(const AutofillProfile& profile,
-                              AutofillPhoneType phone_type,
                               sql::Connection* db) {
-  AutofillFieldType field_type;
-  if (phone_type == kAutofillPhoneNumber) {
-    field_type = PHONE_HOME_WHOLE_NUMBER;
-  } else if (phone_type == kAutofillFaxNumber) {
-    field_type = PHONE_FAX_WHOLE_NUMBER;
-  } else {
-    NOTREACHED();
-    return false;
-  }
-
   std::vector<string16> numbers;
-  profile.GetMultiInfo(field_type, &numbers);
+  profile.GetMultiInfo(PHONE_HOME_WHOLE_NUMBER, &numbers);
 
   for (size_t i = 0; i < numbers.size(); ++i) {
     // Add the new number.
     sql::Statement s(db->GetUniqueStatement(
       "INSERT INTO autofill_profile_phones"
       " (guid, type, number) "
       "VALUES (?,?,?)"));
     if (!s) {
       NOTREACHED();
       return false;
     }
     s.BindString(0, profile.guid());
-    s.BindInt(1, phone_type);
+    // Value used to be either [(0, phone), (1, fax)] but fax has been removed.
+    s.BindInt(1, 0);
     s.BindString16(2, numbers[i]);
 
     if (!s.Run()) {
       NOTREACHED();
       return false;
     }
   }
+
   return true;
 }
 
 bool AddAutofillProfilePieces(const AutofillProfile& profile,
                               sql::Connection* db) {
   if (!AddAutofillProfileNames(profile, db))
     return false;
 
   if (!AddAutofillProfileEmails(profile, db))
     return false;
 
-  if (!AddAutofillProfilePhones(profile, kAutofillPhoneNumber, db))
-    return false;
-
-  if (!AddAutofillProfilePhones(profile, kAutofillFaxNumber, db))
+  if (!AddAutofillProfilePhones(profile, db))
     return false;
 
   return true;
 }
 
 bool RemoveAutofillProfilePieces(const std::string& guid, sql::Connection* db) {
   sql::Statement s1(db->GetUniqueStatement(
       "DELETE FROM autofill_profile_names WHERE guid = ?"));
   if (!s1) {
     NOTREACHED() << "Statement prepare failed";
@@ skipping 408 matching lines @@
       "autofill_dates ad ON a.pair_id=ad.pair_id "
       "WHERE a.name = ? AND a.value = ?"));
 
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
   s.BindString16(0, name);
   s.BindString16(1, value);
-  while (s.Step()) {
+  while (s.Step())
     timestamps->push_back(Time::FromTimeT(s.ColumnInt64(0)));
-  }
 
   return s.Succeeded();
 }
 
 bool AutofillTable::UpdateAutofillEntries(
     const std::vector<AutofillEntry>& entries) {
   if (!entries.size())
     return true;
 
   // Remove all existing entries.
@@ skipping 147 matching lines @@
 
   // Get associated name info.
   AddAutofillProfileNamesToProfile(db_, p.get());
 
   // Get associated email info.
   AddAutofillProfileEmailsToProfile(db_, p.get());
 
   // Get associated phone info.
   AddAutofillProfilePhonesToProfile(db_, p.get());
 
-  // Get associated fax info.
-  AddAutofillProfileFaxesToProfile(db_, p.get());
-
   *profile = p.release();
   return true;
 }
 
 bool AutofillTable::GetAutofillProfiles(
     std::vector<AutofillProfile*>* profiles) {
   DCHECK(profiles);
   profiles->clear();
 
   sql::Statement s(db_->GetUniqueStatement(
@@ skipping 40 matching lines @@
   new_profile.SetMultiInfo(NAME_FULL, values);
 
   old_profile->GetMultiInfo(EMAIL_ADDRESS, &values);
   values[0] = new_profile.GetInfo(EMAIL_ADDRESS);
   new_profile.SetMultiInfo(EMAIL_ADDRESS, values);
 
   old_profile->GetMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
   values[0] = new_profile.GetInfo(PHONE_HOME_WHOLE_NUMBER);
   new_profile.SetMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);
 
-  old_profile->GetMultiInfo(PHONE_FAX_WHOLE_NUMBER, &values);
-  values[0] = new_profile.GetInfo(PHONE_FAX_WHOLE_NUMBER);
-  new_profile.SetMultiInfo(PHONE_FAX_WHOLE_NUMBER, values);
-
   return UpdateAutofillProfileMulti(new_profile);
 }
 
 bool AutofillTable::UpdateAutofillProfileMulti(const AutofillProfile& profile) {
   DCHECK(guid::IsValidGUID(profile.guid()));
 
   // Don't update anything until the trash has been emptied.  There may be
   // pending modifications to process.
   if (!IsAutofillProfilesTrashEmpty())
     return true;
@@ skipping 18 matching lines @@
     return false;
   }
 
   BindAutofillProfileToStatement(profile, &s);
   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.
+  // Remove the old names, emails, and phone numbers.
   if (!RemoveAutofillProfilePieces(profile.guid(), db_))
     return false;
 
   return AddAutofillProfilePieces(profile, db_);
 }
 
 bool AutofillTable::RemoveAutofillProfile(const std::string& guid) {
   DCHECK(guid::IsValidGUID(guid));
 
   if (IsAutofillGUIDInTrash(guid)) {
@@ skipping 543 matching lines @@
 bool AutofillTable::MigrateToVersion24CleanupOversizedStringFields() {
   const std::string autofill_is_too_big =
       "max(length(name), length(value)) > 500";
 
   const std::string credit_cards_is_too_big =
       "max(length(label), length(name_on_card), length(type), "
       "    length(expiration_month), length(expiration_year), "
       "    length(billing_address), length(shipping_address) "
       ") > 500";
 
   const std::string autofill_profiles_is_too_big =

[Ilya Sherman, 2011/09/15 03:47:08]

nit: Should this variable be named 'autofill_profile_is_too_big'?  (as long as
you're changing nearby code)

[James Hawkins, 2011/09/16 03:23:28]

I don't know, but if so, then the credit_cards line above would need to be
changed as well. Leaving off of this CL.

       "max(length(label), length(first_name), "
       "    length(middle_name), length(last_name), length(email), "
       "    length(company_name), length(address_line_1), "
       "    length(address_line_2), length(city), length(state), "
-      "    length(zipcode), length(country), length(phone), "
-      "    length(fax)) > 500";
+      "    length(zipcode), length(country), length(phone)) > 500";
 
   std::string query = "DELETE FROM autofill_dates WHERE pair_id IN ("
       "SELECT pair_id FROM autofill WHERE " + autofill_is_too_big + ")";
 
   if (!db_->Execute(query.c_str()))
     return false;
 
   query = "DELETE FROM autofill WHERE " + autofill_is_too_big;
 
   if (!db_->Execute(query.c_str()))
@@ skipping 230 matching lines @@
                       "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, "
                       "date_modified INTEGER NOT NULL DEFAULT 0)")) {
       return false;
     }
 
     if (!db_->Execute(
         "INSERT INTO autofill_profiles_temp "
         "SELECT guid, label, first_name, middle_name, last_name, email, "
         "company_name, address_line_1, address_line_2, city, state, "
-        "zipcode, country, phone, fax, date_modified "
+        "zipcode, country, phone, date_modified "
         "FROM autofill_profiles")) {
       return false;
     }
 
     if (!db_->Execute("DROP TABLE autofill_profiles"))
       return false;
 
     if (!db_->Execute(
         "ALTER TABLE autofill_profiles_temp RENAME TO autofill_profiles")) {
       return false;
@@ skipping 48 matching lines @@
                         "zipcode VARCHAR, "
                         "country VARCHAR, "
                         "date_modified INTEGER NOT NULL DEFAULT 0)")) {
         return false;
       }
     }
 
     sql::Statement s(db_->GetUniqueStatement(
         "SELECT guid, first_name, middle_name, last_name, email, "
         "company_name, address_line_1, address_line_2, city, state, "
-        "zipcode, country, phone, fax, date_modified "
+        "zipcode, country, phone, date_modified "
         "FROM autofill_profiles"));
     while (s.Step()) {
       AutofillProfile profile;
       profile.set_guid(s.ColumnString(0));
       DCHECK(guid::IsValidGUID(profile.guid()));
 
       profile.SetInfo(NAME_FIRST, s.ColumnString16(1));
       profile.SetInfo(NAME_MIDDLE, s.ColumnString16(2));
       profile.SetInfo(NAME_LAST, s.ColumnString16(3));
       profile.SetInfo(EMAIL_ADDRESS, s.ColumnString16(4));
       profile.SetInfo(COMPANY_NAME, s.ColumnString16(5));
       profile.SetInfo(ADDRESS_HOME_LINE1, s.ColumnString16(6));
       profile.SetInfo(ADDRESS_HOME_LINE2, s.ColumnString16(7));
       profile.SetInfo(ADDRESS_HOME_CITY, s.ColumnString16(8));
       profile.SetInfo(ADDRESS_HOME_STATE, s.ColumnString16(9));
       profile.SetInfo(ADDRESS_HOME_ZIP, s.ColumnString16(10));
       profile.SetInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(11));
       profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, s.ColumnString16(12));
-      profile.SetInfo(PHONE_FAX_WHOLE_NUMBER, s.ColumnString16(13));
-      int64 date_modified = s.ColumnInt64(14);
+      int64 date_modified = s.ColumnInt64(13);
 
       sql::Statement s_insert(db_->GetUniqueStatement(
           "INSERT INTO autofill_profiles_temp"
           "(guid, company_name, address_line_1, address_line_2, city,"
           " state, zipcode, country, date_modified)"
           "VALUES (?,?,?,?,?,?,?,?,?)"));
       if (!s)
         return false;
 
       s_insert.BindString(0, profile.guid());
       s_insert.BindString16(1, profile.GetInfo(COMPANY_NAME));
       s_insert.BindString16(2, profile.GetInfo(ADDRESS_HOME_LINE1));
       s_insert.BindString16(3, profile.GetInfo(ADDRESS_HOME_LINE2));
       s_insert.BindString16(4, profile.GetInfo(ADDRESS_HOME_CITY));
       s_insert.BindString16(5, profile.GetInfo(ADDRESS_HOME_STATE));
       s_insert.BindString16(6, profile.GetInfo(ADDRESS_HOME_ZIP));
       s_insert.BindString16(7, profile.GetInfo(ADDRESS_HOME_COUNTRY));
       s_insert.BindInt64(8, date_modified);
 
       if (!s_insert.Run())
         return false;
 
-      // Add the other bits: names, emails, and phone/fax.
+      // Add the other bits: names, emails and phone.

[Ilya Sherman, 2011/09/15 03:47:08]

nit: 'phone' -> 'phone numbers'.  Also, I kind of prefer keeping the Oxford
comma.

[James Hawkins, 2011/09/16 03:23:28]

It's optional and less economical, but whatevs.

       if (!AddAutofillProfilePieces(profile, db_))
         return false;
     }
 
     if (!db_->Execute("DROP TABLE autofill_profiles"))
       return false;
 
     if (!db_->Execute(
         "ALTER TABLE autofill_profiles_temp RENAME TO autofill_profiles")) {
       return false;
@@ skipping 148 matching lines @@
         "UPDATE autofill_profiles SET date_modified=? "
         "WHERE guid=?"));
     s_date.BindInt64(0, date_item->second);
     s_date.BindString(1, iter->guid());
     if (!s_date.Run())
       return false;
   }
 
   return true;
 }