tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require minimum side-loaded database user_version=6

Browse Source
This commit is contained in:
Asheem Mamoowala
2018-08-21 16:18:51 -07:00
parent bc806d4354
commit eb72fe580b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/default/mbgl/storage/offline_database.cpp
View File

@@ -652,11 +652,13 @@ OfflineDatabase::mergeDatabase(const std::string& sideDatabasePath) {
return unexpected<std::exception_ptr>(std::current_exception());
}
try {
// Attaching an accessible path without a db file creates a new temporary
//database and attaches it. Check for matching schema version.
// Support sideloaded databases at user_version = 6. Future schema version
// changes will need to implement migration paths for sideloaded databases at
// version 6.
auto sideUserVersion = static_cast<int>(getPragma<int64_t>("PRAGMA side.user_version"));
if (sideUserVersion != 6) {
throw std::runtime_error("Merge database does not match schema or has incorrect user_version");
const auto mainUserVersion = getPragma<int64_t>("PRAGMA user_version");
if (sideUserVersion < 6 || sideUserVersion != mainUserVersion) {
throw std::runtime_error("Merge database has incorrect user_version");
}
mapbox::sqlite::Transaction transaction(*db);

2
test/storage/offline_database.test.cpp
View File

@@ -1277,7 +1277,7 @@ TEST(OfflineDatabase, MergeDatabaseWithInvalidPath) {
auto result = db.mergeDatabase(filename_sideload);
EXPECT_FALSE(result);
EXPECT_EQ(1u, log.count({ EventSeverity::Error, Event::Database, -1, "Merge database does not match schema or has incorrect user_version" }));
EXPECT_EQ(1u, log.count({ EventSeverity::Error, Event::Database, -1, "Merge database has incorrect user_version" }));
EXPECT_EQ(0u, log.uncheckedCount());
}