Changed UNIQUE statements in the database table definition so that they make sense...

diff --git a/src/create_tables.sql b/src/create_tables.sql
index 52f782820e809a656b07220df0f84426765d21c5..2f9a90a58f9a97432db0e93df069627003544800 100644 (file)
--- a/src/create_tables.sql
+++ b/src/create_tables.sql
@@ -10,21 +10,24 @@ CREATE TABLE CONFERENCE ( id INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL
     , day_change INTEGER
     , timeslot_duration INTEGER
     , active INTEGER DEFAULT 0
-    , url VARCHAR UNIQUE
+    , url VARCHAR
     , map VARCHAR);
 
 CREATE TABLE TRACK ( id INTEGER  PRIMARY KEY AUTOINCREMENT  NOT NULL
     , xid_conference INTEGER -- NOT NULL
-    , name VARCHAR UNIQUE NOT NULL );
+    , name VARCHAR NOT NULL
+    , UNIQUE (xid_conference, name));
 
 CREATE TABLE ROOM ( id INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL
     , xid_conference INTEGER -- NOT NULL
-    , name VARCHAR UNIQUE NOT NULL
-    , picture VARCHAR NOT NULL);
+    , name VARCHAR NOT NULL
+    , picture VARCHAR NOT NULL
+    , UNIQUE (xid_conference, name));
 
 CREATE TABLE PERSON ( id INTEGER PRIMARY KEY  NOT NULL
     , xid_conference INTEGER -- NOT NULL
-    , name VARCHAR UNIQUE NOT NULL);
+    , name VARCHAR NOT NULL
+    , UNIQUE (xid_conference, name)); 
 
 CREATE TABLE EVENT ( xid_conference INTEGER  NOT NULL
     , id INTEGER NOT NULL

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 71a1c90a7a15fb3cac6e4f168cb307c48b9359c1..db3635534c24fa4c0f3ff289f2124917fd6d1873 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -116,7 +116,7 @@ void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference)
             query.bindValue(":day_change", -QTime::fromString(aConference["day_change"],TIME_FORMAT).secsTo(QTime(0,0)));
             query.bindValue(":day_change", -QTime::fromString(aConference["timeslot_duration"],TIME_FORMAT).secsTo(QTime(0,0)));
             query.bindValue(":active", confsList.count() > 0 ? 0 : 1);
-            query.exec();
+            if (!query.exec()) qDebug() << "Could not execute query to insert a conference:" << query.lastError();
             aConference["id"] = query.lastInsertId().toString(); // 'id' is assigned automatically
         }
     }