Changeset 5a73d27

Timestamp:

12/29/09 18:04:41 (13 years ago)

Author:

komarma <komarma@…>

Branches:

master, qt5

Children:

20a6010

Parents:

e5bc908

Message:

Adding orm module

Location:

src

Files:

• fosdem.pro (modified) (1 diff)
• model/event.cpp (modified) (1 diff)
• model/event.h (modified) (1 diff)
• model/model.pro (modified) (1 diff)
• orm/orm.pro (added)
• orm/ormrecord.h (added)
• orm/sqlcondition.cpp (added)
• orm/sqlcondition.h (added)
• test/model/eventtest.cpp (modified) (2 diffs)
• test/model/eventtest.h (modified) (1 diff)
• test/test.pro (modified) (1 diff)

src/fosdem.pro

@@ -1 +1 @@
 TEMPLATE = subdirs
-SUBDIRS  = model gui app test
+SUBDIRS  = orm model gui app test
 CONFIG += ordered
 

src/model/event.cpp

@@ -1 +1 @@
 #include "event.h"
 
-Event Event::getById(int id, int conferenceId)
-{
-    Event newEvent;
-    return newEvent;
-}
+QStringList const Event::sColNames = QStringList()
+    << "id" << "xid_conference" << "start" << "duration" << "xid_activity" << "type" << "language";
+
+QString const Event::sTableName = QString("event");

src/model/event.h

@@ -3 +3 @@
 
 #include <QDateTime>
+#include <QVector>
+#include <QStringList>
 
-class Event
+#include <ormrecord.h>
+
+
+/**
+  NoSuchEventException is thrown when required event does not exist.
+*/
+class NoSuchEventException
+{
+};
+
+class Event : public OrmRecord <Event>
 {
 public:
-    static Event getById(int id, int conferenceId);
+    // column definition
+    enum Column
+    {
+        Id = 0,
+        Conference,
+        Start,
+        Duration,
+        Activity,
+        Type,
+        Language
+    };
+
+    static QStringList const sColNames;
+
+    static QString const sTableName;
 
 public:
-    int id() const { return mId; }
-    int conferenceId() const { return mConferenceId; }
-    QDateTime start() const { return mStart; }
-    int duration() const { return mDuration; }
-    int activityId() const { return mActivityId; }
-    int typeId() const { return mTypeId; }
-    int languageId() const { return mLanguageId; }
+    static Event getById(int id, int conferenceId) { return Event(); } //EventTable::selectOne("id=1"); }
 
-private:
-    Event() {}; // private constructor, use static methods to access instances
+public:
+    int id() const { return value(Id).toInt(); }
+    int conferenceId() const { return value(Conference).toInt(); }
+    QDateTime start() const { return value(Start).toDateTime(); }
+    int duration() const { return value(Duration).toInt(); }
+    int activityId() const { return value(Activity).toInt(); }
+    int typeId() const { return value(Type).toInt(); }
+    int languageId() const { return value(Language).toInt(); }
 
-private:
-    int mId;
-    int mConferenceId;
-    QDateTime mStart;
-    int mDuration;
-    int mActivityId;
-    int mTypeId;
-    int mLanguageId;
+    void setId(int id) { setValue(Id, id); }
+    void setConferenceId(int conferenceId) { setValue(Conference, conferenceId); }
+    void setStart(const QDateTime& start) { setValue(Start, start); }
+    void setDuration(int duration) { setValue(Duration, duration); }
+    void setActivityId(int activityId) { setValue(Activity, activityId); }
+    void setTypeId(int typeId) { setValue(Type, typeId); }
+    void setLanguageId(int languageId) { setValue(Language, languageId); }
 };
 
+
+
 #endif // EVENT_H

src/model/model.pro

@@ -3 +3 @@
 DESTDIR = ../bin
 CONFIG += static
+QT += sql
 
 # module dependencies
-DEPENDPATH += .
+LIBS += -L$$DESTDIR -lorm
+INCLUDEPATH += ../orm
+DEPENDPATH += . ../orm
+TARGETDEPS += $$DESTDIR/liborm.a
 
 HEADERS += event.h

src/test/model/eventtest.cpp

@@ -3 +3 @@
 #include <QtTest>
 #include <QSqlDatabase>
+
+#include <QDebug>
 
 #include <event.h>
@@ -25 +27 @@
     QCOMPARE(event.languageId(), 0);
 }
+
+void EventTest::colNames()
+{
+    QCOMPARE(Event::colName(Event::Id), QString("id"));
+    QCOMPARE(Event::colName(Event::Conference), QString("xid_conference"));
+    QCOMPARE(Event::colName(Event::Start), QString("start"));
+    QCOMPARE(Event::colName(Event::Duration), QString("duration"));
+    QCOMPARE(Event::colName(Event::Activity), QString("xid_activity"));
+    QCOMPARE(Event::colName(Event::Type), QString("type"));
+    QCOMPARE(Event::colName(Event::Language), QString("language"));
+}
+
+void EventTest::storingValues()
+{
+    Event event;
+    QCOMPARE(event.id(), 0);
+
+    event.setId(10);
+    QCOMPARE(event.id(), 10);
+
+    event.setConferenceId(20);
+    QCOMPARE(event.conferenceId(), 20);
+
+    event.setStart(QDateTime::fromString("Sat Feb 7 11:30:00 2009"));
+    QCOMPARE(event.start(), QDateTime::fromString("Sat Feb 7 11:30:00 2009"));
+
+    event.setDuration(30);
+    QCOMPARE(event.duration(), 30);
+
+    event.setActivityId(40);
+    QCOMPARE(event.activityId(), 40);
+
+    event.setTypeId(50);
+    QCOMPARE(event.typeId(), 50);
+
+    event.setLanguageId(60);
+    QCOMPARE(event.languageId(), 60);
+}

src/test/model/eventtest.h

@@ -12 +12 @@
 
     void getById();
+    void colNames();
+    void storingValues();
 };
 

src/test/test.pro

@@ -7 +7 @@
 # module dependencies
 LIBS += -L$$DESTDIR -lgui -lmodel
-INCLUDEPATH += ../gui ../model
-DEPENDPATH += . ../gui ../model
-TARGETDEPS += $$DESTDIR/libmodel.a $$DESTDIR/libgui.a
+INCLUDEPATH += ../gui ../model ../orm
+DEPENDPATH += . ../gui ../model ../orm
+TARGETDEPS += $$DESTDIR/libmodel.a $$DESTDIR/libgui.a $$DESTDIR/liborm.a
 
 SOURCES += main.cpp \