Sqlite: Add Read and ReadWrite mode to database

We want open databases in read only mode too.

Change-Id: I3b20602d4bd7841c9fca3260edce082d21022052
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-08-01 18:32:29 +02:00
parent 52a911b972
commit 98035954c9
7 changed files with 71 additions and 11 deletions

View File

@@ -30,15 +30,14 @@
namespace Sqlite {
SqliteDatabase::SqliteDatabase()
: m_databaseBackend(*this),
m_journalMode(JournalMode::Wal)
: m_databaseBackend(*this)
{
}
void SqliteDatabase::open()
{
m_databaseBackend.open(m_databaseFilePath);
m_databaseBackend.setJournalMode(journalMode());
m_databaseBackend.open(m_databaseFilePath, m_openMode);
m_databaseBackend.setJournalMode(m_journalMode);
initializeTables();
m_isOpen = true;
}
@@ -92,6 +91,16 @@ JournalMode SqliteDatabase::journalMode() const
return m_journalMode;
}
void SqliteDatabase::setOpenMode(OpenMode openMode)
{
m_openMode = openMode;
}
OpenMode SqliteDatabase::openMode() const
{
return m_openMode;
}
int SqliteDatabase::changesCount()
{
return m_databaseBackend.changesCount();

View File

@@ -65,6 +65,9 @@ public:
void setJournalMode(JournalMode journalMode);
JournalMode journalMode() const;
void setOpenMode(OpenMode openMode);
OpenMode openMode() const;
int changesCount();
int totalChangesCount();
@@ -80,7 +83,8 @@ private:
SqliteDatabaseBackend m_databaseBackend;
std::vector<SqliteTable> m_sqliteTables;
Utils::PathString m_databaseFilePath;
JournalMode m_journalMode;
JournalMode m_journalMode = JournalMode::Wal;
OpenMode m_openMode = OpenMode::ReadWrite;
bool m_isOpen = false;
};

View File

@@ -101,13 +101,13 @@ void SqliteDatabaseBackend::checkpointFullWalLog()
checkIfLogCouldBeCheckpointed(resultCode);
}
void SqliteDatabaseBackend::open(Utils::SmallStringView databaseFilePath)
void SqliteDatabaseBackend::open(Utils::SmallStringView databaseFilePath, OpenMode mode)
{
checkCanOpenDatabase(databaseFilePath);
int resultCode = sqlite3_open_v2(databaseFilePath.data(),
&m_databaseHandle,
SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
openMode(mode),
NULL);
checkDatabaseCouldBeOpened(resultCode);
@@ -375,6 +375,18 @@ TextEncoding SqliteDatabaseBackend::pragmaToTextEncoding(Utils::SmallStringView
return static_cast<TextEncoding>(index);
}
int SqliteDatabaseBackend::openMode(OpenMode mode)
{
int sqliteMode = SQLITE_OPEN_CREATE;
switch (mode) {
case OpenMode::ReadOnly: sqliteMode |= SQLITE_OPEN_READONLY; break;
case OpenMode::ReadWrite: sqliteMode |= SQLITE_OPEN_READWRITE; break;
}
return sqliteMode;
}
void SqliteDatabaseBackend::throwExceptionStatic(const char *whatHasHappens)
{
throw SqliteException(whatHasHappens);

View File

@@ -54,7 +54,7 @@ public:
void shutdownSqliteLibrary();
void checkpointFullWalLog();
void open(Utils::SmallStringView databaseFilePath);
void open(Utils::SmallStringView databaseFilePath, OpenMode openMode);
void close();
void closeWithoutException();
@@ -76,6 +76,8 @@ public:
template <typename Type>
Type toValue(Utils::SmallStringView sqlStatement);
static int openMode(OpenMode);
protected:
bool databaseIsOpen() const;
@@ -106,9 +108,11 @@ protected:
Utils::SmallStringView textEncodingToPragma(TextEncoding textEncoding);
static TextEncoding pragmaToTextEncoding(Utils::SmallStringView pragma);
Q_NORETURN static void throwExceptionStatic(const char *whatHasHappens);
Q_NORETURN void throwException(const char *whatHasHappens) const;
private:
SqliteDatabase &m_database;
sqlite3 *m_databaseHandle;

View File

@@ -66,6 +66,12 @@ enum class JournalMode : char
Wal
};
enum class OpenMode : char
{
ReadOnly,
ReadWrite
};
enum TextEncoding : char
{
Utf8,