Changeset 7d7659d for src/mvc

Timestamp:

01/21/10 14:24:08 (12 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

06570e9

Parents:

d8d5bd2

Message:

combined EVENT and VIRTUAL_EVENT => 'EVENT' now

• Maemo sqlite doesn't support Full-Text-Search

Location:

src/mvc

Files:

• event.cpp (modified) (6 diffs)
• event.h (modified) (5 diffs)

src/mvc/event.cpp

@@ -1 +1 @@
 #include "event.h"
 
-// 'event' record is splitted into two separate tables 'event' and 'virtual_event'
-// for the FTS (Full-Text-Search) support and so, it is necessary to provide/use
-// two table names + corresponding parameters/methods, see bellow
-QString const Event::sTable1Name = QString("event");
-QString const Event::sTable2Name = QString("virtual_event");
-int const Event::sTable1ColCount = 9; // see 'toRecord()' for more details
-int const Event::sTable2ColCount = 5; // see 'toRecord()' for more details
+QString const Event::sTableName = QString("event");
 
 QSqlRecord const Event::sColumns = Event::toRecord(QList<QSqlField>()
-    /* 'columns from Table 1 */
     << QSqlField("id", QVariant::Int)
     << QSqlField("xid_conference", QVariant::Int)
@@ -20 +13 @@
     << QSqlField("favourite", QVariant::Bool)
     << QSqlField("alarm", QVariant::Bool)
-    /* 'columns' from Table2 */
     << QSqlField("tag", QVariant::String)
     << QSqlField("title", QVariant::String)
@@ -30 +22 @@
 Event Event::getById(int id, int conferenceId)
 {
+
     QSqlQuery query;
-    query.prepare(
-            selectQueryJoin2T("id")
-            + QString("WHERE %1.id = :id AND %1.xid_conference = :conf").arg(sTable1Name));
+    query.prepare(selectQuery() + "WHERE id = :id AND xid_conference = :conf");
     query.bindValue(":id", id);
     query.bindValue(":conf", conferenceId);
-
     return loadOne(query);
 }
@@ -43 +33 @@
 {
     QSqlQuery query;
-    query.prepare(
-            selectQueryJoin2T("id")
-            + QString("WHERE %1.xid_conference = :conf AND %1.start >= :start AND %1.start < :end ORDER BY %1.%2").arg(sTable1Name).arg(orderBy));
+    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end ORDER BY %1").arg(orderBy));
     query.bindValue(":conf", conferenceId);
     query.bindValue(":start", convertToDb(date, QVariant::DateTime));
@@ -56 +44 @@
 {
     QSqlQuery query;
-    query.prepare(
-            selectQueryJoin2T("id")
-            + QString("WHERE %1.xid_conference = :conf AND %1.start >= :start AND %1.start < :end AND %1.favourite = 1 ORDER BY %1.start").arg(sTable1Name));
+    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end AND favourite = 1 ORDER BY start"));
     query.bindValue(":conf", conferenceId);
     query.bindValue(":start", convertToDb(date, QVariant::DateTime));
@@ -117 +103 @@
 {
 
-    QString strQuery = QString("SELECT %1 FROM EVENT INNER JOIN VIRTUAL_EVENT USING (xid_conference, id) "
-        "INNER JOIN SEARCH_EVENT USING (xid_conference, id) ").arg( columnsForSelectJoin2T() );
-    strQuery += QString(
-        "WHERE %1.xid_conference = :conf AND %1.start >= :start AND %1.start < :end ORDER BY %1.%2").arg(sTable1Name, orderBy);
+    QString strQuery = QString("SELECT %1 FROM EVENT INNER JOIN SEARCH_EVENT USING (xid_conference, id) ").arg(columnsForSelect());
+    strQuery += QString("WHERE xid_conference = :conf AND start >= :start AND start < :end ORDER BY %1").arg(orderBy);
     qDebug() << strQuery;
     QSqlQuery query;

src/mvc/event.h

@@ -19 +19 @@
 public:
     static const QSqlRecord sColumns;
-    //static QString const sTableName;
-    static const QString sTable1Name;
-    static const QString sTable2Name;
-    static const int sTable1ColCount;
-    static const int sTable2ColCount;
+    static QString const sTableName;
 public:
     static Event getById(int id, int conferenceId);
@@ -30 +26 @@
     static QList<Event> getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy);
 public:
-    // Table 1
     int id() const { return value("id").toInt(); }
     int conferenceId() const { return value("xid_conference").toInt(); }
@@ -41 +36 @@
     bool hasAlarm() const { return value("alarm").toBool(); }
     bool hasTimeConflict() const { return true; /*return value("warning").toBool()*/; } //TODO
-    // Table 2 : virtual table for FTS (Full Text Search)
     QString tag() const { return value("tag").toString(); }
     QString title() const { return value("title").toString(); }
@@ -51 +45 @@
     QStringList persons() const;
 
-    // Table 1
     void setId(int id) { setValue("id", id); }
     void setConferenceId(int conferenceId) { setValue("xid_conference", conferenceId); }
@@ -61 +54 @@
     void setFavourite(bool favourite) { setValue("favourite", (int)((favourite))); }
     void setHasAlarm(bool alarm) { setValue("alarm", (int)((alarm))); }
-    // Table 2 : virtual table for FTS (Full Text Search)
     void setTag(const QString& tag) { setValue("tag", tag); }
     void setTitle(const QString& title) { setValue("title", title); }