Changeset f1826af in confclerk_git for src/sql

Timestamp:

09/25/12 23:24:05 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

95257a6

Parents:

e2c612c

Message:

Schmema update completed. Finally closing ticket #45.

Location:

src/sql

Files:

• sqlengine.cpp (modified) (2 diffs)
• sqlengine.h (modified) (1 diff)

src/sql/sqlengine.cpp

@@ -82 +82 @@
 
 bool SqlEngine::updateDbSchemaVersion000To001() {
-    emit dbError("Upgrade 0 -> 1 not implemented yet");
-    return false;
+    return applySqlFile(":/dbschema000to001.sql");
 }
 
 
 bool SqlEngine::createCurrentDbSchema() {
-    QFile file(":/dbschema001.sql");
-    file.open(QIODevice::ReadOnly | QIODevice::Text);
-    QString allSqlStatements = file.readAll();
-    QSqlQuery query(db);
-    foreach(QString sql, allSqlStatements.split(";")) {
-        if (sql.trimmed().isEmpty())  // do not execute empty queries like the last character from create_tables.sql
-            continue;
-        if (!query.exec(sql)) {
-            emitSqlQueryError(query);
-            return false;
-        }
-    }
-    return true;
+    return applySqlFile(":/dbschema001.sql");
 }
 
@@ -124 +111 @@
     }
     return false;
+}
+
+
+bool SqlEngine::applySqlFile(const QString sqlFile) {
+    QFile file(sqlFile);
+    file.open(QIODevice::ReadOnly | QIODevice::Text);
+    QString allSqlStatements = file.readAll();
+    QSqlQuery query(db);
+    foreach(QString sql, allSqlStatements.split(";")) {
+        if (sql.trimmed().isEmpty())  // do not execute empty queries like the last character from create_tables.sql
+            continue;
+        if (!query.exec(sql)) {
+            emitSqlQueryError(query);
+            return false;
+        }
+    }
+    return true;
 }
 

src/sql/sqlengine.h

@@ -53 +53 @@
         /// otherwise updates the schema if an old one is found. true for success.
         bool createOrUpdateDbSchema();
+        /// Applies an SQL file
+        bool applySqlFile(const QString sqlFile);
 
         // if a conferneceId != 0 is given, the confernce is updated instead of inserted.