diff options
| author | Thies C. Arntzen <thies@php.net> | 1999-04-24 18:54:02 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 1999-04-24 18:54:02 +0000 |
| commit | d0d3316128b280c799b5be89068dd60133d33046 (patch) | |
| tree | 2d1e4c327f2256fafc7c889d4aef2afe546d4064 /ext/oracle/php3_oci8.h | |
| parent | 992e6a429d9ada7686485ce86272a3cbafe9c847 (diff) | |
| download | php-git-d0d3316128b280c799b5be89068dd60133d33046.tar.gz | |
forward-port of php3-CVS version
my 1st zend-array stuff (ocifetchinto) is WORKING!!
Diffstat (limited to 'ext/oracle/php3_oci8.h')
| -rw-r--r-- | ext/oracle/php3_oci8.h | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/ext/oracle/php3_oci8.h b/ext/oracle/php3_oci8.h index eaf9addb0b..ded32b3ea3 100644 --- a/ext/oracle/php3_oci8.h +++ b/ext/oracle/php3_oci8.h @@ -23,7 +23,7 @@ | If you did not, or have any questions about PHP licensing, please | | contact core@php.net. | +----------------------------------------------------------------------+ - | Authors: Stig Sæther Bakken <ssb@guardian.no> | + | Authors: Stig Sæther Bakken <ssb@fast.no> | | | | Initial work sponsored by Thies Arntzen <thies@digicol.de> of | | Digital Collections, http://www.digicol.de/ | @@ -49,19 +49,27 @@ # endif # endif /* osf alpha */ -# include <oci.h> +#include <oci.h> +#include <xa.h> typedef struct { - int id; + int num; int persistent; + int open; + char *hashed_details; + int hashed_details_length; char dbname[ 64 ]; OCIError *pError; OCIServer *pServer; + OCIFocbkStruct failover; } oci8_server; typedef struct { - int id; + int num; int persistent; + int open; + char *hashed_details; + int hashed_details_length; oci8_server *server; OCIError *pError; OCISession *pSession; @@ -69,6 +77,7 @@ typedef struct { typedef struct { int id; + int open; oci8_session *session; OCISvcCtx *pServiceContext; OCIError *pError; @@ -77,6 +86,12 @@ typedef struct { } oci8_connection; typedef struct { + int id; + oci8_session *session; + OCITrans *pTrans; +} oci8_xa; + +typedef struct { dvoid *ocidescr; ub4 type; } oci8_descriptor; @@ -138,33 +153,31 @@ typedef struct { long debug_mode; + /* XXX NYI long allow_persistent; long max_persistent; long max_links; long num_persistent; long num_links; + */ int le_conn; /* active connections */ int le_stmt; /* active statements */ + int le_trans; /* active transactions */ - int le_server; /* server-handles */ - int le_pserver; /* pesistent server-handles */ - - int le_session; /* session-handles */ - int le_psession;/* pesistent session-handles */ + int server_num; + HashTable *server; + int user_num; + HashTable *user; OCIEnv *pEnv; } oci8_module; extern php3_module_entry oci8_module_entry; -# define oci8_module_ptr &oci8_module_entry - -# define OCI8_MAX_NAME_LEN 64 -# define OCI8_MAX_DATA_SIZE 2097152 /* two megs */ +#define oci8_module_ptr &oci8_module_entry -/* this one has to be changed to include persistent connections as well */ -# define OCI8_SERVER_TYPE(x) (((x)==OCI8_GLOBAL(php3_oci8_module).le_server) || ((x)==OCI8_GLOBAL(php3_oci8_module).le_pserver)) -# define OCI8_SESSION_TYPE(x) (((x)==OCI8_GLOBAL(php3_oci8_module).le_session) || ((x)==OCI8_GLOBAL(php3_oci8_module).le_psession)) +#define OCI8_MAX_NAME_LEN 64 +#define OCI8_MAX_DATA_SIZE 2097152 /* two megs */ # define OCI8_CONN_TYPE(x) ((x)==OCI8_GLOBAL(php3_oci8_module).le_conn) # define OCI8_STMT_TYPE(x) ((x)==OCI8_GLOBAL(php3_oci8_module).le_stmt) |