From 318f742b5ca3fd66c325ea0451419e0cb4929438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Wed, 6 May 2015 09:10:39 +0200 Subject: [PATCH] Revert use sqlite_errstr instead of sqlite3_errmsg that fixed #48 - sqlite3_errstr() is new from SQLite v3.7.15, not supported on Ubuntu 12.04 which is what is used for continuous integration with Travis CI - Only case of error is SQLITE_BUSY: "database is locked" (some statements are not finalized) so use this generic string instead --- src/Database.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Database.cpp b/src/Database.cpp index b11ff78..6fe39bf 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -73,8 +73,9 @@ Database::Database(const std::string& aFilename, Database::~Database() noexcept // nothrow { const int ret = sqlite3_close(mpSQLite); - // Never throw an exception in a destructor - SQLITECPP_ASSERT(SQLITE_OK == ret, sqlite3_errstr(ret)); // See SQLITECPP_ENABLE_ASSERT_HANDLER + // Only case of error is SQLITE_BUSY: "database is locked" (some statements are not finalized) + // Never throw an exception in a destructor : + SQLITECPP_ASSERT(SQLITE_OK == ret, "database is locked"); // See SQLITECPP_ENABLE_ASSERT_HANDLER } /**