whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SQL/PostgreSQL: Make sure the server returns datetime in UTC 

The postgresql server by default returns the datetime in it's local
timezone. This works as long as this is the same as on the client. If
they are different, the parsing is going wrong.. Therefore let the
server return the datetime in UTC. Also do not convert the datetime into
local time to be in sync with the MySQL plugin.

[ChangeLog][SQL][PostgreSQL] Fixed a bug where a wrong QDateTime might
be returned when the PostgreSQL server and the Qt client had different
time zones configured.

Fixes: QTBUG-115960
Change-Id: I1a6dda69359a34b99ef399b2a54f35c8ba041326
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Christian Ehrlicher 2024-03-13 20:56:37 +01:00
parent 3d46094b68
commit b71f185ffc
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/sqldrivers/psql/qsql_psql.cpp
View File

@ -140,6 +140,7 @@ public:
bool setEncodingUtf8();
void setDatestyle();
void setByteaOutput();
void setUtcTimeZone();
void detectBackslashEscape();
mutable QHash<int, QString> oidToTable;
};
@ -646,9 +647,12 @@ QVariant QPSQLResult::data(int i)
return QVariant(QDate::fromString(QString::fromLatin1(val), Qt::ISODate));
case QMetaType::QTime:
return QVariant(QTime::fromString(QString::fromLatin1(val), Qt::ISODate));
case QMetaType::QDateTime:
return QVariant(QDateTime::fromString(QString::fromLatin1(val),
Qt::ISODate).toLocalTime());
case QMetaType::QDateTime: {
QString tzString(QString::fromLatin1(val));
if (!tzString.endsWith(u'Z'))
tzString.append(u'Z'); // make UTC
return QVariant(QDateTime::fromString(tzString, Qt::ISODate));
}
#else
case QMetaType::QDate:
case QMetaType::QTime:
@ -927,6 +931,15 @@ void QPSQLDriverPrivate::setByteaOutput()
}
}
void QPSQLDriverPrivate::setUtcTimeZone()
{
PGresult *result = exec("SET TIME ZONE 'UTC'");
int status = PQresultStatus(result);
if (status != PGRES_COMMAND_OK)
qWarning() << QString::fromUtf8(PQerrorMessage(connection));
PQclear(result);
}
void QPSQLDriverPrivate::detectBackslashEscape()
{
// standard_conforming_strings option introduced in 8.2
@ -1192,6 +1205,7 @@ bool QPSQLDriver::open(const QString &db,
}
d->setDatestyle();
d->setByteaOutput();
d->setUtcTimeZone();
setOpen(true);
setOpenError(false);