Changeset 42685b5 in confclerk_git for src/mvc

Timestamp:

09/09/14 21:48:36 (8 years ago)

Author:

gregor herrmann <gregoa@…>

Branches:

master, qt5

Children:

2e08065

Parents:

d942dc3

Message:

Fix SQL query which returned too many rooms.

File:

• src/mvc/event.cpp (modified) (1 diff)

src/mvc/event.cpp

@@ -74 +74 @@
     QString aliasEvent("E");
     QString aliasEventRoom("R");
-    query.prepare(QString("SELECT %1 FROM %2 %3, %4 %5 WHERE %3.xid_conference = :conf AND %3.start >= :start AND %3.start < :end AND %3.id = R.xid_event ORDER BY %5.xid_room, %3.start, %3.duration").arg(
+    query.prepare(QString("SELECT %1 FROM %2 %3, %4 %5 WHERE %3.xid_conference = :conf_e AND %5.xid_conference = :conf_r AND %3.start >= :start AND %3.start < :end AND %3.id = %5.xid_event ORDER BY %5.xid_room, %3.start, %3.duration").arg(
                     columnsForSelect(aliasEvent), Event::sTableName, aliasEvent, "EVENT_ROOM", aliasEventRoom));
-    query.bindValue(":conf", conferenceId);
+    query.bindValue(":conf_e", conferenceId);
+    query.bindValue(":conf_r", conferenceId);
     query.bindValue(":start", dayStart.toTime_t());
     query.bindValue(":end", dayStart.addDays(1).toTime_t());