Changeset 51529bd

Timestamp:

06/22/11 19:51:30 (12 years ago)

Author:

gregor herrmann <gregoa@…>

Branches:

master, qt5

Children:

f657e9c

Parents:

cfe9990

Message:

Insert new field xid_conference into table track, room and person.

Location:

src

Files:

• mvc/track.cpp (modified) (2 diffs)
• mvc/track.h (modified) (1 diff)
• sql/sqlengine.cpp (modified) (4 diffs)

src/mvc/track.cpp

@@ -21 +21 @@
 
 QString const Track::sTableName = QString("track");
-int const Track::sTableColCount = 2;
+int const Track::sTableColCount = 3;
+const QString Track::CONFERENCEID = "xid_conference";
 const QString Track::NAME = "name";
 
 QSqlRecord const Track::sColumns = Track::toRecord(QList<QSqlField>()
     << QSqlField("id", QVariant::Int)
+    << QSqlField(CONFERENCEID, QVariant::Int)
     << QSqlField(NAME, QVariant::String));
 
@@ -37 +39 @@
 {
     QSqlQuery query;
-    query.prepare("INSERT INTO " + sTableName + " (" + NAME + ")" + " VALUES " + "(\"" + name() + "\")");
+    query.prepare("INSERT INTO " + sTableName + " (" + CONFERENCEID + "," + NAME + ")" + " VALUES " + "(\"" + QString::number(conferenceid()) + "\",\"" + name() + "\")");
     if (!query.exec())
     {

src/mvc/track.h

@@ -29 +29 @@
     static QString const sTableName;
     static const int sTableColCount;
+    static const QString CONFERENCEID;
     static const QString NAME;
 public:
     int id() const { return value("id").toInt(); }
     void setId(int id) { setValue("id", id); }
+    int conferenceid() const { return value("xid_conference").toInt(); }
+    void setConference(int conferenceid) { setValue("xid_conference", conferenceid); }
     QString name() const { return value("name").toString(); }
     void setName(const QString & type) { setValue("name", type); }

src/sql/sqlengine.cpp

@@ -132 +132 @@
     {
         //insert event track to table and get track id
+        int conference = aEvent["conference_id"].toInt();
         QString name = aEvent["track"];
         Track track;
@@ -142 +143 @@
         }
         catch (OrmNoObjectException &e) {
+            track.setConference(conference);
             track.setName(name);
             trackId = track.insert();
@@ -212 +214 @@
     if (db.isValid() && db.isOpen())
     {
-        QString values = QString("'%1', '%2'").arg(aPerson["id"],aPerson["name"]);
-        QString query = QString("INSERT INTO PERSON (id,name) VALUES (%1)").arg(values);
+        QString values = QString("'%1', '%2', '%3'").arg(aPerson["conference_id"],aPerson["id"],aPerson["name"]);
+        QString query = QString("INSERT INTO PERSON (xid_conference,id,name) VALUES (%1)").arg(values);
         QSqlQuery result (query, db);
         //LOG_AUTOTEST(query);
@@ -243 +245 @@
         else // ROOM record doesn't exist yet, need to create it
         {
-            QString values = QString("'%1', '%2'").arg(aRoom["name"],aRoom["picture"]);
-            QString query = QString("INSERT INTO ROOM (name,picture) VALUES (%1)").arg(values);
+            QString values = QString("'%1', '%2', '%3'").arg(aRoom["conference_id"],aRoom["name"],aRoom["picture"]);
+            QString query = QString("INSERT INTO ROOM (xid_conference,name,picture) VALUES (%1)").arg(values);
             QSqlQuery result (query, db);
             roomId = result.lastInsertId().toInt(); // 'id' is assigned automatically