This at least partly fixes #42 ("fun with time zones").

[toast/confclerk.git] / src / orm / ormrecord.h

diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index 5f7184c4221a938fa36be4f9d6bd1337b9b59fde..73541e2baa5a78ac1f5e6b17d4c3844deb97a48f 100644 (file)
--- a/src/orm/ormrecord.h
+++ b/src/orm/ormrecord.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann
  *
  * This file is part of ConfClerk.
  *
@@ -93,8 +93,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)
@@ -106,7 +106,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();
 }
 
@@ -151,10 +150,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;
@@ -162,7 +157,6 @@ QList<T> OrmRecord<T>::load(QSqlQuery query)
     {
         objects << hydrate(query.record());
     }
-    /*qDebug() << "Fetch done";*/
     return objects;
 }
 
@@ -221,7 +215,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;