aboutsummaryrefslogtreecommitdiff
path: root/odb/oracle/statement.cxx
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-11-30 10:45:39 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-11-30 11:32:08 +0200
commitb7f64fe7f65eb286b5b0c93776fe38bd682b9552 (patch)
tree3f05495eb0eaff8c2760a962b1d1d81b2aec331a /odb/oracle/statement.cxx
parent4cf24ec9ce581cdb68f53a9066e0de504031f073 (diff)
Provide separate overload of translate_error for oracle::connection
Diffstat (limited to 'odb/oracle/statement.cxx')
-rw-r--r--odb/oracle/statement.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/odb/oracle/statement.cxx b/odb/oracle/statement.cxx
index 26f1358..47e2be5 100644
--- a/odb/oracle/statement.cxx
+++ b/odb/oracle/statement.cxx
@@ -229,7 +229,7 @@ namespace odb
OCI_DEFAULT));
if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
- translate_error (err, r, &conn_);
+ translate_error (conn_, r);
stmt_.reset (handle, OCI_STRLS_CACHE_DELETE, err);
@@ -1023,7 +1023,7 @@ namespace odb
cs_form);
if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
- translate_error (err, r, &conn_);
+ translate_error (conn_, r);
chunk_position cp;
@@ -1114,7 +1114,7 @@ namespace odb
r = OCIStmtExecute (handle, stmt_, err, 0, 0, 0, 0, OCI_DEFAULT);
if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
- translate_error (err, r, &conn_);
+ translate_error (conn_, r);
// In order to successfully execute a select statement, OCI/Oracle
// requires that there be OCIDefine handles provided for all select
@@ -1195,7 +1195,7 @@ namespace odb
// and ignore this error.
//
if (e != 1406)
- translate_error (err, r, &conn_);
+ translate_error (conn_, r);
}
else if (r == OCI_INVALID_HANDLE)
translate_error (err, r);
@@ -1208,7 +1208,7 @@ namespace odb
r = OCIStmtExecute (handle, stmt_, err, 1, 0, 0, 0, OCI_DEFAULT);
if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
- translate_error (err, r, &conn_);
+ translate_error (conn_, r);
}
ub4 row_count (0);
@@ -1328,7 +1328,7 @@ namespace odb
OCI_DEFAULT));
if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
- translate_error (err, r, &conn_);
+ translate_error (conn_, r);
done_ = r == OCI_NO_DATA;
@@ -1372,7 +1372,7 @@ namespace odb
OCI_DEFAULT));
if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
- translate_error (conn_.error_handle (), r, &conn_);
+ translate_error (conn_, r);
else if (r == OCI_NO_DATA)
done_ = true;
}
@@ -1393,7 +1393,7 @@ namespace odb
OCI_DEFAULT));
if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
- translate_error (conn_.error_handle (), r, &conn_);
+ translate_error (conn_, r);
done_ = true;
}
@@ -1561,7 +1561,7 @@ namespace odb
if (e == 1)
return false;
else
- translate_error (err, r, &conn_);
+ translate_error (conn_, r);
}
ub4 row_count (0);
@@ -1640,7 +1640,7 @@ namespace odb
OCI_DEFAULT));
if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
- translate_error (err, r, &conn_);
+ translate_error (conn_, r);
ub4 row_count (0);
r = OCIAttrGet (stmt_,
@@ -1706,7 +1706,7 @@ namespace odb
OCI_DEFAULT));
if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
- translate_error (err, r, &conn_);
+ translate_error (conn_, r);
ub4 row_count (0);
r = OCIAttrGet (stmt_,