diff options
Diffstat (limited to 'src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp')
-rw-r--r-- | src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp index 2a770d0245..e1bf0f2d47 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp @@ -55,9 +55,6 @@ #include <qcache.h> #include <qregularexpression.h> #endif -#if QT_CONFIG(timezone) -#include <QTimeZone> -#endif #include <QScopedValueRollback> #if defined Q_OS_WIN @@ -421,34 +418,6 @@ bool QSQLiteResult::prepare(const QString &query) return true; } -static QString secondsToOffset(int seconds) -{ - const QChar sign = ushort(seconds < 0 ? '-' : '+'); - seconds = qAbs(seconds); - const int hours = seconds / 3600; - const int minutes = (seconds % 3600) / 60; - - return QString(QStringLiteral("%1%2:%3")).arg(sign).arg(hours, 2, 10, QLatin1Char('0')).arg(minutes, 2, 10, QLatin1Char('0')); -} - -static QString timespecToString(const QDateTime &dateTime) -{ - switch (dateTime.timeSpec()) { - case Qt::LocalTime: - return QString(); - case Qt::UTC: - return QStringLiteral("Z"); - case Qt::OffsetFromUTC: - return secondsToOffset(dateTime.offsetFromUtc()); -#if QT_CONFIG(timezone) - case Qt::TimeZone: - return secondsToOffset(dateTime.timeZone().offsetFromUtc(dateTime)); -#endif - default: - return QString(); - } -} - bool QSQLiteResult::execBatch(bool arrayBind) { Q_UNUSED(arrayBind); @@ -555,7 +524,7 @@ bool QSQLiteResult::exec() break; case QVariant::DateTime: { const QDateTime dateTime = value.toDateTime(); - const QString str = dateTime.toString(QLatin1String("yyyy-MM-ddThh:mm:ss.zzz") + timespecToString(dateTime)); + const QString str = dateTime.toString(Qt::ISODateWithMs); res = sqlite3_bind_text16(d->stmt, i + 1, str.utf16(), str.size() * sizeof(ushort), SQLITE_TRANSIENT); break; @@ -673,7 +642,7 @@ static void _q_regexp(sqlite3_context* context, int argc, sqlite3_value** argv) const bool wasCached = regexp; if (!wasCached) - regexp = new QRegularExpression(pattern, QRegularExpression::DontCaptureOption | QRegularExpression::OptimizeOnFirstUsageOption); + regexp = new QRegularExpression(pattern, QRegularExpression::DontCaptureOption); const bool found = subject.contains(*regexp); |