[core] improve SQLite error logging

1 files changed, 76 insertions, 6 deletions

diff --git a/platform/default/sqlite3.cpp b/platform/default/sqlite3.cpp
index 2e08354fdf..ba7a1f6446 100644
--- a/platform/default/sqlite3.cpp
+++ b/platform/default/sqlite3.cpp
@@ -69,14 +69,84 @@ public:
 template <typename T>
 using optional = std::experimental::optional<T>;
 
+static const char* codeToString(const int err) {
+    switch (err) {
+    case SQLITE_OK: return "SQLITE_OK";
+    case SQLITE_ERROR: return "SQLITE_ERROR";
+    case SQLITE_INTERNAL: return "SQLITE_INTERNAL";
+    case SQLITE_PERM: return "SQLITE_PERM";
+    case SQLITE_ABORT: return "SQLITE_ABORT";
+    case SQLITE_BUSY: return "SQLITE_BUSY";
+    case SQLITE_LOCKED: return "SQLITE_LOCKED";
+    case SQLITE_NOMEM: return "SQLITE_NOMEM";
+    case SQLITE_READONLY: return "SQLITE_READONLY";
+    case SQLITE_INTERRUPT: return "SQLITE_INTERRUPT";
+    case SQLITE_IOERR: return "SQLITE_IOERR";
+    case SQLITE_CORRUPT: return "SQLITE_CORRUPT";
+    case SQLITE_NOTFOUND: return "SQLITE_NOTFOUND";
+    case SQLITE_FULL: return "SQLITE_FULL";
+    case SQLITE_CANTOPEN: return "SQLITE_CANTOPEN";
+    case SQLITE_PROTOCOL: return "SQLITE_PROTOCOL";
+    case SQLITE_EMPTY: return "SQLITE_EMPTY";
+    case SQLITE_SCHEMA: return "SQLITE_SCHEMA";
+    case SQLITE_TOOBIG: return "SQLITE_TOOBIG";
+    case SQLITE_CONSTRAINT: return "SQLITE_CONSTRAINT";
+    case SQLITE_MISMATCH: return "SQLITE_MISMATCH";
+    case SQLITE_MISUSE: return "SQLITE_MISUSE";
+    case SQLITE_NOLFS: return "SQLITE_NOLFS";
+    case SQLITE_AUTH: return "SQLITE_AUTH";
+    case SQLITE_FORMAT: return "SQLITE_FORMAT";
+    case SQLITE_RANGE: return "SQLITE_RANGE";
+    case SQLITE_NOTADB: return "SQLITE_NOTADB";
+    case SQLITE_NOTICE: return "SQLITE_NOTICE";
+    case SQLITE_WARNING: return "SQLITE_WARNING";
+    case SQLITE_ROW: return "SQLITE_ROW";
+    case SQLITE_DONE: return "SQLITE_DONE";
+    default: return "<unknown>";
+    }
+}
+
 static void errorLogCallback(void *, const int err, const char *msg) {
-    if (err == SQLITE_ERROR) {
-        mbgl::Log::Error(mbgl::Event::Database, "%s (Code %i)", msg, err);
-    } else if (err == SQLITE_WARNING) {
-        mbgl::Log::Warning(mbgl::Event::Database, "%s (Code %i)", msg, err);
-    } else {
-        mbgl::Log::Info(mbgl::Event::Database, "%s (Code %i)", msg, err);
+    auto severity = mbgl::EventSeverity::Info;
+
+    switch (err) {
+        case SQLITE_ERROR:      // Generic error
+        case SQLITE_INTERNAL:   // Internal logic error in SQLite
+        case SQLITE_PERM:       // Access permission denied
+        case SQLITE_ABORT:      // Callback routine requested an abort
+        case SQLITE_BUSY:       // The database file is locked
+        case SQLITE_LOCKED:     // A table in the database is locked
+        case SQLITE_NOMEM:      // A malloc() failed
+        case SQLITE_READONLY:   // Attempt to write a readonly database
+        case SQLITE_INTERRUPT:  // Operation terminated by sqlite3_interrupt(
+        case SQLITE_IOERR:      // Some kind of disk I/O error occurred
+        case SQLITE_CORRUPT:    // The database disk image is malformed
+        case SQLITE_NOTFOUND:   // Unknown opcode in sqlite3_file_control()
+        case SQLITE_FULL:       // Insertion failed because database is full
+        case SQLITE_CANTOPEN:   // Unable to open the database file
+        case SQLITE_PROTOCOL:   // Database lock protocol error
+        case SQLITE_EMPTY:      // Internal use only
+        case SQLITE_SCHEMA:     // The database schema changed
+        case SQLITE_TOOBIG:     // String or BLOB exceeds size limit
+        case SQLITE_CONSTRAINT: // Abort due to constraint violation
+        case SQLITE_MISMATCH:   // Data type mismatch
+        case SQLITE_MISUSE:     // Library used incorrectly
+        case SQLITE_NOLFS:      // Uses OS features not supported on host
+        case SQLITE_AUTH:       // Authorization denied
+        case SQLITE_FORMAT:     // Not used
+        case SQLITE_RANGE:      // 2nd parameter to sqlite3_bind out of range
+        case SQLITE_NOTADB:     // File opened that is not a database file
+            severity = mbgl::EventSeverity::Error;
+            break;
+        case SQLITE_WARNING:    // Warnings from sqlite3_log()
+            severity = mbgl::EventSeverity::Warning;
+            break;
+        case SQLITE_NOTICE:     // Notifications from sqlite3_log()
+        default:
+            break;
     }
+
+    mbgl::Log::Record(severity, mbgl::Event::Database, "%s (%s)", msg, codeToString(err));
 }
 
 const static bool sqliteVersionCheck __attribute__((unused)) = []() {