Renaming odbc files

2 files changed, 0 insertions, 2429 deletions

diff --git a/ext/odbc/odbc.c b/ext/odbc/odbc.c
deleted file mode 100644
index 7143eba368..0000000000
--- a/ext/odbc/odbc.c
+++ /dev/null
@@ -1,2152 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999 The PHP Group                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.0 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_0.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.               |
-   +----------------------------------------------------------------------+
-   | Authors: Stig Sæther Bakken <ssb@fast.no>                            |
-   |          Andreas Karajannis <Andreas.Karajannis@gmd.de>              |
-   |          Frank M. Kromann <fmk@businessnet.dk> Support for DB/2 CLI  |
-   +----------------------------------------------------------------------+
- */
-
-/* $Id$ */
-
-#if COMPILE_DL
-#include "dl/phpdl.h"
-#endif
-
-#include "php.h"
-#include "php_globals.h"
-#include "ext/standard/php3_standard.h"
-# include "php3_odbc.h"
-
-#if HAVE_UODBC
-
-# include <fcntl.h>
-# include "ext/standard/head.h"
-# include "snprintf.h"
-# include "php_ini.h"
-void odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
-
-function_entry odbc_functions[] = {
-	PHP_FE(odbc_setoption, NULL)
-	PHP_FE(odbc_autocommit, NULL)
-	PHP_FE(odbc_close, NULL)
-	PHP_FE(odbc_close_all, NULL)
-	PHP_FE(odbc_commit, NULL)
-	PHP_FE(odbc_connect, NULL)
-	PHP_FE(odbc_pconnect, NULL)
-	PHP_FE(odbc_cursor, NULL)
-	PHP_FE(odbc_exec, NULL)
-	PHP_FE(odbc_prepare, NULL)
-	PHP_FE(odbc_execute, NULL)
-	PHP_FE(odbc_fetch_row, NULL)
-	PHP_FE(odbc_fetch_into, NULL)
-	PHP_FE(odbc_field_len, NULL)
-	PHP_FE(odbc_field_name, NULL)
-	PHP_FE(odbc_field_type, NULL)
-	PHP_FE(odbc_field_num, NULL)
-	PHP_FE(odbc_free_result, NULL)
-	PHP_FE(odbc_num_fields, NULL)
-	PHP_FE(odbc_num_rows, NULL)
-	PHP_FE(odbc_result, NULL)
-	PHP_FE(odbc_result_all, NULL)
-	PHP_FE(odbc_rollback, NULL)
-	PHP_FE(odbc_binmode, NULL)
-	PHP_FE(odbc_longreadlen, NULL)
-/*	PHP_FE(odbc_bind_param, NULL)
-	PHP_FE(odbc_define, NULL)*/
-	PHP_FALIAS(odbc_do, odbc_exec, NULL)
-	{ NULL, NULL, NULL }
-};
-
-php3_module_entry odbc_module_entry = {
-    "ODBC", 
-	odbc_functions, 
-	PHP_MINIT(odbc), 
-	PHP_MSHUTDOWN(odbc),
-    PHP_RINIT(odbc), 
-	NULL, 
-	PHP_MINFO(odbc), 
-	STANDARD_MODULE_PROPERTIES
-};
-
-#ifdef ZTS
-int odbc_globals_id;
-#else
-ZEND_API php_odbc_globals odbc_globals;
-#endif
-
-#if COMPILE_DL
-DLEXPORT php3_module_entry *get_module() { return &odbc_module_entry; };
-#endif
-
-
-static void _free_odbc_result(odbc_result *res)
-{
-	int i;
-	
-	if (res){
-		if (res->values) {
-			for(i = 0; i < res->numcols; i++){
-				if (res->values[i].value)
-					efree(res->values[i].value);
-			}
-			efree(res->values);
-			res->values = NULL;
-		}
-		if (res->stmt){
-#if HAVE_SOLID
-			SQLTransact(ODBCG(henv), res->conn_ptr->hdbc,
-						(UWORD)SQL_COMMIT);
-#endif
-			SQLFreeStmt(res->stmt,SQL_DROP);
-#if !HAVE_DB2
-			res->stmt = NULL;
-#endif
-		}
-		efree(res);
-	}
-}
-
-
-static void _close_odbc_conn(odbc_connection *conn)
-{
-	/* FIXME
-	 * Closing a connection will fail if there are
-	 * pending transactions. It is in the responsibility
-	 * of the user to avoid this.
-	 */
-
-   	SQLDisconnect(conn->hdbc);
-	SQLFreeConnect(conn->hdbc);
-	efree(conn);
-	ODBCG(num_links)--;
-}
-
-
-static void _close_odbc_pconn(odbc_connection *conn)
-{
-
-	conn->open = 0;
-	SQLDisconnect(conn->hdbc);
-	SQLFreeConnect(conn->hdbc);
-	free(conn);
-
-	ODBCG(num_links)--;
-	ODBCG(num_persistent)--;
-}
-
-
-static PHP_INI_MH(odbc_param_int)
-{
-	ODBC_TLS_VARS;
-
-	long *p;
-
-	p = (long *) (globals + (size_t)mh_arg1);
-	*p = atoi(new_value);
-
-	return SUCCESS;	
-}
-
-
-static PHP_INI_MH(odbc_param_str)
-{
-	ODBC_TLS_VARS;
-
-	char **p;
-
-	p = (char **) (globals + (size_t)mh_arg1);
-	*p = new_value;
-
-	return SUCCESS;
-}
-
-
-PHP_INI_BEGIN()
-	PHP_INI_ENTRY1("odbc.allow_persistent", "1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, allow_persistent))
-	PHP_INI_ENTRY1("odbc.max_persistent",  "-1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, max_persistent))
-	PHP_INI_ENTRY1("odbc.max_links",       "-1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, max_links))
-	PHP_INI_ENTRY1("odbc.default_db",      NULL, PHP_INI_ALL,    odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defDB))
-	PHP_INI_ENTRY1("odbc.default_user",    NULL, PHP_INI_ALL,    odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defUser))
-	PHP_INI_ENTRY1("odbc.default_pw",      NULL, PHP_INI_ALL,    odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defPW))
-	PHP_INI_ENTRY1("odbc.defaultlrl",    "4096", PHP_INI_ALL,    odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, defaultlrl))
-	PHP_INI_ENTRY1("odbc.defaultbinmode",   "1", PHP_INI_ALL,    odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defPW))
-PHP_INI_END()
-
-
-PHP_MINIT_FUNCTION(odbc)
-{
-#ifdef SQLANY_BUG
-	HDBC    foobar;
-	RETCODE rc;
-#endif
-
-	REGISTER_INI_ENTRIES();
-	SQLAllocEnv(&ODBCG(henv));
-	
-	ODBCG(num_persistent) = 0;
-	ODBCG(le_result) = register_list_destructors(_free_odbc_result, NULL);
-	ODBCG(le_conn) = register_list_destructors(_close_odbc_conn, NULL);
-	ODBCG(le_pconn) = register_list_destructors(NULL, _close_odbc_pconn);
-
-#ifdef SQLANY_BUG
-/* Make a dumb connection to avoid crash on SQLFreeEnv(),
- * then release it immediately.
- * This is required for SQL Anywhere 5.5.00 on QNX 4.24 at least.
- * The SQLANY_BUG should be defined in CFLAGS.
- */
-	if ( SQLAllocConnect(ODBCG(henv), &foobar) != SQL_SUCCESS ) {
-			ODBC_SQL_ERROR(SQL_NULL_HDBC, SQL_NULL_HSTMT, "SQLAllocConnect");
-	} else {
-		rc = SQLConnect(foobar, ODBCG(defDB), SQL_NTS, ODBCG(defUser), 
-						SQL_NTS, ODBCG(defPW), SQL_NTS);
-		if(rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO)
-			SQLDisconnect( foobar );
-		SQLFreeConnect( foobar );
-	}
-#endif
-
-	REGISTER_LONG_CONSTANT("ODBC_BINMODE_PASSTHRU", 0, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("ODBC_BINMODE_RETURN", 1, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("ODBC_BINMODE_CONVERT", 2, CONST_CS | CONST_PERSISTENT);
-	/* Define Constants for options
-	   these Constants are are defined in <sqlext.h>
-	*/
-	REGISTER_LONG_CONSTANT("SQL_ODBC_CURSORS", SQL_ODBC_CURSORS, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CUR_USE_DRIVER", SQL_CUR_USE_DRIVER, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CUR_USE_IF_NEEDED", SQL_CUR_USE_IF_NEEDED, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CUR_USE_ODBC", SQL_CUR_USE_ODBC, CONST_PERSISTENT | CONST_CS);
-
-
-	REGISTER_LONG_CONSTANT("SQL_CONCURRENCY", SQL_CONCURRENCY, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CONCUR_READ_ONLY", SQL_CONCUR_READ_ONLY, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CONCUR_LOCK", SQL_CONCUR_LOCK, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CONCUR_ROWVER", SQL_CONCUR_ROWVER, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CONCUR_VALUES", SQL_CONCUR_VALUES, CONST_PERSISTENT | CONST_CS);
-
-	REGISTER_LONG_CONSTANT("SQL_CURSOR_TYPE", SQL_CURSOR_TYPE, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CURSOR_FORWARD_ONLY", SQL_CURSOR_FORWARD_ONLY, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CURSOR_KEYSET_DRIVEN", SQL_CURSOR_KEYSET_DRIVEN, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CURSOR_DYNAMIC", SQL_CURSOR_DYNAMIC, CONST_PERSISTENT | CONST_CS);
-	REGISTER_LONG_CONSTANT("SQL_CURSOR_STATIC", SQL_CURSOR_STATIC, CONST_PERSISTENT | CONST_CS);
-	
-	REGISTER_LONG_CONSTANT("SQL_KEYSET_SIZE", SQL_KEYSET_SIZE, CONST_PERSISTENT | CONST_CS);
-
-	return SUCCESS;
-}
-
-
-PHP_RINIT_FUNCTION(odbc)
-{
-
-	ODBCG(defConn) = -1;
-	ODBCG(num_links) = ODBCG(num_persistent);
-
-	return SUCCESS;
-}
-
-PHP_MSHUTDOWN_FUNCTION(odbc)
-{
-
-	SQLFreeEnv(ODBCG(henv));
-
-	return SUCCESS;
-}
-
-
-PHP_MINFO_FUNCTION(odbc)
-{
-
-	php_printf("ODBC compiled with \"" ODBC_TYPE "\" library");
-	php_printf("<BR>");
-#if DEBUG
-	php_printf("default_db: %s<br>\n",   ODBCG(defDB));
-	php_printf("default_user: %s<br>\n", ODBCG(defUser));
-	php_printf("default_pw: %s<br>\n",   ODBCG(defPW));
-#endif
-	php_printf("allow_persistent: %d<br>\n", ODBCG(allow_persistent));
-	php_printf("max_persistent: %d<br>\n",   ODBCG(max_persistent));
-	php_printf("max_links: %d<br>\n",        ODBCG(max_links));
-}	 
-
-/*
- * List management functions
- */
-
-int odbc_add_result(HashTable *list,odbc_result *result)
-{
-	ODBC_TLS_VARS;
-	return php3_list_insert(result, ODBCG(le_result));
-}
-
-odbc_result *odbc_get_result(HashTable *list, int ind)
-{
-	odbc_result *res;
-	int type;
-
-	res = (odbc_result*)php3_list_find(ind, &type);
-	if (!res || type != ODBCG(le_result)) {
-		php_error(E_WARNING, "Bad result index %d", ind);
-		return NULL;
-	}
-	return res;
-}
-
-void odbc_del_result(HashTable *list, int ind)
-{
-	odbc_result *res;
-	int type;
-
-	res = (odbc_result *)php3_list_find(ind, &type);
-	if (!res || type != ODBCG(le_result)) {
-		php_error(E_WARNING,"Can't find result %d", ind);
-		return;
-	}
-	php3_list_delete(ind);
-}
-
-odbc_connection *odbc_get_conn(HashTable *list, int ind)
-{
-	odbc_connection *conn = NULL;
-	int type;
-	HashTable *plist;
-	
-	plist = ODBCG(resource_plist);
-
-	conn = (odbc_connection *)php3_list_find(ind, &type);
-	if (conn && (type == ODBCG(le_conn) || type == ODBCG(le_pconn))) {
-		return conn;
-	}
-
-	conn = (odbc_connection *)php3_plist_find(ind, &type);
-	if (conn && (type == ODBCG(le_conn) || type == ODBCG(le_pconn)))
-		return conn;
-
-	php_error(E_WARNING,"Bad ODBC connection number (%d)", ind);
-	return NULL;
-}
-
-#if HAVE_DB2
-void ODBC_SQL_ERROR(SQLHANDLE conn, SQLHANDLE stmt, char *func)
-#else
-void ODBC_SQL_ERROR(HDBC conn, HSTMT stmt, char *func)
-#endif
-{
-    char	state[6];     /* Not used */
-	SDWORD	error;        /* Not used */
-	char	errormsg[255];
-	SWORD	errormsgsize; /* Not used */
-	ODBC_TLS_VARS;
-	
-	SQLError(ODBCG(henv), conn, stmt, state,
-			 &error, errormsg, sizeof(errormsg)-1, &errormsgsize);
-	if (func) {
-		php_error(E_WARNING, "SQL error: %s, SQL state %s in %s",
-				   errormsg, state, func);
-	} else {
-		php_error(E_WARNING, "SQL error: %s, SQL state %s",
-				   errormsg, state);
-	}
-}
-
-void php3_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAMETERS, int mode)
-{
-	int         res_ind;
-	odbc_result   *result;
-	pval     *arg1, *arg2;
-	ODBC_TLS_VARS;
-
-	if (getParameters(ht, 2, &arg1, &arg2) == FAILURE)
-		WRONG_PARAM_COUNT;
-
-	convert_to_long(arg1);
-    convert_to_long(arg2);
-    
-	res_ind = arg1->value.lval;
-
-    if (res_ind){           
-        if ((result = odbc_get_result(list, res_ind)) == NULL){
-            RETURN_FALSE;
-        }
-        if (mode)
-            result->longreadlen = arg2->value.lval;	
-        else
-            result->binmode = arg2->value.lval;
-	} else {
-        if (mode)
-            ODBCG(defaultlrl) = arg2->value.lval;
-        else
-            ODBCG(defaultbinmode) = arg2->value.lval;
-    }
-    
-	RETURN_TRUE
-}
-
-
-int odbc_bindcols(odbc_result *result)
-{
-    int i;
-    SWORD       colnamelen; /* Not used */
-	SDWORD      displaysize;
-	ODBC_TLS_VARS;
-	
-    result->values = (odbc_result_value *)
-		emalloc(sizeof(odbc_result_value)*result->numcols);
-
-    if (result->values == NULL){
-        php_error(E_WARNING, "Out of memory");
-        SQLFreeStmt(result->stmt, SQL_DROP);
-        return 0;
-    }
-
-    result->longreadlen = ODBCG(defaultlrl);
-    result->binmode = ODBCG(defaultbinmode);
-        
-    for(i = 0; i < result->numcols; i++){
-        SQLColAttributes(result->stmt, (UWORD)(i+1), SQL_COLUMN_NAME,
-                         result->values[i].name,
-                         sizeof(result->values[i].name),
-                         &colnamelen,
-                         0);
-		SQLColAttributes(result->stmt, (UWORD)(i+1), SQL_COLUMN_TYPE,
-							NULL, 0, NULL, &result->values[i].coltype);
-		
-		/* Don't bind LONG / BINARY columns, so that fetch behaviour can
-           be controlled by odbc_binmode() / odbc_longreadlen()
-		 */
-		
-		switch(result->values[i].coltype){
-            case SQL_BINARY:
-            case SQL_VARBINARY:
-			case SQL_LONGVARBINARY:
-			case SQL_LONGVARCHAR:
-				result->values[i].value = NULL;
-				break;
-				
-#if HAVE_ADABAS
-			case SQL_TIMESTAMP:
-				result->values[i].value = (char *)emalloc(27);
-				SQLBindCol(result->stmt, (UWORD)(i+1), SQL_C_CHAR, result->values[i].value,
-							27, &result->values[i].vallen);
-				break;
-#endif /* HAVE_ADABAS */
-			default:
-				SQLColAttributes(result->stmt, (UWORD)(i+1), SQL_COLUMN_DISPLAY_SIZE,
-									NULL, 0, NULL, &displaysize);
-				result->values[i].value = (char *)emalloc(displaysize + 1);
-				SQLBindCol(result->stmt, (UWORD)(i+1), SQL_C_CHAR, result->values[i].value,
-							displaysize + 1, &result->values[i].vallen);
-				break;
-		}
-    }
-    return 1;
-}
-
-void odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int type)
-{
-	odbc_connection *curr_conn;
-	RETCODE rc;
-	pval *arg1;
-	ODBC_TLS_VARS;
-
- 	if ( getParameters(ht, 1, &arg1) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}                            
- 
-    convert_to_long(arg1);
-
-	if ((curr_conn = odbc_get_conn(list, arg1->value.lval)) == NULL){
-		RETURN_FALSE;
-	}
-
-	rc = SQLTransact(ODBCG(henv), curr_conn->hdbc, (UWORD)((type)?SQL_COMMIT:SQL_ROLLBACK));
-	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO){
-		ODBC_SQL_ERROR(curr_conn->hdbc, SQL_NULL_HSTMT, "SQLTransact");
-		RETURN_FALSE;
-	}
-
-	RETURN_TRUE;
-}
-
-/* Main User Functions */
-/* {{{ proto void odbc_close_all(void)
-   Close all ODBC connections */
-PHP_FUNCTION(odbc_close_all)
-{
-	void *ptr;
-	int type;
-	int i, nument = zend_hash_next_free_element(list);
-	ODBC_TLS_VARS;
-
-	for (i = 1; i < nument; i++) {
-		ptr = php3_list_find(i, &type);
-		if (ptr && (type == ODBCG(le_conn) ||
-				   type == ODBCG(le_pconn))) {
-			php3_list_delete(i);
-		}
-	}
-}
-/* }}} */
-
-/* {{{ proto int odbc_binmode(int result_id, int mode)
-   Handle binary column data */
-PHP_FUNCTION(odbc_binmode)
-{
-	php3_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
-}
-/* }}} */
-
-/* {{{ proto int odbc_longreadlen(int result_id, int length)
-   Handle LONG columns */
-PHP_FUNCTION(odbc_longreadlen)
-{
-	php3_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
-}
-/* }}} */
-
-
-
-/* {{{ proto int odbc_prepare(int connection_id, string query)
-   Prepares a statement for execution */
-PHP_FUNCTION(odbc_prepare)
-{
-	pval     *arg1, *arg2;
-	int         conn;
-	char        *query;
-	odbc_result   *result=NULL;
-	odbc_connection *curr_conn=NULL;
-	RETCODE rc;
-
-	if (getParameters(ht, 2, &arg1, &arg2) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long(arg1);
-	convert_to_string(arg2);
-	conn = arg1->value.lval;
-	query = arg2->value.str.val;
-
-	if ((curr_conn = odbc_get_conn(list, conn)) == NULL){
-		RETURN_FALSE;
-	}
-
-	result = (odbc_result *)emalloc(sizeof(odbc_result));
-	if (result == NULL){
-		php_error(E_WARNING, "Out of memory");
-		RETURN_FALSE;
-	}
-	
-	result->numparams = 0;
-	
-	rc = SQLAllocStmt(curr_conn->hdbc, &(result->stmt));
-	if (rc == SQL_INVALID_HANDLE){
-		efree(result);
-		php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle' in php3_odbc_prepare");
-		RETURN_FALSE;
-	}
-
-	if (rc == SQL_ERROR){
-		ODBC_SQL_ERROR(curr_conn->hdbc, SQL_NULL_HSTMT, "SQLAllocStmt");
-		efree(result);
-		RETURN_FALSE;
-	}
-
-	if ((rc = SQLPrepare(result->stmt, query, SQL_NTS)) != SQL_SUCCESS){
-		ODBC_SQL_ERROR(curr_conn->hdbc, result->stmt, "SQLPrepare");
-		SQLFreeStmt(result->stmt, SQL_DROP);
-		RETURN_FALSE;
-	}
-	
-	SQLNumParams(result->stmt, &(result->numparams));
-    SQLNumResultCols(result->stmt, &(result->numcols));
-
-	if (result->numcols > 0){
-        if (!odbc_bindcols(result)){
-			efree(result);
-            RETURN_FALSE;
-		}
-	} else {
-		result->values = NULL;
-	}
-	result->conn_ptr = curr_conn;
-	result->fetched = 0;
-	RETURN_LONG(odbc_add_result(list, result));	
-}
-/* }}} */
-
-/*
- * Execute prepared SQL statement. Supports only input parameters.
- */
-/* {{{ proto int odbc_execute(int result_id [, array parameters_array])
-   Execute a prepared statement */
-PHP_FUNCTION(odbc_execute)
-{ 
-    pval *arg1, *arg2, **tmp;
-    typedef struct params_t {
-		SDWORD vallen;
-		int fp;
-	} params_t;
-	params_t *params = NULL;
-	char *filename;
-   	SWORD sqltype, ctype, scale, nullable;
-	UDWORD precision;
-   	odbc_result   *result=NULL;
-	int res_ind, numArgs, i, ne;
-	RETCODE rc;
-	
-	numArgs = ARG_COUNT(ht);
-	if (numArgs == 1){
-		if (getParameters(ht, 1, &arg1) == FAILURE)
-			WRONG_PARAM_COUNT;
-	} else {
-		if (getParameters(ht, 2, &arg1, &arg2) == FAILURE)
-			WRONG_PARAM_COUNT;
-
-        if (arg2->type != IS_ARRAY) {
-            php_error(E_WARNING, "No array passed to odbc_execute()");
-            return;
-        }
-    }
-    
-	convert_to_long(arg1);
-	res_ind = arg1->value.lval;
-	
-	/* check result */
-	if ((result = odbc_get_result(list, res_ind)) == NULL){
-		RETURN_FALSE;
-	}
-
-	/* XXX check for already bound parameters*/
-	if (result->numparams > 0 && numArgs == 1) {
-		php_error(E_WARNING, "No parameters to SQL statement given");
-		RETURN_FALSE;
-	}
-
-    if (result->numparams > 0){
-		if ((ne = zend_hash_num_elements(arg2->value.ht)) < result->numparams){
-			php_error(E_WARNING,"Not enough parameters (%d should be %d) given",
-					   ne, result->numparams);
-			RETURN_FALSE;
-		}
-
-		zend_hash_internal_pointer_reset(arg2->value.ht);
-        params = (params_t *)emalloc(sizeof(params_t) * result->numparams);
-		
-		for (i = 1; i <= result->numparams; i++) {
-            if (zend_hash_get_current_data(arg2->value.ht, (void **) &tmp) == FAILURE) {
-                php_error(E_WARNING,"Error getting parameter");
-                SQLFreeStmt(result->stmt,SQL_RESET_PARAMS);
-				efree(params);
-                RETURN_FALSE;
-            }
-            convert_to_string(*tmp);
-			if ((*tmp)->type != IS_STRING) {
-				php_error(E_WARNING,"Error converting parameter");
-				SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
-				efree(params);
-				RETURN_FALSE;
-			}
-			
-            SQLDescribeParam(result->stmt, (UWORD)i, &sqltype, &precision,
-							 &scale, &nullable);
-			params[i-1].vallen = (*tmp)->value.str.len;
-			params[i-1].fp = -1;
-
-			if(IS_SQL_BINARY(sqltype))
-				ctype = SQL_C_BINARY;
-			else
-				ctype = SQL_C_CHAR;
-
-			if ((*tmp)->value.str.val[0] == '\'' && 
-				(*tmp)->value.str.val[(*tmp)->value.str.len - 1] == '\'') {
-				filename = &(*tmp)->value.str.val[1];
-				filename[(*tmp)->value.str.len - 2] = '\0';
-
-                if ((params[i-1].fp = open(filename,O_RDONLY)) == -1) {
-					php_error(E_WARNING,"Can't open file %s", filename);
-					SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
-					for (i = 0; i < result->numparams; i++) {
-						if (params[i].fp != -1) {
-							close(params[i].fp);
-						}
-					}
-					efree(params);
-					RETURN_FALSE;
-				}
-
-				params[i-1].vallen = SQL_LEN_DATA_AT_EXEC(0);
-
-				rc = SQLBindParameter(result->stmt, (UWORD)i, SQL_PARAM_INPUT,
-									  ctype, sqltype, precision, scale,
-									  (void *)params[i-1].fp, 0,
-									  &params[i-1].vallen);
-			} else {
-				rc = SQLBindParameter(result->stmt, (UWORD)i, SQL_PARAM_INPUT,
-									  ctype, sqltype, precision, scale,
-									  (*tmp)->value.str.val, 0,
-									  &params[i-1].vallen);
-			}
-			zend_hash_move_forward(arg2->value.ht);
-		}
-	}
-	/* Close cursor, needed for doing multiple selects */
-	rc = SQLFreeStmt(result->stmt, SQL_CLOSE);
-
-	if (rc == SQL_ERROR){
-		ODBC_SQL_ERROR(result->conn_ptr->hdbc, result->stmt, "SQLFreeStmt");	
-	}
-
-	rc = SQLExecute(result->stmt);
-
-	result->fetched = 0;
-	if (rc == SQL_NEED_DATA){
-		char buf[4096];
-		int fp, nbytes;
-		while(rc == SQL_NEED_DATA){
-			rc = SQLParamData(result->stmt, (PTR FAR *)&fp);
-			if (rc == SQL_NEED_DATA){
-				while((nbytes = read(fp, &buf, 4096)) > 0)
-					SQLPutData(result->stmt,(UCHAR FAR*) &buf, nbytes);
-			}
-		}
-	} else {
-		if (rc != SQL_SUCCESS){
-			ODBC_SQL_ERROR(result->conn_ptr->hdbc, result->stmt, "SQLExecute");
-			RETVAL_FALSE;
-		}
-	}	
-	
-	if (result->numparams > 0){
-		SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
-		for(i = 0; i < result->numparams; i++){
-			if (params[i].fp != -1)
-				close(params[i].fp);
-		}
-		/*
-		zend_hash_destroy(arr.value.ht);
-		efree(arr.value.ht);
-		*/
-		efree(params);
-	}
-
-	if (rc == SQL_SUCCESS){
-		RETVAL_TRUE;
-	}
-
-	if (result->numcols == 0){
-		SQLNumResultCols(result->stmt, &(result->numcols));
-
-		if (result->numcols > 0){
-			if (!odbc_bindcols(result)){
-				efree(result);
-				RETVAL_FALSE;
-			}
-		} else {
-			result->values = NULL;
-		}
-	}
-}
-/* }}} */
-
-/* {{{ proto string odbc_cursor(int result_id)
-   Get cursor name */
-PHP_FUNCTION(odbc_cursor)
-{
-	pval     *arg1;
-	int			res_ind;
-	SWORD		len, max_len;
-	char		*cursorname;
-   	odbc_result *result;
-	RETCODE 	rc;
-
-	if (getParameters(ht, 1, &arg1) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long(arg1);
-	res_ind = arg1->value.lval;
-	
-	/* check result */
-	if ((result = odbc_get_result(list, res_ind)) == NULL) {
-		RETURN_FALSE;
-	}
-	rc = SQLGetInfo(result->conn_ptr->hdbc,SQL_MAX_CURSOR_NAME_LEN,
-					(void *)&max_len,0,&len);
-	if (rc != SQL_SUCCESS){
-		RETURN_FALSE;
-	}
-	
-	if (max_len > 0){
-		cursorname = emalloc(max_len + 1);
-		if (cursorname == NULL){
-			php_error(E_WARNING,"Out of memory");
-			RETURN_FALSE;
-		}
-		rc = SQLGetCursorName(result->stmt,cursorname,(SWORD)max_len,&len);
-		if (rc != SQL_SUCCESS){
-			char    state[6];     /* Not used */
-	 		SDWORD  error;        /* Not used */
-			char    errormsg[255];
-			SWORD   errormsgsize; /* Not used */
-			ODBC_TLS_VARS;
-
-			SQLError(ODBCG(henv), result->conn_ptr->hdbc,
-						result->stmt, state, &error, errormsg,
-						sizeof(errormsg)-1, &errormsgsize);
-			if (!strncmp(state,"S1015",5)){
-				sprintf(cursorname,"php3_curs_%d", (int)result->stmt);
-				if (SQLSetCursorName(result->stmt,cursorname,SQL_NTS) != SQL_SUCCESS){
-					ODBC_SQL_ERROR(result->conn_ptr->hdbc,result->stmt,
-										"SQLSetCursorName");
-					RETVAL_FALSE;
-				} else {
-					RETVAL_STRING(cursorname,1);
-				}
-			} else {
-				php_error(E_WARNING, "SQL error: %s, SQL state %s", errormsg, state);
-				RETVAL_FALSE;
-			}
-		} else {
-			RETVAL_STRING(cursorname,1);
-		}
-		efree(cursorname);
-	} else {
-		RETVAL_FALSE;
-	}
-}
-/* }}} */
-
-/* {{{ proto int odbc_exec(int connection_id, string query [, int flags])
-   Prepare and execute an SQL statement */
-PHP_FUNCTION(odbc_exec)
-{
-	pval 	*arg1, *arg2, *arg3;
-	int         conn, numArgs;
-	char        *query;
-	odbc_result   *result=NULL;
-	odbc_connection *curr_conn=NULL;
-	RETCODE     rc;
-#if HAVE_SQL_EXTENDED_FETCH
-	UDWORD      scrollopts;
-#endif
-
-	numArgs = ARG_COUNT(ht);
-	if (numArgs > 2){
-		if (getParameters(ht, 3, &arg1,&arg2, &arg3) == FAILURE)
-			WRONG_PARAM_COUNT;
-		convert_to_long(arg3);
-	} else {
-		if (getParameters(ht, 2, &arg1, &arg2) == FAILURE)
-			WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(arg1);
-	convert_to_string(arg2);
-	conn = arg1->value.lval;
-	query = arg2->value.str.val;
-	
-	if ((curr_conn = odbc_get_conn(list, conn)) == NULL){
-		RETURN_FALSE;
-	}
-	
-	result = (odbc_result *)emalloc(sizeof(odbc_result));
-	if (result == NULL){
-		php_error(E_WARNING, "Out of memory");
-		RETURN_FALSE;
-	}
-
-	rc = SQLAllocStmt(curr_conn->hdbc, &(result->stmt));
-	if (rc == SQL_INVALID_HANDLE){
-		php_error(E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
-		efree(result);
-		RETURN_FALSE;
-	}
-
-	if (rc == SQL_ERROR){
-		ODBC_SQL_ERROR(curr_conn->hdbc, SQL_NULL_HSTMT, "SQLAllocStmt");
-		efree(result);
-		RETURN_FALSE;
-	}
-	
-#if HAVE_SQL_EXTENDED_FETCH
-	/* Solid doesn't have ExtendedFetch, if DriverManager is used, get Info,
-	   whether Driver supports ExtendedFetch */
-	rc = SQLGetInfo(curr_conn->hdbc, SQL_FETCH_DIRECTION, (void *) &scrollopts, sizeof(scrollopts), NULL);
-	if (rc == SQL_SUCCESS){
-		if ((result->fetch_abs = (scrollopts & SQL_FD_FETCH_ABSOLUTE))){
-			/* Try to set CURSOR_TYPE to dynamic. Driver will replace this with other
-			   type if not possible.
-			 */
-			if(SQLSetStmtOption(result->stmt, SQL_CURSOR_TYPE, SQL_CURSOR_DYNAMIC)
-				== SQL_ERROR){
-				ODBC_SQL_ERROR(curr_conn->hdbc, result->stmt, " SQLSetStmtOption");
-				SQLFreeStmt(result->stmt, SQL_DROP);
-				efree(result);
-				RETURN_FALSE;
-			}
-		}
-	} else {
-		result->fetch_abs = 0;
-	}
-#endif
-
-	rc = SQLExecDirect(result->stmt, query, SQL_NTS);
-	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
-		/* XXX FIXME we should really check out SQLSTATE with SQLError
-		 * in case rc is SQL_SUCCESS_WITH_INFO here.
-		 */
-		ODBC_SQL_ERROR(curr_conn->hdbc, result->stmt, "SQLExecDirect"); 
-		SQLFreeStmt(result->stmt, SQL_DROP);
-		efree(result);
-		RETURN_FALSE;
-	}
-
-	SQLNumResultCols(result->stmt, &(result->numcols));
-	
-	/* For insert, update etc. cols == 0 */
-	if (result->numcols > 0){
-        if (!odbc_bindcols(result)){
-			efree(result);
-            RETURN_FALSE;
-		}
-	} else {
-		result->values = NULL;
-	}
-	result->conn_ptr = curr_conn;
-	result->fetched = 0;
-	RETURN_LONG(odbc_add_result(list, result));
-}
-/* }}} */
-
-/* {{{ proto int odbc_fetch_into(int result_id [, int rownumber], array result_array)
-   Fetch one result row into an array */ 
-PHP_FUNCTION(odbc_fetch_into)
-{
-	int         res_ind, numArgs, i;
-	odbc_result   *result;
-	RETCODE     rc;
-    SWORD sql_c_type;
-	char *buf = NULL;
-#if HAVE_SQL_EXTENDED_FETCH
-	UDWORD      crow;
-	UWORD       RowStatus[1];
-	SDWORD      rownum = -1;
-	pval     *arg1, *arg2, *arr, *tmp;
-	
-	numArgs = ARG_COUNT(ht);
-
-	switch(numArgs){
-		case 2:
-			if (getParameters(ht, 2, &arg1, &arr) == FAILURE)
-				WRONG_PARAM_COUNT;
-			break;
-		case 3:
-			if (getParameters(ht, 3, &arg1, &arg2, &arr) == FAILURE)
-				WRONG_PARAM_COUNT;
-			convert_to_long(arg2);
-			rownum = arg2->value.lval;
-			break;
-		default:
-			WRONG_PARAM_COUNT;
-	}
-
-	if (!ParameterPassedByReference(ht, numArgs)){
-		php_error(E_WARNING, "Array not passed by reference in call to odbc_fetch_into()");
-		RETURN_FALSE;
-	}
-#else
-	pval     *arg1, *arr, *tmp;
-
-	numArgs = ARG_COUNT(ht);
-
-	if (numArgs != 2 || getParameters(ht, 2, &arg1, &arr) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	if (!ParameterPassedByReference(ht, numArgs)){
-		php_error(E_WARNING, "Array not passed by reference in call to odbc_fetch_into()");
-		RETURN_FALSE;
-	}
-#endif				
-	
-	convert_to_long(arg1);
-	res_ind = arg1->value.lval;
-
-	/* check result */
-	if ((result = odbc_get_result(list, res_ind)) == NULL){
-		RETURN_FALSE;
-	}
-
-	if (result->numcols == 0) {
-		php_error(E_WARNING, "No tuples available at this result index");
-		RETURN_FALSE;
-	}
-	
-	if (arr->type != IS_ARRAY){
-		if (array_init(arr) == FAILURE){
-			php_error(E_WARNING, "Can't convert to type Array");
-			RETURN_FALSE;
-		}
-	}
-
-#if HAVE_SQL_EXTENDED_FETCH
-	if (result->fetch_abs){
-		if (rownum > 0)
-			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_ABSOLUTE,rownum,&crow,RowStatus);
-		else
-			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus);
-	}else
-#endif
-		
-		rc = SQLFetch(result->stmt);
-
-	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO)
-		RETURN_FALSE;
-
-#if HAVE_SQL_EXTENDED_FETCH
-	if (rownum > 0 && result->fetch_abs)
-		result->fetched = rownum;
-	else
-#endif
-		result->fetched++;
-
-	for (i = 0; i < result->numcols; i++) {
-		tmp = (pval *) emalloc(sizeof(pval));
-		tmp->refcount=1;
-		tmp->type = IS_STRING;
-		tmp->value.str.len = 0;
-        sql_c_type = SQL_C_CHAR;
-       
-        switch(result->values[i].coltype){
-            case SQL_BINARY:
-            case SQL_VARBINARY:
-            case SQL_LONGVARBINARY:
-                if (result->binmode <= 0){
-                    tmp->value.str.val = empty_string;
-                    break;
-                }
-                if (result->binmode == 1) sql_c_type = SQL_C_BINARY; 
-            case SQL_LONGVARCHAR:
-                if (IS_SQL_LONG(result->values[i].coltype) && 
-                   result->longreadlen <= 0){
-                    tmp->value.str.val = empty_string;
-                    break;
-                }
-        
-                if (buf == NULL) buf = emalloc(result->longreadlen + 1);
-                rc = SQLGetData(result->stmt, (UWORD)(i + 1),sql_c_type,
-								buf, result->longreadlen + 1, &result->values[i].vallen);
-
-                if (rc == SQL_ERROR) {
-					ODBC_SQL_ERROR(result->conn_ptr->hdbc, result->stmt, "SQLGetData");
-					efree(buf);
-					RETURN_FALSE;
-				}
-				if (rc == SQL_SUCCESS_WITH_INFO){
-					tmp->value.str.len = result->longreadlen;
-				} else if (result->values[i].vallen == SQL_NULL_DATA){
-					tmp->value.str.val = empty_string;
-					break;
-				} else {
-					tmp->value.str.len = result->values[i].vallen;
-				}
-				tmp->value.str.val = estrndup(buf, tmp->value.str.len);
-				break;
-
-			default:
-				if (result->values[i].vallen == SQL_NULL_DATA){
-					tmp->value.str.val = empty_string;
-					break;
-				}
-				tmp->value.str.len = result->values[i].vallen;
-				tmp->value.str.val = estrndup(result->values[i].value,tmp->value.str.len);
-				break;
-		}
-		zend_hash_index_update(arr->value.ht, i, &tmp, sizeof(pval *), NULL);
-	}
-	if (buf) efree(buf);
-	RETURN_LONG(result->numcols);	
-}
-/* }}} */
-
-#if HAVE_SOLID
-PHP_FUNCTION(solid_fetch_prev)
-{
-	int         res_ind;
-	odbc_result   *result;
-	RETCODE     rc;
-	pval     *arg1;
-	
-	if (getParameters(ht, 1, &arg1) == FAILURE)
-		            WRONG_PARAM_COUNT;
-	
-	convert_to_long(arg1);
-	res_ind = arg1->value.lval;
-
-	/* check result */
-	if ((result = odbc_get_result(list, res_ind)) == NULL) {
-		RETURN_FALSE;
-	}
-
-	if (result->numcols == 0) {
-		php_error(E_WARNING, "No tuples available at this result index");
-		RETURN_FALSE;
-	}
-	rc = SQLFetchPrev(result->stmt);
-
-	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
-		RETURN_FALSE;
-	}
-
-	if (result->fetched > 1) result->fetched--;
-
-	RETURN_TRUE;
-}
-#endif
-
-/* {{{ proto int odbc_fetch_row(int result_id [, int row_number])
-   Fetch a row */
-PHP_FUNCTION(odbc_fetch_row)
-{
-	int         res_ind, numArgs;
-	SDWORD      rownum = 1;
-	odbc_result   *result;
-	RETCODE     rc;
-	pval		*arg1, *arg2;
-#if HAVE_SQL_EXTENDED_FETCH
-	UDWORD      crow;
-	UWORD       RowStatus[1];
-#endif
-
-	numArgs = ARG_COUNT(ht);
-	if (numArgs ==  1){
-		if (getParameters(ht, 1, &arg1) == FAILURE)
-			WRONG_PARAM_COUNT;
-	} else {
-		if (getParameters(ht, 2, &arg1, &arg2) == FAILURE)
-			WRONG_PARAM_COUNT;
-		convert_to_long(arg2);
-		rownum = arg2->value.lval;
-	}
-	
-	convert_to_long(arg1);
-	res_ind = arg1->value.lval;
-	
-	/* check result */
-	if ((result = odbc_get_result(list, res_ind)) == NULL) {
-		RETURN_FALSE;
-	}
-	
-	if (result->numcols == 0) {
-		php_error(E_WARNING, "No tuples available at this result index");
-		RETURN_FALSE;
-	}
-
-#if HAVE_SQL_EXTENDED_FETCH
-    if (result->fetch_abs){
-		if (numArgs > 1)
-			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_ABSOLUTE,rownum,&crow,RowStatus);
-		else
-			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus);
-	}else
-#endif
-		rc = SQLFetch(result->stmt);
-
-	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
-		RETURN_FALSE;
-	}
-	
-	if (numArgs > 1) {
-		result->fetched = rownum;
-	} else {
-		result->fetched++;
-	}
-	
-	RETURN_TRUE;
-}	
-/* }}} */
-
-/* {{{ proto string odbc_result(int result_id, mixed field)
-   Get result data */ 
-PHP_FUNCTION(odbc_result)
-{
-	char        *field;
-	int         res_ind;
-	int         field_ind;
-	SWORD 		sql_c_type = SQL_C_CHAR;
-	odbc_result   *result;
-	int         i = 0;
-	RETCODE     rc;
-	SDWORD		fieldsize;
-	pval		*arg1, *arg2;
-#if HAVE_SQL_EXTENDED_FETCH
-	UDWORD      crow;
-	UWORD       RowStatus[1];
-#endif
-
-	field_ind = -1;
-	field = NULL;
-
-	if (ARG_COUNT(ht) != 2 || getParameters(ht, 2 , &arg1, &arg2) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	
-	convert_to_long(arg1);
-	res_ind = arg1->value.lval;
-
-	if (arg2->type == IS_STRING){
-		field = arg2->value.str.val;
-	} else {
-		convert_to_long(arg2);
-		field_ind = arg2->value.lval - 1;
-	}
-	
-	/* check result */
-	if ((result = odbc_get_result(list, res_ind)) == NULL) {
-		RETURN_FALSE;
-	}
-	
-	if ((result->numcols == 0)){
-		php_error(E_WARNING, "No tuples available at this result index");
-		RETURN_FALSE;
-	}
-	
-	/* get field index if the field parameter was a string */
-	if (field != NULL){
-		for(i = 0; i < result->numcols; i++){
-			if (!strcasecmp(result->values[i].name, field)){
-				field_ind = i;
-				break;
-			}
-		}
-
-		if (field_ind < 0){
-			php_error(E_WARNING, "Field %s not found", field);
-			RETURN_FALSE;
-		}
-	} else {
-		/* check for limits of field_ind if the field parameter was an int */
-		if (field_ind >= result->numcols || field_ind < 0){
-			php_error(E_WARNING, "Field index is larger than the number of fields");
-			RETURN_FALSE;
-		}
-	}
-
-	if (result->fetched == 0){
-		/* User forgot to call odbc_fetchrow(), let's do it here */
-#if HAVE_SQL_EXTENDED_FETCH
-		if (result->fetch_abs)
-			rc = SQLExtendedFetch(result->stmt, SQL_FETCH_NEXT, 1, &crow,RowStatus);
-		else
-#endif
-			rc = SQLFetch(result->stmt);
-
-		if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO)
-			RETURN_FALSE;
-		
-		result->fetched++;
-	}
-
-	switch(result->values[field_ind].coltype){
-        case SQL_BINARY:
-        case SQL_VARBINARY:
-        case SQL_LONGVARBINARY:
-            if (result->binmode <= 1) sql_c_type = SQL_C_BINARY;
-            if (result->binmode <= 0) break; 
-        case SQL_LONGVARCHAR:
-            if (IS_SQL_LONG(result->values[field_ind].coltype)){
-               if (result->longreadlen <= 0) 
-				   break;
-			   else 
-				   fieldsize = result->longreadlen;
-			} else {
-			
-			   SQLColAttributes(result->stmt, (UWORD)(field_ind + 1), 
-					   			(UWORD)((sql_c_type == SQL_C_BINARY) ? SQL_COLUMN_LENGTH :
-					   			SQL_COLUMN_DISPLAY_SIZE),
-					   			NULL, 0, NULL, &fieldsize);
-			}
-			/* For char data, the length of the returned string will be longreadlen - 1 */
-			fieldsize = (result->longreadlen <= 0) ? 4096 : result->longreadlen;
-            field = emalloc(fieldsize);
-            if (!field){
-                php_error(E_WARNING, "Out of memory");
-                RETURN_FALSE;
-            }
-		/* SQLGetData will truncate CHAR data to fieldsize - 1 bytes and append \0.
-		   For binary data it is truncated to fieldsize bytes. 
-		 */
-            rc = SQLGetData(result->stmt, (UWORD)(field_ind + 1), sql_c_type,
-                            field, fieldsize, &result->values[field_ind].vallen);
-            
-            if (rc == SQL_ERROR) {
-                ODBC_SQL_ERROR(result->conn_ptr->hdbc, result->stmt, "SQLGetData");
-                efree(field);
-                RETURN_FALSE;
-            }
-            
-            if (result->values[field_ind].vallen == SQL_NULL_DATA || rc == SQL_NO_DATA_FOUND){
-                efree(field);
-				RETURN_FALSE;
-            }
-			/* Reduce fieldlen by 1 if we have char data. One day we might 
-			   have binary strings... */
-			if (result->values[field_ind].coltype == SQL_LONGVARCHAR) fieldsize -= 1;
-            /* Don't duplicate result, saves one emalloc.
-			   For SQL_SUCCESS, the length is in vallen.
-			 */
-            RETURN_STRINGL(field, (rc == SQL_SUCCESS_WITH_INFO) ? fieldsize :
-                           result->values[field_ind].vallen, 0);
-            break;
-			
-		default:
-			if (result->values[field_ind].vallen == SQL_NULL_DATA){
-				RETURN_FALSE;
-			} else {
-				RETURN_STRINGL(result->values[field_ind].value, result->values[field_ind].vallen, 1);
-			}
-			break;
-	}
-
-/* If we come here, output unbound LONG and/or BINARY column data to the client */
-
-	
-	/* We emalloc 1 byte more for SQL_C_CHAR (trailing \0) */
-	fieldsize = (sql_c_type == SQL_C_CHAR) ? 4096 : 4095;
-    if ((field = emalloc(fieldsize)) == NULL){
-        php_error(E_WARNING,"Out of memory");
-        RETURN_FALSE;
-    }
-    
-	/* Call SQLGetData() until SQL_SUCCESS is returned */
-	while (1) {
-        rc = SQLGetData(result->stmt, (UWORD)(field_ind + 1),sql_c_type,
-                            field, fieldsize, &result->values[field_ind].vallen);
-
-		if (rc == SQL_ERROR) {
-			ODBC_SQL_ERROR(result->conn_ptr->hdbc, result->stmt, "SQLGetData");
-            efree(field);
-			RETURN_FALSE;
-		}
-        
-        if (result->values[field_ind].vallen == SQL_NULL_DATA){
-            efree(field);
-            RETURN_FALSE;
-        }
-        /* chop the trailing \0 by outputing only 4095 bytes */
-		PHPWRITE(field,(rc == SQL_SUCCESS_WITH_INFO) ? 4095 :
-                           result->values[field_ind].vallen);
-
-		if (rc == SQL_SUCCESS) { /* no more data avail */
-            efree(field);
-			RETURN_TRUE;
-		}
-	}
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int odbc_result_all(int result_id [, string format])
-   Print result as HTML table */
-PHP_FUNCTION(odbc_result_all)
-{
-	char *buf = NULL;
-	int         res_ind, numArgs;
-	odbc_result   *result;
-	int         i;
-	RETCODE     rc;
-	pval     *arg1, *arg2;
-	SWORD sql_c_type;
-#if HAVE_SQL_EXTENDED_FETCH
-	UDWORD      crow;
-	UWORD       RowStatus[1];
-#endif
-
-	numArgs = ARG_COUNT(ht);
-	if (numArgs ==  1){
-		if (getParameters(ht, 1, &arg1) == FAILURE)
-			WRONG_PARAM_COUNT;
-	} else {
-		if (getParameters(ht, 2, &arg1, &arg2) == FAILURE)
-			WRONG_PARAM_COUNT;
-	}
-				
-	convert_to_long(arg1);
-	res_ind = arg1->value.lval;
-	
-	/* check result */
-	if ((result = odbc_get_result(list, res_ind)) == NULL) {
-		RETURN_FALSE;
-	}
-	
-	if (result->numcols == 0){
-		php_error(E_WARNING, "No tuples available at this result index");
-		RETURN_FALSE;
-	}
-#if HAVE_SQL_EXTENDED_FETCH
-	if (result->fetch_abs)
-		rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus);
-	else
-#endif	
-		rc = SQLFetch(result->stmt);
-
-	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO){
-		php_printf("<h2>No rows found</h2>\n");
-		RETURN_LONG(0);
-	}
-	
-	/* Start table tag */
-	if (numArgs == 1){
-		php_printf("<table><tr>");
-	} else {
-		convert_to_string(arg2);	
-		php_printf("<table %s ><tr>",arg2->value.str.val); 
-	}
-	
-	for(i = 0; i < result->numcols; i++)
-		php_printf("<th>%s</th>", result->values[i].name);
-
-	php_printf("</tr>\n");
-
-	while(rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO){
-		result->fetched++;
-		php_printf("<tr>");
-		for(i = 0; i < result->numcols; i++){
-            sql_c_type = SQL_C_CHAR;
-            switch(result->values[i].coltype){
-                case SQL_BINARY:
-                case SQL_VARBINARY:
-                case SQL_LONGVARBINARY:
-                    if (result->binmode <= 0){
-                        php_printf("<td>Not printable</td>");
-                        break;
-                    }
-                    if (result->binmode <= 1) sql_c_type = SQL_C_BINARY; 
-                case SQL_LONGVARCHAR:
-                    if (IS_SQL_LONG(result->values[i].coltype) && 
-                       result->longreadlen <= 0){
-                        php_printf("<td>Not printable</td>"); 
-                        break;
-                    }
-        
-                    if (buf == NULL) buf = emalloc(result->longreadlen);
-                    
-                    rc = SQLGetData(result->stmt, (UWORD)(i + 1),sql_c_type,
-                                    buf, result->longreadlen, &result->values[i].vallen);
-                    
-                    php_printf("<td>");
-
-                    if (rc == SQL_ERROR) {
-                        ODBC_SQL_ERROR(result->conn_ptr->hdbc, result->stmt, "SQLGetData");
-                        php_printf("</td></tr></table>");
-                        efree(buf);
-                        RETURN_FALSE;
-                    }
-                    if (rc == SQL_SUCCESS_WITH_INFO)
-                        php_printf(buf,result->longreadlen);
-                    else if (result->values[i].vallen == SQL_NULL_DATA){
-						php_printf("&nbsp;</td>");
-						break;
-                    }
-		    else
-		    {
-                    	php_printf(buf, result->values[i].vallen);
-		    }
-                    php_printf("</td>");
-                    break;
-
-                default:
-                    if (result->values[i].vallen == SQL_NULL_DATA){
-                        php_printf("<td>&nbsp;</td>");
-                    } else {
-                        php_printf("<td>%s</td>", result->values[i].value);
-                    }
-                    break;
-            }
-		}
-   		php_printf("</tr>\n");
-
-#if HAVE_SQL_EXTENDED_FETCH
-		if (result->fetch_abs)
-			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus);
-		else
-#endif
-			rc = SQLFetch(result->stmt);		
-	}
-	php_printf("</table>\n");
-    if (buf) efree(buf);
-	RETURN_LONG(result->fetched);
-}
-/* }}} */
-
-/* {{{ proto int odbc_free_result(int result_id)
-   Free resources associated with a result */
-PHP_FUNCTION(odbc_free_result)
-{
-	pval *arg1;
-	
-	if ( getParameters(ht, 1, &arg1) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long(arg1);
-	odbc_del_result(list, arg1->value.lval);
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int odbc_connect(string DSN, string user, string password [, int cursor_option])
-   Connect to a datasource */
-PHP_FUNCTION(odbc_connect)
-{
-	odbc_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
-}
-/* }}} */
-
-/* {{{ proto int odbc_pconnect(string DSN, string user, string password [, int cursor_option])
-   Establish a persistant connection to a datasource */
-PHP_FUNCTION(odbc_pconnect)
-{
-	odbc_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
-}
-/* }}} */
-
-/* Persistent connections: two list-types le_pconn, le_conn and a plist
- * where hashed connection info is stored together with index pointer to
- * the actual link of type le_pconn in the list. Only persistent 
- * connections get hashed up. Normal connections use existing pconnections.
- * Maybe this has to change with regard to transactions on pconnections?
- * Possibly set autocommit to on on request shutdown.
- *
- * We do have to hash non-persistent connections, and reuse connections.
- * In the case where two connects were being made, without closing the first
- * connect, access violations were occuring.  This is because some of the
- * "globals" in this module should actualy be per-connection variables.  I
- * simply fixed things to get them working for now.  Shane
- */
-void odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
-{
-	char    *db = NULL;
-	char    *uid = NULL;
-	char    *pwd = NULL;
-	pval *arg1, *arg2, *arg3, *arg4;
-	odbc_connection *db_conn;
-	RETCODE rc;
-	list_entry *index_ptr;
-	char *hashed_details;
-	int hashed_len, len, id, cur_opt;
-	int type;
-	ODBCLS_FETCH();
-	PLS_FETCH();
-
-	/*  Now an optional 4th parameter specifying the cursor type
-	 *  defaulting to the cursors default
-	 */
-	switch(ARG_COUNT(ht)) {
-		case 3:	
-			if (getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) {
-				WRONG_PARAM_COUNT;
-			}
-			/* Use Default: Probably a better way to do this */
-			cur_opt = SQL_CUR_DEFAULT;
-			break;
-		case 4:
-			if (getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) {
-				WRONG_PARAM_COUNT;
-			}
-			convert_to_long(arg4);
-			cur_opt = arg4->value.lval;
-
-			/* Confirm the cur_opt range */
-			if (! (cur_opt == SQL_CUR_USE_IF_NEEDED || 
-				cur_opt == SQL_CUR_USE_ODBC || 
-				cur_opt == SQL_CUR_USE_DRIVER || 
-				cur_opt == SQL_CUR_DEFAULT) ) {
-				php_error(E_WARNING, "odbc: Invalid Cursor type (%d)", cur_opt);
-				RETURN_FALSE;
-			}
-			break;
-		default:
-			WRONG_PARAM_COUNT;
-			break;
-	}
-
-	convert_to_string(arg1);
-	convert_to_string(arg2);
-	convert_to_string(arg3);
-
-	db = arg1->value.str.val;
-	uid = arg2->value.str.val;
-	pwd = arg3->value.str.val;
-
-	if (ODBCG(allow_persistent) <= 0) {
-		persistent = 0;
-	}
-
-	if (ODBCG(max_links) != -1 && ODBCG(num_links) >= ODBCG(max_links)) {
-		php_error(E_WARNING, "odbc: Too many open links (%d)",
-				   ODBCG(num_links));
-		RETURN_FALSE;
-	}
-
-	/* the user requested a persistent connection */
-	if (persistent && ODBCG(max_persistent) != -1 && ODBCG(num_persistent) >= ODBCG(max_persistent)) {
-		php_error(E_WARNING,"odbc: Too many open persistent links (%d)",
-					ODBCG(num_persistent));
-		RETURN_FALSE;
-	}
-
-	len = strlen(db) + strlen(uid) + strlen(pwd) + sizeof(ODBC_TYPE) - 1 + 5;
-	hashed_details = emalloc(len);
-
-	if (hashed_details == NULL) {
-		php_error(E_WARNING, "Out of memory");
-		RETURN_FALSE;
-	}
-
-	hashed_len = php_sprintf(hashed_details, "%s_%s_%s_%s_%d", ODBC_TYPE, db, uid, pwd, cur_opt);
-
-	/* FIXME the idea of checking to see if our connection is already persistent
-		is good, but it adds a lot of overhead to non-persistent connections.  We
-		should look and see if we can fix that somehow */
-	/* try to find if we already have this link in our persistent list,
-	 * no matter if it is to be persistent or not
-	 */
-
-	if ((persistent || (zend_hash_find(list, hashed_details, hashed_len + 1,
-		  (void **) &index_ptr) == FAILURE || !php3_list_find((int) index_ptr->ptr, &type))) &&
-		  zend_hash_find(plist, hashed_details, hashed_len + 1,
-		  (void **) &index_ptr) == FAILURE) {
-		/* the link is not in the persistent list */
-		list_entry new_le, new_index_ptr;
-
-		if (persistent) {
-			db_conn = (odbc_connection *)malloc(sizeof(odbc_connection));
-			db_conn->persistent = 1;
-		} else {
-			db_conn = (odbc_connection *)emalloc(sizeof(odbc_connection));
-			db_conn->persistent = 0;
-		}
-
-		SQLAllocConnect(ODBCG(henv), &db_conn->hdbc);
-#if HAVE_SOLID
-		SQLSetConnectOption(db_conn->hdbc, SQL_TRANSLATE_OPTION,
-							SQL_SOLID_XLATOPT_NOCNV);
-#endif
-#if HAVE_OPENLINK
-		{
-			char dsnbuf[300];
-			short dsnbuflen;
-
-			rc = SQLDriverConnect(db_conn->hdbc, NULL, db, SQL_NTS,
-								  dsnbuf, sizeof(dsnbuf)-1, &dsnbuflen,
-								  SQL_DRIVER_NOPROMPT);
-		}
-#else
-		if(cur_opt != SQL_CUR_DEFAULT){
-			rc = SQLSetConnectOption(db_conn->hdbc, SQL_ODBC_CURSORS, cur_opt);
-			if (rc != SQL_SUCCESS ) {  /* && rc != SQL_SUCCESS_WITH_INFO ? */
-				ODBC_SQL_ERROR(db_conn->hdbc, SQL_NULL_HSTMT, "SQLSetConnectOption");
-				SQLFreeConnect(db_conn->hdbc);
-				if (persistent)
-					free(db_conn);
-				else
-					efree(db_conn);
-				RETURN_FALSE;
-			}
-		}
-
-#if HAVE_EMPRESS
-                {
-                        int     direct = 0;
-                        char    dsnbuf[300];
-                        short   dsnbuflen;
-                        char    *ldb = 0;
-
-                        if (strstr ((char*)db, ";"))
-                        {
-                                direct = 1;
-                                if (uid && !strstr ((char*)db, "uid") &&
-                                                !strstr ((char*)db, "UID"))
-                                {
-                                        ldb = (char*) emalloc (strlen(db) +
-                                                        strlen (uid) +
-                                                        strlen (pwd) + 12);
-                                        sprintf (ldb, "%s;UID=%s;PWD=%s",
-                                                                db, uid, pwd);
-                                }
-                                else
-                                {
-                                        ldb = (char*) emalloc (strlen (db) + 1);
-                                        strcat (ldb, db);
-                                }
-                        }
-
-                        if (direct)
-                                rc = SQLDriverConnect (db_conn->hdbc, NULL,
-                                        ldb, strlen (ldb), dsnbuf, 300,
-                                        &dsnbuflen, SQL_DRIVER_NOPROMPT);
-
-                        else
-                                rc = SQLConnect(db_conn->hdbc, db, SQL_NTS,
-                                                uid, SQL_NTS, pwd, SQL_NTS);
-
-                        if (ldb)
-                                efree (ldb);
-                }
-#else
-		rc = SQLConnect(db_conn->hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, SQL_NTS);
-
-#endif
-
-#endif
-		if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
-			ODBC_SQL_ERROR(db_conn->hdbc, SQL_NULL_HSTMT, "SQLConnect");
-			SQLFreeConnect(db_conn->hdbc);
-			if (persistent)
-				free(db_conn);
-			else
-				efree(db_conn);
-			RETURN_FALSE;
-		}
-		db_conn->open = 1;
-		if (persistent){
-			new_le.type = ODBCG(le_pconn);
-			new_le.ptr = db_conn;
-			return_value->value.lval = 
-				php3_plist_insert(db_conn, ODBCG(le_pconn));
-			new_index_ptr.ptr = (void *) return_value->value.lval;
-#ifdef THREAD_SAFE
-			new_index_ptr.type = _php3_le_index_ptr();
-#else
-			new_index_ptr.type = le_index_ptr;
-#endif
-			if (zend_hash_update(plist,hashed_details,hashed_len + 1,(void *) &new_index_ptr,
-					sizeof(list_entry),NULL)==FAILURE) {
-				SQLDisconnect(db_conn->hdbc);
-				SQLFreeConnect(db_conn->hdbc);
-				free(db_conn);
-				efree(hashed_details);
-				RETURN_FALSE;
-			}
-			ODBCG(num_persistent)++;
-		} else {
-			new_le.type = ODBCG(le_conn);
-			new_le.ptr = db_conn;
-			return_value->value.lval = 
-				php3_list_insert(db_conn, ODBCG(le_conn));
-			new_index_ptr.ptr = (void *) return_value->value.lval;
-#ifdef THREAD_SAFE
-			new_index_ptr.type = _php3_le_index_ptr();
-#else
-			new_index_ptr.type = le_index_ptr;
-#endif
-			if (zend_hash_update(list,hashed_details,hashed_len + 1,(void *) &new_index_ptr,
-					sizeof(list_entry),NULL)==FAILURE) {
-				SQLDisconnect(db_conn->hdbc);
-				SQLFreeConnect(db_conn->hdbc);
-				efree(db_conn);
-				efree(hashed_details);
-				RETURN_FALSE;
-			}
-		}
-
-		ODBCG(num_links)++;
-
-	} else {
-		/* we are already connected */
-#ifdef THREAD_SAFE
-		if (index_ptr->type != _php3_le_index_ptr()) {
-#else
-		if (index_ptr->type != le_index_ptr) {
-#endif
-			efree(hashed_details);
-			RETURN_FALSE;
-		}
-		id = (int) index_ptr->ptr;
-
-		/* first see if there is a persistent connection and use it,
-			else, if we are making a non-persistent connect, check our
-			non-persistent list */
-		db_conn = (odbc_connection *)php3_plist_find(id, &type);
-		if(!db_conn && !persistent)
-			db_conn = (odbc_connection *)php3_list_find(id, &type);
-
-
-		/* FIXME test if the connection is dead */
-		/* For Adabas D and local db connections, a reconnect is performed
-		 * implicitly when needed. Cool.
-		 */
-
-		if (db_conn && (type ==  ODBCG(le_conn) ||
-					type == ODBCG(le_pconn))){
-			return_value->value.lval = id;
-		} else {
-			efree(hashed_details);
-			RETURN_FALSE;
-		}
-	}
-	efree(hashed_details);
-	return_value->type = IS_LONG;
-}
-
-/* {{{ proto void odbc_close(int connection_id)
-   Close an ODBC connection */
-PHP_FUNCTION(odbc_close)
-{
-	pval *arg1;
-	HDBC conn;
-	int type, ind;
-	ODBC_TLS_VARS;
-
-    if (getParameters(ht, 1, &arg1) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long(arg1);
-	ind = (int)arg1->value.lval;
-	conn = (HDBC)php3_list_find(ind, &type);
-	if (!conn ||
-		(type != ODBCG(le_conn) &&
-		 type != ODBCG(le_pconn))) {
-		return;
-	}
-	php3_list_delete(ind);
-}
-/* }}} */
-
-/* {{{ proto int odbc_num_rows(int result_id)
-   Get number of rows in a result */
-PHP_FUNCTION(odbc_num_rows)
-{
-	odbc_result   *result;
-	SDWORD      rows;
-	pval 	*arg1;
-	
-	if ( getParameters(ht, 1, &arg1) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}            
-
-	convert_to_long(arg1);
-
-	if ((result = odbc_get_result(list, arg1->value.lval)) == NULL) {
-		RETURN_FALSE;
-	}
-
-	SQLRowCount(result->stmt, &rows);
-	RETURN_LONG(rows);
-}
-/* }}} */
-
-/* {{{ proto int odbc_num_fields(int result_id)
-   Get number of columns in a result */
-PHP_FUNCTION(odbc_num_fields)
-{
-	odbc_result   *result;
-	pval     *arg1;
-
- 	if ( getParameters(ht, 1, &arg1) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}                            
- 
-    convert_to_long(arg1);
-	 
-	if ((result = odbc_get_result(list, arg1->value.lval)) == NULL) {
-		RETURN_FALSE;
-	}
-	RETURN_LONG(result->numcols);
-}
-/* }}} */
-
-/* {{{ proto string odbc_field_name(int result_id, int field_number)
-   Get a column name */
-PHP_FUNCTION(odbc_field_name)
-{
-	odbc_result       *result;
-	pval     *arg1, *arg2;
-	
-	if (getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-		
-	convert_to_long(arg1);
-	convert_to_long(arg2);
-	
-    if ((result = odbc_get_result(list, arg1->value.lval)) == NULL) {
-		RETURN_FALSE;
-	}
-	
-	if (result->numcols == 0){
-		php_error(E_WARNING, "No tuples available at this result index");
-		RETURN_FALSE;
-	}
-	
-	if (arg2->value.lval > result->numcols){
-		php_error(E_WARNING, "Field index larger than number of fields");
-		RETURN_FALSE;
-	}
-	
-	if (arg2->value.lval < 1){
-		php_error(E_WARNING, "Field numbering starts at 1");
-		RETURN_FALSE;
-	}
-	
-	RETURN_STRING(result->values[arg2->value.lval - 1].name,1)
-}
-/* }}} */
-
-/* {{{ proto string odbc_field_type(int result_id, int field_number)
-   Get the datatype of a column */
-PHP_FUNCTION(odbc_field_type)
-{
-	odbc_result	*result;
-	char    	tmp[32];
-	SWORD   	tmplen;
-	pval     *arg1, *arg2;
-
-	if (getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(arg1);
-	convert_to_long(arg2);
-
-	if ((result = odbc_get_result(list, arg1->value.lval)) == NULL) {
-		RETURN_FALSE;
-	}               
-
-	if (result->numcols == 0){
-		php_error(E_WARNING, "No tuples available at this result index");
-		RETURN_FALSE;
-	}
-
-	if (arg2->value.lval > result->numcols){
-		php_error(E_WARNING, "Field index larger than number of fields");
-		RETURN_FALSE;
-	}
-
-	SQLColAttributes(result->stmt, (UWORD)arg2->value.lval,
-					 SQL_COLUMN_TYPE_NAME, tmp, 31, &tmplen, NULL);
-	RETURN_STRING(tmp,1)
-}
-/* }}} */
-
-/* {{{ proto int odbc_field_len(int result_id, int field_number)
-   Get the length of a column */   
-PHP_FUNCTION(odbc_field_len)
-{
-	odbc_result       *result;
-	SDWORD  len;
-	pval     *arg1, *arg2;
-
-	if (getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(arg1);
-	convert_to_long(arg2);
-	
-	if ((result = odbc_get_result(list, arg1->value.lval)) == NULL) {
-		RETURN_FALSE;
-	}                                                                
-
-	if (result->numcols == 0){
-		php_error(E_WARNING, "No tuples available at this result index");
-		RETURN_FALSE;
-	}
-	
-	if (arg2->value.lval > result->numcols){
-		php_error(E_WARNING, "Field index larger than number of fields");
-		RETURN_FALSE;
-	}
-	SQLColAttributes(result->stmt, (UWORD)arg2->value.lval, 
-					 SQL_COLUMN_PRECISION, NULL, 0, NULL, &len);
-	
-	RETURN_LONG(len);
-}
-/* }}} */
-
-/* {{{ proto int odbc_field_num(int result_id, string field_name)
-   Return column number */
-PHP_FUNCTION(odbc_field_num)
-{
-	int         field_ind;
-	char        *fname;
-	odbc_result *result;
-	int         i;
-	pval     *arg1, *arg2;
-
-	if (getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long(arg1);
-	convert_to_string(arg2);
-	fname = arg2->value.str.val;
-	
-	if (arg1->value.lval == 1){
-		php_error(E_WARNING, "No tuples available at this result index");
-		RETURN_FALSE;
-	}
-	if ((result = odbc_get_result(list, arg1->value.lval)) == NULL) {
-		RETURN_FALSE;
-	}
-	
-	field_ind = -1;
-	for(i = 0; i < result->numcols; i++){
-		if (strcasecmp(result->values[i].name, fname) == 0)
-			field_ind = i + 1;
-		}
-	if (field_ind == -1)
-		RETURN_FALSE;
-	RETURN_LONG(field_ind);
-}
-/* }}} */
-
-/* {{{ proto int odbc_autocommit(int connection_id, int OnOff)
-   Toggle autocommit mode 
-   There can be problems with pconnections!*/
-PHP_FUNCTION(odbc_autocommit)
-{
-	odbc_connection *curr_conn;
-	RETCODE rc;
-	pval *arg1, *arg2 = NULL;
-	int argc;
-
-	argc = ARG_COUNT(ht);
-	if (argc == 2) {
-		if (getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-	} else if (argc == 1) {
-		if (getParameters(ht, 1, &arg1) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-	} else {
-		WRONG_PARAM_COUNT;
-	}
- 
-    convert_to_long(arg1);
-	if (arg2) {
-		convert_to_long(arg2);
-	}
-
-	if ((curr_conn = odbc_get_conn(list, arg1->value.lval)) == NULL) {
-		RETURN_FALSE;
-	}
-
-	if (arg2) {
-		rc = SQLSetConnectOption(curr_conn->hdbc, SQL_AUTOCOMMIT,
-								 (arg2->value.lval) ?
-								 SQL_AUTOCOMMIT_ON : SQL_AUTOCOMMIT_OFF);
-		if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO){
-			ODBC_SQL_ERROR(curr_conn->hdbc, SQL_NULL_HSTMT, "Set autocommit");
-			RETURN_FALSE;
-		}
-		RETVAL_TRUE;
-	} else {
-		SDWORD status;
-
-		rc = SQLGetConnectOption(curr_conn->hdbc, SQL_AUTOCOMMIT, (PTR)&status);
-		if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO){
-			ODBC_SQL_ERROR(curr_conn->hdbc, SQL_NULL_HSTMT, "Test autocommit");
-			RETURN_FALSE;
-		}
-		RETVAL_LONG((long)status);
-	}
-}
-/* }}} */
-
-/* {{{ proto int odbc_commit(int connection_id)
-   Commit an ODBC transaction */
-PHP_FUNCTION(odbc_commit)
-{
-	odbc_transact(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
-}
-/* }}} */
-
-/* {{{ proto int odbc_rollback(int connection_id)
-   Rollback a transaction */
-PHP_FUNCTION(odbc_rollback)
-{
-	odbc_transact(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
-}
-/* }}} */
-
-
-/* {{{ proto int odbc_setoption(int conn_id|result_id, int which, int option, int value)
-   Sets connection or statement options */
-/* This one has to be used carefully. We can't allow to set connection options for
-   persistent connections. I think that SetStmtOption is of little use, since most
-   of those can only be specified before preparing/executing statements.
-   On the other hand, they can be made connection wide default through SetConnectOption
-   - but will be overidden by calls to SetStmtOption() in odbc_prepare/odbc_do
-*/
-PHP_FUNCTION(odbc_setoption)
-{
-	odbc_connection *curr_conn;
-	odbc_result	*result;
-	RETCODE rc;
-	pval *arg1, *arg2, *arg3, *arg4;
-
- 	if ( getParameters(ht, 3, &arg1, &arg2, &arg3, &arg4) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}                            
- 
-	convert_to_long(arg1);
-	convert_to_long(arg2);
-	convert_to_long(arg3);
-	convert_to_long(arg4);
-
-	switch (arg2->value.lval) {
-		case 1:		/* SQLSetConnectOption */
-			if ((curr_conn = odbc_get_conn(list, arg1->value.lval)) == NULL){
-				RETURN_FALSE;
-			}
-			if(curr_conn->persistent){
-				php_error(E_WARNING, "Can't set option for persistent connection");
-				RETURN_FALSE;
-			}
-			rc = SQLSetConnectOption(curr_conn->hdbc, (unsigned short)(arg3->value.lval), (arg4->value.lval));
-			if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO){
-				ODBC_SQL_ERROR(curr_conn->hdbc, SQL_NULL_HSTMT, "SetConnectOption");
-				RETURN_FALSE;
-			}
-			break;
-		case 2:		/* SQLSetStmtOption */
-			if ((result = odbc_get_result(list, arg1->value.lval)) == NULL) {
-				RETURN_FALSE;
-			}
-			rc = SQLSetStmtOption(result->stmt, (unsigned short)(arg3->value.lval), (arg4->value.lval));
-			if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO){
-				ODBC_SQL_ERROR(result->conn_ptr->hdbc, result->stmt, "SetStmtOption");
-				RETURN_FALSE;
-			}
-			break;
-		default:
-			php_error(E_WARNING, "Unknown option type");
-			RETURN_FALSE;
-			break;
-	}
-
-	RETURN_TRUE;
-}
-/* }}} */
-
-#endif /* HAVE_UODBC */
-
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/ext/odbc/php3_odbc.h b/ext/odbc/php3_odbc.h
deleted file mode 100644
index 1a35df910e..0000000000
--- a/ext/odbc/php3_odbc.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP HTML Embedded Scripting Language Version 3.0                     |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997,1998 PHP Development Team (See Credits file)      |
-   +----------------------------------------------------------------------+
-   | This program is free software; you can redistribute it and/or modify |
-   | it under the terms of one of the following licenses:                 |
-   |                                                                      |
-   |  A) the GNU General Public License as published by the Free Software |
-   |     Foundation; either version 2 of the License, or (at your option) |
-   |     any later version.                                               |
-   |                                                                      |
-   |  B) the PHP License as published by the PHP Development Team and     |
-   |     included in the distribution in the file: LICENSE                |
-   |                                                                      |
-   | This program is distributed in the hope that it will be useful,      |
-   | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
-   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
-   | GNU General Public License for more details.                         |
-   |                                                                      |
-   | You should have received a copy of both licenses referred to here.   |
-   | If you did not, or have any questions about PHP licensing, please    |
-   | contact core@php.net.                                                |
-   +----------------------------------------------------------------------+
-   | Authors: Stig Sæther Bakken <ssb@guardian.no>                        |
-   |          Andreas Karajannis <Andreas.Karajannis@gmd.de>              |
-   +----------------------------------------------------------------------+
- */
-
-/* $Id$ */
-
-#ifndef _PHP_ODBC_H
-#define _PHP_ODBC_H
-
-#if HAVE_UODBC
-
-#ifndef MSVC5
-#define FAR
-#endif
-
-/* checking in the same order as in configure.in */
-
-#if HAVE_SOLID /* Solid Server */
-
-#define ODBC_TYPE "Solid"
-#include <cli0core.h>
-#include <cli0ext1.h>
-#define HAVE_SQL_EXTENDED_FETCH 0
-PHP_FUNCTION(solid_fetch_prev);
-
-#elif HAVE_EMPRESS /* Empress */
-
-#define ODBC_TYPE "Empress"
-#include <sql.h>
-#include <sqlext.h>
-#define HAVE_SQL_EXTENDED_FETCH 0
-
-#elif HAVE_ADABAS /* Adabas D */
-
-#define ODBC_TYPE "Adabas D"
-#include <WINDOWS.H>
-#include <sql.h>
-#include <sqlext.h>
-#define HAVE_SQL_EXTENDED_FETCH 1
-
-#elif HAVE_IODBC /* iODBC library */
-
-#define ODBC_TYPE "iODBC"
-#include <isql.h>
-#include <isqlext.h>
-#define HAVE_SQL_EXTENDED_FETCH 1
-#define SQL_FD_FETCH_ABSOLUTE   0x00000010L
-#define SQL_CURSOR_DYNAMIC      2UL
-#define SQL_NO_TOTAL            (-4)
-#define SQL_SO_DYNAMIC          0x00000004L
-#define SQL_LEN_DATA_AT_EXEC_OFFSET  (-100)
-#define SQL_LEN_DATA_AT_EXEC(length) (-(length)+SQL_LEN_DATA_AT_EXEC_OFFSET)
-
-#elif HAVE_UNIXODBC /* unixODBC library */
-
-#define ODBC_TYPE "unixODBC"
-#include <sql.h>
-#include <sqlext.h>
-#define HAVE_SQL_EXTENDED_FETCH 1
-
-#elif HAVE_OPENLINK /* OpenLink ODBC drivers */
-
-#define ODBC_TYPE "Openlink"
-#include <iodbc.h>
-#include <isql.h>
-#include <isqlext.h>
-#include <udbcext.h>
-#define HAVE_SQL_EXTENDED_FETCH 1
-
-#elif HAVE_VELOCIS /* Raima Velocis */
-
-#define ODBC_TYPE "Velocis"
-#define UNIX
-#define HAVE_SQL_EXTENDED_FETCH 1
-#include <sql.h>
-#include <sqlext.h>
-
-#elif HAVE_CODBC /* Custom ODBC */
-
-#define ODBC_TYPE "Custom ODBC"
-#define HAVE_SQL_EXTENDED_FETCH 1
-#include <odbc.h>
-
-#elif HAVE_DB2 /* DB2 CLI */
-
-#define ODBC_TYPE "DB2 CLI"
-#define HAVE_SQL_EXTENDED_FETCH 1
-#include <sqlcli1.h>
-#ifdef DB268K
-/* Need to include ASLM for 68K applications */
-#include <LibraryManager.h>
-#endif
-
-#else /* MS ODBC */
-
-#define HAVE_SQL_EXTENDED_FETCH 1
-#include <WINDOWS.H>
-#include <sql.h>
-#include <sqlext.h>
-#endif
-
-extern php3_module_entry odbc_module_entry;
-#define odbc_module_ptr &odbc_module_entry
-
-
-/* user functions */
-extern PHP_MINIT_FUNCTION(odbc);
-extern PHP_MSHUTDOWN_FUNCTION(odbc);
-extern PHP_RINIT_FUNCTION(odbc);
-PHP_MINFO_FUNCTION(odbc);
-
-PHP_FUNCTION(odbc_setoption);
-PHP_FUNCTION(odbc_autocommit);
-PHP_FUNCTION(odbc_close);
-PHP_FUNCTION(odbc_close_all);
-PHP_FUNCTION(odbc_commit);
-PHP_FUNCTION(odbc_connect);
-PHP_FUNCTION(odbc_pconnect);
-PHP_FUNCTION(odbc_cursor);
-PHP_FUNCTION(odbc_exec);
-PHP_FUNCTION(odbc_do);
-PHP_FUNCTION(odbc_execute);
-PHP_FUNCTION(odbc_fetch_into);
-PHP_FUNCTION(odbc_fetch_row);
-PHP_FUNCTION(odbc_field_len);
-PHP_FUNCTION(odbc_field_name);
-PHP_FUNCTION(odbc_field_type);
-PHP_FUNCTION(odbc_field_num);
-PHP_FUNCTION(odbc_free_result);
-PHP_FUNCTION(odbc_num_fields);
-PHP_FUNCTION(odbc_num_rows);
-PHP_FUNCTION(odbc_prepare);
-PHP_FUNCTION(odbc_result);
-PHP_FUNCTION(odbc_result_all);
-PHP_FUNCTION(odbc_rollback);
-PHP_FUNCTION(odbc_binmode);
-PHP_FUNCTION(odbc_longreadlen);
-/* 
- * PHP_FUNCTION(odbc_bind_param);
- * PHP_FUNCTION(odbc_define);
-*/
-
-typedef struct odbc_connection {
-#if HAVE_DB2
-	SQLHANDLE hdbc;
-#else
-	HDBC hdbc;
-#endif
-	int open;
-	int persistent;
-} odbc_connection;
-
-typedef struct odbc_result_value {
-	char name[32];
-	char *value;
-	long int vallen;
-	SDWORD coltype;
-} odbc_result_value;
-
-typedef struct odbc_result {
-#if HAVE_DB2
-	SQLHANDLE stmt;
-#else
-	HSTMT stmt;
-#endif
-	odbc_result_value *values;
-	SWORD numcols;
-	SWORD numparams;
-# if HAVE_SQL_EXTENDED_FETCH
-	int fetch_abs;
-# endif
-    long longreadlen;
-    int binmode;
-	int fetched;
-	odbc_connection *conn_ptr;
-} odbc_result;
-
-typedef struct {
-#if HAVE_DB2
-	SQLHANDLE henv;
-#else
-	HENV henv;
-#endif
-	char *defDB;
-	char *defUser;
-	char *defPW;
-	long allow_persistent;
-	long max_persistent;
-	long max_links;
-	long num_persistent;
-	long num_links;
-	int defConn;
-	int le_result, le_conn, le_pconn;
-    long defaultlrl;
-    long defaultbinmode;
-	HashTable *resource_list;
-	HashTable *resource_plist;
-} php_odbc_globals;
-
-
-int odbc_add_result(HashTable *list, odbc_result *result);
-odbc_result *odbc_get_result(HashTable *list, int count);
-void odbc_del_result(HashTable *list, int count);
-int odbc_add_conn(HashTable *list, HDBC conn);
-odbc_connection *odbc_get_conn(HashTable *list, int count);
-void odbc_del_conn(HashTable *list, int ind);
-#if HAVE_DB2
-void odbc_sql_error(SQLHANDLE conn, SQLHANDLE stmt, char *func);
-#else
-void odbc_sql_error(HDBC conn, HSTMT stmt, char *func);
-#endif
-int odbc_bindcols(odbc_result *result);
-
-#define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR)
-#define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY)
-
-#ifdef ZTS
-# define ODBCLS_D	php_odbc_globals *odbc_globals
-# define ODBCLS_DC	, ODBCLS_D
-# define ODBCLS_C	odbc_globals
-# define ODBCLS_CC , ODBCLS_C
-# define ODBCG(v) (odbc_globals->v)
-# define ODBCLS_FETCH()	php_odbc_globals *odbc_globals = ts_resource(odbc_globals_id)
-# define ODBC_TLS_VARS char *globals; ODBCLS_FETCH(); globals = (char *)odbc_globals;
-#else
-# define ODBCLS_D
-# define ODBCLS_DC
-# define ODBCLS_C
-# define ODBCLS_CC
-# define ODBCG(v) (odbc_globals.v)
-# define ODBCLS_FETCH()
-# define ODBC_TLS_VARS char *globals = (char *)&odbc_globals
-extern ZEND_API php_odbc_globals odbc_globals;
-#endif
-
-#else
-
-# define odbc_module_ptr NULL
-
-#endif /* HAVE_UODBC */
-
-#define phpext_odbc_ptr odbc_module_ptr
-
-#endif /* _PHP_ODBC_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */