X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/blobdiff_plain/6df32f20316aab78c979f50ff17798cc6dd7e9e0..080dc7d603d45ba0662aa731418993ddd45b5fe8:/src/orm/ormrecord.h

diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index 583ff5b..32a4d5e 100644
--- a/src/orm/ormrecord.h
+++ b/src/orm/ormrecord.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011-2024 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -26,12 +27,13 @@
 #include <QStringList>
 #include <QDateTime>
 #include <QDebug>
+#include <stdexcept>
 
-class OrmException
+class OrmException: public std::runtime_error
 {
 public:
-    OrmException(const QString& text) : mText(text) {}
-    virtual ~OrmException(){}
+    OrmException(const QString& text) : std::runtime_error(text.toStdString()), mText(text) {}
+    virtual ~OrmException() throw() {}
     virtual const QString& text() const { return mText; }
 private:
     QString mText;
@@ -40,15 +42,15 @@ private:
 class OrmNoObjectException : public OrmException
 {
 public:
-    OrmNoObjectException() : OrmException("No object exception"){}
-    ~OrmNoObjectException(){}
+    OrmNoObjectException() : OrmException("SQL query expects one record but found none."){}
+    ~OrmNoObjectException() throw() {}
 };
 
 class OrmSqlException : public OrmException
 {
 public:
     OrmSqlException(const QString& text) : OrmException( QString("Sql error: ") + text ) {}
-    ~OrmSqlException(){}
+    ~OrmSqlException() throw() {}
 };
 
 template <typename T>
@@ -92,8 +94,8 @@ T OrmRecord<T>::hydrate(const QSqlRecord& record)
 }
 
 // updates specified column 'col'
-// if the value is not specified  as an argument,
-// it's taken from the reford itself
+// if the value is not specified as an argument,
+// it's taken from the record itself
 // see also: setValue() method for more details
 template <typename T>
 void OrmRecord<T>::update(QString col, QVariant value)
@@ -105,7 +107,6 @@ void OrmRecord<T>::update(QString col, QVariant value)
     else // take 'col' value from the record; see setValue()
         query.bindValue(":col", convertToDb(this->value(col), this->value(col).type()));
     query.bindValue(":id", this->value("id"));
-    //query.bindValue(":id", convertToDb(value("id"), QVariant::Int));
     query.exec();
 }
 
@@ -150,10 +151,6 @@ QList<T> OrmRecord<T>::load(QSqlQuery query)
             qDebug() << "Error: " << query.lastError().driverText() << "; Type: " << query.lastError().type();
             throw OrmSqlException(query.lastError().text());
         }
-        else
-        {
-            /*qDebug() << "SQL OK";*/
-        }
     }
 
     QList<T> objects;
@@ -161,7 +158,6 @@ QList<T> OrmRecord<T>::load(QSqlQuery query)
     {
         objects << hydrate(query.record());
     }
-    /*qDebug() << "Fetch done";*/
     return objects;
 }
 
@@ -220,7 +216,9 @@ QVariant OrmRecord<T>::convertToDb(QVariant value, QVariant::Type colType)
 {
     if (colType == QVariant::DateTime && value.canConvert<QDateTime>())
     {
-        return value.toDateTime().toTime_t();
+        QDateTime dateTime = value.toDateTime();
+        dateTime.setTimeSpec(Qt::UTC); // this is to avoid that dateTime.toTime_t changes the time depending on the local time zone
+        return dateTime.toTime_t();
     }
 
     return value;