| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser/notification_service_impl.h" | 16 #include "content/browser/notification_service_impl.h" |
| 17 #include "sql/statement.h" | 17 #include "sql/statement.h" |
| 18 #include "sql/transaction.h" | 18 #include "sql/transaction.h" |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 // Current version number. Note: when changing the current version number, | 22 // Current version number. Note: when changing the current version number, |
| 23 // corresponding changes must happen in the unit tests, and new migration test | 23 // corresponding changes must happen in the unit tests, and new migration test |
| 24 // added. See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|. | 24 // added. See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|. |
| 25 const int kCurrentVersionNumber = 40; | 25 const int kCurrentVersionNumber = 41; |
| 26 const int kCompatibleVersionNumber = 40; | 26 const int kCompatibleVersionNumber = 41; |
| 27 | 27 |
| 28 // Change the version number and possibly the compatibility version of | 28 // Change the version number and possibly the compatibility version of |
| 29 // |meta_table_|. | 29 // |meta_table_|. |
| 30 void ChangeVersion(sql::MetaTable* meta_table, | 30 void ChangeVersion(sql::MetaTable* meta_table, |
| 31 int version_num, | 31 int version_num, |
| 32 bool update_compatible_version_num) { | 32 bool update_compatible_version_num) { |
| 33 meta_table->SetVersionNumber(version_num); | 33 meta_table->SetVersionNumber(version_num); |
| 34 if (update_compatible_version_num) { | 34 if (update_compatible_version_num) { |
| 35 meta_table->SetCompatibleVersionNumber( | 35 meta_table->SetCompatibleVersionNumber( |
| 36 std::min(version_num, kCompatibleVersionNumber)); | 36 std::min(version_num, kCompatibleVersionNumber)); |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 // FALL THROUGH | 298 // FALL THROUGH |
| 299 | 299 |
| 300 case 38: | 300 case 38: |
| 301 if (!keyword_table_->MigrateToVersion39AddSyncGUIDColumn()) | 301 if (!keyword_table_->MigrateToVersion39AddSyncGUIDColumn()) |
| 302 return FailedMigrationTo(39); | 302 return FailedMigrationTo(39); |
| 303 | 303 |
| 304 ChangeVersion(&meta_table_, 39, true); | 304 ChangeVersion(&meta_table_, 39, true); |
| 305 // FALL THROUGH | 305 // FALL THROUGH |
| 306 | 306 |
| 307 case 39: | 307 case 39: |
| 308 if (!keyword_table_->MigrateToVersion40AddDefaultSearchEngineBackup()) | 308 if (!keyword_table_->MigrateToVersion40AddDefaultSearchProviderBackup()) |
| 309 return FailedMigrationTo(40); | 309 return FailedMigrationTo(40); |
| 310 | 310 |
| 311 ChangeVersion(&meta_table_, 40, true); | 311 ChangeVersion(&meta_table_, 40, true); |
| 312 // FALL THROUGH | 312 // FALL THROUGH |
| 313 | 313 |
| 314 case 40: |
| 315 if (!keyword_table_-> |
| 316 MigrateToVersion41RewriteDefaultSearchProviderBackup()) |
| 317 return FailedMigrationTo(41); |
| 318 |
| 319 ChangeVersion(&meta_table_, 41, true); |
| 320 // FALL THROUGH |
| 321 |
| 314 // Add successive versions here. Each should set the version number and | 322 // Add successive versions here. Each should set the version number and |
| 315 // compatible version number as appropriate, then fall through to the next | 323 // compatible version number as appropriate, then fall through to the next |
| 316 // case. | 324 // case. |
| 317 | 325 |
| 318 case kCurrentVersionNumber: | 326 case kCurrentVersionNumber: |
| 319 // No migration needed. | 327 // No migration needed. |
| 320 return sql::INIT_OK; | 328 return sql::INIT_OK; |
| 321 } | 329 } |
| 322 } | 330 } |
| OLD | NEW |