From f156cb95bfd5b9ff953690ee7a3a668d864a3f63 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 28 Apr 2015 20:02:49 +0200 Subject: [PATCH] Fixed #107. --- src/definitions/definitions.h.in | 1 + src/miscellaneous/databasefactory.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in index bb2bc3919..d427a2726 100755 --- a/src/definitions/definitions.h.in +++ b/src/definitions/definitions.h.in @@ -109,6 +109,7 @@ #define APP_DB_UPDATE_FILE_PATTERN "db_update_%1_%2_%3.sql" #define APP_DB_COMMENT_SPLIT "-- !\n" #define APP_DB_WEB_PATH "data/database/web" +#define APP_DB_NAME_PLACEHOLDER "##" #define APP_CFG_PATH "data/config" #define APP_CFG_FILE "config.ini" diff --git a/src/miscellaneous/databasefactory.cpp b/src/miscellaneous/databasefactory.cpp index 2137599d7..bceb249cd 100755 --- a/src/miscellaneous/databasefactory.cpp +++ b/src/miscellaneous/databasefactory.cpp @@ -555,7 +555,7 @@ QSqlDatabase DatabaseFactory::mysqlInitializeDatabase(const QString &connection_ foreach(QString statement, statements) { // Assign real database name and run the query. - query_db.exec(statement.replace("##", database_name)); + query_db.exec(statement.replace(APP_DB_NAME_PLACEHOLDER, database_name)); if (query_db.lastError().isValid()) { qFatal("MySQL database initialization failed. Initialization script '%s' is not correct. Error : '%s'.",