From d9ad09ca364df52a316f644f908b7bb493093b48 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 14 Jul 2017 16:39:42 +0300 Subject: [Qt] Align database creation behavior with the default implementation Qt doesn't throw a Exception::Code::CANTOPEN when trying to open a database that doesn't exist without the Create flag. --- platform/qt/src/sqlite3.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'platform') diff --git a/platform/qt/src/sqlite3.cpp b/platform/qt/src/sqlite3.cpp index 8df279c25d..6ed55c541f 100644 --- a/platform/qt/src/sqlite3.cpp +++ b/platform/qt/src/sqlite3.cpp @@ -50,6 +50,15 @@ void checkDatabaseError(const QSqlDatabase &db) { } } +void checkDatabaseOpenError(const QSqlDatabase &db) { + // Assume every error when opening the data as CANTOPEN. Qt + // always returns -1 for `nativeErrorCode()` on database errors. + QSqlError lastError = db.lastError(); + if (lastError.type() != QSqlError::NoError) { + throw Exception { Exception::Code::CANTOPEN, "Error opening the database." }; + } +} + class DatabaseImpl { public: DatabaseImpl(const char* filename, int flags) { @@ -77,7 +86,7 @@ public: db->setDatabaseName(QString(filename)); if (!db->open()) { - checkDatabaseError(*db); + checkDatabaseOpenError(*db); } } @@ -143,7 +152,7 @@ void Database::setBusyTimeout(std::chrono::milliseconds timeout) { } impl->db->setConnectOptions(connectOptions); if (!impl->db->open()) { - checkDatabaseError(*impl->db); + checkDatabaseOpenError(*impl->db); } } -- cgit v1.2.1