Changeset b6cd05c in confclerk_git for src/sql

Timestamp:

01/18/10 16:13:01 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

f6300c7

Parents:

d23aa6a

Message:

added 'alarm' columnt to the 'EVENT' table to signalize
that the event has/hasn't alarm set

File:

• src/sql/sqlengine.cpp (modified) (5 diffs)

src/sql/sqlengine.cpp

@@ -91 +91 @@
         // VIRTUAL_EVENT is for Full-Text-Serach Support
         QDateTime startDateTime = QDateTime(QDate::fromString(aEvent["date"],DATE_FORMAT),QTime::fromString(aEvent["start"],TIME_FORMAT));
-        QString values = QString("'%1', '%2', '%3', '%4', '%5', '%6', '%7', '%8'") \
+        QString values = QString("'%1', '%2', '%3', '%4', '%5', '%6', '%7', '%8', '%9'") \
                          .arg(aEvent["conference_id"]) \
                          .arg(aEvent["id"]) \
@@ -99 +99 @@
                          .arg(aEvent["type"]) \
                          .arg(aEvent["language"]) \
-                         .arg("0"); // not favourite when added
-
-        QString query = QString("INSERT INTO EVENT (xid_conference, id, start, duration, xid_activity, type, language, favourite) VALUES (%1)").arg(values);
+                         .arg("0") \
+                         .arg("0");
+
+        QString query = QString("INSERT INTO EVENT (xid_conference, id, start, duration, xid_activity, type, language, favourite, alarm) VALUES (%1)").arg(values);
         QSqlQuery result (query, db);
         //LOG_AUTOTEST(query);
@@ -120 +121 @@
         result2.bindValue(3,aEvent["description"]);
         result2.exec();
-
-         //LOG_AUTOTEST(query2);
-        qDebug() << query2;
+        //LOG_AUTOTEST(query2);
     }
 }
@@ -235 +234 @@
             language VARCHAR, \
             favourite INTEGER DEFAULT 0, \
+            alarm INTEGER DEFAULT 0, \
             PRIMARY KEY (xid_conference,id), \
             FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id) \
             FOREIGN KEY(xid_activity) REFERENCES ACTIVITY(id))");
 
-        // TBD Virtual tables compatibility (waiting for Marek). Temporary non virtual VIRTUAL_TABLE below: To be deleted
-/*        query.exec("CREATE VIRTUAL TABLE VIRTUAL_EVENT using fts3 ( \
-            xid_conference INTEGER  NOT NULL, \
-            id INTEGER NOT NULL , \
-            tag VARCHAR,title VARCHAR NOT NULL , \
-            subtitle VARCHAR, \
-            abstract VARCHAR, \
-            description VARCHAR, \
-            PRIMARY KEY (xid_conference,id))");
-*/
+#ifdef MAEMO
+        // TBD: MAEMO Virtual tables compatibility (waiting for Marek).
+        // MAEMO sqlite Qt driver doesn't provide FTS support by default - use the following HACK
         query.exec("CREATE TABLE VIRTUAL_EVENT ( \
             xid_conference INTEGER  NOT NULL, \
@@ -257 +250 @@
             description VARCHAR, \
             PRIMARY KEY (xid_conference,id))");
+#else
+        query.exec("CREATE VIRTUAL TABLE VIRTUAL_EVENT using fts3 ( \
+            xid_conference INTEGER  NOT NULL, \
+            id INTEGER NOT NULL , \
+            tag VARCHAR,title VARCHAR NOT NULL , \
+            subtitle VARCHAR, \
+            abstract VARCHAR, \
+            description VARCHAR, \
+            PRIMARY KEY (xid_conference,id))");
+#endif
 
         query.exec("CREATE TABLE EVENT_PERSON ( \