1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQL/OCI: use QDateTime::toString("ttt")

Browse Source 
Use QDateTime::toString("ttt") which is available since Qt6.5 instead
own implementation

Fixes: QTBUG-111275
Change-Id: I41676d3a327c5aaabdeb4f54b9d169e228c482e1
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
(cherry picked from commit 79b22bb1f3ba51f37de03faefc7ddcd712e8e385)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2023-02-21 18:39:08 +01:00 committed by Qt Cherry-pick Bot
parent 7b96dad1e9
commit 42cbf42a75
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/sqldrivers/oci/qsql_oci.cpp
View File

@ -131,15 +131,6 @@ public:
~QOCIDateTime(); ~QOCIDateTime();
OCIDateTime *dateTime; OCIDateTime *dateTime;
static QDateTime fromOCIDateTime(OCIEnv *env, OCIError *err, OCIDateTime *dt); static QDateTime fromOCIDateTime(OCIEnv *env, OCIError *err, OCIDateTime *dt);
static QString toOffsetString(const QDateTime &dt)
{
const auto offset = dt.offsetFromUtc();
const auto offsetAbs = qAbs(offset) / 60;
return QString::asprintf("%c%02d:%02d",
offset >= 0 ? '+' : '-',
offsetAbs / 60,
offsetAbs % 60);
}
}; };
QOCIDateTime::QOCIDateTime(OCIEnv *env, OCIError *err, const QDateTime &dt) QOCIDateTime::QOCIDateTime(OCIEnv *env, OCIError *err, const QDateTime &dt)
@ -150,7 +141,7 @@ QOCIDateTime::QOCIDateTime(OCIEnv *env, OCIError *err, const QDateTime &dt)
const QDate date = dt.date(); const QDate date = dt.date();
const QTime time = dt.time(); const QTime time = dt.time();
// Zone in +hh:mm format // Zone in +hh:mm format
const QString timeZone = toOffsetString(dt); const QString timeZone = dt.toString("ttt");
const OraText *tz = reinterpret_cast<const OraText *>(timeZone.utf16()); const OraText *tz = reinterpret_cast<const OraText *>(timeZone.utf16());
OCIDateTimeConstruct(env, err, dateTime, date.year(), date.month(), date.day(), time.hour(), OCIDateTimeConstruct(env, err, dateTime, date.year(), date.month(), date.day(), time.hour(),
time.minute(), time.second(), time.msec() * 1000000, time.minute(), time.second(), time.msec() * 1000000,