2 files changed, 54 insertions, 1 deletions
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index d7772f5c34..e3f088e763 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -188,6 +188,9 @@ private slots:
     void sqlite_enable_cache_mode_data() { generic_data("QSQLITE"); }
     void sqlite_enable_cache_mode();
 
+    void sqlite_enableRegexp_data() { generic_data("QSQLITE"); }
+    void sqlite_enableRegexp();
+
 private:
     void createTestTables(QSqlDatabase db);
     void dropTestTables(QSqlDatabase db);
@@ -345,7 +348,8 @@ void tst_QSqlDatabase::dropTestTables(QSqlDatabase db)
             << qTableName("qtest_sqlguid", __FILE__, db)
             << qTableName("uint_table", __FILE__, db)
             << qTableName("uint_test", __FILE__, db)
-            << qTableName("bug_249059", __FILE__, db);
+            << qTableName("bug_249059", __FILE__, db)
+            << qTableName("regexp_test", __FILE__, db);
 
     QSqlQuery q(0, db);
     if (dbType == QSqlDriver::PostgreSQL) {
@@ -2259,5 +2263,33 @@ void tst_QSqlDatabase::sqlite_enable_cache_mode()
     db2.close();
 }
 
+void tst_QSqlDatabase::sqlite_enableRegexp()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+    if (db.driverName().startsWith("QSQLITE2"))
+        QSKIP("SQLite3 specific test");
+
+    db.close();
+    db.setConnectOptions("QSQLITE_ENABLE_REGEXP");
+    QVERIFY_SQL(db, open());
+
+    QSqlQuery q(db);
+    const QString tableName(qTableName("regexp_test", __FILE__, db));
+    QVERIFY_SQL(q, exec(QString("CREATE TABLE %1(text TEXT)").arg(tableName)));
+    QVERIFY_SQL(q, prepare(QString("INSERT INTO %1 VALUES(?)").arg(tableName)));
+    q.addBindValue("a0");
+    QVERIFY_SQL(q, exec());
+    q.addBindValue("a1");
+    QVERIFY_SQL(q, exec());
+
+    QVERIFY_SQL(q, exec(QString("SELECT text FROM %1 WHERE text REGEXP 'a[^0]' "
+                                "ORDER BY text").arg(tableName)));
+    QVERIFY_SQL(q, next());
+    QCOMPARE(q.value(0).toString(), QString("a1"));
+    QFAIL_SQL(q, next());
+}
+
 QTEST_MAIN(tst_QSqlDatabase)
 #include "tst_qsqldatabase.moc"
diff --git a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
index 07a6c9c835..08c6039e37 100644
--- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
@@ -44,6 +44,7 @@ public:
 private slots:
     void getSetCheck();
     void construction();
+    void moveOperator();
     void operators();
 };
 
@@ -143,6 +144,26 @@ void tst_QSqlError::construction()
    QCOMPARE(obj7.number(), -1);
    QCOMPARE(obj7.nativeErrorCode(), QString());
 
+   // Move constructor
+   QSqlError obj8(std::move(obj3));
+   QCOMPARE(obj8.driverText(), obj2.driverText());
+   QCOMPARE(obj8.databaseText(), obj2.databaseText());
+   QCOMPARE(obj8.type(), obj2.type());
+   QCOMPARE(obj8.number(), obj2.number());
+   QCOMPARE(obj8.nativeErrorCode(), obj2.nativeErrorCode());
+   QVERIFY(obj8.isValid());
+}
+
+void tst_QSqlError::moveOperator()
+{
+   QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, 123), obj2;
+   obj2 = std::move(obj1);
+   QCOMPARE(obj2.driverText(), QString("drivertext"));
+   QCOMPARE(obj2.databaseText(), QString("databasetext"));
+   QCOMPARE(obj2.type(), QSqlError::UnknownError);
+   QCOMPARE(obj2.number(), 123);
+   QCOMPARE(obj2.nativeErrorCode(), QStringLiteral("123"));
+   QVERIFY(obj2.isValid());
 }
 
 void tst_QSqlError::operators()