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 <[email protected]>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 55c97644b88..f92cda8c252 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -57,6 +57,7 @@
 #include <qmath.h>
 #include <QDebug>
 #include <QSqlQuery>
+#include <QtSql/private/qsqldriver_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -111,15 +112,13 @@ inline static QVarLengthArray<SQLTCHAR> toSQLTCHAR(const QString &input)
     return result;
 }
 
-class QODBCDriverPrivate
+class QODBCDriverPrivate : public QSqlDriverPrivate
 {
 public:
     enum DefaultCase{Lower, Mixed, Upper, Sensitive};
-    enum DBMSType {UnknownDB, MSSqlServer, MySqlServer, PostgreSQL, Oracle, Sybase};
     QODBCDriverPrivate()
-    : hEnv(0), hDbc(0), unicode(false), useSchema(false), disconnectCount(0), datetime_precision(19),
-            dbmsType(UnknownDB), isFreeTDSDriver(false), hasSQLFetchScroll(true),
-           hasMultiResultSets(false), isQuoteInitialized(false), quote(QLatin1Char('"'))
+    : QSqlDriverPrivate(), hEnv(0), hDbc(0), unicode(false), useSchema(false), disconnectCount(0), datetime_precision(19),
+      isFreeTDSDriver(false), hasSQLFetchScroll(true), hasMultiResultSets(false), isQuoteInitialized(false), quote(QLatin1Char('"'))
     {
     }
 
@@ -130,7 +129,6 @@ public:
     bool useSchema;
     int disconnectCount;
     int datetime_precision;
-    DBMSType dbmsType;
     bool isFreeTDSDriver;
     bool hasSQLFetchScroll;
     bool hasMultiResultSets;
@@ -1794,7 +1792,6 @@ void QODBCDriver::init()
 QODBCDriver::~QODBCDriver()
 {
     cleanup();
-    delete d;
 }
 
 bool QODBCDriver::hasFeature(DriverFeature f) const