diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-03-30 19:55:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-02 19:02:26 +0200 |
| commit | 406c8ef6e67da5505c7404a2517a8b4204d7c38a (patch) | |
| tree | 1257c680456e3fa4e386995f7703096982863ac0 /src/sql/drivers/sqlite2 | |
| parent | dcf9c403ba8e903bb52a6fb656c7e2de23383c10 (diff) | |
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>
Diffstat (limited to 'src/sql/drivers/sqlite2')
| -rw-r--r-- | src/sql/drivers/sqlite2/qsql_sqlite2.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp index 1a16b85470..39ad122822 100644 --- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp @@ -51,6 +51,7 @@ #include <qsqlindex.h> #include <qsqlquery.h> #include <QtSql/private/qsqlcachedresult_p.h> +#include <QtSql/private/qsqldriver_p.h> #include <qstringlist.h> #include <qvector.h> @@ -82,7 +83,7 @@ static QVariant::Type nameToType(const QString& typeName) return QVariant::String; } -class QSQLite2DriverPrivate +class QSQLite2DriverPrivate : public QSqlDriverPrivate { public: QSQLite2DriverPrivate(); @@ -90,9 +91,10 @@ public: bool utf8; }; -QSQLite2DriverPrivate::QSQLite2DriverPrivate() : access(0) +QSQLite2DriverPrivate::QSQLite2DriverPrivate() : QSqlDriverPrivate(), access(0) { utf8 = (qstrcmp(sqlite_encoding, "UTF-8") == 0); + dbmsType = SQLite; } class QSQLite2ResultPrivate; @@ -392,7 +394,6 @@ QSQLite2Driver::QSQLite2Driver(sqlite *connection, QObject *parent) QSQLite2Driver::~QSQLite2Driver() { - delete d; } bool QSQLite2Driver::hasFeature(DriverFeature f) const |