Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions src/database/mixxxdb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,46 @@ namespace {

const mixxx::Logger kLogger("MixxxDb");

const QString kType = QStringLiteral("QSQLITE");

const QString kConnectOptions = QStringLiteral("QSQLITE_OPEN_URI");

const QString kUriPrefix = QStringLiteral("file://");

const QString kDefaultFileName = QStringLiteral("mixxxdb.sqlite");

const QString kUserName = QStringLiteral("mixxx");

const QString kPassword = QStringLiteral("mixxx");

// The connection parameters for the main Mixxx DB
mixxx::DbConnection::Params dbConnectionParams(
const UserSettingsPointer& pConfig,
bool inMemoryConnection) {
mixxx::DbConnection::Params params;
params.type = "QSQLITE";
params.hostName = "localhost";
params.filePath = inMemoryConnection ? QString(":memory:") : QDir(pConfig->getSettingsPath()).filePath("mixxxdb.sqlite");
params.userName = "mixxx";
params.password = "mixxx";
params.type = kType;
params.connectOptions = kConnectOptions;
params.filePath = kUriPrefix;
const QString absFilePath =
QDir(pConfig->getSettingsPath()).absoluteFilePath(kDefaultFileName);
// On Windows absFilePath starts with a drive letter instead of
// the leading '/' as required.
// https://www.sqlite.org/c3ref/open.html#urifilenameexamples
if (!absFilePath.startsWith(QChar('/'))) {
params.filePath += QChar('/');
}
params.filePath += absFilePath;
// Allow multiple connections to the same in-memory database by
// using a named connection. This is needed to make the database
// connection pool work correctly even during tests.
//
// See also:
// https://www.sqlite.org/inmemorydb.html
if (inMemoryConnection) {
params.filePath += QStringLiteral("?mode=memory&cache=shared");
}
params.userName = kUserName;
params.password = kPassword;
return params;
}

Expand Down
1 change: 1 addition & 0 deletions src/util/db/dbconnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ QSqlDatabase createDatabase(

QSqlDatabase database =
QSqlDatabase::addDatabase(params.type, connectionName);
database.setConnectOptions(params.connectOptions);
database.setHostName(params.hostName);
database.setDatabaseName(params.filePath);
database.setUserName(params.userName);
Expand Down
1 change: 1 addition & 0 deletions src/util/db/dbconnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class DbConnection final {

struct Params {
QString type;
QString connectOptions;
QString hostName;
QString filePath;
QString userName;
Expand Down