1 files changed, 10 insertions, 31 deletions
diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
index 68313b7ff0..27841d9494 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
+++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
@@ -692,40 +692,24 @@ QVariant QPSQLResult::data(int i)
         return dbl;
     }
     case QVariant::Date:
-        if (val[0] == '\0') {
-            return QVariant(QDate());
-        } else {
 #if QT_CONFIG(datestring)
-            return QVariant(QDate::fromString(QString::fromLatin1(val), Qt::ISODate));
+        return QVariant(QDate::fromString(QString::fromLatin1(val), Qt::ISODate));
 #else
-            return QVariant(QString::fromLatin1(val));
+        return QVariant(QString::fromLatin1(val));
 #endif
-        }
-    case QVariant::Time: {
-        const QString str = QString::fromLatin1(val);
+    case QVariant::Time:
 #if QT_CONFIG(datestring)
-        if (str.isEmpty())
-            return QVariant(QTime());
-        else
-            return QVariant(QTime::fromString(str, Qt::ISODate));
+        return QVariant(QTime::fromString(QString::fromLatin1(val), Qt::ISODate));
 #else
-        return QVariant(str);
+        return QVariant(QString::fromLatin1(val));
 #endif
-    }
-    case QVariant::DateTime: {
-        QString dtval = QString::fromLatin1(val);
+    case QVariant::DateTime:
 #if QT_CONFIG(datestring)
-        if (dtval.length() < 10) {
-            return QVariant(QDateTime());
-        } else {
-            QChar sign = dtval[dtval.size() - 3];
-            if (sign == QLatin1Char('-') || sign == QLatin1Char('+')) dtval += QLatin1String(":00");
-            return QVariant(QDateTime::fromString(dtval, Qt::ISODate).toLocalTime());
-        }
+        return QVariant(QDateTime::fromString(QString::fromLatin1(val),
+                                              Qt::ISODate).toLocalTime());
 #else
-        return QVariant(dtval);
+        return QVariant(QString::fromLatin1(val));
 #endif
-    }
     case QVariant::ByteArray: {
         size_t len;
         unsigned char *data = PQunescapeBytea((const unsigned char*)val, &len);
@@ -838,6 +822,7 @@ QSqlRecord QPSQLResult::record() const
         }
         int ptype = PQftype(d->result, i);
         f.setType(qDecodePSQLType(ptype));
+        f.setValue(QVariant(f.type())); // only set in setType() when it's invalid before
         int len = PQfsize(d->result, i);
         int precision = PQfmod(d->result, i);
 
@@ -1699,12 +1684,6 @@ void QPSQLDriver::_q_handleNotification(int)
             if (notify->extra)
                 payload = d->isUtf8 ? QString::fromUtf8(notify->extra) : QString::fromLatin1(notify->extra);
 #endif
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-            emit notification(name);
-QT_WARNING_POP
-#endif
             QSqlDriver::NotificationSource source = (notify->be_pid == PQbackendPID(d->connection)) ? QSqlDriver::SelfSource : QSqlDriver::OtherSource;
             emit notification(name, source, payload);
         }