OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/webdata/web_database.h" | 5 #include "chrome/browser/webdata/web_database.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "chrome/browser/diagnostics/sqlite_diagnostics.h" | 9 #include "chrome/browser/diagnostics/sqlite_diagnostics.h" |
10 #include "chrome/browser/webdata/autofill_table.h" | 10 #include "chrome/browser/webdata/autofill_table.h" |
11 #include "chrome/browser/webdata/keyword_table.h" | 11 #include "chrome/browser/webdata/keyword_table.h" |
12 #include "chrome/browser/webdata/logins_table.h" | 12 #include "chrome/browser/webdata/logins_table.h" |
13 #include "chrome/browser/webdata/token_service_table.h" | 13 #include "chrome/browser/webdata/token_service_table.h" |
14 #include "chrome/browser/webdata/web_apps_table.h" | 14 #include "chrome/browser/webdata/web_apps_table.h" |
15 #include "chrome/browser/webdata/web_intents_table.h" | 15 #include "chrome/browser/webdata/web_intents_table.h" |
16 #include "content/public/browser/notification_service.h" | 16 #include "content/public/browser/notification_service.h" |
17 #include "sql/statement.h" | 17 #include "sql/statement.h" |
18 #include "sql/transaction.h" | 18 #include "sql/transaction.h" |
19 | 19 |
20 // Current version number. Note: when changing the current version number, | 20 // Current version number. Note: when changing the current version number, |
21 // corresponding changes must happen in the unit tests, and new migration test | 21 // corresponding changes must happen in the unit tests, and new migration test |
22 // added. See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|. | 22 // added. See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|. |
23 // static | 23 // static |
24 const int WebDatabase::kCurrentVersionNumber = 48; | 24 const int WebDatabase::kCurrentVersionNumber = 49; |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 const int kCompatibleVersionNumber = 48; | 28 const int kCompatibleVersionNumber = 48; |
29 | 29 |
30 // Change the version number and possibly the compatibility version of | 30 // Change the version number and possibly the compatibility version of |
31 // |meta_table_|. | 31 // |meta_table_|. |
32 void ChangeVersion(sql::MetaTable* meta_table, | 32 void ChangeVersion(sql::MetaTable* meta_table, |
33 int version_num, | 33 int version_num, |
34 bool update_compatible_version_num) { | 34 bool update_compatible_version_num) { |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 ChangeVersion(&meta_table_, 47, true); | 350 ChangeVersion(&meta_table_, 47, true); |
351 // FALL THROUGH | 351 // FALL THROUGH |
352 | 352 |
353 case 47: | 353 case 47: |
354 if (!keyword_table_->MigrateToVersion48RemoveKeywordsBackup()) | 354 if (!keyword_table_->MigrateToVersion48RemoveKeywordsBackup()) |
355 return FailedMigrationTo(48); | 355 return FailedMigrationTo(48); |
356 | 356 |
357 ChangeVersion(&meta_table_, 48, true); | 357 ChangeVersion(&meta_table_, 48, true); |
358 // FALL THROUGH | 358 // FALL THROUGH |
359 | 359 |
| 360 case 48: |
| 361 if (!keyword_table_-> |
| 362 MigrateToVersion49AddSearchTermsReplacementKeyColumn()) |
| 363 return FailedMigrationTo(49); |
| 364 |
| 365 ChangeVersion(&meta_table_, 49, true); |
| 366 // FALL THROUGH |
| 367 |
360 // Add successive versions here. Each should set the version number and | 368 // Add successive versions here. Each should set the version number and |
361 // compatible version number as appropriate, then fall through to the next | 369 // compatible version number as appropriate, then fall through to the next |
362 // case. | 370 // case. |
363 | 371 |
364 case kCurrentVersionNumber: | 372 case kCurrentVersionNumber: |
365 // No migration needed. | 373 // No migration needed. |
366 return sql::INIT_OK; | 374 return sql::INIT_OK; |
367 } | 375 } |
368 } | 376 } |
OLD | NEW |