Add utc_offset and display_time_shift columns to conference database.

[toast/confclerk.git] / src / sql / sqlengine.h

diff --git a/src/sql/sqlengine.h b/src/sql/sqlengine.h
index 5cfc6bf87f01731b4083b2f2b2685b400d84df2a..a428e7418c6a003374519968373b0794d65937b7 100644 (file)
--- a/src/sql/sqlengine.h
+++ b/src/sql/sqlengine.h
@@ -28,8 +28,8 @@
 class SqlEngine : public QObject {
     Q_OBJECT
     public:
-        const QString DATE_FORMAT = "yyyy-MM-dd";
-        const QString TIME_FORMAT = "hh:mm";
+        const QString DATE_FORMAT; // "yyyy-MM-dd"
+        const QString TIME_FORMAT; // "hh:mm"
 
         QString dbFilename; ///< database filename including path
         QSqlDatabase db; ///< this may be private one day...
@@ -50,6 +50,7 @@ class SqlEngine : public QObject {
         int dbSchemaVersion();
         /// called by createOrUpdateDbSchema. Do not use directly. true for success.
         bool updateDbSchemaVersion000To001();
+        bool updateDbSchemaVersion001To002();
         /// called by createOrUpdateDbSchma. Do not use directly. true for success.
         bool createCurrentDbSchema();
         /// creates the current database schema if an empty database is found,
@@ -71,7 +72,7 @@ class SqlEngine : public QObject {
         bool rollbackTransaction();
 
         /// search Events for .... returns true if success
-        bool searchEvent(int conferenceId, const QHash<QString,QString> &columns, const QString &keyword);
+        bool searchEvent(int conferenceId, const QMultiHash<QString,QString> &columns, const QString &keyword);
     private:
         static QString login(const QString &aDatabaseType, const QString &aDatabaseName);
         /// emits a possible error message as signal. Does nothing if there was not last error
@@ -82,5 +83,24 @@ class SqlEngine : public QObject {
         void dbError(const QString& message);
 };
 
+
+class TransactionRaii {
+    SqlEngine& sqlEngine;
+    bool committed;
+public:
+    TransactionRaii(SqlEngine& sqlEngine): sqlEngine(sqlEngine), committed(false) {
+        sqlEngine.beginTransaction();
+    }
+
+    void commit() {
+        sqlEngine.commitTransaction();
+        committed = true;
+    }
+
+    ~TransactionRaii() {
+        if (!committed) sqlEngine.rollbackTransaction();
+    }
+};
+
 #endif /* SQLENGINE_H */