2 files changed, 82 insertions, 0 deletions

diff --git a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
index 9763e3e7e6..847453b3ed 100644
--- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
@@ -102,6 +102,7 @@ void tst_QSqlError::construction()
    QCOMPARE(obj1.databaseText(), QString("databasetext"));
    QCOMPARE(obj1.type(), QSqlError::UnknownError);
    QCOMPARE(obj1.number(), 123);
+   QCOMPARE(obj1.nativeErrorCode(), QStringLiteral("123"));
    QVERIFY(obj1.isValid());
 
    QSqlError obj2(obj1);
@@ -109,6 +110,7 @@ void tst_QSqlError::construction()
    QCOMPARE(obj2.databaseText(), obj1.databaseText());
    QCOMPARE(obj2.type(), obj1.type());
    QCOMPARE(obj2.number(), obj1.number());
+   QCOMPARE(obj2.nativeErrorCode(), obj1.nativeErrorCode());
    QVERIFY(obj2.isValid());
 
    QSqlError obj3 = obj2;
@@ -116,10 +118,16 @@ void tst_QSqlError::construction()
    QCOMPARE(obj3.databaseText(), obj2.databaseText());
    QCOMPARE(obj3.type(), obj2.type());
    QCOMPARE(obj3.number(), obj2.number());
+   QCOMPARE(obj3.nativeErrorCode(), obj2.nativeErrorCode());
    QVERIFY(obj3.isValid());
 
    QSqlError obj4;
    QVERIFY(!obj4.isValid());
+   QCOMPARE(obj4.driverText(), QString());
+   QCOMPARE(obj4.databaseText(), QString());
+   QCOMPARE(obj4.type(), QSqlError::NoError);
+   QCOMPARE(obj4.number(), -1);
+   QCOMPARE(obj4.nativeErrorCode(), QString());
 
    QSqlError obj5(QStringLiteral("drivertext"), QStringLiteral("databasetext"),
                   QSqlError::UnknownError, QStringLiteral("123"));
@@ -138,6 +146,16 @@ void tst_QSqlError::construction()
    QCOMPARE(obj6.number(), 0);
    QCOMPARE(obj6.nativeErrorCode(), QStringLiteral("Err123"));
    QVERIFY(obj6.isValid());
+
+   // Default constructed object as constructed before Qt 5.3
+   QSqlError obj7(QString(), QString(), QSqlError::NoError, -1);
+   QVERIFY(!obj7.isValid());
+   QCOMPARE(obj7.driverText(), QString());
+   QCOMPARE(obj7.databaseText(), QString());
+   QCOMPARE(obj7.type(), QSqlError::NoError);
+   QCOMPARE(obj7.number(), -1);
+   QCOMPARE(obj7.nativeErrorCode(), QString());
+
 }
 
 void tst_QSqlError::operators()
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index 55cb67eed9..824f042ffc 100644
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
@@ -195,6 +195,9 @@ private slots:
     void task_233829_data() { generic_data("QPSQL"); }
     void task_233829();
 
+    void QTBUG_12477_data() { generic_data("QPSQL"); }
+    void QTBUG_12477();
+
     void sqlServerReturn0_data() { generic_data(); }
     void sqlServerReturn0();
 
@@ -1247,6 +1250,26 @@ void tst_QSqlQuery::seek()
     QVERIFY( q.seek( 0 ) );
     QCOMPARE( q.at(), 0 );
     QCOMPARE( q.value( 0 ).toInt(), 1 );
+
+    QVERIFY(!q.seek(QSql::BeforeFirstRow));
+    QCOMPARE(q.at(), int(QSql::BeforeFirstRow));
+    QVERIFY(q.seek(1, true));
+    QCOMPARE(q.at(), 0);
+    QCOMPARE(q.value(0).toInt(), 1);
+
+    qint32 count = 1;
+    while (q.next()) ++count;
+
+    QCOMPARE(q.at(), int(QSql::AfterLastRow));
+
+    if (!q.isForwardOnly()) {
+        QVERIFY(q.seek(-1, true));
+        QCOMPARE(q.at(), count - 1);
+        QCOMPARE(q.value(0).toInt(), count);
+    } else {
+        QVERIFY(!q.seek(-1, true));
+        QCOMPARE(q.at(), int(QSql::AfterLastRow));
+    }
 }
 
 void tst_QSqlQuery::seekForwardOnlyQuery()
@@ -2992,6 +3015,47 @@ void tst_QSqlQuery::task_233829()
     QVERIFY_SQL(q,exec());
 }
 
+void tst_QSqlQuery::QTBUG_12477()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+    if (!db.driverName().startsWith("QPSQL"))
+        QSKIP("PostgreSQL specific test");
+
+    QSqlQuery q(db);
+    QVERIFY_SQL(q, exec("SELECT 1::bit, '10101010000111101101'::varbit, "
+                              "'10101111011'::varbit(15), '22222.20'::numeric(16,2), "
+                              "'333333'::numeric(18), '444444'::numeric"));
+    QVERIFY_SQL(q, next());
+    QSqlRecord r = q.record();
+    QSqlField f;
+
+    f = r.field(0);
+    QCOMPARE(f.length(), 1);
+    QCOMPARE(f.precision(), -1);
+
+    f = r.field(1);
+    QCOMPARE(f.length(), -1);
+    QCOMPARE(f.precision(), -1);
+
+    f = r.field(2);
+    QCOMPARE(f.length(), 15);
+    QCOMPARE(f.precision(), -1);
+
+    f = r.field(3);
+    QCOMPARE(f.length(), 16);
+    QCOMPARE(f.precision(), 2);
+
+    f = r.field(4);
+    QCOMPARE(f.length(), 18);
+    QCOMPARE(f.precision(), 0);
+
+    f = r.field(5);
+    QCOMPARE(f.length(), -1);
+    QCOMPARE(f.precision(), -1);
+}
+
 void tst_QSqlQuery::sqlServerReturn0()
 {
     QFETCH( QString, dbName );