1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQL: Fix OCI driver's compile errors.

Browse Source 
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>
This commit is contained in:
Caroline Chao 2012-11-15 09:58:32 +01:00 committed by The Qt Project
parent adf4e54742
commit b98b11fa03
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/drivers/oci/qsql_oci.cpp
View File

@ -82,7 +82,9 @@
//#define QOCI_DEBUG //#define QOCI_DEBUG
Q_DECLARE_OPAQUE_POINTER(OCIEnv*);
Q_DECLARE_METATYPE(OCIEnv*) Q_DECLARE_METATYPE(OCIEnv*)
Q_DECLARE_OPAQUE_POINTER(OCIStmt*);
Q_DECLARE_METATYPE(OCIStmt*) Q_DECLARE_METATYPE(OCIStmt*)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -2040,8 +2042,8 @@ QVariant QOCIResult::lastInsertId() const
bool QOCIResult::execBatch(bool arrayBind) bool QOCIResult::execBatch(bool arrayBind)
{ {
QOCICols::execBatch(d, boundValues(), arrayBind); QOCICols::execBatch(d, boundValues(), arrayBind);
d->resetBindCount(); resetBindCount();
return d->error.type() == QSqlError::NoError; return lastError().type() == QSqlError::NoError;
} }
void QOCIResult::virtual_hook(int id, void *data) void QOCIResult::virtual_hook(int id, void *data)

2
src/sql/kernel/qsqlresult.h
View File

@ -132,10 +132,10 @@ protected:
virtual void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy policy); virtual void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy policy);
QSql::NumericalPrecisionPolicy numericalPrecisionPolicy() const; QSql::NumericalPrecisionPolicy numericalPrecisionPolicy() const;
virtual bool nextResult(); virtual bool nextResult();
void resetBindCount(); // HACK
private: private:
QSqlResultPrivate* d; QSqlResultPrivate* d;
void resetBindCount(); // HACK
private: private:
Q_DISABLE_COPY(QSqlResult) Q_DISABLE_COPY(QSqlResult)