diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-05 18:18:29 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-05 18:18:29 -0700 |
| commit | 4b778faa8014947390d55dbc71e15ae0d7aca53a (patch) | |
| tree | 64b18f29a5ae3362f790be7bd19c745ffb2a0f2b /ext/oci8/php_oci8_int.h | |
| parent | 6ece5503942a1d8c4a78504161f9466e9e14fed2 (diff) | |
| download | php-git-4b778faa8014947390d55dbc71e15ae0d7aca53a.tar.gz | |
Make oci_set_*($connection,...) errors retrievable via oci_error($connection).
Improve some error handling to produce error text on some rare edge cases.
Disambiguate the Oracle library function call return status values from ORA error numbers.
Review and unify error data types.
Diffstat (limited to 'ext/oci8/php_oci8_int.h')
| -rw-r--r-- | ext/oci8/php_oci8_int.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index 24d80a8163..7c8485800f 100644 --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@ -141,7 +141,7 @@ typedef struct { OCIAuthInfo *authinfo; /* Cached authinfo handle for OCISessionGet */ OCIError *err; /* private error handle */ php_oci_spool *private_spool; /* private session pool (for persistent) */ - sword errcode; /* last errcode */ + sb4 errcode; /* last ORA- error number */ HashTable *descriptors; /* descriptors hash, used to flush all the LOBs using this connection on commit */ ulong descriptor_count; /* used to index the descriptors hash table. Not an accurate count */ @@ -213,7 +213,7 @@ typedef struct { struct php_oci_statement *impres_child_stmt;/* child of current Implicit Result Set statement handle */ ub4 impres_count; /* count of remaining Implicit Result children on parent statement handle */ php_oci_connection *connection; /* parent connection handle */ - sword errcode; /* last errcode*/ + sb4 errcode; /* last ORA- error number */ OCIError *err; /* private error handle */ OCIStmt *stmt; /* statement handle */ char *last_query; /* last query issued. also used to determine if this is a statement or a refcursor recieved from Oracle */ @@ -412,7 +412,7 @@ void php_oci_client_get_version(char **version TSRMLS_DC); int php_oci_server_get_version(php_oci_connection *connection, char **version TSRMLS_DC); void php_oci_fetch_row(INTERNAL_FUNCTION_PARAMETERS, int mode, int expected_args); int php_oci_column_to_zval(php_oci_out_column *column, zval *value, int mode TSRMLS_DC); -void php_oci_dtrace_check_connection(php_oci_connection *connection, sword errcode, ub4 serverStatus); +void php_oci_dtrace_check_connection(php_oci_connection *connection, sb4 errcode, ub4 serverStatus); /* }}} */ @@ -493,7 +493,7 @@ php_oci_bind *php_oci_bind_array_helper_date(zval *var, long max_table_length, p /* }}} */ ZEND_BEGIN_MODULE_GLOBALS(oci) /* {{{ Module globals */ - sword errcode; /* global last error code (used when connect fails, for example) */ + sb4 errcode; /* global last ORA- error number. Used when connect fails, for example */ OCIError *err; /* global error handle */ zend_bool debug_mode; /* debug mode flag */ |