| 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 "components/webdata/common/web_database.h" | 5 #include "components/webdata/common/web_database.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "sql/statement.h" | 10 #include "sql/statement.h" |
| 11 #include "sql/transaction.h" | 11 #include "sql/transaction.h" |
| 12 | 12 |
| 13 // Current version number. Note: when changing the current version number, | 13 // Current version number. Note: when changing the current version number, |
| 14 // corresponding changes must happen in the unit tests, and new migration test | 14 // corresponding changes must happen in the unit tests, and new migration test |
| 15 // added. See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|. | 15 // added. See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|. |
| 16 // static | 16 // static |
| 17 const int WebDatabase::kCurrentVersionNumber = 55; | 17 const int WebDatabase::kCurrentVersionNumber = 56; |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 const int kCompatibleVersionNumber = 55; | 21 const int kCompatibleVersionNumber = 56; |
| 22 | 22 |
| 23 // Change the version number and possibly the compatibility version of | 23 // Change the version number and possibly the compatibility version of |
| 24 // |meta_table_|. | 24 // |meta_table_|. |
| 25 void ChangeVersion(sql::MetaTable* meta_table, | 25 void ChangeVersion(sql::MetaTable* meta_table, |
| 26 int version_num, | 26 int version_num, |
| 27 bool update_compatible_version_num) { | 27 bool update_compatible_version_num) { |
| 28 meta_table->SetVersionNumber(version_num); | 28 meta_table->SetVersionNumber(version_num); |
| 29 if (update_compatible_version_num) { | 29 if (update_compatible_version_num) { |
| 30 meta_table->SetCompatibleVersionNumber( | 30 meta_table->SetCompatibleVersionNumber( |
| 31 std::min(version_num, kCompatibleVersionNumber)); | 31 std::min(version_num, kCompatibleVersionNumber)); |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 if (!it->second->MigrateToVersion(next_version, | 162 if (!it->second->MigrateToVersion(next_version, |
| 163 &update_compatible_version)) { | 163 &update_compatible_version)) { |
| 164 return FailedMigrationTo(next_version); | 164 return FailedMigrationTo(next_version); |
| 165 } | 165 } |
| 166 | 166 |
| 167 ChangeVersion(&meta_table_, next_version, update_compatible_version); | 167 ChangeVersion(&meta_table_, next_version, update_compatible_version); |
| 168 } | 168 } |
| 169 } | 169 } |
| 170 return sql::INIT_OK; | 170 return sql::INIT_OK; |
| 171 } | 171 } |
| OLD | NEW |