Added preliminary support framework for Oracle 8. (Mc)

Thies C. Arntzen will look into this to actually make it work,
as I don't have Oracle installed here. As I said, it is only a
framework for Oracle, and it will most likely crash if you
actually try to use the oracle functions before Thies (or
anyone else that wants to, of course) has had a chance to look
at it.
# The other databases will continue to work, of course :)

8 files changed, 329 insertions, 2 deletions

diff --git a/ext/dbx/CREDITS b/ext/dbx/CREDITS
index cda948aead..3bc82c5fd3 100644
--- a/ext/dbx/CREDITS
+++ b/ext/dbx/CREDITS
@@ -6,3 +6,4 @@ odbc support:  Marc Boeren
 pgsql support: Rui Hirokawa (hirokawa@php.net)
 mssql support: Marc Boeren
 fbsql support: Frank M. Kromann (frank@frontbase.com)
+initial oci8 support: Marc Boeren
diff --git a/ext/dbx/Makefile.in b/ext/dbx/Makefile.in
index 87f1fc602f..07965d071f 100644
--- a/ext/dbx/Makefile.in
+++ b/ext/dbx/Makefile.in
@@ -1,6 +1,6 @@
 
 LTLIBRARY_NAME = libdbx.la
-LTLIBRARY_SOURCES = dbx.c dbx_mysql.c dbx_odbc.c dbx_pgsql.c dbx_mssql.c dbx_fbsql.c
+LTLIBRARY_SOURCES = dbx.c dbx_mysql.c dbx_odbc.c dbx_pgsql.c dbx_mssql.c dbx_fbsql.c dbx_oci8.c
 LTLIBRARY_SHARED_NAME = dbx.la
 
 include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/dbx/dbx.c b/ext/dbx/dbx.c
index 906eab3bf3..8de52924e6 100644
--- a/ext/dbx/dbx.c
+++ b/ext/dbx/dbx.c
@@ -38,6 +38,7 @@
 #define DBX_PGSQL 3
 #define DBX_MSSQL 4
 #define DBX_FBSQL 5
+#define DBX_OCI8 6
 /* includes for supported databases */
 #include "dbx.h"
 #include "dbx_mysql.h"
@@ -45,6 +46,7 @@
 #include "dbx_pgsql.h"
 #include "dbx_mssql.h"
 #include "dbx_fbsql.h"
+#include "dbx_oci8.h"
 
 /* support routines */
 int module_exists(char * module_name) {
@@ -61,6 +63,7 @@ int module_identifier_exists(long module_identifier) {
         case DBX_PGSQL: return module_exists("pgsql");
         case DBX_MSSQL: return module_exists("mssql");
         case DBX_FBSQL: return module_exists("fbsql");
+        case DBX_OCI8: return module_exists("oci8");
         }
     return 0;
     }
@@ -71,6 +74,7 @@ int get_module_identifier(char * module_name) {
     if (!strcmp("pgsql", module_name)) return DBX_PGSQL;
     if (!strcmp("mssql", module_name)) return DBX_MSSQL;
     if (!strcmp("fbsql", module_name)) return DBX_FBSQL;
+    if (!strcmp("oci8", module_name)) return DBX_OCI8;
     return DBX_UNKNOWN;
     }
 
@@ -161,6 +165,7 @@ ZEND_MINIT_FUNCTION(dbx)
     REGISTER_LONG_CONSTANT("DBX_PGSQL", DBX_PGSQL, CONST_CS | CONST_PERSISTENT);
     REGISTER_LONG_CONSTANT("DBX_MSSQL", DBX_MSSQL, CONST_CS | CONST_PERSISTENT);
     REGISTER_LONG_CONSTANT("DBX_FBSQL", DBX_FBSQL, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("DBX_OCI8", DBX_OCI8, CONST_CS | CONST_PERSISTENT);
 
     REGISTER_LONG_CONSTANT("DBX_PERSISTENT", DBX_PERSISTENT, CONST_CS | CONST_PERSISTENT);
 
@@ -197,7 +202,7 @@ ZEND_MINFO_FUNCTION(dbx)
     php_info_print_table_start();
     php_info_print_table_row(2, "dbx support", "enabled");
     php_info_print_table_row(2, "dbx version", "1.0.0");
-    php_info_print_table_row(2, "supported databases", "MySQL<br />ODBC<br />PostgreSQL<br />Microsoft SQL Server<br />FrontBase");
+    php_info_print_table_row(2, "supported databases", "MySQL<br />ODBC<br />PostgreSQL<br />Microsoft SQL Server<br />FrontBase<br />Oracle 8");
     php_info_print_table_end();
 }
 
