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/oci/qsql_oci.cpp | |
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/oci/qsql_oci.cpp')
-rw-r--r-- | src/sql/drivers/oci/qsql_oci.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp index b0950110e0..6eb6703ebf 100644 --- a/src/sql/drivers/oci/qsql_oci.cpp +++ b/src/sql/drivers/oci/qsql_oci.cpp @@ -52,6 +52,7 @@ #include <qsqlindex.h> #include <qsqlquery.h> #include <QtSql/private/qsqlcachedresult_p.h> +#include <QtSql/private/qsqldriver_p.h> #include <qstringlist.h> #include <qvarlengtharray.h> #include <qvector.h> @@ -492,8 +493,9 @@ void QOCIResultPrivate::outValues(QVector<QVariant> &values, IndicatorArray &ind } -struct QOCIDriverPrivate +class QOCIDriverPrivate : public QSqlDriverPrivate { +public: QOCIDriverPrivate(); OCIEnv *env; @@ -511,9 +513,10 @@ struct QOCIDriverPrivate }; QOCIDriverPrivate::QOCIDriverPrivate() - : env(0), svc(0), srvhp(0), authp(0), err(0), transaction(false), serverVersion(-1), - prefetchRows(-1), prefetchMem(QOCI_PREFETCH_MEM) + : QSqlDriverPrivate(), env(0), svc(0), srvhp(0), authp(0), err(0), transaction(false), + serverVersion(-1), prefetchRows(-1), prefetchMem(QOCI_PREFETCH_MEM) { + dbmsType = Oracle; } void QOCIDriverPrivate::allocErrorHandle() @@ -2137,8 +2140,6 @@ QOCIDriver::~QOCIDriver() r = OCIHandleFree(d->env, OCI_HTYPE_ENV); if (r != OCI_SUCCESS) qWarning("Unable to free Environment handle: %d", r); - - delete d; } bool QOCIDriver::hasFeature(DriverFeature f) const |