diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 05:49:05 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 05:49:05 +0000 |
| commit | 29a4fd5d7ea7177c8ad6d95e4b6a1f5d9a090bcc (patch) | |
| tree | 26bd64a028cf07282df38cc1a5cf52ddd53ea367 /sql | |
| parent | f454eed0f7ead2959c249da24f6b0e6e69bbe832 (diff) | |
| download | chromium_src-29a4fd5d7ea7177c8ad6d95e4b6a1f5d9a090bcc.zip chromium_src-29a4fd5d7ea7177c8ad6d95e4b6a1f5d9a090bcc.tar.gz chromium_src-29a4fd5d7ea7177c8ad6d95e4b6a1f5d9a090bcc.tar.bz2 | |
Recover version 6 Favicons, fix meta table.
Version 6 is exactly like version 7, except it has an extra trailing
column on favicons which was never used. The version-7 recovery code
works for it, so long as the meta table is updated correctly.
In writing this change, I realized that the meta table wasn't being
created for recovered databases. Instead, SQLite was resolving to the
corrupt.meta table. This works so long as the version doesn't change
(next open will populate meta with kCurrentVersion). This change
makes the table references absolute, and fixes the meta table setup.
BUG=240396
R=jar@chromium.org, pkotwicz@chromium.org, sky@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=228217
Review URL: https://codereview.chromium.org/25032004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/test/test_helpers.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/test/test_helpers.cc b/sql/test/test_helpers.cc index 20471dc..de3e8f8 100644 --- a/sql/test/test_helpers.cc +++ b/sql/test/test_helpers.cc @@ -82,6 +82,12 @@ bool CreateDatabaseFromSQL(const base::FilePath& db_path, if (!db.Open(db_path)) return false; + // TODO(shess): Android defaults to auto_vacuum mode. + // Unfortunately, this makes certain kinds of tests which manipulate + // the raw database hard/impossible to write. + // http://crbug.com/307303 is for exploring this test issue. + ignore_result(db.Execute("PRAGMA auto_vacuum = 0")); + return db.Execute(sql.c_str()); } |