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

[core] Add additional logging for exceptions during database connection / creation

Browse Source 
Refs #4382
This commit is contained in:
John Firebaugh
2016-03-18 16:08:00 -07:00
parent 7155c9bb81
commit 90d271709f
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,23 +58,36 @@ void OfflineDatabase::ensureSchema() {
removeExisting();
connect(ReadWrite | Create);
} catch (mapbox::sqlite::Exception& ex) {
if (ex.code == SQLITE_CANTOPEN) {
connect(ReadWrite | Create);
} else if (ex.code == SQLITE_NOTADB) {
removeExisting();
if (ex.code != SQLITE_CANTOPEN && ex.code != SQLITE_NOTADB) {
Log::Error(Event::Database, "Unexpected error connecting to database: %s", ex.what());
throw;
}
try {
if (ex.code == SQLITE_NOTADB) {
removeExisting();
}
connect(ReadWrite | Create);
} catch (...) {
Log::Error(Event::Database, "Unexpected error creating database: %s", util::toString(std::current_exception()).c_str());
throw;
}
}
}
#include "offline_schema.cpp.include"
try {
#include "offline_schema.cpp.include"
connect(ReadWrite | Create);
connect(ReadWrite | Create);
// If you change the schema you must write a migration from the previous version.
db->exec("PRAGMA auto_vacuum = INCREMENTAL");
db->exec(schema);
db->exec("PRAGMA user_version = 3");
// If you change the schema you must write a migration from the previous version.
db->exec("PRAGMA auto_vacuum = INCREMENTAL");
db->exec(schema);
db->exec("PRAGMA user_version = 3");
} catch (...) {
Log::Error(Event::Database, "Unexpected error creating database schema: %s", util::toString(std::current_exception()).c_str());
throw;
}
}
int OfflineDatabase::userVersion() {