SQL: Fix OCI driver's compile errors.

Task-number: QTBUG-27979

Change-Id: I4ae4cdba855c05bc6fab0f845ff16a96c8119fdb
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>

diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index 385a688..b467fdc 100644 (file)
--- 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 153af92..5037ce1 100644 (file)
--- 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)