From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 21 Apr 2015 20:38:00 +0000 (+0200)
Subject: Merge pull request #122 from mamarley/psqltzfix
X-Git-Tag: travis-deploy-test~570
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=9e7ee3a501d5dce09982d92102b7f1873cd0d3db;hp=a26536d6f300be97b11338867160099743028a50

Merge pull request #122 from mamarley/psqltzfix

Set the PostgreSQL session timezone to 'UTC'
---

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index ca865704..68cf2544 100644
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -136,6 +136,14 @@ bool PostgreSqlStorage::initDbSession(QSqlDatabase &db)
         return false;
         break;
     }
+
+    // Set the PostgreSQL session timezone to UTC, since we want timestamps stored in UTC
+    QSqlQuery tzQuery = db.exec("SET timezone = 'UTC'");
+    if (tzQuery.lastError().isValid()) {
+        quError() << "Failed to set timezone to UTC!";
+        return false;
+    }
+
     return true;
 }