The database is now created from the program. We don't need to copy or provide fosdem...

diff --git a/src/db.qrc b/src/db.qrc
index 37282e0c148c81bd138d72f746c2df7c9db0db73..03d8d30057937dd70dacfce743eeac8b880c0df6 100644 (file)
--- a/src/db.qrc
+++ b/src/db.qrc
@@ -1,6 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>

-    <file>fosdem.sqlite</file>
+    <file>create_tables.sql</file>

 </qresource>
 </RCC>
 
 </qresource>
 </RCC>
 

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 9b2948b3780be613a045d1891db8b0e4d09ff155..8e3e78053ee94aaa1f604fbdd100eed0037d4676 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -50,12 +50,15 @@ QString SqlEngine::login(const QString &aDatabaseType, const QString &aDatabaseN
     bool result = false;
     if(!QFile::exists(aDatabaseName)) // the DB (tables) doesn't exists, and so we have to create one
     {
     bool result = false;
     if(!QFile::exists(aDatabaseName)) // the DB (tables) doesn't exists, and so we have to create one
     {

-        // copy conference Db from resource, instead of creating
-        // empty tables and then parsing the schedule
-        QFile dbFile(aDatabaseName);
-        QFile(":/fosdem.sqlite").copy(aDatabaseName);
-        dbFile.setPermissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ReadGroup | QFile::WriteGroup);
-        database.open();
+        // create Db
+        if (!database.open()) qDebug() << "Could not open database" << database.lastError();
+        QFile file(":/create_tables.sql");
+        file.open(QIODevice::ReadOnly | QIODevice::Text);
+        QString allSqlStatements = file.readAll();
+        foreach(QString sql, allSqlStatements.split(";")) {
+            QSqlQuery query(database);
+            if (!query.exec(sql)) qDebug() << "Could not execute query" << query.lastError();
+        }

     }
     else
     {
     }
     else
     {