From 36711dab34e19e9a301e0f3c87128176f6e3b1c6 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Sat, 16 May 2020 15:24:01 +0200 Subject: [PATCH] Sqlite: Export interface Change-Id: I17fffdb2d6ca43e5f0897c0c86dd461b0d844699 Reviewed-by: Thomas Hartmann --- src/libs/sqlite/sqlitedatabase.cpp | 5 +++++ src/libs/sqlite/sqlitedatabase.h | 2 ++ src/libs/sqlite/sqlitedatabasebackend.cpp | 16 ++++++++++------ src/libs/sqlite/sqlitedatabasebackend.h | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/libs/sqlite/sqlitedatabase.cpp b/src/libs/sqlite/sqlitedatabase.cpp index ef5205484c6..688801c02e1 100644 --- a/src/libs/sqlite/sqlitedatabase.cpp +++ b/src/libs/sqlite/sqlitedatabase.cpp @@ -75,6 +75,11 @@ Database::Database(Utils::PathString &&databaseFilePath, Database::~Database() = default; +void Database::activateLogging() +{ + DatabaseBackend::activateLogging(); +} + void Database::open() { m_databaseBackend.open(m_databaseFilePath, m_openMode); diff --git a/src/libs/sqlite/sqlitedatabase.h b/src/libs/sqlite/sqlitedatabase.h index 94b0da03ba7..31de1d7b015 100644 --- a/src/libs/sqlite/sqlitedatabase.h +++ b/src/libs/sqlite/sqlitedatabase.h @@ -66,6 +66,8 @@ public: Database(const Database &) = delete; Database &operator=(const Database &) = delete; + static void activateLogging(); + void open(); void open(Utils::PathString &&databaseFilePath); void close(); diff --git a/src/libs/sqlite/sqlitedatabasebackend.cpp b/src/libs/sqlite/sqlitedatabasebackend.cpp index 1c5128c54c9..a0edd8e78d1 100644 --- a/src/libs/sqlite/sqlitedatabasebackend.cpp +++ b/src/libs/sqlite/sqlitedatabasebackend.cpp @@ -68,7 +68,7 @@ void DatabaseBackend::activateMultiThreading() static void sqliteLog(void*,int errorCode,const char *errorMessage) { - qWarning() << sqlite3_errstr(errorCode) << errorMessage; + std::cout << "Sqlite " << sqlite3_errstr(errorCode) << ": " << errorMessage << std::endl; } void DatabaseBackend::activateLogging() @@ -285,31 +285,35 @@ void DatabaseBackend::checkDatabaseHandleIsNotNull() const void DatabaseBackend::checkIfMultithreadingIsActivated(int resultCode) { if (resultCode != SQLITE_OK) - throwException("SqliteDatabaseBackend::activateMultiThreading: multithreading can't be activated!"); + throwExceptionStatic( + "SqliteDatabaseBackend::activateMultiThreading: multithreading can't be activated!"); } void DatabaseBackend::checkIfLoogingIsActivated(int resultCode) { if (resultCode != SQLITE_OK) - throwException("SqliteDatabaseBackend::activateLogging: logging can't be activated!"); + throwExceptionStatic("SqliteDatabaseBackend::activateLogging: logging can't be activated!"); } void DatabaseBackend::checkMmapSizeIsSet(int resultCode) { if (resultCode != SQLITE_OK) - throwException("SqliteDatabaseBackend::checkMmapSizeIsSet: mmap size can't be changed!"); + throwExceptionStatic( + "SqliteDatabaseBackend::checkMmapSizeIsSet: mmap size can't be changed!"); } void DatabaseBackend::checkInitializeSqliteLibraryWasSuccesful(int resultCode) { if (resultCode != SQLITE_OK) - throwException("SqliteDatabaseBackend::initializeSqliteLibrary: SqliteLibrary cannot initialized!"); + throwExceptionStatic( + "SqliteDatabaseBackend::initializeSqliteLibrary: SqliteLibrary cannot initialized!"); } void DatabaseBackend::checkShutdownSqliteLibraryWasSuccesful(int resultCode) { if (resultCode != SQLITE_OK) - throwException("SqliteDatabaseBackend::shutdownSqliteLibrary: SqliteLibrary cannot be shutdowned!"); + throwExceptionStatic( + "SqliteDatabaseBackend::shutdownSqliteLibrary: SqliteLibrary cannot be shutdowned!"); } void DatabaseBackend::checkIfLogCouldBeCheckpointed(int resultCode) diff --git a/src/libs/sqlite/sqlitedatabasebackend.h b/src/libs/sqlite/sqlitedatabasebackend.h index 3a23afa10c9..3e57085f8db 100644 --- a/src/libs/sqlite/sqlitedatabasebackend.h +++ b/src/libs/sqlite/sqlitedatabasebackend.h @@ -52,11 +52,11 @@ public: DatabaseBackend(DatabaseBackend &&) = delete; DatabaseBackend &operator=(DatabaseBackend &&) = delete; - void setMmapSize(qint64 defaultSize, qint64 maximumSize); - void activateMultiThreading(); - void activateLogging(); - void initializeSqliteLibrary(); - void shutdownSqliteLibrary(); + static void setMmapSize(qint64 defaultSize, qint64 maximumSize); + static void activateMultiThreading(); + static void activateLogging(); + static void initializeSqliteLibrary(); + static void shutdownSqliteLibrary(); void checkpointFullWalLog(); void open(Utils::SmallStringView databaseFilePath, OpenMode openMode); @@ -107,11 +107,11 @@ protected: void checkCarrayCannotBeIntialized(int resultCode); void checkPragmaValue(Utils::SmallStringView databaseValue, Utils::SmallStringView expectedValue); void checkDatabaseHandleIsNotNull() const; - void checkIfMultithreadingIsActivated(int resultCode); - void checkIfLoogingIsActivated(int resultCode); - void checkMmapSizeIsSet(int resultCode); - void checkInitializeSqliteLibraryWasSuccesful(int resultCode); - void checkShutdownSqliteLibraryWasSuccesful(int resultCode); + static void checkIfMultithreadingIsActivated(int resultCode); + static void checkIfLoogingIsActivated(int resultCode); + static void checkMmapSizeIsSet(int resultCode); + static void checkInitializeSqliteLibraryWasSuccesful(int resultCode); + static void checkShutdownSqliteLibraryWasSuccesful(int resultCode); void checkIfLogCouldBeCheckpointed(int resultCode); void checkIfBusyTimeoutWasSet(int resultCode);