summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f91f3fa)
Print the problematic setup step (e.g. 'setup_070_coreinfo') if
storage backend initialization fails. This may help with debugging.
Modify setupQueries() to return a list of query strings and
resource filenames, used for the above.
return query.trimmed();
}
return query.trimmed();
}
-QStringList AbstractSqlStorage::setupQueries()
+QList<AbstractSqlStorage::SqlQueryResource> AbstractSqlStorage::setupQueries()
+ QList<SqlQueryResource> queries;
// The current schema is stored in the root folder, including setup scripts.
QDir dir = QDir(QString(":/SQL/%1/").arg(displayName()));
foreach (QFileInfo fileInfo, dir.entryInfoList(QStringList() << "setup*", QDir::NoFilter, QDir::Name)) {
// The current schema is stored in the root folder, including setup scripts.
QDir dir = QDir(QString(":/SQL/%1/").arg(displayName()));
foreach (QFileInfo fileInfo, dir.entryInfoList(QStringList() << "setup*", QDir::NoFilter, QDir::Name)) {
- queries << queryString(fileInfo.baseName());
+ queries << SqlQueryResource(queryString(fileInfo.baseName()), fileInfo.baseName());
- foreach (QString queryString, setupQueries()) {
- QSqlQuery query = db.exec(queryString);
+ foreach (auto queryResource, setupQueries()) {
+ QSqlQuery query = db.exec(queryResource.queryString);
if (!watchQuery(query)) {
if (!watchQuery(query)) {
- qCritical() << "Unable to setup Logging Backend!";
+ qCritical() << qPrintable(QString("Unable to setup Logging Backend! Setup query failed (step: %1).")
+ .arg(queryResource.queryFilename));
db.rollback();
return false;
}
db.rollback();
return false;
}
*/
QString queryString(const QString& queryName, int version = 0);
*/
QString queryString(const QString& queryName, int version = 0);
- QStringList setupQueries();
+ /**
+ * Gets the collection of SQL setup queries and filenames to create a new database
+ *
+ * @return List of SQL query strings and filenames
+ */
+ QList<SqlQueryResource> setupQueries();
/**
* Gets the collection of SQL upgrade queries and filenames for a given schema version
/**
* Gets the collection of SQL upgrade queries and filenames for a given schema version