Move the dbmstype to QSqlDriverPrivate so it can be used for all drivers

By moving it to QSqlDriverPrivate we make it easier to check what
database is actually connected which is particularly useful for the
autotests.

Change-Id: I54d1c2c998919c1d54efb1b6ac9303070ece54aa
Reviewed-by: Mark Brand <mabrand@mabrand.nl>

9 files changed, 17 insertions, 17 deletions

diff --git a/tests/auto/sql/kernel/qsql/qsql.pro b/tests/auto/sql/kernel/qsql/qsql.pro
index c890352d45..0735986438 100644
--- a/tests/auto/sql/kernel/qsql/qsql.pro
+++ b/tests/auto/sql/kernel/qsql/qsql.pro
@@ -3,7 +3,7 @@ CONFIG += parallel_test
 TARGET = tst_qsql
 SOURCES  += tst_qsql.cpp
 
-QT += sql sql-private gui testlib
+QT += sql sql-private gui testlib core-private
 
 wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
diff --git a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
index 89dc7a5c7c..d562e47c55 100644
--- a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
+++ b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
@@ -2,7 +2,7 @@ CONFIG += testcase
 TARGET = tst_qsqldatabase
 SOURCES  += tst_qsqldatabase.cpp
 
-QT = core sql testlib
+QT = core sql testlib core-private sql-private
 
 win32: {
    !wince*: LIBS += -lws2_32
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
index 9d3523576f..0eb3ba8c22 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
@@ -52,7 +52,7 @@
 #include <QVariant>
 #include <QDebug>
 #include <QSqlTableModel>
-
+#include <QtSql/private/qsqldriver_p.h>
 #include <QtTest/QtTest>
 
 #if defined (Q_OS_WIN) || defined (Q_OS_WIN32)
@@ -510,11 +510,8 @@ public:
 
     static bool isSqlServer( QSqlDatabase db )
     {
-        return db.databaseName().contains( "sql server", Qt::CaseInsensitive )
-               || db.databaseName().contains( "sqlserver", Qt::CaseInsensitive )
-               || db.databaseName().contains( "sql native client", Qt::CaseInsensitive )
-               || db.databaseName().contains( "bq-winserv", Qt::CaseInsensitive )
-               || db.hostName().contains( "bq-winserv", Qt::CaseInsensitive );
+        QSqlDriverPrivate *d = static_cast<QSqlDriverPrivate *>(QObjectPrivate::get(db.driver()));
+        return d->dbmsType == QSqlDriverPrivate::MSSqlServer;
     }
 
     static bool isMSAccess( QSqlDatabase db )
@@ -524,16 +521,19 @@ public:
 
     static bool isPostgreSQL( QSqlDatabase db )
     {
-        return db.driverName().startsWith("QPSQL") || (db.driverName().startsWith("QODBC") && ( db.databaseName().contains("PostgreSQL", Qt::CaseInsensitive) || db.databaseName().contains("pgsql", Qt::CaseInsensitive) ) );
+        QSqlDriverPrivate *d = static_cast<QSqlDriverPrivate *>(QObjectPrivate::get(db.driver()));
+        return d->dbmsType == QSqlDriverPrivate::PostgreSQL;
     }
 
     static bool isMySQL( QSqlDatabase db )
     {
-        return db.driverName().startsWith("QMYSQL") || (db.driverName().startsWith("QODBC") && db.databaseName().contains("MySQL", Qt::CaseInsensitive) );
+        QSqlDriverPrivate *d = static_cast<QSqlDriverPrivate *>(QObjectPrivate::get(db.driver()));
+        return d->dbmsType == QSqlDriverPrivate::MySqlServer;
     }
     static bool isDB2( QSqlDatabase db )
     {
-        return db.driverName().startsWith("QDB2") || (db.driverName().startsWith("QODBC") && db.databaseName().contains("db2", Qt::CaseInsensitive) );
+        QSqlDriverPrivate *d = static_cast<QSqlDriverPrivate *>(QObjectPrivate::get(db.driver()));
+        return d->dbmsType == QSqlDriverPrivate::DB2;
     }
 
     // -1 on fail, else Oracle version
diff --git a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
index ef7bb70a94..abdc157c7f 100644
--- a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
+++ b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
@@ -3,7 +3,7 @@ CONFIG += parallel_test
 TARGET = tst_qsqldriver
 SOURCES  += tst_qsqldriver.cpp
 
-QT = core sql testlib
+QT = core sql testlib core-private sql-private
 
 wince*: {
    plugFiles.files = ../../../plugins/sqldrivers
diff --git a/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro b/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro
index c1e2a7ebb1..360d874f1a 100644
--- a/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro
+++ b/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro
@@ -3,7 +3,7 @@ CONFIG += testcase
 
 SOURCES  += tst_qsqlquery.cpp
 
-QT = core sql testlib
+QT = core sql testlib core-private sql-private
 
 !wince*:win32:LIBS += -lws2_32
 
diff --git a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro
index 73247545ce..3249309bf4 100644
--- a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro
+++ b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro
@@ -2,7 +2,7 @@ CONFIG += testcase
 TARGET = tst_qsqlthread
 SOURCES  += tst_qsqlthread.cpp
 
-QT = core sql testlib
+QT = core sql testlib core-private sql-private
 
 
 wince*: {
diff --git a/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro
index cbbd1d6eb7..40ec56d473 100644
--- a/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro
+++ b/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro
@@ -2,7 +2,7 @@ CONFIG += testcase
 TARGET = tst_qsqlquerymodel
 SOURCES  += tst_qsqlquerymodel.cpp
 
-QT += widgets sql testlib
+QT += widgets sql testlib core-private sql-private
 
 wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
index 117ad5cbf6..0d7318a5c9 100644
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
@@ -2,7 +2,7 @@ CONFIG += testcase
 TARGET = tst_qsqlrelationaltablemodel
 SOURCES  += tst_qsqlrelationaltablemodel.cpp
 
-QT = core sql testlib
+QT = core sql testlib core-private sql-private
 
 wince*: {
    plugFiles.files = ../../../plugins/sqldrivers
diff --git a/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro b/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro
index 5c17220190..bfea404980 100644
--- a/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro
+++ b/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro
@@ -2,6 +2,6 @@ TARGET = tst_bench_qsqlquery
 
 SOURCES += main.cpp
 
-QT = core sql testlib
+QT = core sql testlib core-private sql-private
 win32: LIBS += -lws2_32
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0