@@ -671,6 +676,7 @@ int switch_dbx_connect(zval ** rv, zval ** host, zval ** db, zval ** username, z
         case DBX_PGSQL: return dbx_pgsql_connect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_MSSQL: return dbx_mssql_connect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_FBSQL: return dbx_fbsql_connect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
+        case DBX_OCI8: zend_error(E_WARNING, "dbx_connect: OCI8 extension is still highly experimental!"); return dbx_oci8_connect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         }
     zend_error(E_WARNING, "dbx_connect: not supported in this module");
     return 0;
@@ -684,6 +690,7 @@ int switch_dbx_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username,
         case DBX_PGSQL: return dbx_pgsql_pconnect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_MSSQL: return dbx_mssql_pconnect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_FBSQL: return dbx_fbsql_pconnect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
+        case DBX_OCI8: zend_error(E_WARNING, "dbx_pconnect: OCI8 extension is still highly experimental!"); return dbx_oci8_pconnect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         }
     zend_error(E_WARNING, "dbx_pconnect: not supported in this module");
     return 0;
@@ -697,6 +704,7 @@ int switch_dbx_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETER
         case DBX_PGSQL: return dbx_pgsql_close(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_MSSQL: return dbx_mssql_close(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_FBSQL: return dbx_fbsql_close(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
+        case DBX_OCI8: return dbx_oci8_close(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         }
     zend_error(E_WARNING, "dbx_close: not supported in this module");
     return 0;
@@ -710,6 +718,7 @@ int switch_dbx_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sq
         case DBX_PGSQL: return dbx_pgsql_query(rv, dbx_handle, db_name, sql_statement, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_MSSQL: return dbx_mssql_query(rv, dbx_handle, db_name, sql_statement, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_FBSQL: return dbx_fbsql_query(rv, dbx_handle, db_name, sql_statement, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
+        case DBX_OCI8: return dbx_oci8_query(rv, dbx_handle, db_name, sql_statement, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         }
     zend_error(E_WARNING, "dbx_query: not supported in this module");
     return 0;
@@ -723,6 +732,7 @@ int switch_dbx_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTI
         case DBX_PGSQL: return dbx_pgsql_getcolumncount(rv, result_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_MSSQL: return dbx_mssql_getcolumncount(rv, result_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_FBSQL: return dbx_fbsql_getcolumncount(rv, result_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
+        case DBX_OCI8: return dbx_oci8_getcolumncount(rv, result_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         }
     zend_error(E_WARNING, "dbx_getcolumncount: not supported in this module");
     return 0;
@@ -736,6 +746,7 @@ int switch_dbx_getcolumnname(zval ** rv, zval ** result_handle, long column_inde
         case DBX_PGSQL: return dbx_pgsql_getcolumnname(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_MSSQL: return dbx_mssql_getcolumnname(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_FBSQL: return dbx_fbsql_getcolumnname(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
+        case DBX_OCI8: return dbx_oci8_getcolumnname(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         }
     zend_error(E_WARNING, "dbx_getcolumnname: not supported in this module");
     return 0;
@@ -749,6 +760,7 @@ int switch_dbx_getcolumntype(zval ** rv, zval ** result_handle, long column_inde
         case DBX_PGSQL: return dbx_pgsql_getcolumntype(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_MSSQL: return dbx_mssql_getcolumntype(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_FBSQL: return dbx_fbsql_getcolumntype(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
+        case DBX_OCI8: return dbx_oci8_getcolumntype(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
        }
     zend_error(E_WARNING, "dbx_getcolumntype: not supported in this module");
     return 0;
@@ -762,6 +774,7 @@ int switch_dbx_getrow(zval ** rv, zval ** result_handle, long row_number, INTERN
         case DBX_PGSQL: return dbx_pgsql_getrow(rv, result_handle, row_number, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_MSSQL: return dbx_mssql_getrow(rv, result_handle, row_number, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_FBSQL: return dbx_fbsql_getrow(rv, result_handle, row_number, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
+        case DBX_OCI8: return dbx_oci8_getrow(rv, result_handle, row_number, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         }
     zend_error(E_WARNING, "dbx_getrow: not supported in this module");
     return 0;
@@ -775,6 +788,7 @@ int switch_dbx_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETER
         case DBX_PGSQL: return dbx_pgsql_error(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_MSSQL: return dbx_mssql_error(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         case DBX_FBSQL: return dbx_fbsql_error(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
+        case DBX_OCI8: return dbx_oci8_error(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU);        
         }
     zend_error(E_WARNING, "dbx_error: not supported in this module");
     return 0;
diff --git a/ext/dbx/dbx.dsp b/ext/dbx/dbx.dsp
index 88a1a0f492..1cd5c7660e 100644
--- a/ext/dbx/dbx.dsp
+++ b/ext/dbx/dbx.dsp
@@ -110,6 +110,10 @@ SOURCE=.\dbx_mysql.c
 # End Source File

 # Begin Source File

 

+SOURCE=.\dbx_oci8.c

+# End Source File

+# Begin Source File

+

 SOURCE=.\dbx_odbc.c

 # End Source File

 # Begin Source File

@@ -138,6 +142,10 @@ SOURCE=.\dbx_mysql.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\dbx_oci8.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\dbx_odbc.h

 # End Source File

 # Begin Source File

diff --git a/ext/dbx/dbx_oci8.c b/ext/dbx/dbx_oci8.c
new file mode 100644
index 0000000000..11910fbb53
--- /dev/null
+++ b/ext/dbx/dbx_oci8.c
@@ -0,0 +1,235 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2001 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | dbx module version 1.0                                               |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2001 Guidance Rotterdam BV                             |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author : Marc Boeren         <marc@guidance.nl>                      |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include "dbx.h"
+#include "dbx_oci8.h"
+
+#define OCI_ASSOC	1<<0
+#define OCI_NUM		1<<1
+#define OCI_RETURN_NULLS       	1<<2
+#define OCI_RETURN_LOBS       	1<<3
+
+int dbx_oci8_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) {
+    /* returns connection handle as resource on success or 0 as long on failure */
+    int number_of_arguments=3;
+    zval ** arguments[3];
+    zval * returned_zval=NULL;
+
+    arguments[0]=username;
+    arguments[1]=password;
+    arguments[2]=db;
+    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "OCILogon", &returned_zval, number_of_arguments, arguments);
+    if (!returned_zval || returned_zval->type!=IS_RESOURCE) {
+        if (returned_zval) zval_ptr_dtor(&returned_zval);
+        return 0;
+        }
+    MOVE_RETURNED_TO_RV(rv, returned_zval);
+    return 1;
+    }
+
+int dbx_oci8_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) {
+    /* returns connection handle as resource on success or 0 as long on failure */
+    int number_of_arguments=3;
+    zval ** arguments[3];
+    zval * returned_zval=NULL;
+
+    arguments[0]=username;
+    arguments[1]=password;
+    arguments[2]=db;
+    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "OCIPLogon", &returned_zval, number_of_arguments, arguments);
+    if (!returned_zval || returned_zval->type!=IS_RESOURCE) {
+        if (returned_zval) zval_ptr_dtor(&returned_zval);
+        return 0;
+        }
+    MOVE_RETURNED_TO_RV(rv, returned_zval);
+    return 1;
+    }
+
+int dbx_oci8_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) {
+    /* returns 1 as long on success or 0 as long on failure */
+    int number_of_arguments=1;
+    zval ** arguments[1];
+    zval * returned_zval=NULL;
+
+    arguments[0]=dbx_handle;
+    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "OCILogOff", &returned_zval, number_of_arguments, arguments);
+    if (!returned_zval || returned_zval->type!=IS_BOOL) {
+        if (returned_zval) zval_ptr_dtor(&returned_zval);
+        return 0;
+        }
+    MOVE_RETURNED_TO_RV(rv, returned_zval);
+    return 1;
+    }
+
+int dbx_oci8_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) {
+    /* returns 1 as long or a result identifier as resource on success  or 0 as long on failure */
+    int number_of_arguments=2;
+    zval ** arguments[2];
+    zval * returned_zval=NULL;
+    zval * execute_zval=NULL;
+
+    arguments[0]=dbx_handle;
+    arguments[1]=sql_statement;
+    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "OCIParse", &returned_zval, number_of_arguments, arguments);
+    /* OCIParse returns a bool for failure, or a statement_identifier for valid sql_statements */
+    if (!returned_zval || (returned_zval->type!=IS_BOOL && returned_zval->type!=IS_RESOURCE)) {
+        if (returned_zval) zval_ptr_dtor(&returned_zval);
+        return 0;
+        }
+    number_of_arguments=1;
+    arguments[0]=&returned_zval;
+    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "OCIExecute", &execute_zval, number_of_arguments, arguments);
+    /* OCIExecute returns a bool for success or failure???? */
+    if (!execute_zval || execute_zval->type!=IS_BOOL) {
+        if (execute_zval) zval_ptr_dtor(&execute_zval);
+        zval_ptr_dtor(&returned_zval);
+        return 0;
+        }
+    MOVE_RETURNED_TO_RV(rv, returned_zval);
+    return 1;
+    }
+
+int dbx_oci8_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) {
+    /* returns column-count as long on success or 0 as long on failure */
+    int number_of_arguments=1;
+    zval ** arguments[1];
+    zval * returned_zval=NULL;
+
+    arguments[0]=result_handle;
+    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "OCINumCols", &returned_zval, number_of_arguments, arguments);
+    if (!returned_zval || returned_zval->type!=IS_LONG) {
+        if (returned_zval) zval_ptr_dtor(&returned_zval);
+        return 0;
+        }
+    MOVE_RETURNED_TO_RV(rv, returned_zval);
+    return 1;
+    }
+
+int dbx_oci8_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) {
+    /* returns column-name as string on success or 0 as long on failure */
+    int number_of_arguments=2;
+    zval ** arguments[2];
+    zval * zval_column_index;
+    zval * returned_zval=NULL;
+
+    MAKE_STD_ZVAL(zval_column_index);
+    /* dbx uses 0-based column-indices, oci8 uses 1-based indices... */
+    ZVAL_LONG(zval_column_index, column_index+1);
+    arguments[0]=result_handle;
+    arguments[1]=&zval_column_index;
+    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "OCIColumnName", &returned_zval, number_of_arguments, arguments);
+    /* OCIColumnName returns a string */
+    if (!returned_zval || returned_zval->type!=IS_STRING) {
+        if (returned_zval) zval_ptr_dtor(&returned_zval);
+        FREE_ZVAL(zval_column_index);
+        return 0;
+        }
+    FREE_ZVAL(zval_column_index);
+    MOVE_RETURNED_TO_RV(rv, returned_zval);
+    return 1;
+    }
+
+int dbx_oci8_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) {
+    /* returns column-type as string on success or 0 as long on failure */
+    int number_of_arguments=2;
+    zval ** arguments[2];
+    zval * zval_column_index;
+    zval * returned_zval=NULL;
+
+    MAKE_STD_ZVAL(zval_column_index);
+    /* dbx uses 0-based column-indices, oci8 uses 1-based indices... */
+    ZVAL_LONG(zval_column_index, column_index+1);
+    arguments[0]=result_handle;
+    arguments[1]=&zval_column_index;
+    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "OCIColumnType", &returned_zval, number_of_arguments, arguments);
+    /* OCIColumnType returns a string??? */
+    if (!returned_zval || returned_zval->type!=IS_STRING) {
+        if (returned_zval) zval_ptr_dtor(&returned_zval);
+        FREE_ZVAL(zval_column_index);
+        return 0;
+        }
+    FREE_ZVAL(zval_column_index);
+
+    MOVE_RETURNED_TO_RV(rv, returned_zval);
+    return 1;
+    }
+
+int dbx_oci8_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) {
+    /* returns array[0..columncount-1] as strings on success or 0 as long on failure */
+    int number_of_arguments=3;
+    zval ** arguments[3];
+    zval * zval_resulttype=NULL;
+    zval * zval_returned_array=NULL;
+    zval * returned_zval=NULL;
+
+    MAKE_STD_ZVAL(zval_resulttype);
+    ZVAL_LONG(zval_resulttype, OCI_NUM | OCI_RETURN_NULLS);/* no ASSOC, dbx handles that part */
+    arguments[0]=result_handle;
+    arguments[1]=&zval_returned_array;
+    arguments[2]=&zval_resulttype;
+    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "OCIFetchInto", &returned_zval, number_of_arguments, arguments);
+    /* OCIFetchInto returns an integer, but the actual array is passed back in arg[1] */
+    /* I'm not sure how this will work, Thies, so this is something that should be especially tested! */
+    if (!returned_zval || returned_zval->type!=IS_BOOL || returned_zval->value.lval==0) {
+        if (returned_zval) zval_ptr_dtor(&returned_zval);
+        FREE_ZVAL(zval_resulttype);
+        return 0;
+        }
+    FREE_ZVAL(zval_resulttype);
+    zval_ptr_dtor(&returned_zval);
+    MOVE_RETURNED_TO_RV(rv, zval_returned_array);
+    return 1;
+    }
+
+int dbx_oci8_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) {
+    /* returns string */
+    int number_of_arguments=1;
+    zval ** arguments[1];
+    zval * returned_zval=NULL;
+    zval * returned_message_zval=NULL;
+    arguments[0]=dbx_handle;
+    if (!dbx_handle) number_of_arguments=0;
+    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "OCIError", &returned_zval, number_of_arguments, arguments);
+    /* OCIError should returns an assoc array containing code & message, dbx needs the message */
+    if (!returned_zval || returned_zval->type!=IS_ARRAY) {
+        if (returned_zval) zval_ptr_dtor(&returned_zval);
+        return 0;
+        }
+    /* get the messagestring here */
+    if (zend_hash_find(returned_zval->value.ht, "message", strlen("message")+1, (void **) &returned_message_zval)==FAILURE) {
+        /* oops! no msg? */
+        zval_ptr_dtor(&returned_zval);
+        return 0;
+        }
+    MOVE_RETURNED_TO_RV(rv, returned_message_zval);
+    zval_ptr_dtor(&returned_zval);
+    return 1;
+    }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/dbx/dbx_oci8.h b/ext/dbx/dbx_oci8.h
new file mode 100644
index 0000000000..9e384ce2f7
--- /dev/null
+++ b/ext/dbx/dbx_oci8.h
@@ -0,0 +1,60 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2001 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | dbx module version 1.0                                               |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2001 Guidance Rotterdam BV                             |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author : Marc Boeren         <marc@guidance.nl>                      |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_DBX_OCI8_H
+#define ZEND_DBX_OCI8_H
+
+#ifndef INIT_FUNC_ARGS
+#include "zend_modules.h"
+#endif
+
+#include "php.h"
+
+int dbx_oci8_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS);
+    /* returns connection handle as resource on success or 0 as long on failure */
+int dbx_oci8_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS);
+    /* returns persistent connection handle as resource on success or 0 as long on failure */
+int dbx_oci8_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS);
+    /* returns 1 as long on success or 0 as long on failure */
+int dbx_oci8_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS);
+    /* returns 1 as long or a result identifier as resource on success  or 0 as long on failure */
+int dbx_oci8_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS);
+    /* returns column-count as long on success or 0 as long on failure */
+int dbx_oci8_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS);
+    /* returns column-name as string on success or 0 as long on failure */
+int dbx_oci8_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS);
+    /* returns column-type as string on success or 0 as long on failure */
+int dbx_oci8_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS);
+    /* returns array[0..columncount-1] as strings on success or 0 as long on failure */
+int dbx_oci8_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS);
+    /* returns string */
+
+#endif	/* ZEND_DBX_OCI8_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/dbx/tests/002.phpt b/ext/dbx/tests/002.phpt
index e889858b76..78201a4ff6 100644
--- a/ext/dbx/tests/002.phpt
+++ b/ext/dbx/tests/002.phpt
@@ -11,6 +11,7 @@ if (DBX_ODBC=="DBX_ODBC")                 print('!DBX_ODBC');
 if (DBX_PGSQL=="DBX_PGSQL")               print('!DBX_PGSQL');
 if (DBX_MSSQL=="DBX_MSSQL")               print('!DBX_MSSQL');
 if (DBX_FBSQL=="DBX_FBSQL")               print('!DBX_FBSQL');
+if (DBX_OCI8=="DBX_OCI8")                 print('!DBX_OCI8');
 if (DBX_PERSISTENT=="DBX_PERSISTENT")     print('!DBX_PERSISTENT');
 if (DBX_RESULT_INFO=="DBX_RESULT_INFO")   print('!DBX_RESULT_INFO');
 if (DBX_RESULT_INDEX=="DBX_RESULT_INDEX") print('!DBX_RESULT_INDEX');
diff --git a/ext/dbx/tests/dbx_test.p b/ext/dbx/tests/dbx_test.p
index e1ad7fa8aa..b7a7bc5027 100644
--- a/ext/dbx/tests/dbx_test.p
+++ b/ext/dbx/tests/dbx_test.p
@@ -41,6 +41,14 @@ switch ($connection) {
         $password="dbx_testpassword";
         $module_name="fbsql";
         break;
+    case DBX_OCI8:
+        $module=DBX_OCI8;
+        $host="";
+        $database="dbx_test";
+        $username="dbx_testuser";
+        $password="dbx_testpassword";
+        $module_name="oci8";
+        break;
     }
 
 ?>
\ No newline at end of file