diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 20:55:26 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 20:55:26 +0000 |
| commit | bf898dad1b57c6fd436bc8d8c8ef143e3d11755d (patch) | |
| tree | a7f37c0ca8b97620ee88586d2dc4cd2c7f7891dd /chrome/browser/webdata/web_database.h | |
| parent | 63b9eb2c8d3bb29e814f7a0da90568e77a47a42f (diff) | |
| download | chromium_src-bf898dad1b57c6fd436bc8d8c8ef143e3d11755d.zip chromium_src-bf898dad1b57c6fd436bc8d8c8ef143e3d11755d.tar.gz chromium_src-bf898dad1b57c6fd436bc8d8c8ef143e3d11755d.tar.bz2 | |
Fix credit card table migration step by ensuring that we're not trying to add a column which is already present. If we create a table as part of the init process, don't try to alter the table, because it already exists.
BUG=10913
TEST= search engine dialog works, search engines don't disappear.
Review URL: http://codereview.chromium.org/3239006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/webdata/web_database.h')
| -rw-r--r-- | chrome/browser/webdata/web_database.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h index 34b7aa6..23938a8 100644 --- a/chrome/browser/webdata/web_database.h +++ b/chrome/browser/webdata/web_database.h @@ -329,12 +329,13 @@ class WebDatabase { bool InitAutofillTable(); bool InitAutofillDatesTable(); bool InitAutoFillProfilesTable(); - bool InitCreditCardsTable(); + // Out parameter |credit_card_table_created| true if table created here. + bool InitCreditCardsTable(bool* table_was_created); bool InitTokenServiceTable(); bool InitWebAppIconsTable(); bool InitWebAppsTable(); - void MigrateOldVersionsAsNeeded(); + void MigrateOldVersionsAsNeeded(bool credit_card_table_created); sql::Connection db_; sql::MetaTable meta_table_; |