From b98b11fa036ea301d1483df6f533ec55be727d9d Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Thu, 15 Nov 2012 09:58:32 +0100 Subject: SQL: Fix OCI driver's compile errors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-27979 Change-Id: I4ae4cdba855c05bc6fab0f845ff16a96c8119fdb Reviewed-by: Andy Shaw Reviewed-by: Jędrzej Nowacki Reviewed-by: Mark Brand --- src/sql/drivers/oci/qsql_oci.cpp | 6 ++++-- src/sql/kernel/qsqlresult.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp index 385a68840d..b467fdc6d2 100644 --- a/src/sql/drivers/oci/qsql_oci.cpp +++ b/src/sql/drivers/oci/qsql_oci.cpp @@ -82,7 +82,9 @@ //#define QOCI_DEBUG +Q_DECLARE_OPAQUE_POINTER(OCIEnv*); Q_DECLARE_METATYPE(OCIEnv*) +Q_DECLARE_OPAQUE_POINTER(OCIStmt*); Q_DECLARE_METATYPE(OCIStmt*) QT_BEGIN_NAMESPACE @@ -2040,8 +2042,8 @@ QVariant QOCIResult::lastInsertId() const bool QOCIResult::execBatch(bool arrayBind) { QOCICols::execBatch(d, boundValues(), arrayBind); - d->resetBindCount(); - return d->error.type() == QSqlError::NoError; + resetBindCount(); + return lastError().type() == QSqlError::NoError; } void QOCIResult::virtual_hook(int id, void *data) diff --git a/src/sql/kernel/qsqlresult.h b/src/sql/kernel/qsqlresult.h index 153af92096..5037ce1dc5 100644 --- a/src/sql/kernel/qsqlresult.h +++ b/src/sql/kernel/qsqlresult.h @@ -132,10 +132,10 @@ protected: virtual void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy policy); QSql::NumericalPrecisionPolicy numericalPrecisionPolicy() const; virtual bool nextResult(); + void resetBindCount(); // HACK private: QSqlResultPrivate* d; - void resetBindCount(); // HACK private: Q_DISABLE_COPY(QSqlResult) -- cgit v1.2.3