cvs: pecl /ingres CHANGELOG TODO config.m4 config.w32 convertUTF.c convertUTF.h ii.c ii.h package.xml php_ii.h

grantc Thu Sep 13 10:59:08 2007 UTC Added files: /pecl/ingres convertUTF.c convertUTF.h Modified files: /pecl/ingres CHANGELOG TODO config.m4 config.w32 ii.c ii.h package.xml php_ii.h Log: - Added support for multiple concurrent result-sets - Added automatic coercion between UTF-8 and UTF-16 - Added support for Bi-directional scrolling cursors - Added ingres_free_results() - free the memory associated with a given result set - Added ingres_autocommit_state() - return the current auto-commit state - Added ingres_next_error() - fetch additional errors if any

http://cvs.php.net/viewvc.cgi/pecl/ingres/CHANGELOG?r1=1.34&r2=1.35&diff_format=u Index: pecl/ingres/CHANGELOG diff -u pecl/ingres/CHANGELOG:1.34 pecl/ingres/CHANGELOG:1.35 --- pecl/ingres/CHANGELOG:1.34 Wed Mar 7 12:30:11 2007 +++ pecl/ingres/CHANGELOG Thu Sep 13 10:59:08 2007 @@ -1,3 +1,11 @@ +CVS + - Added support for multiple concurrent result-sets + - Added automatic coercion between UTF-8 and UTF-16 + - Added support for Bi-directional scrolling cursors + - Added ingres_free_results() - free the memory associated with a given result set + - Added ingres_autocommit_state() - return the current auto-commit state + - Added ingres_next_error() - fetch additional errors if any + version 1.4.3 - Wait for disconnect to complete to prevent thread terminating uncleanly [grantc 07-03-07] http://cvs.php.net/viewvc.cgi/pecl/ingres/TODO?r1=1.8&r2=1.9&diff_format=u Index: pecl/ingres/TODO diff -u pecl/ingres/TODO:1.8 pecl/ingres/TODO:1.9 --- pecl/ingres/TODO:1.8 Wed Nov 8 08:04:22 2006 +++ pecl/ingres/TODO Thu Sep 13 10:59:08 2007 @@ -1,7 +1,8 @@ Still to do -- documentation +- Byref procedure calls - Add/Show/Delete Ingres Name server entries - BIG int / int8 support - not possible with PHP as yet since it does not support 8 byte int -vim: ff=unix + +vim: ff=unix ts=4 sw=4 expandtab http://cvs.php.net/viewvc.cgi/pecl/ingres/config.m4?r1=1.18&r2=1.19&diff_format=u Index: pecl/ingres/config.m4 diff -u pecl/ingres/config.m4:1.18 pecl/ingres/config.m4:1.19 --- pecl/ingres/config.m4:1.18 Wed Nov 8 13:24:07 2006 +++ pecl/ingres/config.m4 Thu Sep 13 10:59:08 2007 @@ -1,14 +1,17 @@ dnl -dnl $Id: config.m4,v 1.18 2006/11/08 13:24:07 grantc Exp $ +dnl $Id: config.m4,v 1.19 2007/09/13 10:59:08 grantc Exp $ dnl -PHP_ARG_WITH(ingres, for Ingres support, +PHP_ARG_WITH(ingres, for improved Ingres support, [ --with-ingres[=DIR] Include Ingres support. DIR is the Ingres base directory (default $II_SYSTEM)]) - -if test "$PHP_INGRES" != "no"; then - AC_DEFINE(HAVE_II, 1, [Whether you have Ingres]) - PHP_NEW_EXTENSION(ingres, ii.c, $ext_shared) +PHP_ARG_ENABLE(ingres2, Use ingres2 as the extension name, +[ --enable-ingres2] Use ingres2 as the extension name + allowing the driver to co-exist with the older ingres release, ,no) + +if test "$PHP_INGRES" != "no" && test "$PHP_INGRES2" == "no"; then + AC_DEFINE(HAVE_INGRES, 1, [Whether you have Ingres]) + PHP_NEW_EXTENSION(ingres, ii.c convertUTF.c, $ext_shared) PHP_SUBST(II_SHARED_LIBADD) if test "$PHP_INGRES" = "yes"; then @@ -20,13 +23,13 @@ if test -r $II_DIR/files/iiapi.h; then II_INC_DIR=$II_DIR/files else - AC_MSG_ERROR(Cannot find iiapi.h under $II_DIR/files) + AC_MSG_ERROR(Cannot find iiapi.h under $II_DIR/files - is \$II_SYSTEM set?) fi if test -r $II_DIR/lib/libiiapi.1.so; then II_LIB_DIR=$II_DIR/lib else - AC_MSG_ERROR(Cannot find libiiapi.1.so under $II_DIR/lib) + AC_MSG_ERROR(Cannot find libiiapi.1.so under $II_DIR/lib - is \$II_SYSTEM set?) fi PHP_ADD_LIBRARY_WITH_PATH(iiapi.1, $II_LIB_DIR, INGRES_SHARED_LIBADD) @@ -37,4 +40,39 @@ PHP_SUBST(INGRES_SHARED_LIBADD) fi +if test "$PHP_INGRES2" != "no"; then + AC_DEFINE(HAVE_INGRES, 1, [Whether you have Ingres]) + AC_DEFINE(HAVE_INGRES2, 1, [use ingres2 as the extension name]) + PHP_NEW_EXTENSION(ingres2, ii.c convertUTF.c, $ext_shared) + + PHP_SUBST(II_SHARED_LIBADD) + + if test "$PHP_INGRES" = "yes"; then + II_DIR=$II_SYSTEM/ingres + else + II_DIR=$PHP_INGRES/ingres + fi + + if test -r $II_DIR/files/iiapi.h; then + II_INC_DIR=$II_DIR/files + else + AC_MSG_ERROR(Cannot find iiapi.h under $II_DIR/files - is \$II_SYSTEM set?) + fi + + if test -r $II_DIR/lib/libiiapi.1.so; then + II_LIB_DIR=$II_DIR/lib + else + AC_MSG_ERROR(Cannot find libiiapi.1.so under $II_DIR/lib - is \$II_SYSTEM set?) + fi + + PHP_ADD_LIBRARY_WITH_PATH(iiapi.1, $II_LIB_DIR, INGRES2_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(q.1, $II_LIB_DIR, INGRES2_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(frame.1, $II_LIB_DIR, INGRES2_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(compat.1, $II_LIB_DIR, INGRES2_SHARED_LIBADD) + PHP_ADD_INCLUDE($II_INC_DIR) + PHP_SUBST(INGRES2_SHARED_LIBADD) + +fi + + dnl vim: ff=unix http://cvs.php.net/viewvc.cgi/pecl/ingres/config.w32?r1=1.4&r2=1.5&diff_format=u Index: pecl/ingres/config.w32 diff -u pecl/ingres/config.w32:1.4 pecl/ingres/config.w32:1.5 --- pecl/ingres/config.w32:1.4 Fri Jul 8 12:15:20 2005 +++ pecl/ingres/config.w32 Thu Sep 13 10:59:08 2007 @@ -1,7 +1,7 @@ -// $Id: config.w32,v 1.4 2005/07/08 12:15:20 edink Exp $ +// $Id: config.w32,v 1.5 2007/09/13 10:59:08 grantc Exp $ // vim:ft=javascript ts=4 sw=4 -ARG_WITH("ingres", "Ingres support", "no"); +ARG_WITH("ingres2", "Ingres support", "no"); if (PHP_INGRES != "no") { if (PHP_INGRES == "yes") { @@ -11,15 +11,15 @@ if (ii_system != "") { if (CHECK_HEADER_ADD_INCLUDE("iiapi.h", "CFLAGS_INGRES", ii_system + "\\ingres\\files;" + PHP_INGRES) && - CHECK_LIB("iilibapi.lib", "ingres", ii_system + "\\ingres\\lib;" + PHP_INGRES)) { + CHECK_LIB("iilibapi.lib", "ingres2", ii_system + "\\ingres\\lib;" + PHP_INGRES)) { // Ingres r3 - AC_DEFINE('HAVE_II', 1); - EXTENSION("ingres","ii.c"); + AC_DEFINE('HAVE_INGRES2', 1); + EXTENSION("ingres2","ii.c convertUTF.c"); } else if (CHECK_HEADER_ADD_INCLUDE("iiapi.h", "CFLAGS_INGRES", ii_system + "\\ingres\\files;" + PHP_INGRES) && - CHECK_LIB("oiapi.lib", "ingres", ii_system + "\\ingres\\lib;" + PHP_INGRES)) { + CHECK_LIB("oiapi.lib", "ingres2", ii_system + "\\ingres\\lib;" + PHP_INGRES)) { // Ingres 2.0/2.5/2.6 - AC_DEFINE('HAVE_II', 1); - EXTENSION("ingres","ii.c"); + AC_DEFINE('HAVE_INGRES2', 1); + EXTENSION("ingres2","ii.c convertUTF.c"); } else { // ingres is missing files WARNING("Ingres not enabled; libraries and headers not found in " + ii_system); @@ -27,9 +27,9 @@ } else { // Check php_build dirs for headers if (CHECK_HEADER_ADD_INCLUDE("iiapi.h", "CFLAGS_INGRES", PHP_PHP_BUILD + "\\include\\ingres") && - CHECK_LIB("iilibapi.lib", "ingres", PHP_PHP_BUILD + "\\lib")) { - AC_DEFINE('HAVE_II', 1); - EXTENSION("ingres","ii.c"); + CHECK_LIB("iilibapi.lib", "ingres2", PHP_PHP_BUILD + "\\lib")) { + AC_DEFINE('HAVE_INGRES2', 1); + EXTENSION("ingres2","ii.c convertUTF.c"); } else { // %II_SYSTEM% is not set WARNING("Ingres not enabled; %II_SYSTEM% has not been defined"); @@ -38,14 +38,14 @@ } else { // path supplied to --with-ingres if (CHECK_HEADER_ADD_INCLUDE("iiapi.h", "CFLAGS_INGRES", PHP_INGRES + "\\ingres\\files;") && - CHECK_LIB("iilibapi.lib", "ingres", PHP_INGRES + "\\ingres\\lib;")) { - AC_DEFINE('HAVE_II', 1); - EXTENSION("ingres","ii.c"); + CHECK_LIB("iilibapi.lib", "ingres2", PHP_INGRES + "\\ingres\\lib;")) { + AC_DEFINE('HAVE_INGRES2', 1); + EXTENSION("ingres2","ii.c convertUTF.c"); } else if (CHECK_HEADER_ADD_INCLUDE("iiapi.h", "CFLAGS_INGRES", PHP_INGRES + "\\ingres\\files;" + PHP_INGRES) && - CHECK_LIB("oiapi.lib", "ingres", PHP_INGRES + "\\ingres\\lib;")) { + CHECK_LIB("oiapi.lib", "ingres2", PHP_INGRES + "\\ingres\\lib;")) { // Ingres 2.0/2.5/2.6 - AC_DEFINE('HAVE_II', 1); - EXTENSION("ingres","ii.c"); + AC_DEFINE('HAVE_INGRES2', 1); + EXTENSION("ingres2","ii.c convertUTF.c"); } else { // cannot find files in supplied path WARNING("Ingres not enabled; libraries and headers not found"); http://cvs.php.net/viewvc.cgi/pecl/ingres/ii.c?r1=1.95&r2=1.96&diff_format=u Index: pecl/ingres/ii.c diff -u pecl/ingres/ii.c:1.95 pecl/ingres/ii.c:1.96 --- pecl/ingres/ii.c:1.95 Mon May 14 12:12:33 2007 +++ pecl/ingres/ii.c Thu Sep 13 10:59:08 2007 @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PECL :: ingres | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2004 The PHP Group | + | Copyright (c) 1997-2007 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,12 +16,12 @@ | http://www.eclips-software.com | | mailto:idev@eclips-software.com | | Ingres Corporation, http://ingres.com | - | Authors: David Hénot <henot@php.net> | + | Authors: David Hénot <henot@php.net> | | Grant Croker <grantc@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.95 2007/05/14 12:12:33 grantc Exp $ */ +/* $Id: ii.c,v 1.96 2007/09/13 10:59:08 grantc Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,133 +34,199 @@ #include "php_ii.h" #include "ii.h" #include "ext/standard/php_string.h" +#include "convertUTF.h" -#if HAVE_II +#if HAVE_INGRES ZEND_DECLARE_MODULE_GLOBALS(ii) /* True globals, no need for thread safety */ +static int le_ii_result; static int le_ii_link, le_ii_plink; #define SAFE_STRING(s) ((s)?(s):"") /* {{{ Ingres module function list - * Every user visible function must have an entry in ii_functions[]. + * Every user visible function must have an entry in ingres_functions[]. */ -function_entry ii_functions[] = { - PHP_FE(ingres_connect, NULL) - PHP_FE(ingres_pconnect, NULL) - PHP_FE(ingres_close, NULL) - PHP_FE(ingres_query, NULL) - PHP_FE(ingres_num_rows, NULL) - PHP_FE(ingres_num_fields, NULL) - PHP_FE(ingres_field_name, NULL) - PHP_FE(ingres_field_type, NULL) - PHP_FE(ingres_field_nullable, NULL) - PHP_FE(ingres_field_length, NULL) - PHP_FE(ingres_field_precision, NULL) - PHP_FE(ingres_field_scale, NULL) - PHP_FE(ingres_fetch_array, NULL) - PHP_FE(ingres_fetch_row, NULL) - PHP_FE(ingres_fetch_object, NULL) - PHP_FE(ingres_rollback, NULL) - PHP_FE(ingres_commit, NULL) - PHP_FE(ingres_autocommit, NULL) - PHP_FE(ingres_error, NULL) - PHP_FE(ingres_errno, NULL) - PHP_FE(ingres_errsqlstate, NULL) - PHP_FE(ingres_prepare, NULL) - PHP_FE(ingres_execute, NULL) - PHP_FE(ingres_cursor, NULL) - PHP_FE(ingres_set_environment, NULL) - PHP_FE(ingres_fetch_proc_return, NULL) +function_entry ingres_functions[] = { +#if defined(HAVE_INGRES2) + PHP_FE(ingres2_connect, NULL) + PHP_FE(ingres2_pconnect, NULL) + PHP_FE(ingres2_close, NULL) + PHP_FE(ingres2_query, NULL) + PHP_FE(ingres2_num_rows, NULL) + PHP_FE(ingres2_num_fields, NULL) + PHP_FE(ingres2_field_name, NULL) + PHP_FE(ingres2_field_type, NULL) + PHP_FE(ingres2_field_nullable, NULL) + PHP_FE(ingres2_field_length, NULL) + PHP_FE(ingres2_field_precision, NULL) + PHP_FE(ingres2_field_scale, NULL) + PHP_FE(ingres2_fetch_array, NULL) + PHP_FE(ingres2_fetch_row, NULL) + PHP_FE(ingres2_fetch_object, NULL) + PHP_FE(ingres2_rollback, NULL) + PHP_FE(ingres2_commit, NULL) + PHP_FE(ingres2_autocommit, NULL) + PHP_FE(ingres2_conn_errno, NULL) + PHP_FE(ingres2_conn_error, NULL) + PHP_FE(ingres2_conn_errsqlstate, NULL) + PHP_FE(ingres2_stmt_errno, NULL) + PHP_FE(ingres2_stmt_error, NULL) + PHP_FE(ingres2_stmt_errsqlstate, NULL) + PHP_FE(ingres2_prepare, NULL) + PHP_FE(ingres2_execute, NULL) + PHP_FE(ingres2_cursor, NULL) + PHP_FE(ingres2_set_environment, NULL) + PHP_FE(ingres2_fetch_proc_return, NULL) + PHP_FE(ingres2_free_result, NULL) + PHP_FE(ingres2_autocommit_state, NULL) + PHP_FE(ingres2_errno, NULL) + PHP_FE(ingres2_error, NULL) + PHP_FE(ingres2_errsqlstate, NULL) + PHP_FE(ingres2_next_error, NULL) +#else + PHP_FE(ingres_connect, NULL) + PHP_FE(ingres_pconnect, NULL) + PHP_FE(ingres_close, NULL) + PHP_FE(ingres_query, NULL) + PHP_FE(ingres_num_rows, NULL) + PHP_FE(ingres_num_fields, NULL) + PHP_FE(ingres_field_name, NULL) + PHP_FE(ingres_field_type, NULL) + PHP_FE(ingres_field_nullable, NULL) + PHP_FE(ingres_field_length, NULL) + PHP_FE(ingres_field_precision, NULL) + PHP_FE(ingres_field_scale, NULL) + PHP_FE(ingres_fetch_array, NULL) + PHP_FE(ingres_fetch_row, NULL) + PHP_FE(ingres_fetch_object, NULL) + PHP_FE(ingres_rollback, NULL) + PHP_FE(ingres_commit, NULL) + PHP_FE(ingres_autocommit, NULL) + PHP_FE(ingres_conn_errno, NULL) + PHP_FE(ingres_conn_error, NULL) + PHP_FE(ingres_conn_errsqlstate, NULL) + PHP_FE(ingres_stmt_errno, NULL) + PHP_FE(ingres_stmt_error, NULL) + PHP_FE(ingres_stmt_errsqlstate, NULL) + PHP_FE(ingres_prepare, NULL) + PHP_FE(ingres_execute, NULL) + PHP_FE(ingres_cursor, NULL) + PHP_FE(ingres_set_environment, NULL) + PHP_FE(ingres_fetch_proc_return, NULL) + PHP_FE(ingres_free_result, NULL) + PHP_FE(ingres_autocommit_state, NULL) + PHP_FE(ingres_errno, NULL) + PHP_FE(ingres_error, NULL) + PHP_FE(ingres_errsqlstate, NULL) + PHP_FE(ingres_next_error, NULL) +#endif - {NULL, NULL, NULL} /* Must be the last line in ii_functions[] */ + {NULL, NULL, NULL} /* Must be the last line in ingres_functions[] */ }; /* }}} */ zend_module_entry ingres_module_entry = { - STANDARD_MODULE_HEADER, - "ingres", - ii_functions, - PHP_MINIT(ii), - PHP_MSHUTDOWN(ii), - PHP_RINIT(ii), - PHP_RSHUTDOWN(ii), - PHP_MINFO(ii), - II_VERSION, - STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, +#ifdef HAVE_INGRES2 + "ingres2", +#else + "ingres", +#endif + ingres_functions, + PHP_MINIT(ingres), + PHP_MSHUTDOWN(ingres), + PHP_RINIT(ingres), + PHP_RSHUTDOWN(ingres), + PHP_MINFO(ingres), + II_VERSION, + STANDARD_MODULE_PROPERTIES }; +#ifdef HAVE_INGRES2 + +#ifdef COMPILE_DL_INGRES2 +ZEND_GET_MODULE(ingres) +#endif + +#else + #ifdef COMPILE_DL_INGRES ZEND_GET_MODULE(ingres) #endif +#endif + + + #ifndef ZEND_ENGINE_2 -# define OnUpdateLong OnUpdateInt +# define OnUpdateLong OnUpdateInt #endif /* {{{ php.ini entries */ PHP_INI_BEGIN() - STD_PHP_INI_BOOLEAN("ingres.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong, allow_persistent, zend_ii_globals, ii_globals) - STD_PHP_INI_ENTRY_EX("ingres.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_persistent, zend_ii_globals, ii_globals, display_link_numbers) - STD_PHP_INI_ENTRY_EX("ingres.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_ii_globals, ii_globals, display_link_numbers) - STD_PHP_INI_ENTRY("ingres.default_database", NULL, PHP_INI_ALL, OnUpdateString, default_database, zend_ii_globals, ii_globals) - STD_PHP_INI_ENTRY("ingres.default_user", NULL, PHP_INI_ALL, OnUpdateString, default_user, zend_ii_globals, ii_globals) - STD_PHP_INI_ENTRY("ingres.default_password", NULL, PHP_INI_ALL, OnUpdateString, default_password, zend_ii_globals, ii_globals) - STD_PHP_INI_BOOLEAN("ingres.report_db_warnings","1", PHP_INI_ALL, OnUpdateBool, report_db_warnings, zend_ii_globals, ii_globals) - STD_PHP_INI_ENTRY("ingres.cursor_mode", "0", PHP_INI_ALL, OnUpdateLong, cursor_mode, zend_ii_globals, ii_globals) - STD_PHP_INI_ENTRY("ingres.blob_segment_length", "4096", PHP_INI_ALL, OnUpdateLong, blob_segment_length, zend_ii_globals, ii_globals) - STD_PHP_INI_BOOLEAN("ingres.trace_connect", "0", PHP_INI_ALL, OnUpdateLong, trace_connect, zend_ii_globals, ii_globals) - STD_PHP_INI_ENTRY("ingres.timeout", "-1", PHP_INI_ALL, OnUpdateLong, connect_timeout, zend_ii_globals, ii_globals) - STD_PHP_INI_ENTRY("ingres.array_index_start", "1", PHP_INI_ALL, OnUpdateLong, array_index_start, zend_ii_globals, ii_globals) + STD_PHP_INI_BOOLEAN(INGRES_INI_ALLOW_PERSISTENT, "1", PHP_INI_SYSTEM, OnUpdateLong, allow_persistent, zend_ii_globals, ii_globals) + STD_PHP_INI_ENTRY_EX(INGRES_INI_MAX_PERSISTENT, "-1", PHP_INI_SYSTEM, OnUpdateLong, max_persistent, zend_ii_globals, ii_globals, display_link_numbers) + STD_PHP_INI_ENTRY_EX(INGRES_INI_MAX_LINKS, "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_ii_globals, ii_globals, display_link_numbers) + STD_PHP_INI_ENTRY(INGRES_INI_DEFAULT_DATABASE, NULL, PHP_INI_ALL, OnUpdateString, default_database, zend_ii_globals, ii_globals) + STD_PHP_INI_ENTRY(INGRES_INI_DEFAULT_USER, NULL, PHP_INI_ALL, OnUpdateString, default_user, zend_ii_globals, ii_globals) + STD_PHP_INI_ENTRY(INGRES_INI_DEFAULT_PASSWORD, NULL, PHP_INI_ALL, OnUpdateString, default_password, zend_ii_globals, ii_globals) + STD_PHP_INI_BOOLEAN(INGRES_INI_REPORT_DB_WARNINGS,"1", PHP_INI_ALL, OnUpdateBool, report_db_warnings, zend_ii_globals, ii_globals) + STD_PHP_INI_ENTRY(INGRES_INI_CURSOR_MODE, "0", PHP_INI_ALL, OnUpdateLong, cursor_mode, zend_ii_globals, ii_globals) + STD_PHP_INI_ENTRY(INGRES_INI_BLOB_SEGMENT_LENGTH, "4096", PHP_INI_ALL, OnUpdateLong, blob_segment_length, zend_ii_globals, ii_globals) + STD_PHP_INI_BOOLEAN(INGRES_INI_TRACE_CONNECT, "0", PHP_INI_ALL, OnUpdateBool, trace_connect, zend_ii_globals, ii_globals) + STD_PHP_INI_ENTRY(INGRES_INI_TIMEOUT, "-1", PHP_INI_ALL, OnUpdateLong, connect_timeout, zend_ii_globals, ii_globals) + STD_PHP_INI_ENTRY(INGRES_INI_ARRAY_INDEX_START, "1", PHP_INI_ALL, OnUpdateLong, array_index_start, zend_ii_globals, ii_globals) + STD_PHP_INI_BOOLEAN(INGRES_INI_AUTO, "1", PHP_INI_ALL, OnUpdateBool, auto_multi, zend_ii_globals, ii_globals) + STD_PHP_INI_BOOLEAN(INGRES_INI_UTF8, "1", PHP_INI_ALL, OnUpdateBool, utf8, zend_ii_globals, ii_globals) + STD_PHP_INI_BOOLEAN(INGRES_INI_REUSE_CONNECTION, "1", PHP_INI_ALL, OnUpdateBool, reuse_connection, zend_ii_globals, ii_globals) PHP_INI_END() /* }}} */ /* {{{ static int _close_statement(II_LINK *ii_link TSRMLS_DC) */ /* closes statement in given link */ -static int _close_statement(II_LINK *ii_link TSRMLS_DC) +static int _close_statement(II_RESULT *ii_result TSRMLS_DC) { - IIAPI_CLOSEPARM closeParm; + IIAPI_CLOSEPARM closeParm; - closeParm.cl_genParm.gp_callback = NULL; - closeParm.cl_genParm.gp_closure = NULL; - closeParm.cl_stmtHandle = ii_link->stmtHandle; + closeParm.cl_genParm.gp_callback = NULL; + closeParm.cl_genParm.gp_closure = NULL; + closeParm.cl_stmtHandle = ii_result->stmtHandle; - IIapi_close(&closeParm); - ii_sync(&(closeParm.cl_genParm)); + IIapi_close(&closeParm); + ii_sync(&(closeParm.cl_genParm)); - IIG(errorText) = NULL; - - if (ii_success(&(closeParm.cl_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "_close_statement : failed "); - return 1; - } + if (ii_success(&(closeParm.cl_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "_close_statement : failed "); + return 1; + } - ii_link->stmtHandle = NULL; - ii_link->fieldCount = 0; - ii_link->descriptor = NULL; - if ( ii_link->procname != NULL ) - { - free(ii_link->procname); - ii_link->procname = NULL; - - } - if ( ii_link->descriptor != NULL ) - { - free(ii_link->descriptor); - ii_link->descriptor = NULL; - } - if ( ii_link->cursor_id != NULL ) - { - efree(ii_link->cursor_id); - ii_link->cursor_id = NULL; - } + ii_result->stmtHandle = NULL; + ii_result->fieldCount = 0; + ii_result->descriptor = NULL; + if ( ii_result->procname != NULL ) + { + free(ii_result->procname); + ii_result->procname = NULL; + + } + if ( ii_result->descriptor != NULL ) + { + free(ii_result->descriptor); + ii_result->descriptor = NULL; + } + if ( ii_result->cursor_id != NULL ) + { + efree(ii_result->cursor_id); + ii_result->cursor_id = NULL; + } - ii_link->paramCount = 0; + ii_result->paramCount = 0; - return 0; + return 0; } /* }}} */ @@ -168,81 +234,255 @@ /* rolls back transaction in given link after closing the active transaction (if any) */ static int _rollback_transaction(II_LINK *ii_link TSRMLS_DC) { - IIAPI_ROLLBACKPARM rollbackParm; + IIAPI_ROLLBACKPARM rollbackParm; - if (ii_link->stmtHandle && _close_statement(ii_link TSRMLS_CC)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "_rollback_transaction : Unable to close statement"); - return 1; - } + /* clean up any un-freed statements/results */ + _free_ii_link_result_list(ii_link TSRMLS_CC); - rollbackParm.rb_genParm.gp_callback = NULL; - rollbackParm.rb_genParm.gp_closure = NULL; - rollbackParm.rb_tranHandle = ii_link->tranHandle; - rollbackParm.rb_savePointHandle = NULL; + rollbackParm.rb_genParm.gp_callback = NULL; + rollbackParm.rb_genParm.gp_closure = NULL; + rollbackParm.rb_tranHandle = ii_link->tranHandle; + rollbackParm.rb_savePointHandle = NULL; - IIapi_rollback(&rollbackParm); - ii_sync(&(rollbackParm.rb_genParm)); + IIapi_rollback(&rollbackParm); + ii_sync(&(rollbackParm.rb_genParm)); - if (ii_success(&(rollbackParm.rb_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - return 1; - } + switch((rollbackParm.rb_genParm).gp_status) + { + case IIAPI_ST_SUCCESS: + case IIAPI_ST_NO_DATA: + break; + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "_rollback_transaction : Unable to rollback transaction"); + } + + ii_link->tranHandle = NULL; + + return 0; +} +/* }}} */ + +/* {{{ static int _commit_transaction(II_LINK *ii_link TSRMLS_DC) */ +/* commit transaction in given link after closing the active transaction (if any) */ +static int _commit_transaction(II_LINK *ii_link TSRMLS_DC) +{ + IIAPI_COMMITPARM commitParm; + + if ( ii_link->tranHandle != NULL ) + { + commitParm.cm_genParm.gp_callback = NULL; + commitParm.cm_genParm.gp_closure = NULL; + commitParm.cm_tranHandle = ii_link->tranHandle; + + IIapi_commit(&commitParm); + ii_sync(&(commitParm.cm_genParm)); + + if (ii_success(&(commitParm.cm_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + return II_FAIL; + } + + ii_link->tranHandle = NULL; + } + + return II_OK; +} +/* }}} */ + +/* {{{ static int _autocommit_transaction(II_LINK *ii_link TSRMLS_DC) */ +/* rolls back transaction in given link after closing the active transaction (if any) */ +static int _autocommit_transaction(II_LINK *ii_link TSRMLS_DC) +{ + IIAPI_AUTOPARM autoParm; + + if ( !ii_link->result_list_ptr ) + { + + autoParm.ac_genParm.gp_callback = NULL; + autoParm.ac_genParm.gp_closure = NULL; + autoParm.ac_connHandle = ii_link->connHandle; + autoParm.ac_tranHandle = (ii_link->autocommit ? ii_link->tranHandle : NULL ); + + IIapi_autocommit(&autoParm); + ii_sync(&(autoParm.ac_genParm)); + + if (ii_success(&(autoParm.ac_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + if ( ii_link->autocommit ) + { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "_autocommit_transaction : Unable to disable autocommit"); + } + else + { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "_autocommit_transaction : Unable to enable autocommit"); + } + return II_FAIL; + } + + if ( ii_link->autocommit ) + { + ii_link->autocommit = 0; + ii_link->tranHandle = autoParm.ac_tranHandle; + } + else + { + ii_link->autocommit = 1; + ii_link->tranHandle = autoParm.ac_tranHandle; + } - ii_link->tranHandle = NULL; - return 0; + return II_OK; + } + else + { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unable to change the auto-commit state with active result-sets."); + return II_FAIL; + } } /* }}} */ /* {{{ static void _close_ii_link(II_LINK *ii_link TSRMLS_DC) */ static void _close_ii_link(II_LINK *ii_link TSRMLS_DC) { - IIAPI_AUTOPARM autoParm; - IIAPI_DISCONNPARM disconnParm; + IIAPI_DISCONNPARM disconnParm; + IIAPI_AUTOPARM autoParm; + IIAPI_GETEINFOPARM error_info; - if (ii_link->tranHandle && _rollback_transaction(ii_link TSRMLS_CC)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to rollback transaction"); - } + /* clean up any un-freed statements/results */ + _free_ii_link_result_list(ii_link TSRMLS_CC); - /* Disable autocommit if enabled */ - if ( ii_link->autocommit ) - { - autoParm.ac_genParm.gp_callback = NULL; - autoParm.ac_genParm.gp_closure = NULL; - autoParm.ac_connHandle = ii_link->connHandle; - autoParm.ac_tranHandle = ii_link->tranHandle; - - IIapi_autocommit(&autoParm); - ii_sync(&(autoParm.ac_genParm)); - - if (ii_success(&(autoParm.ac_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to disable autocommit"); - } + /* if in auto-commit emulation mode we should commit any outstanding transactions */ + if (ii_link->auto_multi) + { + /* commit the previous statement before changing the auto-commit state */ + if (_commit_transaction(ii_link TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "An error occur when issuing an internal commit"); + } + } - ii_link->autocommit = 0; - ii_link->tranHandle = NULL; - } + /* Disable auto-commit if enabled */ + if ( ii_link->autocommit ) + { + if (_autocommit_transaction(ii_link TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "_close_ii_link : An error occurred when changing the auto-commit state"); + } + } - disconnParm.dc_genParm.gp_callback = NULL; - disconnParm.dc_genParm.gp_closure = NULL; - disconnParm.dc_connHandle = ii_link->connHandle; + if (ii_link->tranHandle && _rollback_transaction(ii_link TSRMLS_CC)) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "_close_ii_link : Unable to rollback transaction"); + } - IIapi_disconnect(&disconnParm); - ii_sync(&(disconnParm.dc_genParm)); + disconnParm.dc_genParm.gp_callback = NULL; + disconnParm.dc_genParm.gp_closure = NULL; + disconnParm.dc_connHandle = ii_link->connHandle; - if (ii_success(&(disconnParm.dc_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to close link"); - } + IIapi_disconnect(&disconnParm); + ii_sync(&(disconnParm.dc_genParm)); - free(ii_link); + switch((disconnParm.dc_genParm).gp_status) + { + case IIAPI_ST_SUCCESS: + case IIAPI_ST_NO_DATA: + ii_link->stmtHandle = NULL; + break; + default: + error_info.ge_errorHandle = (disconnParm.dc_genParm).gp_errorHandle; + IIapi_getErrorInfo(&error_info); + if (error_info.ge_status == IIAPI_ST_SUCCESS) + { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "_close_ii_link : %d - %s", error_info.ge_errorCode, error_info.ge_message); + } + else + { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "_close_ii_link : Unable to close link"); + } + php_error_docref(NULL TSRMLS_CC, E_WARNING, "_close_ii_link : Unable to close statement"); + } + + free(ii_link); + + IIG(num_links)--; - IIG(num_links)--; } +/* }}} */ + +/* {{{ static void _free_ii_link_result_list (II_LINK *ii_link TSRMLS_DC) */ +static void _free_ii_link_result_list (II_LINK *ii_link TSRMLS_DC) +{ + IIAPI_CANCELPARM cancelParm; + IIAPI_CLOSEPARM closeParm; + + II_RESULT *ii_result = NULL; + ii_result_entry *result_entry = NULL; + int type; + + /* clean up any un-freed statements/results */ + + while ( ii_link->result_list_ptr ) + { + ii_result = (II_RESULT *)zend_list_find(ii_link->result_list_ptr->result_id, &type); + + if ( ii_result ) + { + _close_ii_result (ii_result TSRMLS_CC); + } + zend_list_delete(ii_link->result_list_ptr->result_id); + + result_entry = ii_link->result_list_ptr; + ii_link->result_list_ptr = (ii_result_entry *)ii_link->result_list_ptr->next_result_ptr; + + /* free memory associated with the top entry in the list */ + free(result_entry); + free(ii_result); + } + + /* if there are no result resources created it is possible the last query generated an error + for which there will still be an active transaction that needs to be closed */ + + if ( ii_link->stmtHandle != NULL ) + { + /* Cancel query processing. */ + cancelParm.cn_genParm.gp_callback = NULL; + cancelParm.cn_genParm.gp_closure = NULL; + cancelParm.cn_stmtHandle = ii_link->stmtHandle; + + IIapi_cancel(&cancelParm ); + + ii_sync(&(cancelParm.cn_genParm)); + + /* Free query resources. */ + closeParm.cl_genParm.gp_callback = NULL; + closeParm.cl_genParm.gp_closure = NULL; + closeParm.cl_stmtHandle = ii_link->stmtHandle; + IIapi_close( &closeParm ); + + ii_sync(&(closeParm.cl_genParm)); + + switch((closeParm.cl_genParm).gp_status) + { + case IIAPI_ST_SUCCESS: + case IIAPI_ST_NO_DATA: + ii_link->stmtHandle = NULL; + break; + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "_close_ii_link : Unable to close statement"); + } + + + /* + if (ii_success(&(closeParm.cl_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "_close_ii_link : Unable to close statement"); + } else { + ii_link->stmtHandle = NULL; + } + */ + } +} /* }}} */ /* {{{ static void php_close_ii_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) @@ -251,9 +491,72 @@ */ static void php_close_ii_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { - II_LINK *ii_link = (II_LINK *) rsrc->ptr; + II_LINK *ii_link = (II_LINK *) rsrc->ptr; + + _close_ii_link(ii_link TSRMLS_CC); +} +/* }}} */ + +/* {{{ static void _close_ii_result(II_LINK *ii_result TSRMLS_DC) */ +static int _close_ii_result(II_RESULT *ii_result TSRMLS_DC) +{ + IIAPI_CANCELPARM cancelParm; + IIAPI_CLOSEPARM closeParm; + IIAPI_GETEINFOPARM error_info; + + if (ii_result->stmtHandle) + { + /* see if we can close the query without cancelling it */ + /* Free query resources. */ + closeParm.cl_genParm.gp_callback = NULL; + closeParm.cl_genParm.gp_closure = NULL; + closeParm.cl_stmtHandle = ii_result->stmtHandle; + + IIapi_close( &closeParm ); + + ii_sync(&(closeParm.cl_genParm)); + + if (ii_success(&(closeParm.cl_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + /* unable to close */ + /* Cancel query processing. */ + cancelParm.cn_genParm.gp_callback = NULL; + cancelParm.cn_genParm.gp_closure = NULL; + cancelParm.cn_stmtHandle = ii_result->stmtHandle; + + IIapi_cancel(&cancelParm ); + + ii_sync(&(cancelParm.cn_genParm)); + + /* Free query resources. */ + closeParm.cl_genParm.gp_callback = NULL; + closeParm.cl_genParm.gp_closure = NULL; + closeParm.cl_stmtHandle = ii_result->stmtHandle; + + IIapi_close( &closeParm ); + + ii_sync(&(closeParm.cl_genParm)); + + if (ii_success(&(closeParm.cl_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "_close_ii_result : Unable to close statement"); + return II_FAIL; + } + } + } + ii_result->stmtHandle = NULL; + return II_OK; +} +/* }}} */ + +/* {{{ static void php_close_ii_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) + * closes the given result +*/ +static void php_close_ii_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) +{ + II_RESULT *ii_result = (II_RESULT *) rsrc->ptr; - _close_ii_link(ii_link TSRMLS_CC); + _close_ii_result(ii_result TSRMLS_CC); } /* }}} */ @@ -261,10 +564,10 @@ /* closes the given persistent link, see _close_ii_link */ static void _close_ii_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { - II_LINK *ii_link = (II_LINK *) rsrc->ptr; + II_LINK *ii_link = (II_LINK *) rsrc->ptr; - _close_ii_link(ii_link TSRMLS_CC); - IIG(num_persistent)--; + _close_ii_link(ii_link TSRMLS_CC); + IIG(num_persistent)--; } /* }}} */ @@ -273,112 +576,91 @@ /* by the next request */ static void _ai_clean_ii_plink(II_LINK *ii_link TSRMLS_DC) { - int ai_error = 0; - IIAPI_DISCONNPARM disconnParm; - IIAPI_AUTOPARM autoParm; - - /* if link as always been marked as broken do nothing */ - /* This because we call this function directly from close function */ - /* And it's called in the end of request */ - if (ii_link->connHandle == NULL) - { - return; - } - - if (ii_link->stmtHandle && _close_statement(ii_link TSRMLS_CC)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "_ai_clean_ii_plink : Unable to close statement"); - ai_error = 1; - } - - if (ii_link->autocommit) - { - autoParm.ac_genParm.gp_callback = NULL; - autoParm.ac_genParm.gp_closure = NULL; - autoParm.ac_connHandle = ii_link->connHandle; - autoParm.ac_tranHandle = ii_link->tranHandle; - - IIapi_autocommit(&autoParm); - ii_sync(&(autoParm.ac_genParm)); - - if (ii_success(&(autoParm.ac_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to disable autocommit"); - } + int ai_error = 0; + IIAPI_DISCONNPARM disconnParm; + IIAPI_AUTOPARM autoParm; + + II_RESULT *ii_result = NULL; + ii_result_entry *result_entry = NULL; + int type; + + /* if link as always been marked as broken do nothing */ + /* This because we call this function directly from close function */ + /* And it's called in the end of request */ + if (ii_link->connHandle == NULL) + { + return; + } - ii_link->autocommit = 0; - ii_link->tranHandle = NULL; - } + /* clean up any un-freed statements/results */ + _free_ii_link_result_list(ii_link TSRMLS_CC); - if (ii_link->tranHandle && _rollback_transaction(ii_link TSRMLS_CC)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to rollback transaction"); - } + /* if in auto-commit emulation mode we should commit any outstanding transactions */ + if (ii_link->auto_multi) + { + /* commit the previous statement before changing the auto-commit state */ + if (_commit_transaction(ii_link TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "An error occur when issuing an internal commit"); + } + } + /* auto-commit must before before disconnection */ + if (ii_link->autocommit) + { + if (_autocommit_transaction(ii_link TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "_ai_clean_ii_plink : An error occur when changing the auto-commit state"); + } + } - /* Assume link is broken, close it, and mark it as broken with conn Handle NULL */ - if (ai_error) - { - disconnParm.dc_genParm.gp_callback = NULL; - disconnParm.dc_genParm.gp_closure = NULL; - disconnParm.dc_connHandle = ii_link->connHandle; - - IIapi_disconnect(&disconnParm); - ii_link->connHandle = NULL; - } - if (ii_link->errorText != NULL ) - { - free(ii_link->errorText); - ii_link->errorText = NULL; - } -} -/* }}} */ + if (ii_link->tranHandle && _rollback_transaction(ii_link TSRMLS_CC)) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "_ai_clean_ii_plink : Unable to rollback transaction"); + } -/* {{{ static void _clean_ii_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) */ -static void _clean_ii_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) -{ - II_LINK *ii_link; - ii_link = (II_LINK *)rsrc->ptr; - _ai_clean_ii_plink(ii_link TSRMLS_CC); -} -/* }}} */ + /* Assume link is broken, close it, and mark it as broken with conn Handle NULL */ + if (ai_error) + { + disconnParm.dc_genParm.gp_callback = NULL; + disconnParm.dc_genParm.gp_closure = NULL; + disconnParm.dc_connHandle = ii_link->connHandle; + + IIapi_disconnect(&disconnParm); + ii_link->connHandle = NULL; + } + + if (IIG(error_text) != NULL ) + { + efree(IIG(error_text)); + IIG(error_text) = NULL; + } -/* {{{ static void php_ii_set_default_link(int id TSRMLS_DC) */ -/* sets the default link */ -static void php_ii_set_default_link(int id TSRMLS_DC) -{ - if (IIG(default_link) != -1) - { - zend_list_delete(IIG(default_link)); - } - IIG(default_link) = id; - zend_list_addref(id); } /* }}} */ -/* {{{ static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS) - * gets the default link if none has been set, tries to open a new one with default parameters -*/ -static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS) +/* {{{ static void _clean_ii_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) */ +static void _clean_ii_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { - if (IIG(default_link) == -1) - { /* no link opened yet, implicitly open one */ - ht = 0; - php_ii_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); - } - return IIG(default_link); + II_LINK *ii_link; + ii_link = (II_LINK *)rsrc->ptr; + _ai_clean_ii_plink(ii_link TSRMLS_CC); } /* }}} */ /* {{{ static void php_ii_globals_init(zend_ii_globals *ii_globals) */ static void php_ii_globals_init(zend_ii_globals *ii_globals) { - IIAPI_INITPARM initParm; + IIAPI_INITPARM initParm; - /* Ingres api initialization */ - /* timeout in ms, -1, (default) = no timeout */ - initParm.in_timeout = ii_globals->connect_timeout; - -#if defined(IIAPI_VERSION_4) + /* Ingres api initialization */ + /* timeout in ms, -1, (default) = no timeout */ + initParm.in_timeout = -1; + +#if defined(IIAPI_VERSION_6) + initParm.in_version = IIAPI_VERSION_6; +#elif defined(IIAPI_VERSION_5) + initParm.in_version = IIAPI_VERSION_5; +#elif defined(IIAPI_VERSION_4) initParm.in_version = IIAPI_VERSION_4; #elif defined(IIAPI_VERSION_3) initParm.in_version = IIAPI_VERSION_3; @@ -388,161 +670,175 @@ initParm.in_version = IIAPI_VERSION_1; #endif - IIapi_initialize(&initParm); + IIapi_initialize(&initParm); -#ifdef IIAPI_VERSION_2 - if ( initParm.in_envHandle != NULL ) - { - ii_globals->envHandle = initParm.in_envHandle; - } +#if defined(IIAPI_VERSION_2) + if ( initParm.in_envHandle != NULL ) + { + ii_globals->envHandle = initParm.in_envHandle; + } #else - ii_globals->envHandle = NULL; + ii_globals->envHandle = NULL; #endif - ii_globals->num_persistent = 0; - ii_globals->errorText = NULL; + ii_globals->num_persistent = 0; + ii_globals->auto_multi = 1; + ii_globals->trace_connect = 0; + ii_globals->array_index_start = 1; + ii_globals->error_text = NULL; + ii_globals->error_number = 0; + ii_globals->reuse_connection = 1; } /* }}} */ /* {{{ static void php_ii_globals_shutdown(zend_ii_globals *ii_globals) */ static void php_ii_globals_shutdown(zend_ii_globals *ii_globals) { - IIAPI_TERMPARM termParm; - IIAPI_RELENVPARM relEnvParm; - - -#ifdef IIAPI_VERSION_2 - relEnvParm.re_envHandle = ii_globals->envHandle; - IIapi_releaseEnv( &relEnvParm ); -#endif - /* Ingres api termination */ - IIapi_terminate(&termParm); -/* if (termParm.tm_status == IIAPI_ST_SUCCESS) - { - return SUCCESS; - } else { - return FAILURE; - - } -*/ - - } /* }}} */ /* {{{ Module initialization */ -PHP_MINIT_FUNCTION(ii) +PHP_MINIT_FUNCTION(ingres) { - /* Sanity check */ - /* prevent module from loading if environment is not properly setup */ - if ( getenv("II_SYSTEM") != NULL ) - { - - ZEND_INIT_MODULE_GLOBALS(ii, php_ii_globals_init, php_ii_globals_shutdown); - REGISTER_INI_ENTRIES(); - - le_ii_link = zend_register_list_destructors_ex(php_close_ii_link, NULL, "ingres", module_number); - le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, _close_ii_plink, "ingres persistent", module_number); - - /* Constants registration */ - REGISTER_LONG_CONSTANT("INGRES_ASSOC", II_ASSOC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_NUM", II_NUM, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_BOTH", II_BOTH, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_EXT_VERSION", II_VERSION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_API_VERSION", IIAPI_VERSION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_CURSOR_READONLY", II_CURSOR_READONLY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_CURSOR_UPDATE", II_CURSOR_UPDATE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_US", II_DATE_US, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL", II_DATE_MULTINATIONAL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL4", II_DATE_MULTINATIONAL4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_FINNISH", II_DATE_FINNISH, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_ISO", II_DATE_ISO, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_ISO4", II_DATE_ISO4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_GERMAN", II_DATE_GERMAN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_MDY", II_DATE_MDY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_DMY", II_DATE_DMY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_YMD", II_DATE_YMD, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_MONEY_LEADING", II_MONEY_LEAD_SIGN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_MONEY_TRAILING", II_MONEY_TRAIL_SIGN, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_ISAM", II_STRUCTURE_ISAM, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CISAM", II_STRUCTURE_CISAM, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_BTREE", II_STRUCTURE_BTREE, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CTREE", II_STRUCTURE_CBTREE, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HASH", II_STRUCTURE_HASH, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHASH", II_STRUCTURE_CHASH, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HEAP", II_STRUCTURE_HEAP, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHEAP", II_STRUCTURE_CHEAP, CONST_CS | CONST_PERSISTENT); - - return SUCCESS; - } - else - { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "II_SYSTEM is not defined" ); - return FAILURE; - } + ZEND_INIT_MODULE_GLOBALS(ii, php_ii_globals_init, php_ii_globals_shutdown); + REGISTER_INI_ENTRIES(); + + le_ii_result = zend_register_list_destructors_ex(php_close_ii_result, NULL, "ingres result", module_number); + le_ii_link = zend_register_list_destructors_ex(php_close_ii_link, NULL, "ingres connection", module_number); + le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, _close_ii_plink, "ingres persistent connection", module_number); + + /* Constants registration */ +#ifndef HAVE_INGRES2 + REGISTER_LONG_CONSTANT("INGRES_ASSOC", II_ASSOC, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_NUM", II_NUM, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_BOTH", II_BOTH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_EXT_VERSION", II_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_API_VERSION", IIAPI_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_CURSOR_READONLY", II_CURSOR_READONLY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_CURSOR_UPDATE", II_CURSOR_UPDATE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_US", II_DATE_US, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL", II_DATE_MULTINATIONAL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL4",II_DATE_MULTINATIONAL4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_FINNISH", II_DATE_FINNISH, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_ISO", II_DATE_ISO, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_ISO4", II_DATE_ISO4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_GERMAN", II_DATE_GERMAN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_MDY", II_DATE_MDY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_DMY", II_DATE_DMY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_YMD", II_DATE_YMD, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_MONEY_LEADING", II_MONEY_LEAD_SIGN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_MONEY_TRAILING", II_MONEY_TRAIL_SIGN, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_ISAM", II_STRUCTURE_ISAM, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CISAM", II_STRUCTURE_CISAM, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_BTREE", II_STRUCTURE_BTREE, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CTREE", II_STRUCTURE_CBTREE, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HASH", II_STRUCTURE_HASH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHASH", II_STRUCTURE_CHASH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HEAP", II_STRUCTURE_HEAP, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHEAP", II_STRUCTURE_CHEAP, CONST_CS | CONST_PERSISTENT); +#else + REGISTER_LONG_CONSTANT("INGRES2_ASSOC", II_ASSOC, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_NUM", II_NUM, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_BOTH", II_BOTH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES2_EXT_VERSION", II_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_API_VERSION", IIAPI_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_CURSOR_READONLY", II_CURSOR_READONLY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_CURSOR_UPDATE", II_CURSOR_UPDATE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_DATE_US", II_DATE_US, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_DATE_MULTINATIONAL", II_DATE_MULTINATIONAL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_DATE_MULTINATIONAL4",II_DATE_MULTINATIONAL4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_DATE_FINNISH", II_DATE_FINNISH, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_DATE_ISO", II_DATE_ISO, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_DATE_ISO4", II_DATE_ISO4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_DATE_GERMAN", II_DATE_GERMAN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_DATE_MDY", II_DATE_MDY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_DATE_DMY", II_DATE_DMY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_DATE_YMD", II_DATE_YMD, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_MONEY_LEADING", II_MONEY_LEAD_SIGN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES2_MONEY_TRAILING", II_MONEY_TRAIL_SIGN, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES2_STRUCTURE_ISAM", II_STRUCTURE_ISAM, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES2_STRUCTURE_CISAM", II_STRUCTURE_CISAM, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES2_STRUCTURE_BTREE", II_STRUCTURE_BTREE, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES2_STRUCTURE_CTREE", II_STRUCTURE_CBTREE, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES2_STRUCTURE_HASH", II_STRUCTURE_HASH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES2_STRUCTURE_CHASH", II_STRUCTURE_CHASH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES2_STRUCTURE_HEAP", II_STRUCTURE_HEAP, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES2_STRUCTURE_CHEAP", II_STRUCTURE_CHEAP, CONST_CS | CONST_PERSISTENT); +#endif + + + return SUCCESS; } /* }}} */ /* {{{ Module shutdown */ -PHP_MSHUTDOWN_FUNCTION(ii) +PHP_MSHUTDOWN_FUNCTION(ingres) { + IIAPI_TERMPARM termParm; + IIAPI_RELENVPARM relEnvParm; +#if defined(IIAPI_VERSION_2) + relEnvParm.re_envHandle = IIG(envHandle); + IIapi_releaseEnv(&relEnvParm); +#endif + /* Ingres api termination */ + IIapi_terminate(&termParm); #ifdef ZTS - - ts_free_id(ii_globals_id); - + ts_free_id(ii_globals_id); #endif - UNREGISTER_INI_ENTRIES(); - - return SUCCESS; - + UNREGISTER_INI_ENTRIES(); + if (termParm.tm_status == IIAPI_ST_SUCCESS) + { + return SUCCESS; + } + else + { + return FAILURE; + } } /* }}} */ /* {{{ New request initialization */ -PHP_RINIT_FUNCTION(ii) +PHP_RINIT_FUNCTION(ingres) { + IIG(num_links) = IIG(num_persistent); + IIG(cursor_no) = 0; - IIG(default_link) = -1; - IIG(num_links) = IIG(num_persistent); - IIG(cursor_no) = 0; - - - return SUCCESS; + return SUCCESS; } /* }}} */ /* {{{ End of request */ -PHP_RSHUTDOWN_FUNCTION(ii) +PHP_RSHUTDOWN_FUNCTION(ingres) { - return SUCCESS; + return SUCCESS; } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION(ii) +/* {{{ PHP_MINFO_FUNCTION(ingres) * Information reported to phpinfo() */ -PHP_MINFO_FUNCTION(ii) +PHP_MINFO_FUNCTION(ingres) { - char buf[32]; + char buf[32]; - php_info_print_table_start(); - php_info_print_table_header(2, "Ingres Support", "enabled"); - php_info_print_table_row(2, "Ingres Extension Version", II_VERSION); - php_info_print_table_row(2, "Revision", "$Revision: 1.95 $"); - sprintf(buf, "%ld", IIAPI_VERSION ); - php_info_print_table_row(2, "Ingres OpenAPI Version", buf); - sprintf(buf, "%ld", IIG(num_persistent)); - php_info_print_table_row(2, "Active Persistent Links", buf); - sprintf(buf, "%ld", IIG(num_links)); - php_info_print_table_row(2, "Active Links", buf); - php_info_print_table_end(); + php_info_print_table_start(); + php_info_print_table_header(2, "Ingres Support", "enabled"); + php_info_print_table_row(2, "Ingres Extension Version", II_VERSION); + php_info_print_table_row(2, "Revision", "$Revision: 1.96 $"); + sprintf(buf, "%ld", IIAPI_VERSION ); + php_info_print_table_row(2, "Ingres OpenAPI Version", buf); + sprintf(buf, "%ld", IIG(num_persistent)); + php_info_print_table_row(2, "Active Persistent Links", buf); + sprintf(buf, "%ld", IIG(num_links)); + php_info_print_table_row(2, "Active Links", buf); + php_info_print_table_end(); - DISPLAY_INI_ENTRIES(); + DISPLAY_INI_ENTRIES(); } /* }}} */ @@ -551,751 +847,653 @@ */ static int ii_sync(IIAPI_GENPARM *genParm) { - static IIAPI_WAITPARM waitParm = { - -1, /* no timeout, we don't want asynchronous queries */ - 0 /* wt_status (output) */ - }; + static IIAPI_WAITPARM waitParm = { + -1, /* no timeout, we don't want asynchronous queries */ + 0 /* wt_status (output) */ + }; - while (genParm->gp_completed == FALSE) - { - IIapi_wait(&waitParm); - } + while (genParm->gp_completed == FALSE) + { + IIapi_wait(&waitParm); + } - if (waitParm.wt_status != IIAPI_ST_SUCCESS) - { - TSRMLS_FETCH(); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected failure of IIapi_wait()"); - return 0; - } - return 1; + if (waitParm.wt_status != IIAPI_ST_SUCCESS) + { + TSRMLS_FETCH(); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected failure of IIapi_wait()"); + return 0; + } + return 1; } /* }}} */ -/* {{{ static int ii_success(IIAPI_GENPARM *genParm, II_LINK *ii_link TSRMLS_DC) - * Handles and stores errors for later retrieval from Ingres api +/* {{{ static int ii_success(IIAPI_GENPARM *genParm, II_PTR *errorHandle TSRMLS_DC) + * Handles and stores errors for later retrieval */ -static int ii_success(IIAPI_GENPARM *genParm, II_LINK *ii_link TSRMLS_DC) +static int ii_success(IIAPI_GENPARM *genParm, II_PTR *errorHandle TSRMLS_DC) { - IIAPI_GETEINFOPARM error_info; + IIAPI_GETEINFOPARM error_info; - /* Initialise global variables */ - IIG(errorCode) = 0; - sprintf(IIG(sqlstate),"\0\0\0\0\0\0"); - if ( IIG(errorText) != NULL) + /* Initialise global variables */ + IIG(errorHandle) = NULL; + IIG(error_number) = 0; + if (IIG(error_text) != NULL) { - efree(IIG(errorText)); - IIG(errorText) = NULL; + efree(IIG(error_text)); + IIG(error_text) = NULL; } - /* Initialise link */ - if (ii_link->connHandle != NULL) - { - ii_link->errorCode = 0; - sprintf(ii_link->sqlstate,"\0\0\0\0\0\0"); - if ( ii_link->errorText != NULL) - { - free(ii_link->errorText); - ii_link->errorText=NULL; - } - } + switch (genParm->gp_status) + { + case IIAPI_ST_SUCCESS: + return II_OK; + + case IIAPI_ST_NO_DATA: + return II_NO_DATA; - switch (genParm->gp_status) - { - - case IIAPI_ST_SUCCESS: - return II_OK; - - case IIAPI_ST_NO_DATA: - return II_NO_DATA; - - default: - if (genParm->gp_errorHandle == NULL) - { /* no error message available */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Server or API error - no error message available"); - } else { - error_info.ge_errorHandle = genParm->gp_errorHandle; - IIapi_getErrorInfo(&error_info); - - switch (error_info.ge_status) - { - case IIAPI_ST_SUCCESS: - /* load error information into globals */ - IIG(errorCode) = error_info.ge_errorCode; - memcpy(IIG(sqlstate),error_info.ge_SQLSTATE,strlen(error_info.ge_SQLSTATE)); - IIG(errorText) = estrdup(error_info.ge_message); - - /* load error information into the passed link - */ - if (ii_link->connHandle != NULL) - { - ii_link->errorCode = error_info.ge_errorCode; - memcpy (ii_link->sqlstate ,error_info.ge_SQLSTATE,strlen(error_info.ge_SQLSTATE)); - ii_link->errorText=strdup(error_info.ge_message); - } - if (IIG(report_db_warnings)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ingres error : %ld : %s",IIG(errorCode), IIG(errorText)); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ingres SQLSTATE : %s", IIG(sqlstate)); - } - break; - default: /* An error occured with IIapi_getErrorInfo() */ - php_error_docref(NULL TSRMLS_CC, E_ERROR, "IIapi_getErrorInfo error, status returned was : %d", error_info.ge_status ); - break; - } - } - return II_FAIL; - } + default: + if (genParm->gp_errorHandle == NULL) + { + /* no error message available */ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "ii_success : Server or API error - no error message available, status %d", genParm->gp_status); + } + else + { + error_info.ge_errorHandle = genParm->gp_errorHandle; + IIapi_getErrorInfo(&error_info); + + switch (error_info.ge_status) + { + case IIAPI_ST_SUCCESS: + case IIAPI_ST_NO_DATA: + IIG(error_number) = error_info.ge_errorCode; + IIG(error_text) = estrdup(error_info.ge_message); + memcpy(IIG(error_sqlstate), error_info.ge_SQLSTATE, II_SQLSTATE_LEN + 1); + + break; + default: /* An error occured with IIapi_getErrorInfo() */ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "IIapi_getErrorInfo error, status returned was : %d", error_info.ge_status ); + break; + } + IIG(errorHandle) = genParm->gp_errorHandle; + } + return II_FAIL; + } } /* }}} */ +/* {{{ static void _ii_init_link ( II_LINK *ii_link ) + * + */ +static void _ii_init_link (INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link ) +{ + ii_link->envHandle = IIG(envHandle); + if ( ii_link->envHandle != NULL ) + { + ii_link->connHandle = ii_link->envHandle; + } + else + { + ii_link->connHandle = NULL; + } + ii_link->tranHandle = NULL; + ii_link->stmtHandle = NULL; + ii_link->autocommit = 0; + ii_link->errorHandle = NULL; + ii_link->result_list_ptr = NULL; + ii_link->auto_multi = 0; +} +/* }}} */ + +/* {{{ static void _ii_init_result ( II_RESULT *ii_result, II_LINK *ii_link ) + * + */ +static void _ii_init_result (INTERNAL_FUNCTION_PARAMETERS, II_RESULT *ii_result, II_LINK *ii_link ) +{ + ii_result->stmtHandle = ii_link->stmtHandle; + ii_result->connHandle = ii_link->connHandle; + ii_result->tranHandle = ii_link->tranHandle; + ii_result->fieldCount = 0; + ii_result->descriptor = NULL; + ii_result->paramCount = 0 ; + ii_result->cursor_id = NULL; + ii_result->procname = NULL; + ii_result->cursor_mode = -1; + ii_result->errorHandle = NULL; +#if defined(IIAPI_VERSION_6) + ii_result->scrollable = 0; +#endif + ii_result->link_id = -1; +} +/* }}} */ + /* {{{ static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) * Actually handles connection creation, either persistent or not */ static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { - zval **database, **username, **password, **options; - char *db, *user, *pass; - int argc, dblen; - char *hashed_details; - int hashed_details_length; - IIAPI_CONNPARM connParm; - II_LINK *ii_link; - II_PTR envHandle = (II_PTR)NULL; - char *z_type; - -#ifdef IIAPI_VERSION_2 - IIAPI_SETENVPRMPARM setEnvPrmParm; - long temp_long; + char *database = NULL; + char *username = NULL; + char *password = NULL; + int database_len = 0; + int username_len = 0; + int password_len = 0; + zval *options = NULL; + char *db, *user, *pass; + int dblen; + char *hashed_details; + int hashed_details_length; + IIAPI_CONNPARM connParm; + II_LINK *ii_link; + II_PTR envHandle = (II_PTR)NULL; + char *z_type; + +#if defined(IIAPI_VERSION_2) + IIAPI_SETENVPRMPARM setEnvPrmParm; + long temp_long; #endif + if ( getenv("II_SYSTEM") == NULL ) + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "II_SYSTEM is not defined - unable to connect" ); + RETURN_FALSE; + } - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Enter php_ii_do_connect"); - } + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Enter php_ii_do_connect"); + } - /* Setting db, user and pass according to sql_safe_mode, parameters and/or default values */ - argc = ZEND_NUM_ARGS(); + /* Setting db, user and pass according to sql_safe_mode, parameters and/or default values */ + if (PG(sql_safe_mode)) + { /* sql_safe_mode */ - if (PG(sql_safe_mode)) - { /* sql_safe_mode */ + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "SQL safe mode in effect"); + } - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "SQL safe mode in effect"); - } - - if (argc > 0) - { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "SQL safe mode in effect - ignoring host/user/password/option information"); - } - - db = NULL; - pass = NULL; - user = php_get_current_user(); - hashed_details_length = strlen(user) + sizeof("ingres___") - 1; - hashed_details = (char *) emalloc(hashed_details_length + 1); - sprintf(hashed_details, "Ingres__%s_", user); - - } else { /* non-sql_safe_mode */ - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "SQL safe mode not in effect"); - } - db = IIG(default_database); - user = IIG(default_user); - pass = IIG(default_password); - - if (argc > 4 || zend_get_parameters_ex(argc, &database, &username, &password, &options) == FAILURE) - { - WRONG_PARAM_COUNT; - } - - switch (argc) - { - case 4: - if ( Z_TYPE_PP(options) != IS_ARRAY ) - { - switch (Z_TYPE_PP(options)) - { - case IS_STRING: - z_type = emalloc(9); - sprintf(z_type,"a STRING"); - break; - case IS_LONG: - z_type = emalloc(7); - sprintf (z_type,"a LONG"); - break; - case IS_DOUBLE: - z_type = emalloc(9); - sprintf (z_type,"a DOUBLE"); - break; - case IS_RESOURCE: - z_type = emalloc(11); - sprintf (z_type,"a RESOURCE"); - break; - case IS_OBJECT: - z_type = emalloc(10); - sprintf (z_type,"an OBJECT"); - break; - case IS_NULL: - z_type = emalloc(7); - sprintf (z_type,"a NULL"); - break; - default: - z_type = emalloc(16); - sprintf (z_type,"an UNKNOWN type"); - break; - } - - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected an array of connect options but got %s instead.", z_type ); - efree(z_type); - RETURN_FALSE; - } - /* Fall-through. */ - case 3: - convert_to_string_ex(password); - pass = Z_STRVAL_PP(password); - /* Fall-through. */ - - case 2: - convert_to_string_ex(username); - user = Z_STRVAL_PP(username); - /* Fall-through. */ - - case 1: - convert_to_string_ex(database); - db = Z_STRVAL_PP(database); - /* Fall-through. */ - - case 0: - break; - } - - /* Perform Sanity Check. If no database has been set then we have a problem */ - if ( db != NULL ) { - dblen = strlen(db); - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "No default database available to connect to" ); - RETURN_FALSE; - } - if ( dblen == 0 ) - { - } - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Connecting to %s as %s", db, user); - } - - hashed_details_length = sizeof("ingres___") - 1 + - strlen(SAFE_STRING(db)) + - strlen(SAFE_STRING(user)) + - strlen(SAFE_STRING(pass)); - - hashed_details = (char *) emalloc(hashed_details_length + 1); - sprintf(hashed_details, "Ingres_%s_%s_%s", - SAFE_STRING(db), - SAFE_STRING(user), - SAFE_STRING(pass)); - } + if (ZEND_NUM_ARGS() > 0) + { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "SQL safe mode in effect - ignoring host/user/password/option information"); + } - /* if asked for unauthorized persistency, issue a warning - and go for a non-persistent link */ - if (persistent && !IIG(allow_persistent)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Persistent links disabled !"); - persistent = 0; - } + db = NULL; + pass = NULL; + user = php_get_current_user(); + hashed_details_length = strlen(user) + sizeof("ingres___") - 1; + hashed_details = (char *) emalloc(hashed_details_length + 1); + sprintf(hashed_details, "Ingres__%s_", user); + + } + else + { /* non-sql_safe_mode */ + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "SQL safe mode not in effect"); + } + db = IIG(default_database); + user = IIG(default_user); + pass = IIG(default_password); - if (persistent) - { - list_entry *le; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"s|ssa", &database, &database_len, &username, &username_len, &password, &password_len, &options) == FAILURE) + { + RETURN_NULL(); + } - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Enter persistent connection"); - } - - /* is this link already in the persistent list ? */ - if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_details_length + 1, (void **) &le) == FAILURE) - { /* no, new persistent connection */ - - list_entry new_le; - - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "creating new persistent connection"); - } - - if (IIG(max_links) != -1 && IIG(num_links) >= IIG(max_links)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", IIG(num_links)); - efree(hashed_details); - RETURN_FALSE; - } - if (IIG(max_persistent) != -1 && IIG(num_persistent) >= IIG(max_persistent)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%d)", IIG(num_persistent)); - efree(hashed_details); - RETURN_FALSE; - } - - /* setup the link */ - ii_link = (II_LINK *) malloc(sizeof(II_LINK)); - ii_link->envHandle = IIG(envHandle); - if ( ii_link->envHandle != NULL ) - { - ii_link->connHandle = ii_link->envHandle; - } - else - { - ii_link->connHandle = NULL; - } - ii_link->tranHandle = NULL; - ii_link->stmtHandle = NULL; - ii_link->fieldCount = 0; - ii_link->descriptor = NULL; - ii_link->autocommit = 0; - ii_link->errorCode = 0; - ii_link->errorText = NULL; - ii_link->cursor_id = NULL; - ii_link->cursor_mode = -1; - ii_link->paramCount = 0; - ii_link->procname = NULL; - - if ( argc == 4 ) /* set options */ - { - if ( php_ii_set_connect_options(options, ii_link, db TSRMLS_CC ) == II_FAIL ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set options provided"); - RETURN_FALSE; - } - } - - /* create the link */ - connParm.co_genParm.gp_callback = NULL; - connParm.co_genParm.gp_closure = NULL; - connParm.co_target = db; - connParm.co_username = user; - connParm.co_password = pass; - connParm.co_timeout = -1; /* -1 is no timeout */ - connParm.co_type = IIAPI_CT_SQL; - if ( ii_link->connHandle == NULL ) - { - connParm.co_connHandle = ii_link->envHandle; - } - else - { - connParm.co_connHandle = ii_link->connHandle; - } - - connParm.co_tranHandle = NULL; - - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Start IIapi_connect()"); - } - - IIapi_connect(&connParm); - - if (!ii_sync(&(connParm.co_genParm)) || ii_success(&(connParm.co_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - free(ii_link); - efree(hashed_details); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to connect to database (%s)", db); - RETURN_FALSE; - } - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "End IIapi_connect()"); - } - - ii_link->connHandle = connParm.co_connHandle; - - /* set environment params */ - -#ifdef IIAPI_VERSION_2 - /* first set the blob_segment_length according to the default */ - - setEnvPrmParm.se_envHandle = ii_link->envHandle; - temp_long = IIG(blob_segment_length); - setEnvPrmParm.se_paramValue = (II_PTR)&temp_long; - setEnvPrmParm.se_paramID = IIAPI_EP_MAX_SEGMENT_LEN; - IIapi_setEnvParam( &setEnvPrmParm ); - - if (setEnvPrmParm.se_status != IIAPI_ST_SUCCESS) - { - efree(hashed_details); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set BLOB segment size"); - RETURN_FALSE; - } -#endif - - if ( argc == 4 ) /* set options */ - { - if ( php_ii_set_environment_options(options, ii_link TSRMLS_CC) == II_FAIL ) - { - efree(hashed_details); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set environment options provided"); - RETURN_FALSE; - } - } - - /* hash it up */ - Z_TYPE(new_le) = le_ii_plink; - new_le.ptr = ii_link; - if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length + 1, (void *) &new_le, sizeof(list_entry), NULL) == FAILURE) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to hash (%s)", hashed_details); - free(ii_link); - efree(hashed_details); - RETURN_FALSE; - } - IIG(num_persistent)++; - IIG(num_links)++; - - } else { /* already open persistent connection */ - - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "using existing persistent connection"); - } - - if (Z_TYPE_P(le) != le_ii_plink) - { - efree(hashed_details); - RETURN_FALSE; - } - /* here we should ensure that the link did not die */ - /* unable to figure out the right way to do this */ - /* maybe does the api handle the reconnection transparently ? */ - ii_link = (II_LINK *) le->ptr; - - /* Unfortunetaly NO !!!*/ - /* Ingres api doesn't reconnect */ - /* Have to reconnect if cleaning function has flagged link as broken */ - if (ii_link->connHandle == NULL) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Broken persistent link (%s),reconnect", db); - - ii_link->envHandle = IIG(envHandle); - if ( ii_link->envHandle != NULL ) - { - ii_link->connHandle = ii_link->envHandle; - } - else - { - ii_link->connHandle = NULL; - } - ii_link->tranHandle = NULL; - ii_link->stmtHandle = NULL; - ii_link->fieldCount = 0; - ii_link->descriptor = NULL; - ii_link->autocommit = 0; - ii_link->errorCode = 0; - ii_link->errorText = NULL; - ii_link->cursor_id = NULL; - ii_link->cursor_mode = -1; - ii_link->paramCount = 0; - ii_link->procname = NULL; - - if ( argc == 4 ) /* set options */ - { - if ( php_ii_set_connect_options(options, ii_link, db TSRMLS_CC ) == II_FAIL ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set options provided"); - RETURN_FALSE; - } - } - - /* Recreate the link */ - - connParm.co_connHandle = ii_link->connHandle; - connParm.co_tranHandle = NULL; - connParm.co_genParm.gp_callback = NULL; - connParm.co_genParm.gp_closure = NULL; - connParm.co_target = db; - connParm.co_username = user; - connParm.co_password = pass; - connParm.co_timeout = -1; /* no timeout */ - connParm.co_tranHandle = NULL; - connParm.co_type = IIAPI_CT_SQL; - - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Start IIapi_connect()"); - } - - IIapi_connect(&connParm); - - if (!ii_sync(&(connParm.co_genParm)) || ii_success(&(connParm.co_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - efree(hashed_details); - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Unable to connect to database (%s)", db); - RETURN_FALSE; - } - - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "End IIapi_connect()"); - } - - ii_link->connHandle = connParm.co_connHandle; - - /* set environment params */ - - if ( argc == 4 ) /* set options */ - { - if ( php_ii_set_environment_options(options, ii_link TSRMLS_CC) == II_FAIL ) - { - efree(hashed_details); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set environment options provided"); - RETURN_FALSE; - } - } - } - } - - ZEND_REGISTER_RESOURCE(return_value, ii_link, le_ii_plink); - - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Exit persistent connection"); - } - - } else { /* non persistent */ - - list_entry *index_ptr, new_index_ptr; - - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Enter non-persistent connection"); - } - - /* first we check the hash for the hashed_details key. if it exists, - * it should point us to the right offset where the actual link sits. - * if it doesn't, open a new link, add it to the resource list, - * and add a pointer to it with hashed_details as the key. - */ - - if (zend_hash_find(&EG(regular_list), hashed_details, hashed_details_length + 1, (void **) &index_ptr) == SUCCESS) - { - int type; - void *ptr; - - if (Z_TYPE_P(index_ptr) != le_index_ptr) - { - RETURN_FALSE; - } - ii_link = (II_LINK *) index_ptr->ptr; - ptr = zend_list_find((int) ii_link, &type); /* check if the link is still there */ - if (ptr && (type == le_ii_link || type == le_ii_plink)) - { - zend_list_addref((int) ii_link); - Z_LVAL_P(return_value) = (int) ii_link; - - php_ii_set_default_link((int) ii_link TSRMLS_CC); - - Z_TYPE_P(return_value) = IS_RESOURCE; - efree(hashed_details); - return; - } else { - zend_hash_del(&EG(regular_list), hashed_details, hashed_details_length + 1); - } - } - if (IIG(max_links) != -1 && IIG(num_links) >= IIG(max_links)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", IIG(num_links)); - efree(hashed_details); - RETURN_FALSE; - } - - /* setup the link */ - ii_link = (II_LINK *) malloc(sizeof(II_LINK)); - - ii_link->envHandle = IIG(envHandle); - if ( ii_link->envHandle != NULL ) - { - ii_link->connHandle = ii_link->envHandle; - } - else - { - ii_link->connHandle = NULL; - } - ii_link->tranHandle = NULL; - ii_link->stmtHandle = NULL; - ii_link->fieldCount = 0; - ii_link->descriptor = NULL; - ii_link->autocommit = 0; - ii_link->errorCode = 0; - ii_link->errorText = NULL; - ii_link->cursor_id = NULL; - ii_link->cursor_mode = -1; - ii_link->paramCount = 0; - ii_link->procname = NULL; - - IIG(errorCode)=0; - - if ( argc == 4 ) /* set options */ - { - if ( php_ii_set_connect_options(options, ii_link, db TSRMLS_CC) == II_FAIL ) - { - efree(hashed_details); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set options provided"); - RETURN_FALSE; - } - } - - /* create the link */ - connParm.co_genParm.gp_callback = NULL; - connParm.co_genParm.gp_closure = NULL; - connParm.co_target = db; - connParm.co_username = user; - connParm.co_password = pass; - connParm.co_timeout = -1; /* -1 is no timeout */ - connParm.co_type = IIAPI_CT_SQL; - if ( ii_link->connHandle == NULL ) - { - connParm.co_connHandle = ii_link->envHandle; - } - else - { - connParm.co_connHandle = ii_link->connHandle; - } - - connParm.co_tranHandle = NULL; - - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Start IIapi_connect()"); - } - - IIapi_connect(&connParm); - - if (!ii_sync(&(connParm.co_genParm)) || ii_success(&(connParm.co_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - efree(hashed_details); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to connect to database (%s)", db); - RETURN_FALSE; - } - - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "End IIapi_connect()"); - } - - ii_link->connHandle = connParm.co_connHandle; - - /* set environment params */ - -#ifdef IIAPI_VERSION_2 - /* first set the blob_segment_length according to the default */ - - setEnvPrmParm.se_envHandle = ii_link->envHandle; - temp_long = IIG(blob_segment_length); - setEnvPrmParm.se_paramValue = (II_PTR)&temp_long; - setEnvPrmParm.se_paramID = IIAPI_EP_MAX_SEGMENT_LEN; - IIapi_setEnvParam( &setEnvPrmParm ); - - if (setEnvPrmParm.se_status != IIAPI_ST_SUCCESS) - { - efree(hashed_details); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set BLOB segment size"); - RETURN_FALSE; - } -#endif - - if ( argc == 4 ) /* set options */ - { - if ( php_ii_set_environment_options(options, ii_link TSRMLS_CC) == II_FAIL ) - { - efree(hashed_details); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set environment options provided"); - RETURN_FALSE; - } - } - - /* add it to the list */ - ZEND_REGISTER_RESOURCE(return_value, ii_link, le_ii_link); - - /* add it to the hash */ - new_index_ptr.ptr = (void *) Z_LVAL_P(return_value); - Z_TYPE(new_index_ptr) = le_index_ptr; - if (zend_hash_update(&EG(regular_list), hashed_details, hashed_details_length + 1, (void *) &new_index_ptr, sizeof(list_entry), NULL) == FAILURE) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to hash (%s)", hashed_details); - free(ii_link); - efree(hashed_details); - RETURN_FALSE; - } - IIG(num_links)++; - - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Exit non-persistent connection"); - } - } + switch (ZEND_NUM_ARGS()) + { + case 4: /* do nothing */ + case 3: + pass = password; + /* Fall-through. */ + + case 2: + user = username; + /* Fall-through. */ + + case 1: + db = database; + /* Fall-through. */ - efree(hashed_details); - php_ii_set_default_link(Z_LVAL_P(return_value) TSRMLS_CC); + case 0: + break; + } + + /* Perform Sanity Check. If no database has been set then we have a problem */ + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Connecting to %s as %s", db, user); + } - if (IIG(trace_connect)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Exit php_ii_do_connect"); - } + hashed_details_length = sizeof("ingres___") - 1 + + strlen(SAFE_STRING(db)) + + strlen(SAFE_STRING(user)) + + strlen(SAFE_STRING(pass)); + + hashed_details = (char *) emalloc(hashed_details_length + 1); + sprintf(hashed_details, "Ingres_%s_%s_%s", + SAFE_STRING(db), + SAFE_STRING(user), + SAFE_STRING(pass)); + } + + /* if asked for an unauthorized persistent connection, issue a warning and go for a non-persistent link */ + if (persistent && !IIG(allow_persistent)) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Persistent links disabled !"); + persistent = 0; + } + + if (persistent) + { + list_entry *le; + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Enter persistent connection"); + } + + /* is this link already in the persistent list ? */ + if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_details_length + 1, (void *) &le) == FAILURE) + { /* no, new persistent connection */ + + list_entry new_le; + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "creating new persistent connection"); + } + + if (IIG(max_links) != -1 && IIG(num_links) >= IIG(max_links)) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", IIG(num_links)); + efree(hashed_details); + RETURN_FALSE; + } + if (IIG(max_persistent) != -1 && IIG(num_persistent) >= IIG(max_persistent)) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%d)", IIG(num_persistent)); + efree(hashed_details); + RETURN_FALSE; + } + + /* setup the link */ + ii_link = (II_LINK *) malloc(sizeof(II_LINK)); + _ii_init_link(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link); + + if ( ZEND_NUM_ARGS() == 4 ) /* set options */ + { + if ( php_ii_set_connect_options(options, ii_link, db TSRMLS_CC ) == II_FAIL ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set options provided"); + RETURN_FALSE; + } + } + + /* create the link */ + connParm.co_genParm.gp_callback = NULL; + connParm.co_genParm.gp_closure = NULL; + connParm.co_target = db; + connParm.co_username = user; + connParm.co_password = pass; + connParm.co_timeout = -1; /* -1 is no timeout */ + connParm.co_type = IIAPI_CT_SQL; + if ( ii_link->connHandle == NULL ) + { + connParm.co_connHandle = ii_link->envHandle; + } + else + { + connParm.co_connHandle = ii_link->connHandle; + } + + connParm.co_tranHandle = NULL; + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Start IIapi_connect()"); + } + + IIapi_connect(&connParm); + + if (!ii_sync(&(connParm.co_genParm)) || ii_success(&(connParm.co_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + free(ii_link); + efree(hashed_details); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to connect to database (%s)", db); + RETURN_FALSE; + } + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "End IIapi_connect()"); + } + + ii_link->connHandle = connParm.co_connHandle; + + /* set environment params */ + +#if defined(IIAPI_VERSION_2) + /* first set the blob_segment_length according to the default */ + + setEnvPrmParm.se_envHandle = ii_link->envHandle; + temp_long = IIG(blob_segment_length); + setEnvPrmParm.se_paramValue = (II_PTR)&temp_long; + setEnvPrmParm.se_paramID = IIAPI_EP_MAX_SEGMENT_LEN; + IIapi_setEnvParam( &setEnvPrmParm ); + + if (setEnvPrmParm.se_status != IIAPI_ST_SUCCESS) + { + efree(hashed_details); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set BLOB segment size"); + RETURN_FALSE; + } +#endif + + if ( ZEND_NUM_ARGS() == 4 ) /* set options */ + { + if ( php_ii_set_environment_options(options, ii_link TSRMLS_CC) == II_FAIL ) + { + efree(hashed_details); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set environment options provided"); + RETURN_FALSE; + } + } + + /* hash it up */ + Z_TYPE(new_le) = le_ii_plink; + new_le.ptr = ii_link; + if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length + 1, (void *) &new_le, sizeof(list_entry), NULL) == FAILURE) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to hash (%s)", hashed_details); + free(ii_link); + efree(hashed_details); + RETURN_FALSE; + } + IIG(num_persistent)++; + IIG(num_links)++; + + } else { /* already open persistent connection */ + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "using existing persistent connection"); + } + + if (Z_TYPE_P(le) != le_ii_plink) + { + efree(hashed_details); + RETURN_FALSE; + } + /* here we should ensure that the link did not die */ + /* unable to figure out the right way to do this */ + /* maybe does the api handle the reconnection transparently ? */ + ii_link = (II_LINK *) le->ptr; + + /* Unfortunetaly NO !!!*/ + /* Ingres api doesn't reconnect */ + /* Have to reconnect if cleaning function has flagged link as broken */ + if (ii_link->connHandle == NULL) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Broken persistent link (%s),reconnect", db); + _ii_init_link(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link); + + if ( ZEND_NUM_ARGS() == 4 ) /* set options */ + { + if ( php_ii_set_connect_options(options, ii_link, db TSRMLS_CC ) == II_FAIL ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set options provided"); + RETURN_FALSE; + } + } + + /* Recreate the link */ + + connParm.co_connHandle = ii_link->connHandle; + connParm.co_tranHandle = NULL; + connParm.co_genParm.gp_callback = NULL; + connParm.co_genParm.gp_closure = NULL; + connParm.co_target = db; + connParm.co_username = user; + connParm.co_password = pass; + connParm.co_timeout = -1; /* no timeout */ + connParm.co_tranHandle = NULL; + connParm.co_type = IIAPI_CT_SQL; + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Start IIapi_connect()"); + } + + IIapi_connect(&connParm); + + if (!ii_sync(&(connParm.co_genParm)) || ii_success(&(connParm.co_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + efree(hashed_details); + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Unable to connect to database (%s)", db); + RETURN_FALSE; + } + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "End IIapi_connect()"); + } + + ii_link->connHandle = connParm.co_connHandle; + + /* set environment params */ + + if ( ZEND_NUM_ARGS() == 4 ) /* set options */ + { + if ( php_ii_set_environment_options(options, ii_link TSRMLS_CC) == II_FAIL ) + { + efree(hashed_details); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set environment options provided"); + RETURN_FALSE; + } + } + } + } + + ZEND_REGISTER_RESOURCE(return_value, ii_link, le_ii_plink); + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Exit persistent connection"); + } + + } else { /* non persistent */ + + list_entry *index_ptr, new_index_ptr; + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Enter non-persistent connection"); + } + + /* first we check the hash for the hashed_details key. if it exists, + * it should point us to the right offset where the actual link sits. + * if it doesn't, open a new link, add it to the resource list, + * and add a pointer to it with hashed_details as the key. + */ + + if ((IIG(reuse_connection)) && (zend_hash_find(&EG(regular_list), hashed_details, hashed_details_length + 1, (void *) &index_ptr) == SUCCESS)) + { + int type; + void *ptr; + + if (Z_TYPE_P(index_ptr) != le_index_ptr) + { + RETURN_FALSE; + } + ii_link = (II_LINK *) index_ptr->ptr; + ptr = zend_list_find((int) ii_link, &type); /* check if the link is still there */ + if (ptr && (type == le_ii_link || type == le_ii_plink)) + { + zend_list_addref((int) ii_link); + Z_LVAL_P(return_value) = (int) ii_link; + + Z_TYPE_P(return_value) = IS_RESOURCE; + efree(hashed_details); + return; + } else { + zend_hash_del(&EG(regular_list), hashed_details, hashed_details_length + 1); + } + } + if (IIG(max_links) != -1 && IIG(num_links) >= IIG(max_links)) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", IIG(num_links)); + efree(hashed_details); + RETURN_FALSE; + } + + /* setup the link */ + ii_link = (II_LINK *) malloc(sizeof(II_LINK)); + _ii_init_link(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link); + + if ( ZEND_NUM_ARGS() == 4 ) /* set options */ + { + if ( php_ii_set_connect_options(options, ii_link, db TSRMLS_CC) == II_FAIL ) + { + efree(hashed_details); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set options provided"); + RETURN_FALSE; + } + } + + /* create the link */ + connParm.co_genParm.gp_callback = NULL; + connParm.co_genParm.gp_closure = NULL; + connParm.co_target = db; + connParm.co_username = user; + connParm.co_password = pass; + connParm.co_timeout = -1; /* -1 is no timeout */ + connParm.co_type = IIAPI_CT_SQL; + if ( ii_link->connHandle == NULL ) + { + connParm.co_connHandle = ii_link->envHandle; + } + else + { + connParm.co_connHandle = ii_link->connHandle; + } + + connParm.co_tranHandle = NULL; + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Start IIapi_connect()"); + } + + IIapi_connect(&connParm); + + if (!ii_sync(&(connParm.co_genParm)) || ii_success(&(connParm.co_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + efree(hashed_details); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to connect to database (%s)", db); + RETURN_FALSE; + } + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "End IIapi_connect()"); + } + + ii_link->connHandle = connParm.co_connHandle; + + /* set environment params */ + +#if defined(IIAPI_VERSION_2) + /* first set the blob_segment_length according to the default */ + + setEnvPrmParm.se_envHandle = ii_link->envHandle; + temp_long = IIG(blob_segment_length); + setEnvPrmParm.se_paramValue = (II_PTR)&temp_long; + setEnvPrmParm.se_paramID = IIAPI_EP_MAX_SEGMENT_LEN; + IIapi_setEnvParam( &setEnvPrmParm ); + + if (setEnvPrmParm.se_status != IIAPI_ST_SUCCESS) + { + efree(hashed_details); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set BLOB segment size"); + RETURN_FALSE; + } +#endif + + if ( ZEND_NUM_ARGS() == 4 ) /* set options */ + { + if ( php_ii_set_environment_options(options, ii_link TSRMLS_CC) == II_FAIL ) + { + efree(hashed_details); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set environment options provided"); + RETURN_FALSE; + } + } + + /* add it to the list */ + ZEND_REGISTER_RESOURCE(return_value, ii_link, le_ii_link); + + /* add it to the hash */ + new_index_ptr.ptr = (void *) Z_LVAL_P(return_value); + Z_TYPE(new_index_ptr) = le_index_ptr; + if (zend_hash_update(&EG(regular_list), hashed_details, hashed_details_length + 1, (void *) &new_index_ptr, sizeof(list_entry), NULL) == FAILURE) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to hash (%s)", hashed_details); + free(ii_link); + efree(hashed_details); + RETURN_FALSE; + } + IIG(num_links)++; + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Exit non-persistent connection"); + } + } + + efree(hashed_details); + + if (IIG(trace_connect)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Exit php_ii_do_connect"); + } } /* }}} */ /* {{{ proto resource ingres_connect([string database [, string username [, string password [, options ]]]]) Open a connection to an Ingres database the syntax of database is [node_id::]dbname[/svr_class] */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_connect) +#else PHP_FUNCTION(ingres_connect) +#endif { - php_ii_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); + php_ii_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); + } /* }}} */ /* {{{ proto resource ingres_pconnect([string database [, string username [, string password [, options ]]]]) Open a persistent connection to an Ingres database the syntax of database is [node_id::]dbname[/svr_class] */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_pconnect) +#else PHP_FUNCTION(ingres_pconnect) +#endif { - php_ii_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); + php_ii_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool ingres_close([resource link]) +/* {{{ proto bool ingres_close(resource link) Close an Ingres database connection */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_close) +#else PHP_FUNCTION(ingres_close) +#endif { - zval **link = NULL; - int link_id = -1; - II_LINK *ii_link; + zval *link = NULL; + II_LINK *ii_link; - switch (ZEND_NUM_ARGS()) - { - case 0: - link_id = IIG(default_link); - if (link_id == -1) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - - break; - - case 1: - if (zend_get_parameters_ex(1, &link) == FAILURE) - { - RETURN_FALSE; - } - link_id = -1; - break; - - default: - WRONG_PARAM_COUNT; - break; - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r" , &link) == FAILURE) + { + RETURN_FALSE; + } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, &link, -1, "Ingres Link", le_ii_link, le_ii_plink); - /* Call the clean function synchronously here */ - /* Otherwise we have to wait for request shutdown */ - /* This way we can reuse the link in the same script */ - _ai_clean_ii_plink(ii_link TSRMLS_CC); + /* Call the clean function synchronously here */ + /* Otherwise we have to wait for request shutdown */ + /* This way we can reuse the link in the same script */ + _ai_clean_ii_plink(ii_link TSRMLS_CC); - if (link_id == -1) - { /* explicit resource number */ - zend_list_delete(Z_RESVAL_PP(link)); - } - - if (link_id != -1 || (ii_link && Z_RESVAL_PP(link) == IIG(default_link))) - { - zend_list_delete(IIG(default_link)); - IIG(default_link) = -1; - } - - RETURN_TRUE; + /* explicit resource number */ + zend_list_delete(Z_RESVAL_P(link)); + + RETURN_TRUE; } /* }}} */ @@ -1314,50 +1512,44 @@ - set autocommit - <all cursor related queries> (look for dedicated functions instead) */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_query) +#else PHP_FUNCTION(ingres_query) +#endif { - zval **query, **link, **queryParams, **paramtypes=NULL; - int argc; - int link_id = -1; - II_LINK *ii_link; - IIAPI_QUERYPARM queryParm; - IIAPI_GETDESCRPARM getDescrParm; - - HashTable *arr_hash; - int elementCount; - char *procname=NULL; - char *statement; - char *tmp_statement; - int query_type; + zval *link = NULL; + zval *queryParams = NULL; + char *query = NULL; + char *paramtypes = NULL; + int query_len=0; + int paramtypes_len=0; + II_LINK *ii_link; + II_RESULT *ii_result; + IIAPI_QUERYPARM queryParm; + IIAPI_GETDESCRPARM getDescrParm; + IIAPI_CLOSEPARM closeParm; - argc = ZEND_NUM_ARGS(); - if (argc < 1 || argc > 4 || zend_get_parameters_ex(argc, &query, &link, &queryParams, &paramtypes) == FAILURE) - { - WRONG_PARAM_COUNT; - } - - if ( argc == 1 ) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - } - - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + HashTable *arr_hash; + int elementCount; + char *procname = NULL; + char *query_ptr = NULL; + char *converted_query = NULL; + int query_type; + int converted_query_len; - /* if there's already an active statement, close it */ - if (ii_link->stmtHandle && _close_statement(ii_link TSRMLS_CC)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "ingres_query : Unable to close statement"); - RETURN_FALSE; - } + ii_result_entry *result_entry; + - convert_to_string_ex(query); + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"rs|as" , &link, &query, &query_len, &queryParams, &paramtypes, &paramtypes_len) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE2(ii_link, II_LINK*, &link, -1, "Ingres Link", le_ii_link, le_ii_plink); - query_type = php_ii_query_type(Z_STRVAL_PP(query) TSRMLS_CC); + /* determine what sort of query is being executed */ + query_type = php_ii_query_type(query TSRMLS_CC); switch (query_type) { @@ -1365,1403 +1557,1859 @@ case INGRES_SQL_INSERT: case INGRES_SQL_UPDATE: case INGRES_SQL_DELETE: - break; + case INGRES_SQL_CREATE: + case INGRES_SQL_ALTER: + break; case INGRES_SQL_COMMIT: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use ingres_commit() to commit a transaction"); - RETURN_FALSE; - break; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use ingres_commit() to commit a transaction"); + RETURN_FALSE; + break; case INGRES_SQL_ROLLBACK: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use ingres_rollback() to rollback a transaction"); - RETURN_FALSE; - break; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use ingres_rollback() to rollback a transaction"); + RETURN_FALSE; + break; case INGRES_SQL_OPEN: case INGRES_SQL_CLOSE: - break; + break; case INGRES_SQL_CONNECT: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use ingres_connect() to connect to a database"); - RETURN_FALSE; - break; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use ingres_connect() to connect to a database"); + RETURN_FALSE; + break; case INGRES_SQL_DISCONNECT: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use ingres_close() to disconnect from a database"); - RETURN_FALSE; - break; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use ingres_close() to disconnect from a database"); + RETURN_FALSE; + break; case INGRES_SQL_GETDBEVENT: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ingres 'GET DBEVENT' is not supported at the current time"); - RETURN_FALSE; - break; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ingres 'GET DBEVENT' is not supported at the current time"); + RETURN_FALSE; + break; case INGRES_SQL_SAVEPOINT: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ingres 'SAVEPOINT' is not supported at the current time"); - RETURN_FALSE; - break; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ingres 'SAVEPOINT' is not supported at the current time"); + RETURN_FALSE; + break; case INGRES_SQL_AUTOCOMMIT: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use ingres_autocommit() to set the autocommit state"); - RETURN_FALSE; - break; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use ingres_autocommit() to set the auto-commit state"); + RETURN_FALSE; + break; case INGRES_SQL_EXECUTE_PROCEDURE: case INGRES_SQL_CALL: - break; - case INGRES_SQL_COPY: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ingres 'COPY TABLE() INTO/FROM' is not supported at the current time"); - RETURN_FALSE; - break; + break; + case INGRES_SQL_COPY: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ingres 'COPY TABLE() INTO/FROM' is not supported at the current time"); + RETURN_FALSE; + break; default: break; } - /* check to see if there are any parameters to the query */ + /* Ingres only allows for a single cursor to be open when auto-commit is enabled */ + /* To allow multiple open cursors we disable auto-commit before opening the first cursor */ + /* auto-commit is restarted when all resultsets have been freed. The last freed resultset */ + /* invokes a commit before auto-commit is re-enabled */ - ii_link->paramCount = php_ii_paramcount(Z_STRVAL_PP(query) TSRMLS_CC); + /* If we are to simulate auto-commit */ + if (IIG(auto_multi)) + { + if (ii_link->auto_multi) /* We are in emulation mode */ + { + if (query_type != INGRES_SQL_SELECT) + { + /* re-enable auto-commit */ + if ( ii_link->result_list_ptr ) + { + /* clean up any un-freed statements/results */ + _free_ii_link_result_list(ii_link TSRMLS_CC); + } + /* commit the previous statement before changing the auto-commit state */ + if (_commit_transaction(ii_link TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "An error occur when issuing an internal commit"); + } + if (_autocommit_transaction(ii_link TSRMLS_CC) == II_FAIL) + { + ii_link->auto_multi = 1; + php_error_docref(NULL TSRMLS_CC, E_ERROR, "An error occur when changing the auto-commit state"); + } + ii_link->auto_multi = 0; + } + } + else /* We are not in emulation mode */ + { + if (query_type == INGRES_SQL_SELECT) + { + /* with multiple cursors and auto-commit is enabled */ + if (ii_link->autocommit) + { + /* If there are any active transactions they must be freed */ + if ( ii_link->result_list_ptr ) + { + /* clean up any un-freed statements/results */ + _free_ii_link_result_list(ii_link TSRMLS_CC); + } + if (_autocommit_transaction(ii_link TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "An error occur when changing the auto-commit state"); + ii_link->auto_multi = 0; + } + /* we are in emulation mode */ + ii_link->auto_multi = 1; + } + } + } + } - if ( ii_link->paramCount > 0 ) - { - if ((argc < 3) || (Z_TYPE_PP(queryParams) != IS_ARRAY)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expecting a parameter array but did not get one" ); - RETURN_FALSE; - } - - arr_hash = Z_ARRVAL_PP(queryParams); - - if ((elementCount = zend_hash_num_elements(arr_hash)) != ii_link->paramCount ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Incorrect number of parameters passed, expected %d got %d",ii_link->paramCount, elementCount ); - RETURN_FALSE; - } - - zend_hash_internal_pointer_reset(Z_ARRVAL_PP(queryParams)); - - - /* if we have been provided with type hints for parameters check to see the number of params */ - /* passed matches the number of type hints recieved */ - if ( argc >= 4 && ( Z_TYPE_PP(paramtypes) != IS_STRING ) ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expecting a string list of parameter types but did not recieve one. " ); - RETURN_FALSE; - } - - if ((argc >= 4 ) && (Z_STRLEN_PP(paramtypes) != ii_link->paramCount )) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Incorrrect number of parameter types recieved, expected %d got %d", ii_link->paramCount, Z_STRLEN_PP(paramtypes) ); - RETURN_FALSE; - } - } + /* Allocate and initialize the memory for the new result resource */ + ii_result = (II_RESULT *) malloc(sizeof(II_RESULT)); + _ii_init_result(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, ii_link); - /* check to see if this is a procedure or not - load the procedure name into ii_link->procname. - If ii_link->procname is NULL then there is no procedure */ - if ( ii_link->procname != NULL ) - { - free(ii_link->procname); - ii_link->procname = NULL; - } + /* check to see if there are any parameters to the query */ + ii_result->paramCount = php_ii_paramcount(query TSRMLS_CC); - ii_link->procname = php_ii_check_procedure(Z_STRVAL_PP(query), ii_link TSRMLS_CC); + if (ii_result->paramCount) + { + if (queryParams==NULL) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expecting a parameter array but did not get one" ); + RETURN_FALSE; + } - if ( ii_link->paramCount > 0 && ii_link->procname == NULL ) - { /* convert ? to ~V so we don't have to prepare the query */ - tmp_statement=emalloc(Z_STRLEN_PP(query) + ( ii_link->paramCount*3 ) + 1); - memcpy (tmp_statement, Z_STRVAL_PP(query), Z_STRLEN_PP(query)); - tmp_statement[Z_STRLEN_PP(query)] ='\0'; - statement = php_ii_convert_param_markers( tmp_statement TSRMLS_CC ); - } + arr_hash = Z_ARRVAL_P(queryParams); - queryParm.qy_genParm.gp_callback = NULL; - queryParm.qy_genParm.gp_closure = NULL; - queryParm.qy_connHandle = ii_link->connHandle; - queryParm.qy_tranHandle = ii_link->tranHandle; - queryParm.qy_stmtHandle = NULL; + if ((elementCount = zend_hash_num_elements(arr_hash)) != ii_result->paramCount ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Incorrect number of parameters passed, expected %d got %d",ii_result->paramCount, elementCount ); + RETURN_FALSE; + } + + zend_hash_internal_pointer_reset(Z_ARRVAL_P(queryParams)); + + /* if we have been provided with type hints for parameters check to see the number of params */ + /* passed matches the number of type hints recieved */ + if (paramtypes) + { + if (paramtypes_len != ii_result->paramCount ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Incorrect number of parameter types received, expected %d got %d", ii_result->paramCount, paramtypes_len ); + RETURN_FALSE; + } + } + } - if ( ii_link->procname == NULL ) - { - queryParm.qy_queryType = IIAPI_QT_QUERY; - if ( ii_link->paramCount > 0 ) - { - queryParm.qy_parameters = TRUE; - queryParm.qy_queryText = statement; - } - else - { - queryParm.qy_parameters = FALSE; - queryParm.qy_queryText = Z_STRVAL_PP(query); - } - } - else - { - queryParm.qy_queryType = IIAPI_QT_EXEC_PROCEDURE; - queryParm.qy_parameters = TRUE; - queryParm.qy_queryText = NULL; - } + /* check to see if this is a procedure or not + load the procedure name into ii_result->procname. + If ii_result->procname is NULL then there is no procedure */ - IIapi_query(&queryParm); - ii_sync(&(queryParm.qy_genParm)); + if (ii_result->procname) + { + free(ii_result->procname); + ii_result->procname = NULL; + } - if (ii_success(&(queryParm.qy_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - RETURN_FALSE; - } + ii_result->procname = php_ii_check_procedure(query, ii_link TSRMLS_CC); - /* store transaction and statement handles */ - ii_link->tranHandle = queryParm.qy_tranHandle; - ii_link->stmtHandle = queryParm.qy_stmtHandle; +/* convert ? to ~V so we don't have to prepare the query */ + if ( ii_result->paramCount > 0 && ii_result->procname == NULL ) + { + converted_query = emalloc(query_len + ( ii_result->paramCount*3 ) + 1); + memcpy (converted_query, query, query_len); + converted_query[query_len] ='\0'; + php_ii_convert_param_markers( query, converted_query TSRMLS_CC ); + } - if ( ii_link->paramCount > 0 || ii_link->procname != NULL ) - { - if ( php_ii_bind_params (INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, queryParams, paramtypes) == II_FAIL) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error binding parameters"); - efree(tmp_statement); - RETURN_FALSE; - } - } + queryParm.qy_genParm.gp_callback = NULL; + queryParm.qy_genParm.gp_closure = NULL; + queryParm.qy_connHandle = ii_result->connHandle; + queryParm.qy_tranHandle = ii_result->tranHandle; + queryParm.qy_stmtHandle = NULL; - /* get description of results */ - getDescrParm.gd_genParm.gp_callback = NULL; - getDescrParm.gd_genParm.gp_closure = NULL; - getDescrParm.gd_stmtHandle = ii_link->stmtHandle; + if ( ii_result->procname == NULL ) + { + if (query_type == INGRES_SQL_SELECT) + { + queryParm.qy_queryType = IIAPI_QT_OPEN; +#if defined(IIAPI_VERSION_6) + /* Enable scrolling cursor support */ + queryParm.qy_flags = IIAPI_QF_SCROLL; + ii_result->scrollable = 1; +#endif - IIapi_getDescriptor(&getDescrParm); - ii_sync(&(getDescrParm.gd_genParm)); + if ( converted_query != NULL ) + { + converted_query_len = strlen(converted_query); + converted_query = erealloc(converted_query, (converted_query_len + 16)); + query_ptr = &(converted_query[converted_query_len]); + } + else + { + converted_query = emalloc(query_len + 16); + memcpy (converted_query, query, query_len); + query_ptr = &(converted_query[query_len]); + } + sprintf (query_ptr," for readonly"); - if (ii_success(&(getDescrParm.gd_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - RETURN_FALSE; - } + } + else + { +#if defined(IIAPI_VERSION_6) + queryParm.qy_flags = 0; +#endif + queryParm.qy_queryType = IIAPI_QT_QUERY; + } + if ( ii_result->paramCount > 0 ) + { + queryParm.qy_parameters = TRUE; + queryParm.qy_queryText = converted_query; + } + else + { + queryParm.qy_parameters = FALSE; +#if defined(IIAPI_VERSION_6) + if ( queryParm.qy_flags == IIAPI_QF_SCROLL ) + { + queryParm.qy_queryText = converted_query; + } + else + { + queryParm.qy_queryText = query; + } +#else + queryParm.qy_queryText = query; +#endif + } + } + else + { + queryParm.qy_queryType = IIAPI_QT_EXEC_PROCEDURE; + queryParm.qy_parameters = TRUE; + queryParm.qy_queryText = NULL; + } - /* store the results */ - ii_link->fieldCount = getDescrParm.gd_descriptorCount; - ii_link->descriptor = getDescrParm.gd_descriptor; - - if ( ii_link->paramCount > 0 && ii_link->procname == NULL ) - { - efree(statement); - } + IIapi_query(&queryParm); + ii_sync(&(queryParm.qy_genParm)); + + if (ii_success(&(queryParm.qy_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + RETURN_FALSE; + } + + /* store transaction and statement handles */ + ii_result->tranHandle = queryParm.qy_tranHandle; + ii_result->stmtHandle = queryParm.qy_stmtHandle; + ii_link->tranHandle = queryParm.qy_tranHandle; + ii_link->stmtHandle = queryParm.qy_stmtHandle; + + if ( ii_result->paramCount > 0 || ii_result->procname != NULL ) + { + if ( php_ii_bind_params (INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, queryParams, paramtypes) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error binding parameters"); + efree(converted_query); + RETURN_FALSE; + } + } + + /* get description of results */ + getDescrParm.gd_genParm.gp_callback = NULL; + getDescrParm.gd_genParm.gp_closure = NULL; + getDescrParm.gd_stmtHandle = ii_result->stmtHandle; + + IIapi_getDescriptor(&getDescrParm); + ii_sync(&(getDescrParm.gd_genParm)); + + if (ii_success(&(getDescrParm.gd_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + if (converted_query) + { + efree(converted_query); + converted_query = NULL; + } + RETURN_FALSE; + } + ii_link->stmtHandle = NULL; - RETURN_TRUE; + /* store the results */ + ii_result->fieldCount = getDescrParm.gd_descriptorCount; + ii_result->descriptor = getDescrParm.gd_descriptor; + ii_result->link_id = Z_LVAL_P(link); + + + if ( ii_result->paramCount > 0 && ii_result->procname == NULL ) + { + efree(converted_query); + converted_query = NULL; + } + + ZEND_REGISTER_RESOURCE(return_value, ii_result, le_ii_result) + + /* Add details of the II_RESULT resource to the II_LINK resource for later clean up */ + + result_entry = (ii_result_entry *)malloc(sizeof(ii_result_entry)); + if (result_entry == NULL ) + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to create memory for result_entry"); + RETURN_FALSE; + } + + if ( ii_link->result_list_ptr == NULL ) + { + ii_link->result_list_ptr = result_entry; + result_entry->next_result_ptr = NULL; + result_entry->result_id = Z_LVAL_P(return_value); /* resource id */ + } + else + { + /* insert the new result_entry to the head of the result_list */ + result_entry->next_result_ptr = (char *)ii_link->result_list_ptr; + ii_link->result_list_ptr = result_entry; + result_entry->result_id = Z_LVAL_P(return_value); /* resource id */ + } + + if (converted_query) + { + efree(converted_query); + converted_query = NULL; + } } /* }}} */ -/* {{{ proto bool ingres_prepare(string query [, long cursor_mode [, resource link]]) */ +/* {{{ proto bool ingres_prepare(resource link, string query) */ /* Prepare SQL for later execution */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_prepare) +#else PHP_FUNCTION(ingres_prepare) +#endif { - zval **query, **link, **cursor_mode; - int argc; - int link_id = -1; - II_LINK *ii_link; - - IIAPI_QUERYPARM queryParm; - IIAPI_CLOSEPARM closeParm; - - int queryLen; - char *statement; - char *preparedStatement; + zval *link; + char *query; + int cursor_mode; + II_LINK *ii_link; + II_RESULT *ii_result; - int cursor_id_len; + IIAPI_QUERYPARM queryParm; + IIAPI_CLOSEPARM closeParm; - argc = ZEND_NUM_ARGS(); - if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &query, &cursor_mode, &link) == FAILURE) - { - WRONG_PARAM_COUNT; - } + int query_len=0; + char *statement; + char *preparedStatement; - if ( argc == 1 || argc == 2 ) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } + int cursor_id_len; - } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"rs" , &link, &query, &query_len) == FAILURE) + { + RETURN_FALSE; + } - if ( argc == 2 || argc == 3 ) - { - convert_to_long_ex(cursor_mode); - ii_link->cursor_mode = (Z_LVAL_PP(cursor_mode) < 0 || Z_LVAL_PP(cursor_mode) > 1 ? II_CURSOR_READONLY : Z_LVAL_PP(cursor_mode)); - } - else - { - /* set to the ini default */ - ii_link->cursor_mode = IIG(cursor_mode); - } + ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, &link, -1, "Ingres Link", le_ii_link, le_ii_plink); - convert_to_string_ex(query); - statement = Z_STRVAL_PP(query); + /* Allocate and initialize the memory for the new result resource */ + ii_result = (II_RESULT *) malloc(sizeof(II_RESULT)); + _ii_init_result(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, ii_link); - /* figure how many parameters are expected */ - ii_link->paramCount = php_ii_paramcount(statement TSRMLS_CC); + statement = query; - /* if there's already an active statement, close it */ - if (ii_link->stmtHandle && _close_statement(ii_link TSRMLS_CC)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to close statement"); - RETURN_FALSE; - } + /* figure how many parameters are expected */ + ii_result->paramCount = php_ii_paramcount(query TSRMLS_CC); - ii_link->procname = NULL; + ii_result->procname = NULL; - /* check to see if this is a procedure or not - load the procedure name into ii_link->procname. - If ii_link->procname is NULL then there is no procedure */ + /* check to see if this is a procedure or not + load the procedure name into ii_link->procname. + If ii_link->procname is NULL then there is no procedure */ - ii_link->procname = php_ii_check_procedure(Z_STRVAL_PP(query), ii_link TSRMLS_CC); + ii_result->procname = php_ii_check_procedure(query, ii_link TSRMLS_CC); - if ( ii_link->procname == NULL ) - { - /* Adapt the query into a prepared statement */ - queryLen = strlen(statement); + if ( ii_result->procname == NULL ) + { + /* Adapt the query into a prepared statement */ + php_ii_gen_cursor_id(ii_result TSRMLS_CC); + cursor_id_len = strlen(ii_result->cursor_id); + preparedStatement=ecalloc(query_len + 15 + cursor_id_len, 1); + sprintf (preparedStatement,"Prepare %s from %s\0", ii_result->cursor_id, statement); + statement = preparedStatement; + + queryParm.qy_genParm.gp_callback = NULL; + queryParm.qy_genParm.gp_closure = NULL; + queryParm.qy_connHandle = ii_result->connHandle; + queryParm.qy_tranHandle = ii_result->tranHandle; + queryParm.qy_stmtHandle = NULL; + queryParm.qy_queryType = IIAPI_QT_OPEN; + queryParm.qy_parameters = FALSE; + queryParm.qy_queryText = statement; - php_ii_gen_cursor_id(ii_link TSRMLS_CC); - cursor_id_len = strlen(ii_link->cursor_id); - preparedStatement=ecalloc(queryLen + 15 + cursor_id_len, 1); - sprintf (preparedStatement,"Prepare %s from %s\0", ii_link->cursor_id, statement); - statement = preparedStatement; - - queryParm.qy_genParm.gp_callback = NULL; - queryParm.qy_genParm.gp_closure = NULL; - queryParm.qy_connHandle = ii_link->connHandle; - queryParm.qy_tranHandle = ii_link->tranHandle; - queryParm.qy_stmtHandle = NULL; - queryParm.qy_queryType = IIAPI_QT_OPEN; - queryParm.qy_parameters = FALSE; - queryParm.qy_queryText = statement; - - IIapi_query(&queryParm); - ii_sync(&(queryParm.qy_genParm)); - - if (ii_success(&(queryParm.qy_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - efree(preparedStatement); - RETURN_FALSE; - } - - ii_link->tranHandle = queryParm.qy_tranHandle; - ii_link->stmtHandle = queryParm.qy_stmtHandle; - - /* - ** Call IIapi_close() to release resources. - */ - closeParm.cl_genParm.gp_callback = NULL; - closeParm.cl_genParm.gp_closure = NULL; - closeParm.cl_stmtHandle = queryParm.qy_stmtHandle; - - IIapi_close( &closeParm ); - ii_sync(&(closeParm.cl_genParm)); - if (ii_success(&(closeParm.cl_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - efree(preparedStatement); - RETURN_FALSE; - } - efree(preparedStatement); - } + IIapi_query(&queryParm); + ii_sync(&(queryParm.qy_genParm)); + + if (ii_success(&(queryParm.qy_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + efree(preparedStatement); + RETURN_FALSE; + } + + ii_result->tranHandle = queryParm.qy_tranHandle; + ii_result->stmtHandle = queryParm.qy_stmtHandle; + + /* + * Call IIapi_close() to release resources. + */ + closeParm.cl_genParm.gp_callback = NULL; + closeParm.cl_genParm.gp_closure = NULL; + closeParm.cl_stmtHandle = queryParm.qy_stmtHandle; + + IIapi_close( &closeParm ); + ii_sync(&(closeParm.cl_genParm)); + if (ii_success(&(closeParm.cl_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + efree(preparedStatement); + RETURN_FALSE; + } + efree(preparedStatement); + } } /* }}} */ -/* {{{ proto int ingres_execute([array params,[string paramtypes [, resource link ]]]) +/* {{{ proto bool ingres_execute(resource result [,array params,[string paramtypes]]) execute a query prepared by ingres_prepare() */ -PHP_FUNCTION (ingres_execute) +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_execute) +#else +PHP_FUNCTION(ingres_execute) +#endif { + zval *result, *queryParams; + char *paramtypes; + int paramtypes_len; + II_RESULT *ii_result; + IIAPI_QUERYPARM queryParm; + IIAPI_GETDESCRPARM getDescrParm; + II_INT2 columnType; - zval **link, **queryParams, **paramtypes; - int argc; - int link_id = -1; - II_LINK *ii_link; - IIAPI_QUERYPARM queryParm; - IIAPI_GETDESCRPARM getDescrParm; - II_INT2 columnType; + int elementCount; + char *statement; - int elementCount; - char *statement; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"ra|s" , &result, &queryParams, &paramtypes, &paramtypes_len) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres Result", le_ii_result); - argc = ZEND_NUM_ARGS(); - if (argc > 3 || zend_get_parameters_ex(argc, &queryParams, &paramtypes, &link) == FAILURE) - { - WRONG_PARAM_COUNT; - } + if ( ii_result->paramCount > 0 ) + { + if (Z_TYPE_P(queryParams) != IS_ARRAY ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expecting a parameter array but did not get one" ); + RETURN_FALSE; + } - if ( argc <= 1 ) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - } - - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + if ((elementCount = zend_hash_num_elements(Z_ARRVAL_P(queryParams))) != ii_result->paramCount ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Incorrect number of parameters passed, expected %d got %d",ii_result->paramCount, elementCount ); + RETURN_FALSE; + } + zend_hash_internal_pointer_reset(Z_ARRVAL_P(queryParams)); + } - if ( ii_link->paramCount > 0 ) - { - if (Z_TYPE_PP(queryParams) != IS_ARRAY ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expecting a parameter array but did not get one" ); - RETURN_FALSE; - } - - if ((elementCount = zend_hash_num_elements(Z_ARRVAL_PP(queryParams))) != ii_link->paramCount ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Incorrect number of parameters passed, expected %d got %d",ii_link->paramCount, elementCount ); - RETURN_FALSE; - } - zend_hash_internal_pointer_reset(Z_ARRVAL_PP(queryParams)); - } + if ( ii_result->procname == NULL ) + { + statement = ecalloc(strlen(ii_result->cursor_id) + 17, 1); - if ( ii_link->procname == NULL ) - { - statement = ecalloc(sizeof(ii_link->cursor_id) + 17, 1); + /* Set the cursor mode according to ii_link->cursor_mode */ + switch (IIG(cursor_mode)) + { + case II_CURSOR_UPDATE: + sprintf (statement,"%s", ii_result->cursor_id ); + break; + case II_CURSOR_READONLY: + sprintf (statement,"%s for readonly", ii_result->cursor_id ); + break; + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown cursor mode requested, %d", IIG(cursor_mode)); + efree(statement); + statement = NULL; + RETURN_FALSE; + } + + queryParm.qy_genParm.gp_callback = NULL; + queryParm.qy_genParm.gp_closure = NULL; + queryParm.qy_connHandle = ii_result->connHandle; + queryParm.qy_tranHandle = ii_result->tranHandle; + queryParm.qy_stmtHandle = NULL; + queryParm.qy_queryType = IIAPI_QT_OPEN; - /* Set the cursor mode according to ii_link->cursor_mode */ - switch (ii_link->cursor_mode) - { - case II_CURSOR_UPDATE: - sprintf (statement,"%s", ii_link->cursor_id ); - break; - case II_CURSOR_READONLY: - sprintf (statement,"%s for readonly", ii_link->cursor_id ); - break; - default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown cursor mode requested, %d",ii_link->cursor_mode); - efree(statement); - RETURN_FALSE; - } - - queryParm.qy_genParm.gp_callback = NULL; - queryParm.qy_genParm.gp_closure = NULL; - queryParm.qy_connHandle = ii_link->connHandle; - queryParm.qy_tranHandle = ii_link->tranHandle; - queryParm.qy_stmtHandle = NULL; - queryParm.qy_queryType = IIAPI_QT_OPEN; - - if (ii_link->paramCount >0 ) - { - queryParm.qy_parameters = TRUE; - } - else - { - queryParm.qy_parameters = FALSE; - } + if (ii_result->paramCount) + { + queryParm.qy_parameters = TRUE; + } + else + { + queryParm.qy_parameters = FALSE; + } - queryParm.qy_queryText = statement; + queryParm.qy_queryText = statement; - columnType = IIAPI_COL_QPARM; + columnType = IIAPI_COL_QPARM; - } - else - { - queryParm.qy_genParm.gp_callback = NULL; - queryParm.qy_genParm.gp_closure = NULL; - queryParm.qy_connHandle = ii_link->connHandle; - queryParm.qy_tranHandle = ii_link->tranHandle; - queryParm.qy_stmtHandle = NULL; - queryParm.qy_queryType = IIAPI_QT_EXEC_PROCEDURE; - queryParm.qy_parameters = TRUE; - queryParm.qy_queryText = NULL; + } + else + { + queryParm.qy_genParm.gp_callback = NULL; + queryParm.qy_genParm.gp_closure = NULL; + queryParm.qy_connHandle = ii_result->connHandle; + queryParm.qy_tranHandle = ii_result->tranHandle; + queryParm.qy_stmtHandle = NULL; + queryParm.qy_queryType = IIAPI_QT_EXEC_PROCEDURE; + queryParm.qy_parameters = TRUE; + queryParm.qy_queryText = NULL; - columnType = IIAPI_COL_PROCPARM; + columnType = IIAPI_COL_PROCPARM; - /* allow for the procedure name as a param */ - ii_link->paramCount++; + /* allow for the procedure name as a param */ + ii_result->paramCount++; - } + } - IIapi_query(&queryParm); - ii_sync(&(queryParm.qy_genParm)); + IIapi_query(&queryParm); + ii_sync(&(queryParm.qy_genParm)); - if (ii_success(&(queryParm.qy_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - if ( ii_link->procname == NULL ) - { - efree (statement); - } - RETURN_FALSE; - } + if (ii_success(&(queryParm.qy_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + if ( ii_result->procname == NULL ) + { + efree (statement); + } + RETURN_FALSE; + } - ii_link->tranHandle = queryParm.qy_tranHandle; - ii_link->stmtHandle = queryParm.qy_stmtHandle; + ii_result->tranHandle = queryParm.qy_tranHandle; + ii_result->stmtHandle = queryParm.qy_stmtHandle; - if ( ii_link->paramCount > 0 ) - { - if ( php_ii_bind_params (INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, queryParams, paramtypes) == II_FAIL) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error binding parameters"); - RETURN_FALSE; - } - } else { - /* not handling parameters */ - - queryParm.qy_genParm.gp_callback = NULL; - queryParm.qy_genParm.gp_closure = NULL; - queryParm.qy_connHandle = ii_link->connHandle; - queryParm.qy_tranHandle = ii_link->tranHandle; - queryParm.qy_stmtHandle = NULL; - queryParm.qy_queryType = IIAPI_QT_QUERY; - queryParm.qy_parameters = FALSE; - queryParm.qy_queryText = statement; - - IIapi_query(&queryParm); - ii_sync(&(queryParm.qy_genParm)); - - if (ii_success(&(queryParm.qy_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - if ( ii_link->procname == NULL ) - { - efree (statement); - } - RETURN_FALSE; - } - - } /* if ii_link->paramCount > 0 */ - - /* store transaction and statement handles */ - ii_link->tranHandle = queryParm.qy_tranHandle; - ii_link->stmtHandle = queryParm.qy_stmtHandle; - - - /* get description of results */ - getDescrParm.gd_genParm.gp_callback = NULL; - getDescrParm.gd_genParm.gp_closure = NULL; - getDescrParm.gd_stmtHandle = ii_link->stmtHandle; + if ( ii_result->paramCount > 0 ) + { + if ( php_ii_bind_params (INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, queryParams, paramtypes) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error binding parameters"); + RETURN_FALSE; + } + } else { + /* not handling parameters */ - IIapi_getDescriptor(&getDescrParm); - ii_sync(&(getDescrParm.gd_genParm)); + queryParm.qy_genParm.gp_callback = NULL; + queryParm.qy_genParm.gp_closure = NULL; + queryParm.qy_connHandle = ii_result->connHandle; + queryParm.qy_tranHandle = ii_result->tranHandle; + queryParm.qy_stmtHandle = NULL; + queryParm.qy_queryType = IIAPI_QT_QUERY; + queryParm.qy_parameters = FALSE; + queryParm.qy_queryText = statement; - if (ii_success(&(getDescrParm.gd_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - if ( ii_link->procname == NULL ) - { - efree (statement); - } - RETURN_FALSE; - } + IIapi_query(&queryParm); + ii_sync(&(queryParm.qy_genParm)); - /* store the results */ - ii_link->fieldCount = getDescrParm.gd_descriptorCount; - ii_link->descriptor = getDescrParm.gd_descriptor; - if ( ii_link->procname == NULL ) - { - efree (statement); - } + if (ii_success(&(queryParm.qy_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + if ( ii_result->procname == NULL ) + { + efree (statement); + } + RETURN_FALSE; + } + + } /* if ii_link->paramCount > 0 */ + + /* store transaction and statement handles */ + ii_result->tranHandle = queryParm.qy_tranHandle; + ii_result->stmtHandle = queryParm.qy_stmtHandle; + + + /* get description of results */ + getDescrParm.gd_genParm.gp_callback = NULL; + getDescrParm.gd_genParm.gp_closure = NULL; + getDescrParm.gd_stmtHandle = ii_result->stmtHandle; + + IIapi_getDescriptor(&getDescrParm); + ii_sync(&(getDescrParm.gd_genParm)); + + if (ii_success(&(getDescrParm.gd_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + if ( ii_result->procname == NULL ) + { + efree (statement); + } + RETURN_FALSE; + } + + /* store the results */ + ii_result->fieldCount = getDescrParm.gd_descriptorCount; + ii_result->descriptor = getDescrParm.gd_descriptor; + if ( ii_result->procname == NULL ) + { + efree (statement); + } } /* }}} */ /* {{{ php_ii_gen_cursor_id(char *cursor_id TSRMLS_DC) generates a cursor name */ -static void php_ii_gen_cursor_id(II_LINK *ii_link TSRMLS_DC) +static void php_ii_gen_cursor_id(II_RESULT *ii_result TSRMLS_DC) { - char *tmp_id = '\0'; - unsigned long thread_id; + char *tmp_id = '\0'; + unsigned long thread_id; - if (ii_link->cursor_id != NULL) - { - efree(ii_link->cursor_id); - ii_link->cursor_id = NULL; - } - - /* remove potential for a negative number */ - thread_id = II_THREAD_ID; - - tmp_id = ecalloc (33,1); - IIG(cursor_no)++; - sprintf (tmp_id,"php_%lu_%d", II_THREAD_ID, IIG(cursor_no)); - ii_link->cursor_id = emalloc(strlen(tmp_id) + 1); - strcpy(ii_link->cursor_id,tmp_id); - efree(tmp_id); + if (ii_result->cursor_id != NULL) + { + efree(ii_result->cursor_id); + ii_result->cursor_id = NULL; + } + + /* remove potential for a negative number */ + thread_id = II_THREAD_ID; + + tmp_id = ecalloc (33,1); + IIG(cursor_no)++; + sprintf (tmp_id,"php_%lu_%d", II_THREAD_ID, IIG(cursor_no)); + ii_result->cursor_id = emalloc(strlen(tmp_id) + 1); + strcpy(ii_result->cursor_id,tmp_id); + efree(tmp_id); } /* }}} */ -/* {{{ proto string ingres_cursor(resource link) - Gets a cursor name for a given link resource */ +/* {{{ proto string ingres_cursor(resource result) + Gets a cursor name for a given result resource */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_cursor) +#else PHP_FUNCTION(ingres_cursor) +#endif { - zval **link; - int argc; - II_LINK *ii_link; - int link_id = -1; + zval *result; + II_RESULT *ii_result; - argc = ZEND_NUM_ARGS(); - if (argc > 1 || zend_get_parameters_ex(argc, &link) == FAILURE) - { - WRONG_PARAM_COUNT; - } - - if (argc < 1) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r" , &result) == FAILURE) + { + RETURN_FALSE; + } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres Result", le_ii_result); - RETURN_STRING(ii_link->cursor_id,1); + RETURN_STRING(ii_result->cursor_id,1); } /* }}} */ -/* {{{ proto int ingres_num_rows([resource link]) +/* {{{ proto int ingres_num_rows(resource result) Return the number of rows affected/returned by the last query */ /* Warning : don't call ingres_num_rows() before ingres_fetch_xx() since IIapi_getQueryInfo() - * nullifies the data set being returned and ingres_fetch_xx() will not find any data */ + * nullifies the data set being returned and ingres_fetch_xx() will not find any data + * TODO : Add some mechanism to allow a row count to be returned */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_num_rows) +#else PHP_FUNCTION(ingres_num_rows) +#endif { - zval **link; - int argc; - int link_id = -1; - II_LINK *ii_link; - IIAPI_GETQINFOPARM getQInfoParm; + zval *result; + II_RESULT *ii_result; + IIAPI_GETQINFOPARM getQInfoParm; +#if defined(IIAPI_VERSION_6) + IIAPI_SCROLLPARM scrollParm; + IIAPI_GETDESCRPARM getDescrParm; + long row_count=0; +#endif - argc = ZEND_NUM_ARGS(); - if (argc > 1 || zend_get_parameters_ex(argc, &link) == FAILURE) - { - WRONG_PARAM_COUNT; - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r" , &result) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres Result", le_ii_result); - if (argc < 1) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - } +#if defined(IIAPI_VERSION_6) + if (ii_result->scrollable) + { - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + getQInfoParm.gq_genParm.gp_callback = NULL; + getQInfoParm.gq_genParm.gp_closure = NULL; + getQInfoParm.gq_stmtHandle = ii_result->stmtHandle; - /* get number of affected rows */ - getQInfoParm.gq_genParm.gp_callback = NULL; - getQInfoParm.gq_genParm.gp_closure = NULL; - getQInfoParm.gq_stmtHandle = ii_link->stmtHandle; + IIapi_getQueryInfo(&getQInfoParm); + ii_sync(&(getQInfoParm.gq_genParm)); - IIapi_getQueryInfo(&getQInfoParm); - ii_sync(&(getQInfoParm.gq_genParm)); + if (ii_success(&(getQInfoParm.gq_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + RETURN_FALSE; + } - if (ii_success(&(getQInfoParm.gq_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - RETURN_FALSE; - } + scrollParm.sl_genParm.gp_callback = NULL; + scrollParm.sl_genParm.gp_closure = NULL; + scrollParm.sl_stmtHandle = ii_result->stmtHandle; + scrollParm.sl_orientation = IIAPI_SCROLL_AFTER; + scrollParm.sl_offset = 0; - /* return the result */ - if (getQInfoParm.gq_mask & IIAPI_GQ_ROW_COUNT) - { - RETURN_LONG(getQInfoParm.gq_rowCount); - } else { - RETURN_LONG(0); - } + IIapi_scroll(&scrollParm); + ii_sync(&(scrollParm.sl_genParm)); + + if (ii_success(&(scrollParm.sl_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + RETURN_FALSE; + } + } +#endif + /* get number of affected rows */ + getQInfoParm.gq_genParm.gp_callback = NULL; + getQInfoParm.gq_genParm.gp_closure = NULL; + getQInfoParm.gq_stmtHandle = ii_result->stmtHandle; + + IIapi_getQueryInfo(&getQInfoParm); + ii_sync(&(getQInfoParm.gq_genParm)); + + if (ii_success(&(getQInfoParm.gq_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + RETURN_FALSE; + } + +#if defined(IIAPI_VERSION_6) + /* return the result */ + if ((getQInfoParm.gq_cursorType & IIAPI_CURSOR_SCROLL) && (getQInfoParm.gq_mask & IIAPI_GQ_ROW_STATUS)) + { + row_count = getQInfoParm.gq_rowPosition; + } + + scrollParm.sl_genParm.gp_callback = NULL; + scrollParm.sl_genParm.gp_closure = NULL; + scrollParm.sl_stmtHandle = ii_result->stmtHandle; + scrollParm.sl_orientation = IIAPI_SCROLL_BEFORE; + scrollParm.sl_offset = 0; + + IIapi_scroll(&scrollParm); + ii_sync(&(scrollParm.sl_genParm)); + + if (ii_success(&(scrollParm.sl_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + RETURN_FALSE; + } + + getQInfoParm.gq_genParm.gp_callback = NULL; + getQInfoParm.gq_genParm.gp_closure = NULL; + getQInfoParm.gq_stmtHandle = ii_result->stmtHandle; + + IIapi_getQueryInfo(&getQInfoParm); + ii_sync(&(getQInfoParm.gq_genParm)); + + if (ii_success(&(getQInfoParm.gq_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + RETURN_FALSE; + } + RETURN_LONG(row_count); +#else + /* return the result */ + if (getQInfoParm.gq_mask & IIAPI_GQ_ROW_COUNT) + { + RETURN_LONG(getQInfoParm.gq_rowCount); + } else { + RETURN_LONG(0); + } +#endif } /* }}} */ -/* {{{ proto int ingres_num_fields([resource link]) +/* {{{ proto int ingres_num_fields(resource result) Return the number of fields returned by the last query */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_num_fields) +#else PHP_FUNCTION(ingres_num_fields) +#endif { - zval **link; - int argc; - int link_id = -1; - II_LINK *ii_link; - - argc = ZEND_NUM_ARGS(); - if (argc > 1 || zend_get_parameters_ex(argc, &link) == FAILURE) - { - WRONG_PARAM_COUNT; - } + zval *result; + II_RESULT *ii_result; - if (argc < 1) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - } - - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r" , &result) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres Result", le_ii_result); - RETURN_LONG(ii_link->fieldCount); + RETURN_LONG(ii_result->fieldCount); } /* }}} */ /* {{{ static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, int info_type) * Return information about a field in a query result */ -static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, int info_type) +static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, II_RESULT *ii_result, long index, int info_type) { - zval **idx, **link; - int argc; - int link_id = -1; - char *name, *fun_name; - int index; - II_LINK *ii_link; + char *name, *fun_name; - argc = ZEND_NUM_ARGS(); - if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &idx, &link) == FAILURE) - { - WRONG_PARAM_COUNT; - } + if (index < IIG(array_index_start) || index > ii_result->fieldCount) + { + switch (info_type) + { - if (argc < 2) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - } + case II_FIELD_INFO_NAME: + fun_name = "ii_field_name"; + break; + + case II_FIELD_INFO_TYPE: + fun_name = "ii_field_type"; + break; + + case II_FIELD_INFO_NULLABLE: + fun_name = "ii_field_nullable"; + break; + + case II_FIELD_INFO_LENGTH: + fun_name = "ii_field_length"; + break; + + case II_FIELD_INFO_PRECISION: + fun_name = "ii_field_precision"; + break; + + case II_FIELD_INFO_SCALE: + fun_name = "ii_field_scale"; + break; + + default: + fun_name = "foobar"; + break; + } + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s() called with wrong index (%d)", fun_name, index); + RETURN_FALSE; + } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + switch (info_type) + { - convert_to_long_ex(idx); - index = Z_LVAL_PP(idx); + case II_FIELD_INFO_NAME: + name = php_ii_field_name(ii_result, index TSRMLS_CC); + if (name == NULL) + { + RETURN_FALSE; + } + RETURN_STRING(name, 1); + break; - if (index < 1 || index > ii_link->fieldCount) - { - switch (info_type) - { + case II_FIELD_INFO_TYPE: + switch ((ii_result->descriptor[index - 1]).ds_dataType) + { + case IIAPI_BYTE_TYPE: + RETURN_STRING("IIAPI_BYTE_TYPE", 1); + + case IIAPI_CHA_TYPE: + RETURN_STRING("IIAPI_CHA_TYPE", 1); + + case IIAPI_CHR_TYPE: + RETURN_STRING("IIAPI_CHR_TYPE", 1); - case II_FIELD_INFO_NAME: - fun_name = "ii_field_name"; - break; - - case II_FIELD_INFO_TYPE: - fun_name = "ii_field_type"; - break; - - case II_FIELD_INFO_NULLABLE: - fun_name = "ii_field_nullable"; - break; - - case II_FIELD_INFO_LENGTH: - fun_name = "ii_field_length"; - break; - - case II_FIELD_INFO_PRECISION: - fun_name = "ii_field_precision"; - break; - - case II_FIELD_INFO_SCALE: - fun_name = "ii_field_scale"; - break; - - default: - fun_name = "foobar"; - break; - } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s() called with wrong index (%d)", fun_name, index); - RETURN_FALSE; - } + case IIAPI_DEC_TYPE: + RETURN_STRING("IIAPI_DEC_TYPE", 1); + + case IIAPI_DTE_TYPE: + RETURN_STRING("IIAPI_DTE_TYPE", 1); - switch (info_type) - { +#if defined(IIAPI_VERSION_5) + case IIAPI_ADATE_TYPE: /* SQL Standard DATE */ + RETURN_STRING("IIAPI_ADATE_TYPE", 1); - case II_FIELD_INFO_NAME: - name = php_ii_field_name(ii_link, index TSRMLS_CC); - if (name == NULL) - { - RETURN_FALSE; - } - RETURN_STRING(name, 1); - break; - - case II_FIELD_INFO_TYPE: - switch ((ii_link->descriptor[index - 1]).ds_dataType) - { - case IIAPI_BYTE_TYPE: - RETURN_STRING("IIAPI_BYTE_TYPE", 1); - - case IIAPI_CHA_TYPE: - RETURN_STRING("IIAPI_CHA_TYPE", 1); - - case IIAPI_CHR_TYPE: - RETURN_STRING("IIAPI_CHR_TYPE", 1); - - case IIAPI_DEC_TYPE: - RETURN_STRING("IIAPI_DEC_TYPE", 1); - - case IIAPI_DTE_TYPE: - RETURN_STRING("IIAPI_DTE_TYPE", 1); - - case IIAPI_FLT_TYPE: - RETURN_STRING("IIAPI_FLT_TYPE", 1); - - case IIAPI_INT_TYPE: - RETURN_STRING("IIAPI_INT_TYPE", 1); - - case IIAPI_LOGKEY_TYPE: - RETURN_STRING("IIAPI_LOGKEY_TYPE", 1); - - case IIAPI_LBYTE_TYPE: - RETURN_STRING("IIAPI_LBYTE_TYPE", 1); - - case IIAPI_LVCH_TYPE: - RETURN_STRING("IIAPI_LVCH_TYPE", 1); - - case IIAPI_MNY_TYPE: - RETURN_STRING("IIAPI_MNY_TYPE", 1); - - case IIAPI_TABKEY_TYPE: - RETURN_STRING("IIAPI_TABKEY_TYPE", 1); - - case IIAPI_TXT_TYPE: - RETURN_STRING("IIAPI_TXT_TYPE", 1); - - case IIAPI_VBYTE_TYPE: - RETURN_STRING("IIAPI_VBYTE_TYPE", 1); - - case IIAPI_VCH_TYPE: - RETURN_STRING("IIAPI_VCH_TYPE", 1); + case IIAPI_TIME_TYPE: /* Ingres Time */ + RETURN_STRING("IIAPI_TIME_TYPE", 1); + + case IIAPI_TMWO_TYPE: /* Time without Timezone */ + RETURN_STRING("IIAPI_TMWO_TYPE", 1); + + case IIAPI_TMTZ_TYPE: /* Time with Timezone */ + RETURN_STRING("IIAPI_TMTZ_TYPE", 1); + + case IIAPI_TS_TYPE: /* Ingres Timestamp */ + RETURN_STRING("IIAPI_TS_TYPE", 1); + + case IIAPI_TSWO_TYPE: /* Timestamp without Timezone */ + RETURN_STRING("IIAPI_TSWO_TYPE", 1); + + case IIAPI_TSTZ_TYPE: /* Timestamp with Timezone */ + RETURN_STRING("IIAPI_TSTZ_TYPE", 1); + + case IIAPI_INTYM_TYPE: /* Interval Year to Month */ + RETURN_STRING("IIAPI_INTYM_TYPE", 1); + + case IIAPI_INTDS_TYPE: /* Interval Day to Second */ + RETURN_STRING("IIAPI_INTDS_TYPE", 1); + +#endif + case IIAPI_FLT_TYPE: + RETURN_STRING("IIAPI_FLT_TYPE", 1); + + case IIAPI_INT_TYPE: + RETURN_STRING("IIAPI_INT_TYPE", 1); + + case IIAPI_LOGKEY_TYPE: + RETURN_STRING("IIAPI_LOGKEY_TYPE", 1); + + case IIAPI_LBYTE_TYPE: + RETURN_STRING("IIAPI_LBYTE_TYPE", 1); + + case IIAPI_LVCH_TYPE: + RETURN_STRING("IIAPI_LVCH_TYPE", 1); + + case IIAPI_MNY_TYPE: + RETURN_STRING("IIAPI_MNY_TYPE", 1); + + case IIAPI_TABKEY_TYPE: + RETURN_STRING("IIAPI_TABKEY_TYPE", 1); + + case IIAPI_TXT_TYPE: + RETURN_STRING("IIAPI_TXT_TYPE", 1); + + case IIAPI_VBYTE_TYPE: + RETURN_STRING("IIAPI_VBYTE_TYPE", 1); + + case IIAPI_VCH_TYPE: + RETURN_STRING("IIAPI_VCH_TYPE", 1); #if defined(IIAPI_VERSION_3) - case IIAPI_NCHA_TYPE: - RETURN_STRING("IIAPI_NCHA_TYPE", 1); + case IIAPI_NCHA_TYPE: + RETURN_STRING("IIAPI_NCHA_TYPE", 1); - case IIAPI_NVCH_TYPE: - RETURN_STRING("IIAPI_NVCH_TYPE", 1); + case IIAPI_NVCH_TYPE: + RETURN_STRING("IIAPI_NVCH_TYPE", 1); #endif - - default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown Ingres data type"); - RETURN_FALSE; - break; - } - break; - - case II_FIELD_INFO_NULLABLE: - if ((ii_link->descriptor[index - 1]).ds_nullable) - { - RETURN_TRUE; - } else { - RETURN_FALSE; - } - break; - - case II_FIELD_INFO_LENGTH: - RETURN_LONG((ii_link->descriptor[index - 1]).ds_length); - break; - - case II_FIELD_INFO_PRECISION: - RETURN_LONG((ii_link->descriptor[index - 1]).ds_precision); - break; - - case II_FIELD_INFO_SCALE: - RETURN_LONG((ii_link->descriptor[index - 1]).ds_scale); - break; - - default: - RETURN_FALSE; - } + + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown Ingres data type"); + RETURN_FALSE; + break; + } + break; + + case II_FIELD_INFO_NULLABLE: + if ((ii_result->descriptor[index - 1]).ds_nullable) + { + RETURN_TRUE; + } else { + RETURN_FALSE; + } + break; + + case II_FIELD_INFO_LENGTH: + RETURN_LONG((ii_result->descriptor[index - 1]).ds_length); + break; + + case II_FIELD_INFO_PRECISION: + RETURN_LONG((ii_result->descriptor[index - 1]).ds_precision); + break; + + case II_FIELD_INFO_SCALE: + RETURN_LONG((ii_result->descriptor[index - 1]).ds_scale); + break; + + default: + RETURN_FALSE; + } } /* }}} */ -/* {{{ static char *php_ii_field_name(II_LINK *ii_link, int index TSRMLS_DC) +/* {{{ static char *php_ii_field_name(II_RESULT *ii_result, int index TSRMLS_DC) Return the name of a field in a query result */ -static char *php_ii_field_name(II_LINK *ii_link, int index TSRMLS_DC) +static char *php_ii_field_name(II_RESULT *ii_result, int index TSRMLS_DC) { - char space; - - space = ' '; + char *colname; + char space; + + space = ' '; - if ((index < IIG(array_index_start)) || index > ii_link->fieldCount) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_ii_field_name() called with wrong index (%d)", index); - return NULL; - } + if ((index < IIG(array_index_start)) || index > ii_result->fieldCount) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_ii_field_name() called with wrong index (%d)", index); + return NULL; + } - if ( (ii_link->descriptor[index - IIG(array_index_start)]).ds_columnName != NULL ) - { - /* if the column name has a space */ - if ( strchr((ii_link->descriptor[index - IIG(array_index_start)]).ds_columnName, space ) != NULL ) - { - sprintf(ii_link->descriptor[index - IIG(array_index_start)].ds_columnName,"col%d",index); - } - /* If we have created the memory ourselves */ - if ( (ii_link->descriptor[index - IIG(array_index_start)]).ds_columnName[0] == '\0' ) - { - sprintf(ii_link->descriptor[index - IIG(array_index_start)].ds_columnName,"col%d",index); - } - } + if ( (ii_result->descriptor[index - IIG(array_index_start)]).ds_columnName != NULL ) + { + /* if the column name has a space */ + if ( strchr((ii_result->descriptor[index - IIG(array_index_start)]).ds_columnName, space ) != NULL ) + { + sprintf(ii_result->descriptor[index - IIG(array_index_start)].ds_columnName,"col%d",index); + } + /* If we have created the memory ourselves */ + if ( (ii_result->descriptor[index - IIG(array_index_start)]).ds_columnName[0] == '\0' ) + { + sprintf(ii_result->descriptor[index - IIG(array_index_start)].ds_columnName,"col%d",index); + } + } - return (ii_link->descriptor[index - IIG(array_index_start)]).ds_columnName; + return (ii_result->descriptor[index - IIG(array_index_start)]).ds_columnName; } /* }}} */ /* {{{ proto string ingres_field_name(int index [, resource link]) Return the name of a field in a query result index must be >0 and <= ingres_num_fields() */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_field_name) +#else PHP_FUNCTION(ingres_field_name) +#endif { - php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, II_FIELD_INFO_NAME); + zval *result = NULL; + II_RESULT *ii_result; + long index=IIG(array_index_start); + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"rl" , &result, &index) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres Result", le_ii_result); + + php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, index, II_FIELD_INFO_NAME); } /* }}} */ /* {{{ proto string ingres_field_type(int index [, resource link]) Return the type of a field in a query result index must be >0 and <= ingres_num_fields() */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_field_type) +#else PHP_FUNCTION(ingres_field_type) +#endif { - php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, II_FIELD_INFO_TYPE); + zval *result = NULL; + II_RESULT *ii_result; + long index=IIG(array_index_start); + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"rl" , &result, &index) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres Result", le_ii_result); + + php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, index, II_FIELD_INFO_TYPE); } /* }}} */ /* {{{ proto string ingres_field_nullable(int index [, resource link]) Return true if the field is nullable and false otherwise index must be >0 and <= ingres_num_fields() */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_field_nullable) +#else PHP_FUNCTION(ingres_field_nullable) +#endif { - php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, II_FIELD_INFO_NULLABLE); + zval *result = NULL; + II_RESULT *ii_result; + long index=IIG(array_index_start); + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"rl" , &result, &index) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres Result", le_ii_result); + + php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, index, II_FIELD_INFO_NULLABLE); } /* }}} */ /* {{{ proto string ingres_field_length(int index [, resource link]) Return the length of a field in a query result index must be >0 and <= ingres_num_fields() */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_field_length) +#else PHP_FUNCTION(ingres_field_length) +#endif { - php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, II_FIELD_INFO_LENGTH); + zval *result = NULL; + II_RESULT *ii_result; + long index=IIG(array_index_start); + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"rl" , &result, &index) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres Result", le_ii_result); + + php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, index, II_FIELD_INFO_LENGTH); } /* }}} */ /* {{{ proto string ingres_field_precision(int index [, resource link]) Return the precision of a field in a query result index must be >0 and <= ingres_num_fields() */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_field_precision) +#else PHP_FUNCTION(ingres_field_precision) +#endif { - php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, II_FIELD_INFO_PRECISION); + zval *result = NULL; + II_RESULT *ii_result; + long index=IIG(array_index_start); + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"rl" , &result, &index) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres Result", le_ii_result); + + php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, index, II_FIELD_INFO_PRECISION); } /* }}} */ /* {{{ proto string ingres_field_scale(int index [, resource link]) Return the scale of a field in a query result index must be >0 and <= ingres_num_fields() */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_field_scale) +#else PHP_FUNCTION(ingres_field_scale) +#endif +{ + zval *result = NULL; + II_RESULT *ii_result; + long index=IIG(array_index_start); + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"rl" , &result, &index) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres Result", le_ii_result); + + php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, index, II_FIELD_INFO_SCALE); +} +/* }}} */ + +/* {{{ proto bool ingres_free_result(resource result) + Free result set memory allocated by ingres_query()/ingres_execute() */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_free_result) +#else +PHP_FUNCTION(ingres_free_result) +#endif +{ + zval *result = NULL; + II_RESULT *ii_result; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r" , &result) == FAILURE) + { + RETURN_FALSE; + } + + if (Z_LVAL_P(result) == 0) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1, "Ingres result", le_ii_result); + + if (ii_result->stmtHandle && _close_statement(ii_result TSRMLS_CC)) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to close statement"); + RETURN_FALSE; + } + + php_ii_result_remove (ii_result, Z_LVAL_P(result) TSRMLS_CC); + + zend_list_delete(Z_LVAL_P(result)); + + RETURN_TRUE; +} +/* }}} */ + +/* {{{ static short php_ii_result_remove ( II_RESULT *ii_result, long result_id ) + Remove the result information from the link that references it +*/ +static short php_ii_result_remove ( II_RESULT *ii_result, long result_id TSRMLS_DC) { - php_ii_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, II_FIELD_INFO_SCALE); + + char *resource = NULL; + char *type_name = NULL; + int type; + ii_result_entry *result_entry; + char *last_ptr = NULL; + char *next_ptr = NULL; + char *this_ptr = NULL; + + /* Check to see we have a valid link_id */ + if ( ii_result->link_id != -1 ) + { + resource = zend_list_find(ii_result->link_id, &type); + type_name = zend_rsrc_list_get_rsrc_type(ii_result->link_id TSRMLS_CC); + /* Is it an "ingres connection" ? */ + if (strcmp("ingres connection\0",type_name) == 0 ) + { + this_ptr = (char *)((II_LINK *)resource)->result_list_ptr; + result_entry = ((II_LINK *)resource)->result_list_ptr; + next_ptr = result_entry->next_result_ptr; + /* scan the link's resource list */ + while (result_entry->result_id != result_id) + { + result_entry = (ii_result_entry *)result_entry->next_result_ptr; + last_ptr = this_ptr; + this_ptr = next_ptr; + next_ptr = (char *)((ii_result_entry *)this_ptr)->next_result_ptr; + } + + if (this_ptr == (char *)((II_LINK *)resource)->result_list_ptr) /* head of list */ + { + if ( next_ptr != NULL ) /* another result after this one */ + { + ((II_LINK *)resource)->result_list_ptr = (ii_result_entry *)next_ptr; + free(this_ptr); + this_ptr = NULL; + + } + else /* nothing else after us in the list */ + { + this_ptr = NULL; + free(((II_LINK *)resource)->result_list_ptr); + ((II_LINK *)resource)->result_list_ptr = NULL; + next_ptr = NULL; + last_ptr = NULL; + } + } + else + { + if ( next_ptr != NULL ) /* another result after this one */ + { + if (last_ptr == (char *)((II_LINK *)resource)->result_list_ptr) + { + ((II_LINK *)resource)->result_list_ptr = (ii_result_entry *)next_ptr; + } + else + { + ((ii_result_entry *)last_ptr)->next_result_ptr = next_ptr; + } /* (last_ptr == (char *)((II_LINK *)resource)->result_list_ptr) */ + + free(this_ptr); + } + else /* nothing else after us in the list */ + { + if (last_ptr == (char *)((II_LINK *)resource)->result_list_ptr) + { + ((II_LINK *)resource)->result_list_ptr = NULL; + } + else + { + ((ii_result_entry *)last_ptr)->next_result_ptr = NULL; + } /* (last_ptr == (char *)((II_LINK *)resource)->result_list_ptr) */ + + free(this_ptr); + + } /* ( next_ptr != NULL ) */ + } /* (this_ptr == (char *)((II_LINK *)resource)->result_list_ptr) */ + } + else + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "php_ii_result_remove : An unknown resource type was passed"); + return II_FAIL; + } + } + return II_OK; } /* }}} */ /* {{{static short php_ii_convert_data ( II_LONG destType, int destSize, int precision, II_LINK *ii_link, IIAPI_DATAVALUE *columnData, IIAPI_GETCOLPARM getColParm TSRMLS_DC) */ /* Convert complex Ingres data types to php-usable ones */ -static II_LONG php_ii_convert_data ( II_LONG destType, int destSize, int precision, II_LINK *ii_link, IIAPI_DATAVALUE *columnData, IIAPI_GETCOLPARM getColParm, int field, int column TSRMLS_DC ) +static II_LONG php_ii_convert_data ( II_LONG destType, int destSize, int precision, II_RESULT *ii_result, IIAPI_DATAVALUE *columnData, IIAPI_GETCOLPARM getColParm, int field, int column TSRMLS_DC ) { #if defined (IIAPI_VERSION_2) - IIAPI_FORMATPARM formatParm; + IIAPI_FORMATPARM formatParm; - formatParm.fd_envHandle = IIG(envHandle); + formatParm.fd_envHandle = IIG(envHandle); - formatParm.fd_srcDesc.ds_dataType = (ii_link->descriptor[field+column]).ds_dataType; - formatParm.fd_srcDesc.ds_nullable = (ii_link->descriptor[field+column]).ds_nullable; - formatParm.fd_srcDesc.ds_length = (ii_link->descriptor[field+column]).ds_length; - formatParm.fd_srcDesc.ds_precision = (ii_link->descriptor[field+column]).ds_precision; - formatParm.fd_srcDesc.ds_scale = (ii_link->descriptor[field+column]).ds_scale; - formatParm.fd_srcDesc.ds_columnType = (ii_link->descriptor[field+column]).ds_columnType; - formatParm.fd_srcDesc.ds_columnName = (ii_link->descriptor[field+column]).ds_columnName; - formatParm.fd_srcValue.dv_null = columnData[column].dv_null; - formatParm.fd_srcValue.dv_length = columnData[column].dv_length; - formatParm.fd_srcValue.dv_value = columnData[column].dv_value; - - formatParm.fd_dstDesc.ds_dataType = destType; - formatParm.fd_dstDesc.ds_nullable = FALSE; - formatParm.fd_dstDesc.ds_length = destSize; - formatParm.fd_dstDesc.ds_precision = precision; - formatParm.fd_dstDesc.ds_scale = 0; - formatParm.fd_dstDesc.ds_columnType = IIAPI_COL_TUPLE; - formatParm.fd_dstDesc.ds_columnName = NULL; - formatParm.fd_dstValue.dv_null = FALSE; - formatParm.fd_dstValue.dv_length = formatParm.fd_dstDesc.ds_length; - formatParm.fd_dstValue.dv_value = emalloc(formatParm.fd_dstDesc.ds_length+1); + formatParm.fd_srcDesc.ds_dataType = (ii_result->descriptor[field+column]).ds_dataType; + formatParm.fd_srcDesc.ds_nullable = (ii_result->descriptor[field+column]).ds_nullable; + formatParm.fd_srcDesc.ds_length = (ii_result->descriptor[field+column]).ds_length; + formatParm.fd_srcDesc.ds_precision = (ii_result->descriptor[field+column]).ds_precision; + formatParm.fd_srcDesc.ds_scale = (ii_result->descriptor[field+column]).ds_scale; + formatParm.fd_srcDesc.ds_columnType = (ii_result->descriptor[field+column]).ds_columnType; + formatParm.fd_srcDesc.ds_columnName = (ii_result->descriptor[field+column]).ds_columnName; + formatParm.fd_srcValue.dv_null = columnData[column].dv_null; + formatParm.fd_srcValue.dv_length = columnData[column].dv_length; + formatParm.fd_srcValue.dv_value = columnData[column].dv_value; + + formatParm.fd_dstDesc.ds_dataType = destType; + formatParm.fd_dstDesc.ds_nullable = FALSE; + formatParm.fd_dstDesc.ds_length = destSize; + formatParm.fd_dstDesc.ds_precision = precision; + formatParm.fd_dstDesc.ds_scale = 0; + formatParm.fd_dstDesc.ds_columnType = IIAPI_COL_TUPLE; + formatParm.fd_dstDesc.ds_columnName = NULL; + formatParm.fd_dstValue.dv_null = FALSE; + formatParm.fd_dstValue.dv_length = formatParm.fd_dstDesc.ds_length; + formatParm.fd_dstValue.dv_value = emalloc(formatParm.fd_dstDesc.ds_length+1); - IIapi_formatData(&formatParm); + IIapi_formatData(&formatParm); - if (formatParm.fd_status != IIAPI_ST_SUCCESS ) { - return formatParm.fd_status; - } + if (formatParm.fd_status != IIAPI_ST_SUCCESS ) { + return formatParm.fd_status; + } - columnData[column].dv_length = formatParm.fd_dstValue.dv_length; - columnData[column].dv_value = formatParm.fd_dstValue.dv_value; - efree(formatParm.fd_srcValue.dv_value); - -#else - IIAPI_CONVERTPARM convertParm; - - convertParm.cv_srcDesc.ds_dataType = (ii_link->descriptor[field+column]).ds_dataType; - convertParm.cv_srcDesc.ds_nullable = (ii_link->descriptor[field+column]).ds_nullable; - convertParm.cv_srcDesc.ds_length = (ii_link->descriptor[field+column]).ds_length; - convertParm.cv_srcDesc.ds_precision = (ii_link->descriptor[field+column]).ds_precision; - convertParm.cv_srcDesc.ds_scale = (ii_link->descriptor[field+column]).ds_scale; - convertParm.cv_srcDesc.ds_columnType = (ii_link->descriptor[field+column]).ds_columnType; - convertParm.cv_srcDesc.ds_columnName = (ii_link->descriptor[field+column]).ds_columnName; - convertParm.cv_srcValue.dv_null = columnData[column].dv_null; - convertParm.cv_srcValue.dv_length = columnData[column].dv_length; - convertParm.cv_srcValue.dv_value = columnData[column].dv_value; - convertParm.cv_dstDesc.ds_dataType = destType; - convertParm.cv_dstDesc.ds_nullable = FALSE; - convertParm.cv_dstDesc.ds_length = destSize; - convertParm.cv_dstDesc.ds_precision = precision; - convertParm.cv_dstDesc.ds_scale = 0; - convertParm.cv_dstDesc.ds_columnType = IIAPI_COL_TUPLE; - convertParm.cv_dstDesc.ds_columnName = NULL; - convertParm.cv_dstValue.dv_null = FALSE; - convertParm.cv_dstValue.dv_length = convertParm.cv_dstDesc.ds_length; - convertParm.cv_dstValue.dv_value = emalloc(convertParm.cv_dstDesc.ds_length+1); + columnData[column].dv_length = formatParm.fd_dstValue.dv_length; + columnData[column].dv_value = formatParm.fd_dstValue.dv_value; + efree(formatParm.fd_srcValue.dv_value); + formatParm.fd_srcValue.dv_value = NULL; + +#else + IIAPI_CONVERTPARM convertParm; + + convertParm.cv_srcDesc.ds_dataType = (ii_result->descriptor[field+column]).ds_dataType; + convertParm.cv_srcDesc.ds_nullable = (ii_result->descriptor[field+column]).ds_nullable; + convertParm.cv_srcDesc.ds_length = (ii_result->descriptor[field+column]).ds_length; + convertParm.cv_srcDesc.ds_precision = (ii_result->descriptor[field+column]).ds_precision; + convertParm.cv_srcDesc.ds_scale = (ii_result->descriptor[field+column]).ds_scale; + convertParm.cv_srcDesc.ds_columnType = (ii_result->descriptor[field+column]).ds_columnType; + convertParm.cv_srcDesc.ds_columnName = (ii_result->descriptor[field+column]).ds_columnName; + convertParm.cv_srcValue.dv_null = columnData[column].dv_null; + convertParm.cv_srcValue.dv_length = columnData[column].dv_length; + convertParm.cv_srcValue.dv_value = columnData[column].dv_value; + convertParm.cv_dstDesc.ds_dataType = destType; + convertParm.cv_dstDesc.ds_nullable = FALSE; + convertParm.cv_dstDesc.ds_length = destSize; + convertParm.cv_dstDesc.ds_precision = precision; + convertParm.cv_dstDesc.ds_scale = 0; + convertParm.cv_dstDesc.ds_columnType = IIAPI_COL_TUPLE; + convertParm.cv_dstDesc.ds_columnName = NULL; + convertParm.cv_dstValue.dv_null = FALSE; + convertParm.cv_dstValue.dv_length = convertParm.cv_dstDesc.ds_length; + convertParm.cv_dstValue.dv_value = emalloc(convertParm.cv_dstDesc.ds_length+1); - IIapi_convertData(&convertParm); + IIapi_convertData(&convertParm); - if(convertParm.fd_status != IIAPI_ST_SUCCESS ) { - return convertParm.cv_status; - } + if(convertParm.fd_status != IIAPI_ST_SUCCESS ) { + return convertParm.cv_status; + } - columnData[column].dv_length = convertParm.cv_dstValue.dv_length; - columnData[column].dv_value = convertParm.cv_dstValue.dv_value; - efree(convertParm.cv_srcValue.dv_value); + columnData[column].dv_length = convertParm.cv_dstValue.dv_length; + columnData[column].dv_value = convertParm.cv_dstValue.dv_value; + efree(convertParm.cv_srcValue.dv_value); + convertParm.cv_srcValue.dv_value=NULL; #endif - return II_OK; + return II_OK; } /* }}} */ /* {{{ static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int result_type) */ /* Fetch a row of result */ -static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int result_type) +static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_RESULT *ii_result, int result_type, long row_position, II_INT2 row_count) { - IIAPI_GETCOLPARM getColParm; - IIAPI_DATAVALUE *columnData; - IIAPI_GETQINFOPARM getQInfoParm; - - int i, j, k; - double value_double = 0; - long value_long = 0; - char *value_char_p; - int len, should_copy, correct_length=0; - int lob_len ; - short int lob_segment_len, found_lob; - short int null_column_name, mem; - char *lob_segment, *lob_ptr, *lob_data; + IIAPI_GETCOLPARM getColParm; + IIAPI_DATAVALUE *columnData; + IIAPI_GETQINFOPARM getQInfoParm; +#if defined(IIAPI_VERSION_6) + IIAPI_POSPARM posParm; +#endif - /* array initialization */ - array_init(return_value); + int i, j, k, l; + double value_double = 0; + long value_long = 0; + char *value_char_p; + int len, should_copy, correct_length=0; + int lob_len ; + short int lob_segment_len, found_lob; + short int null_column_name, mem; + char *lob_segment, *lob_ptr, *lob_data; + + UTF8 *tmp_utf8_string_ptr = NULL; + UTF8 *tmp_utf8_string = NULL; + int utf8_string_len = 0; + UTF16 *string_start; + ConversionResult result; - if ( ii_link->procname != NULL ) /* look to see if there is a return value*/ - { - if ( ii_link->fieldCount == 0 ) - /* if > 0 then we are looking at a row producing procedure and don't want to call IIapi_getQueryInfo - * to nullify any results */ - { - getQInfoParm.gq_genParm.gp_callback = NULL; - getQInfoParm.gq_genParm.gp_closure = NULL; - getQInfoParm.gq_stmtHandle = ii_link->stmtHandle; - - IIapi_getQueryInfo( &getQInfoParm ); - ii_sync(&(getQInfoParm.gq_genParm)); - - if (ii_success(&(getQInfoParm.gq_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - RETURN_FALSE; - } - - /* Check that the last query was for a procedure and there is a return value */ - if ((getQInfoParm.gq_mask & IIAPI_GQ_PROCEDURE_ID) && - (getQInfoParm.gq_mask & IIAPI_GQ_PROCEDURE_RET)) - { - if (result_type & II_NUM) - { - add_index_long(return_value, 0, getQInfoParm.gq_procedureReturn); - } - if (result_type & II_ASSOC) - { - add_assoc_long(return_value, "returnvalue", getQInfoParm.gq_procedureReturn); - } - } - else - { - RETURN_FALSE; - } - } - } + /* array initialization */ + array_init(return_value); - /* going through all fields */ - for (i = 0; i < ii_link->fieldCount;) - { - j = 0; - k = 0; - found_lob = 0; - - /* as long as there are no long byte or long varchar fields, Ingres is able to fetch - many fields at a time, so try to find these types and stop if they're found. variable - j will get number of fields to fetch */ - while ( (i + j) < ii_link->fieldCount ) - { - if ((ii_link->descriptor[i+j]).ds_dataType != IIAPI_LBYTE_TYPE && - (ii_link->descriptor[i+j]).ds_dataType != IIAPI_LVCH_TYPE && - (ii_link->descriptor[i+j]).ds_dataType != IIAPI_LNVCH_TYPE ) - { - j++; - } - else - { - /* break out of loop */ - /* a lob needs to be processed separately */ - found_lob = 1; - break; - } - } - - if ( j > 0 ) - { - /* process non LOB fields */ - - /* allocate memory for j fields */ - columnData = (IIAPI_DATAVALUE *) safe_emalloc(sizeof(IIAPI_DATAVALUE), j, 0); - for (k = 0; k < j; k++) - { - columnData[k].dv_value = (II_PTR) emalloc((ii_link->descriptor[i + k]).ds_length); - } - - getColParm.gc_genParm.gp_callback = NULL; - getColParm.gc_genParm.gp_closure = NULL; - getColParm.gc_rowCount = 1; - getColParm.gc_columnCount = j; - getColParm.gc_columnData = columnData; - getColParm.gc_stmtHandle = ii_link->stmtHandle; - getColParm.gc_moreSegments = 0; - - IIapi_getColumns(&getColParm); - ii_sync(&(getColParm.gc_genParm)); - - if (ii_success(&(getColParm.gc_genParm), ii_link TSRMLS_CC) != II_OK) - { - for (k = 0; k < j; k++) - { - efree(columnData[k].dv_value); - } - zend_hash_destroy(return_value->value.ht); - efree(return_value->value.ht); - efree(columnData); - RETURN_FALSE; - } - - for (k = 0; k < j; k++) - { - - /* some releases of Ingres do not set a column name for row producing procedures */ - /* set up some memory so we can roll our own column name */ - if ( ii_link->procname != NULL && ii_link->descriptor[i + k].ds_columnName == NULL ) - { - ii_link->descriptor[i+k].ds_columnName = emalloc(8); - for ( mem = 0 ; mem < 8 ; mem++ ) - { - ii_link->descriptor[i+k].ds_columnName[mem] = '\0'; - } - null_column_name = 1; - } - if (columnData[k].dv_null) - { /* NULL value ? */ - - if (result_type & II_NUM) - { - add_index_null(return_value, i + k + IIG(array_index_start)); - } - if (result_type & II_ASSOC) - { - add_assoc_null(return_value, php_ii_field_name(ii_link, i + k + IIG(array_index_start) TSRMLS_CC)); - } - - } else { /* non NULL value */ - correct_length = 0; - - switch ((ii_link->descriptor[i + k]).ds_dataType) - { - - case IIAPI_DEC_TYPE: /* decimal (fixed point number) */ - case IIAPI_MNY_TYPE: /* money */ - /* convert to floating point number */ - php_ii_convert_data ( IIAPI_FLT_TYPE, sizeof(II_FLOAT8), 53, ii_link, columnData, getColParm, i, k TSRMLS_CC ); - /* NO break */ - - case IIAPI_FLT_TYPE: /* floating point number */ - switch (columnData[k].dv_length) - { - - case 4: - value_double = (double) *((II_FLOAT4 *) columnData[k].dv_value); - break; - - case 8: - value_double = (double) *((II_FLOAT8 *) columnData[k].dv_value); - break; - - default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid size for IIAPI_FLT_TYPE data (%d)", columnData[k - 1].dv_length); - break; - } - - if (result_type & II_NUM) - { - add_index_double(return_value, i + k + IIG(array_index_start), value_double); - } - - if (result_type & II_ASSOC) - { - add_assoc_double(return_value, php_ii_field_name(ii_link, i + k + IIG(array_index_start) TSRMLS_CC), value_double); - - } - break; - - case IIAPI_INT_TYPE: /* integer */ - switch (columnData[k].dv_length) - { - - case 1: - value_long = (long) *((II_INT1 *) columnData[k].dv_value); - break; - - case 2: - value_long = (long) *((II_INT2 *) columnData[k].dv_value); - break; - - case 4: - value_long = (long) *((II_INT4 *) columnData[k].dv_value); - break; -#ifdef IIAPI_VERSION_4 - case 8: - value_long = (long) *((II_INT4 *) columnData[k].dv_value); - break; -#endif - default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid size for IIAPI_INT_TYPE data (%d)", columnData[k].dv_length); - break; - } - - if (result_type & II_NUM) - { - add_index_long(return_value, i + k + IIG(array_index_start), value_long); - } - - if (result_type & II_ASSOC) - { - add_assoc_long(return_value, php_ii_field_name(ii_link, i + k + IIG(array_index_start) TSRMLS_CC), value_long); - } - break; - -#ifdef IIAPI_VERSION_3 - case IIAPI_NVCH_TYPE: /* variable length unicode character string */ - columnData[k].dv_length = *((II_INT2 *) columnData[k].dv_value) * 2; - columnData[k].dv_value = (II_CHAR *)(columnData[k]).dv_value + 2; - correct_length = 1; - case IIAPI_NCHA_TYPE: /* fixed length unicode character string */ - /* use php_addslashes if asked to */ - if (PG(magic_quotes_runtime)) - { - value_char_p = php_addslashes((char *) columnData[k].dv_value, columnData[k].dv_length, &len, 0 TSRMLS_CC); - should_copy = 0; - } else { - value_char_p = (char *) columnData[k].dv_value; - len = columnData[k].dv_length; - should_copy = 1; - } - - if (result_type & II_NUM) - { - add_index_stringl(return_value, i + k + IIG(array_index_start), value_char_p, len, should_copy); - } - - if (result_type & II_ASSOC) - { - add_assoc_stringl(return_value, php_ii_field_name(ii_link, i + k + IIG(array_index_start) TSRMLS_CC), value_char_p, len, should_copy); - } - - break; -#endif - case IIAPI_TXT_TYPE: /* variable length character string */ - case IIAPI_VBYTE_TYPE: /* variable length binary string */ - case IIAPI_VCH_TYPE: /* variable length character string */ - /* real length is stored in first 2 bytes of data, so adjust - length variable and data pointer */ - columnData[k].dv_length = *((II_INT2 *) columnData[k].dv_value); - columnData[k].dv_value = (II_CHAR *)(columnData[k]).dv_value + 2; - correct_length = 1; - /* NO break */ - - case IIAPI_BYTE_TYPE: /* fixed length binary string */ - case IIAPI_CHA_TYPE: /* fixed length character string */ - case IIAPI_CHR_TYPE: /* fixed length character string */ - case IIAPI_LOGKEY_TYPE: /* value unique to database */ - case IIAPI_TABKEY_TYPE: /* value unique to table */ - case IIAPI_DTE_TYPE: /* date */ - - /* eventualy convert date to string */ - if ((ii_link->descriptor[i + k]).ds_dataType == IIAPI_DTE_TYPE) - { - php_ii_convert_data ( IIAPI_CHA_TYPE, 32, 0, ii_link, columnData, getColParm, i, k TSRMLS_CC ); - } - - /* use php_addslashes if asked to */ - if (PG(magic_quotes_runtime)) - { - value_char_p = php_addslashes((char *) columnData[k].dv_value, columnData[k].dv_length, &len, 0 TSRMLS_CC); - should_copy = 0; - } else { - value_char_p = (char *) columnData[k].dv_value; - len = columnData[k].dv_length; - should_copy = 1; - } - - if (result_type & II_NUM) - { - add_index_stringl(return_value, i + k + IIG(array_index_start), value_char_p, len, should_copy); - } - - if (result_type & II_ASSOC) - { - add_assoc_stringl(return_value, php_ii_field_name(ii_link, i + k + IIG(array_index_start) TSRMLS_CC), value_char_p, len, should_copy); - } - - break; - - default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid SQL data type in fetched field (%d -- length : %d)", (ii_link->descriptor[i + k]).ds_dataType, columnData[k].dv_length); - break; - } - /* eventualy restore data pointer state for variable length data types */ - if (correct_length) - { - columnData[k].dv_value = (II_CHAR *)(columnData[k]).dv_value - 2; - } - } - if ( ii_link->procname != NULL && null_column_name == 1 ) - { - efree(ii_link->descriptor[i+k].ds_columnName); - ii_link->descriptor[i+k].ds_columnName = NULL; - null_column_name = 0; - } - - } - - /* free the memory buffers */ - for (k = 0; k < j; k++) - { - efree(columnData[k].dv_value); - } - efree(columnData); - } - - if (found_lob) - { - - /* alloc memory for the size of the segment we need */ - - columnData = (IIAPI_DATAVALUE *) safe_emalloc(sizeof(IIAPI_DATAVALUE), 1, 0); - lob_segment = (char *) emalloc (IIG(blob_segment_length)); - lob_len = 0; - do - { - getColParm.gc_genParm.gp_callback = NULL; - getColParm.gc_genParm.gp_closure = NULL; - getColParm.gc_rowCount = 1; - getColParm.gc_columnCount = 1; /* just the lob */ - getColParm.gc_columnData = columnData; - getColParm.gc_columnData[0].dv_value = lob_segment; - getColParm.gc_stmtHandle = ii_link->stmtHandle; - - IIapi_getColumns(&getColParm); - ii_sync(&(getColParm.gc_genParm)); - - switch (ii_success(&(getColParm.gc_genParm), ii_link TSRMLS_CC)) - { - case II_OK: - break; - case II_NO_DATA: - efree(lob_segment); - efree(columnData); - RETURN_FALSE; - break; - default: - efree(lob_segment); - efree(columnData); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured whilst fetching a BLOB"); - RETURN_FALSE; - break; - } - - if (columnData[0].dv_null) - { - break; - } - - /* length of the segment fetched is in the first 2 bytes of - lob_segment */ - memcpy( (char *)&lob_segment_len, lob_segment, 2 ); - - - if ( lob_len == 0 ) - { - lob_data = (char *) emalloc (lob_segment_len + 1); - } - else - { - /* extend existing lob buffer by the size of the new segment */ - lob_data = erealloc (lob_data, lob_len + lob_segment_len + 16); - } - - /* copy segement in to buffer. First two bytes contain the length of the segment. */ - - - lob_segment += 2; - lob_ptr = lob_data + lob_len; - memcpy(lob_ptr, lob_segment, lob_segment_len); - - /* move on dv_length and add to the total length of the lob fetched - so far */ - lob_segment -= 2; - lob_len += lob_segment_len; - - } - while ( getColParm.gc_moreSegments ); - - if (columnData[0].dv_null) - { /* NULL value ? */ - - if (result_type & II_NUM) - { - add_index_null(return_value, i + k + IIG(array_index_start)); - } - if (result_type & II_ASSOC) - { - add_assoc_null(return_value, php_ii_field_name(ii_link, i + k + IIG(array_index_start) TSRMLS_CC)); - } - } - else - { - if (result_type & II_NUM) - { - add_index_stringl(return_value, i + k + IIG(array_index_start), lob_data, lob_len, 1); - } - - if (result_type & II_ASSOC) - { - add_assoc_stringl(return_value, php_ii_field_name(ii_link, i + k + IIG(array_index_start) TSRMLS_CC), lob_data, lob_len, 1); - } - } - - efree(lob_segment); - efree(columnData); - if (lob_len != 0) - { - efree(lob_data); - } - - } - - - /* increase field pointer by number of fetched fields */ - /* include any LOB data fetched */ - i += j + found_lob; - } + if ( ii_result->procname != NULL ) /* look to see if there is a return value*/ + { + if ( ii_result->fieldCount == 0 ) + /* if > 0 then we are looking at a row producing procedure and don't want to call IIapi_getQueryInfo + * to nullify any results */ + { + getQInfoParm.gq_genParm.gp_callback = NULL; + getQInfoParm.gq_genParm.gp_closure = NULL; + getQInfoParm.gq_stmtHandle = ii_result->stmtHandle; + + IIapi_getQueryInfo( &getQInfoParm ); + ii_sync(&(getQInfoParm.gq_genParm)); + + if (ii_success(&(getQInfoParm.gq_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + RETURN_FALSE; + } + + /* Check that the last query was for a procedure and there is a return value */ + if ((getQInfoParm.gq_mask & IIAPI_GQ_PROCEDURE_ID) && + (getQInfoParm.gq_mask & IIAPI_GQ_PROCEDURE_RET)) + { + if (result_type & II_NUM) + { + add_index_long(return_value, 0, getQInfoParm.gq_procedureReturn); + } + if (result_type & II_ASSOC) + { + add_assoc_long(return_value, "returnvalue", getQInfoParm.gq_procedureReturn); + } + } + else + { + RETURN_FALSE; + } + } + } + +#if defined(IIAPI_VERSION_6) + if ((row_position > 0) && (ii_result->scrollable )) + { + + posParm.po_genParm.gp_callback = NULL; + posParm.po_genParm.gp_closure = NULL; + posParm.po_stmtHandle = ii_result->stmtHandle; + posParm.po_reference = IIAPI_POS_BEGIN; + posParm.po_offset = row_position; + posParm.po_rowCount = 1; + + IIapi_position(&posParm); + ii_sync(&(posParm.po_genParm)); + + if (ii_success(&(posParm.po_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + RETURN_FALSE; + } + } +#else + if ( row_position > 0) + { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Row positioning is not supported at this release level"); + } +#endif + + /* going through all fields */ + for (i = 0; i < ii_result->fieldCount;) + { + j = 0; + k = 0; + found_lob = 0; + + /* as long as there are no long byte or long varchar fields, Ingres is able to fetch + many fields at a time, so try to find these types and stop if they're found. variable + j will get number of fields to fetch */ + while ((i + j) < ii_result->fieldCount ) + { + if ((ii_result->descriptor[i+j]).ds_dataType != IIAPI_LBYTE_TYPE && + (ii_result->descriptor[i+j]).ds_dataType != IIAPI_LVCH_TYPE && + (ii_result->descriptor[i+j]).ds_dataType != IIAPI_LNVCH_TYPE ) + { + j++; + } + else + { + /* break out of loop */ + /* a lob needs to be processed separately */ + found_lob = 1; + break; + } + } + + if ( j > 0 ) + { + /* process non LOB fields */ + + /* allocate memory for j fields */ + columnData = (IIAPI_DATAVALUE *) safe_emalloc(sizeof(IIAPI_DATAVALUE), j, 0); + for (k = 0; k < j; k++) + { + columnData[k].dv_value = (II_PTR) emalloc((ii_result->descriptor[i + k]).ds_length); + } + + getColParm.gc_genParm.gp_callback = NULL; + getColParm.gc_genParm.gp_closure = NULL; + getColParm.gc_rowCount = 1; + getColParm.gc_columnCount = j; + getColParm.gc_columnData = columnData; + getColParm.gc_stmtHandle = ii_result->stmtHandle; + getColParm.gc_moreSegments = 0; + + IIapi_getColumns(&getColParm); + ii_sync(&(getColParm.gc_genParm)); + + if (ii_success(&(getColParm.gc_genParm), &ii_result->errorHandle TSRMLS_CC) != II_OK) + { + for (k = 0; k < j; k++) + { + efree(columnData[k].dv_value); + } + zend_hash_destroy(return_value->value.ht); + efree(return_value->value.ht); + efree(columnData); + RETURN_FALSE; + } + + for (k = 0; k < j; k++) + { + + /* some releases of Ingres do not set a column name for row producing procedures */ + /* set up some memory so we can roll our own column name */ + if ( ii_result->procname != NULL && ii_result->descriptor[i + k].ds_columnName == NULL ) + { + ii_result->descriptor[i+k].ds_columnName = emalloc(8); + for ( mem = 0 ; mem < 8 ; mem++ ) + { + ii_result->descriptor[i+k].ds_columnName[mem] = '\0'; + } + null_column_name = 1; + } + if (columnData[k].dv_null) + { /* NULL value ? */ + + if (result_type & II_NUM) + { + add_index_null(return_value, i + k + IIG(array_index_start)); + } + if (result_type & II_ASSOC) + { + add_assoc_null(return_value, php_ii_field_name(ii_result, i + k + IIG(array_index_start) TSRMLS_CC)); + } + + } else { /* non NULL value */ + correct_length = 0; + + switch ((ii_result->descriptor[i + k]).ds_dataType) + { + + case IIAPI_DEC_TYPE: /* decimal (fixed point number) */ + case IIAPI_MNY_TYPE: /* money */ + /* convert to floating point number */ + php_ii_convert_data ( IIAPI_FLT_TYPE, sizeof(II_FLOAT8), 53, ii_result, columnData, getColParm, i, k TSRMLS_CC ); + /* NO break */ + + case IIAPI_FLT_TYPE: /* floating point number */ + switch (columnData[k].dv_length) + { + + case 4: + value_double = (double) *((II_FLOAT4 *) columnData[k].dv_value); + break; + + case 8: + value_double = (double) *((II_FLOAT8 *) columnData[k].dv_value); + break; + + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid size for IIAPI_FLT_TYPE data (%d)", columnData[k - 1].dv_length); + break; + } + + if (result_type & II_NUM) + { + add_index_double(return_value, i + k + IIG(array_index_start), value_double); + } + + if (result_type & II_ASSOC) + { + add_assoc_double(return_value, php_ii_field_name(ii_result, i + k + IIG(array_index_start) TSRMLS_CC), value_double); + + } + break; + + case IIAPI_INT_TYPE: /* integer */ + switch (columnData[k].dv_length) + { + + case 1: + value_long = (long) *((II_INT1 *) columnData[k].dv_value); + break; + + case 2: + value_long = (long) *((II_INT2 *) columnData[k].dv_value); + break; + + case 4: + value_long = (long) *((II_INT4 *) columnData[k].dv_value); + break; +#if defined(IIAPI_VERSION_4) + case 8: + value_long = (long) *((II_INT4 *) columnData[k].dv_value); + break; +#endif + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid size for IIAPI_INT_TYPE data (%d)", columnData[k].dv_length); + break; + } + + if (result_type & II_NUM) + { + add_index_long(return_value, i + k + IIG(array_index_start), value_long); + } + + if (result_type & II_ASSOC) + { + add_assoc_long(return_value, php_ii_field_name(ii_result, i + k + IIG(array_index_start) TSRMLS_CC), value_long); + } + break; + +#if defined(IIAPI_VERSION_3) + case IIAPI_NVCH_TYPE: /* variable length unicode character string */ + columnData[k].dv_length = *((II_INT2 *) columnData[k].dv_value) * 2; + columnData[k].dv_value = (II_CHAR *)(columnData[k]).dv_value + 2; + correct_length = 1; + case IIAPI_NCHA_TYPE: /* fixed length unicode character string */ + /* use php_addslashes if asked to */ + if (PG(magic_quotes_runtime)) + { + value_char_p = php_addslashes((char *) columnData[k].dv_value, columnData[k].dv_length, &len, 0 TSRMLS_CC); + should_copy = 0; + } else { + value_char_p = (char *) columnData[k].dv_value; + len = columnData[k].dv_length; + should_copy = 1; + } + + if (IIG(utf8)) { + /* User has requested the output in UTF-8 */ + /* create a big enough buffer - each code point in UTF-16 can be upto 4 bytes in UTF-8 */ + tmp_utf8_string = emalloc((len * 4) + 1); + for ( l = 0; l < len * 4 ; l++) { + tmp_utf8_string[l] = '\0'; + } + string_start = (UTF16 *)columnData[k].dv_value; + tmp_utf8_string_ptr = tmp_utf8_string; + result = ConvertUTF16toUTF8((const UTF16 **) &string_start, string_start + len/2, &tmp_utf8_string_ptr, tmp_utf8_string_ptr + (len * 4), strictConversion); + len = tmp_utf8_string_ptr - tmp_utf8_string; + tmp_utf8_string[len] = '\0'; + value_char_p = (char *)tmp_utf8_string; + } + + if (result_type & II_NUM) + { + add_index_stringl(return_value, i + k + IIG(array_index_start), value_char_p, len, should_copy); + } + if (result_type & II_ASSOC) + { + add_assoc_stringl(return_value, php_ii_field_name(ii_result, i + k + IIG(array_index_start) TSRMLS_CC), value_char_p, len, should_copy); + } + if (tmp_utf8_string) { + efree(tmp_utf8_string); + tmp_utf8_string = NULL; + } + break; +#endif + case IIAPI_TXT_TYPE: /* variable length character string */ + case IIAPI_VBYTE_TYPE: /* variable length binary string */ + case IIAPI_VCH_TYPE: /* variable length character string */ + /* real length is stored in first 2 bytes of data, so adjust + length variable and data pointer */ + columnData[k].dv_length = *((II_INT2 *) columnData[k].dv_value); + columnData[k].dv_value = (II_CHAR *)(columnData[k]).dv_value + 2; + correct_length = 1; + /* NO break */ + + case IIAPI_BYTE_TYPE: /* fixed length binary string */ + case IIAPI_CHA_TYPE: /* fixed length character string */ + case IIAPI_CHR_TYPE: /* fixed length character string */ + case IIAPI_LOGKEY_TYPE: /* value unique to database */ + case IIAPI_TABKEY_TYPE: /* value unique to table */ + case IIAPI_DTE_TYPE: /* Ingres date */ +#if defined(IIAPI_VERSION_5) + case IIAPI_ADATE_TYPE: /* SQL Date (aka ANSI DATE) */ + case IIAPI_TIME_TYPE: /* Ingres Time */ + case IIAPI_TMWO_TYPE: /* Time without Timezone */ + case IIAPI_TMTZ_TYPE: /* Time with Timezone */ + case IIAPI_TS_TYPE: /* Ingres Timestamp */ + case IIAPI_TSWO_TYPE: /* Timestamp without Timezone */ + case IIAPI_TSTZ_TYPE: /* Timestamp with Timezone */ + case IIAPI_INTYM_TYPE: /* Interval Year to Month */ + case IIAPI_INTDS_TYPE: /* Interval Day to Second */ +#endif + /* convert date to variable length string */ + if ((ii_result->descriptor[i + k]).ds_dataType == IIAPI_DTE_TYPE || + (ii_result->descriptor[i + k]).ds_dataType == IIAPI_ADATE_TYPE || + (ii_result->descriptor[i + k]).ds_dataType == IIAPI_TIME_TYPE || + (ii_result->descriptor[i + k]).ds_dataType == IIAPI_TMWO_TYPE || + (ii_result->descriptor[i + k]).ds_dataType == IIAPI_TMTZ_TYPE || + (ii_result->descriptor[i + k]).ds_dataType == IIAPI_TS_TYPE || + (ii_result->descriptor[i + k]).ds_dataType == IIAPI_TSWO_TYPE || + (ii_result->descriptor[i + k]).ds_dataType == IIAPI_TSTZ_TYPE || + (ii_result->descriptor[i + k]).ds_dataType == IIAPI_INTYM_TYPE || + (ii_result->descriptor[i + k]).ds_dataType == IIAPI_INTDS_TYPE) + { + php_ii_convert_data ( IIAPI_VCH_TYPE, 32, 0, ii_result, columnData, getColParm, i, k TSRMLS_CC ); + columnData[k].dv_length = *((II_INT2 *) columnData[k].dv_value); + columnData[k].dv_value = (II_CHAR *)(columnData[k]).dv_value + 2; + correct_length = 1; + } + + /* use php_addslashes if asked to */ + if (PG(magic_quotes_runtime)) + { + value_char_p = php_addslashes((char *) columnData[k].dv_value, columnData[k].dv_length, &len, 0 TSRMLS_CC); + should_copy = 0; + } + else + { + value_char_p = (char *) columnData[k].dv_value; + len = columnData[k].dv_length; + should_copy = 1; + } + + if (result_type & II_NUM) + { + add_index_stringl(return_value, i + k + IIG(array_index_start), value_char_p, len, should_copy); + } + + if (result_type & II_ASSOC) + { + add_assoc_stringl(return_value, php_ii_field_name(ii_result, i + k + IIG(array_index_start) TSRMLS_CC), value_char_p, len, should_copy); + } + + break; + + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid SQL data type in fetched field (%d -- length : %d)", (ii_result->descriptor[i + k]).ds_dataType, columnData[k].dv_length); + break; + } + /* eventualy restore data pointer state for variable length data types */ + if (correct_length) + { + columnData[k].dv_value = (II_CHAR *)(columnData[k]).dv_value - 2; + } + } + if ( ii_result->procname != NULL && null_column_name == 1 ) + { + efree(ii_result->descriptor[i+k].ds_columnName); + ii_result->descriptor[i+k].ds_columnName = NULL; + null_column_name = 0; + } + + } + + /* free the memory buffers */ + for (k = 0; k < j; k++) + { + efree(columnData[k].dv_value); + } + efree(columnData); + } + + if (found_lob) + { + + /* alloc memory for the size of the segment we need */ + + columnData = (IIAPI_DATAVALUE *) safe_emalloc(sizeof(IIAPI_DATAVALUE), 1, 0); + lob_segment = (char *) emalloc (IIG(blob_segment_length)); + lob_len = 0; + do + { + getColParm.gc_genParm.gp_callback = NULL; + getColParm.gc_genParm.gp_closure = NULL; + getColParm.gc_rowCount = 1; + getColParm.gc_columnCount = 1; /* just the lob */ + getColParm.gc_columnData = columnData; + getColParm.gc_columnData[0].dv_value = lob_segment; + getColParm.gc_stmtHandle = ii_result->stmtHandle; + + IIapi_getColumns(&getColParm); + ii_sync(&(getColParm.gc_genParm)); + + switch (ii_success(&(getColParm.gc_genParm), &ii_result->errorHandle TSRMLS_CC)) + { + case II_OK: + break; + case II_NO_DATA: + efree(lob_segment); + efree(columnData); + RETURN_FALSE; + break; + default: + efree(lob_segment); + efree(columnData); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured whilst fetching a BLOB"); + RETURN_FALSE; + break; + } + + if (columnData[0].dv_null) + { + break; + } + + /* length of the segment fetched is in the first 2 bytes of + lob_segment */ + memcpy( (char *)&lob_segment_len, lob_segment, 2 ); + + if ( lob_len == 0 ) + { + lob_data = (char *) emalloc (lob_segment_len + 1); + } + else + { + /* extend existing lob buffer by the size of the new segment */ + lob_data = erealloc (lob_data, lob_len + lob_segment_len + 16); + } + + /* copy segement in to buffer. First two bytes contain the length of the segment. */ + + + lob_segment += 2; + lob_ptr = lob_data + lob_len; + memcpy(lob_ptr, lob_segment, lob_segment_len); + + /* move on dv_length and add to the total length of the lob fetched + so far */ + lob_segment -= 2; + lob_len += lob_segment_len; + + } + while ( getColParm.gc_moreSegments ); + + if (columnData[0].dv_null) + { /* NULL value ? */ + + if (result_type & II_NUM) + { + add_index_null(return_value, i + k + IIG(array_index_start)); + } + if (result_type & II_ASSOC) + { + add_assoc_null(return_value, php_ii_field_name(ii_result, i + k + IIG(array_index_start) TSRMLS_CC)); + } + } + else + { + if (result_type & II_NUM) + { + add_index_stringl(return_value, i + k + IIG(array_index_start), lob_data, lob_len, 1); + } + + if (result_type & II_ASSOC) + { + add_assoc_stringl(return_value, php_ii_field_name(ii_result, i + k + IIG(array_index_start) TSRMLS_CC), lob_data, lob_len, 1); + } + } + + efree(lob_segment); + efree(columnData); + if (lob_len != 0) + { + efree(lob_data); + } + + } + + + /* increase field pointer by number of fetched fields */ + /* include any LOB data fetched */ + i += j + found_lob; + } } /* }}} */ @@ -2770,433 +3418,467 @@ II_NUM for enumerated array, II_ASSOC for associative array, or II_BOTH (default) */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_fetch_array) +#else PHP_FUNCTION(ingres_fetch_array) +#endif { - zval **result_type, **link; - int argc; - II_LINK *ii_link; - int link_id = -1; - - argc = ZEND_NUM_ARGS(); - if (argc > 2 || zend_get_parameters_ex(argc, &result_type, &link) == FAILURE) - { - WRONG_PARAM_COUNT; - } - - if (argc != 0) - { - convert_to_long_ex(result_type); - } - - if (argc <= 1 ) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } + long result_type=II_BOTH; + long row_position = -1; + zval *result; + II_RESULT *ii_result; + II_INT2 row_count=1; - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r|lll" , &result, &row_position, &row_count, &result_type) == FAILURE) + { + RETURN_FALSE; + } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id , "Ingres Link", le_ii_link, le_ii_plink); + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1 , "Ingres Result", le_ii_result); - php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, (argc == 0 ? II_BOTH : Z_LVAL_PP(result_type))); + php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, (ZEND_NUM_ARGS() == 1 ? II_BOTH : result_type), row_position, row_count); } /* }}} */ -/* {{{ proto array ingres_fetch_row([resource link]) +/* {{{ proto array ingres_fetch_row(resource result) Fetch a row of result into an enumerated array */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_fetch_row) +#else PHP_FUNCTION(ingres_fetch_row) +#endif { - zval **link; - int argc; - II_LINK *ii_link; - int link_id = -1; - - argc = ZEND_NUM_ARGS(); - if (argc > 1 || zend_get_parameters_ex(argc, &link) == FAILURE) - { - WRONG_PARAM_COUNT; - } - - if (argc == 0 ) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - - } + zval *result; + II_RESULT *ii_result; + long row_position = -1; + II_INT2 row_count=1; - if (argc == 0 ) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r|ll" , &result, &row_position, &row_count) == FAILURE) + { + RETURN_FALSE; + } - } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id , "Ingres Link", le_ii_link, le_ii_plink); + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1 , "Ingres Result", le_ii_result); - php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, II_NUM); + php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, II_NUM, row_position, row_count); } /* }}} */ /* {{{ proto array ingres_fetch_object([int result_type [, resource link]]) Fetch a row of result into an object result_type can be II_NUM for enumerated object, II_ASSOC for associative object, or II_BOTH (default) */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_fetch_object) +#else PHP_FUNCTION(ingres_fetch_object) +#endif { - zval **result_type, **link; - int argc; - II_LINK *ii_link; - int link_id = -1; - - argc = ZEND_NUM_ARGS(); - if (argc > 2 || zend_get_parameters_ex(argc, &result_type, &link) == FAILURE) - { - WRONG_PARAM_COUNT; - } - - if ( argc == 1 ) - { - convert_to_long_ex(result_type); - } + long result_type = II_BOTH; + zval *result = NULL; + II_RESULT *ii_result; + long row_position = -1; + II_INT2 row_count = 1; - if (argc != 2) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r|lll" , &result, &row_position, &row_count, &result_type) == FAILURE) + { + RETURN_FALSE; + } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id , "Ingres Link", le_ii_link, le_ii_plink); + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1 , "Ingres Result", le_ii_result); - php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, (argc == 0 ? II_BOTH : Z_LVAL_PP(result_type))); + php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_result, (ZEND_NUM_ARGS() == 1 ? II_ASSOC : result_type), row_position, row_count); - if (Z_TYPE_P(return_value) == IS_ARRAY) - { - convert_to_object(return_value); - } + if (Z_TYPE_P(return_value) == IS_ARRAY) + { + convert_to_object(return_value); + } } /* }}} */ -/* {{{ proto array ingres_fetch_proc_return([resource link]]) +/* {{{ proto array ingres_fetch_proc_return(resource result) Fetch the return code from a procedure call. Calling this with rows to fetch from a row producing procedure will destroy any rows left to fetch */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_fetch_proc_return) +#else PHP_FUNCTION(ingres_fetch_proc_return) +#endif { - zval **link; - int argc; - II_LINK *ii_link; - int link_id = -1; - IIAPI_GETQINFOPARM getQInfoParm; - - argc = ZEND_NUM_ARGS(); - if (argc > 2 || zend_get_parameters_ex(argc, &link) == FAILURE) - { - WRONG_PARAM_COUNT; - } + zval *result; + II_RESULT *ii_result; + IIAPI_GETQINFOPARM getQInfoParm; - if (argc != 1) - { - link_id = php_ii_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if ( link_id == -1 ) /* There was a problem in php_ii_get_default_link */ - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r" , &result) == FAILURE) + { + RETURN_FALSE; + } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id , "Ingres Link", le_ii_link, le_ii_plink); + ZEND_FETCH_RESOURCE(ii_result, II_RESULT *, &result, -1 , "Ingres Result", le_ii_result); - getQInfoParm.gq_genParm.gp_callback = NULL; - getQInfoParm.gq_genParm.gp_closure = NULL; - getQInfoParm.gq_stmtHandle = ii_link->stmtHandle; + getQInfoParm.gq_genParm.gp_callback = NULL; + getQInfoParm.gq_genParm.gp_closure = NULL; + getQInfoParm.gq_stmtHandle = ii_result->stmtHandle; - IIapi_getQueryInfo( &getQInfoParm ); - ii_sync(&(getQInfoParm.gq_genParm)); + IIapi_getQueryInfo( &getQInfoParm ); + ii_sync(&(getQInfoParm.gq_genParm)); - if (ii_success(&(getQInfoParm.gq_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - RETURN_FALSE; - } + if (ii_success(&(getQInfoParm.gq_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + RETURN_FALSE; + } - /* Check that the last query was for a procedure and there is a return value */ - if ((getQInfoParm.gq_mask & IIAPI_GQ_PROCEDURE_ID) && - (getQInfoParm.gq_mask & IIAPI_GQ_PROCEDURE_RET)) - { - RETURN_LONG(getQInfoParm.gq_procedureReturn); - } + /* Check that the last query was for a procedure and there is a return value */ + if ((getQInfoParm.gq_mask & IIAPI_GQ_PROCEDURE_ID) && + (getQInfoParm.gq_mask & IIAPI_GQ_PROCEDURE_RET)) + { + RETURN_LONG(getQInfoParm.gq_procedureReturn); + } } /* }}} */ -/* {{{ proto bool ingres_rollback([resource link]) +/* {{{ proto bool ingres_rollback(resource link) Roll back a transaction */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_rollback) +#else PHP_FUNCTION(ingres_rollback) +#endif { - zval **link; - int argc; - int link_id = -1; - II_LINK *ii_link; + zval *link; + II_LINK *ii_link; - argc = ZEND_NUM_ARGS(); - if (argc > 1 || (argc && zend_get_parameters_ex(argc, &link) == FAILURE)) - { - WRONG_PARAM_COUNT; - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r" , &link) == FAILURE) + { + RETURN_FALSE; + } - if (argc == 0) - { - link_id = IIG(default_link); - if ( link_id == -1 ) - { - RETURN_FALSE; - } - } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, &link, -1, "Ingres Link", le_ii_link, le_ii_plink); - if (_rollback_transaction(ii_link TSRMLS_CC)) - { - RETURN_FALSE; - } - RETURN_TRUE; + if (_rollback_transaction(ii_link TSRMLS_CC)) + { + RETURN_FALSE; + } + RETURN_TRUE; } /* }}} */ -/* {{{ proto bool ingres_commit([resource link]) +/* {{{ proto bool ingres_commit(resource link) Commit a transaction */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_commit) +#else PHP_FUNCTION(ingres_commit) +#endif { - zval **link; - int argc; - int link_id = -1; - II_LINK *ii_link; - IIAPI_COMMITPARM commitParm; - - argc = ZEND_NUM_ARGS(); - if (argc > 1 || (argc && zend_get_parameters_ex(argc, &link) == FAILURE)) - { - WRONG_PARAM_COUNT; - } + zval *link; + II_LINK *ii_link; + IIAPI_COMMITPARM commitParm; - if (argc == 0) - { - link_id = IIG(default_link); - if (link_id == -1) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r" , &link) == FAILURE) + { + RETURN_FALSE; + } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, &link, -1, "Ingres Link", le_ii_link, le_ii_plink); - if ( ii_link ->tranHandle != NULL ) - { - if (ii_link->stmtHandle && _close_statement(ii_link TSRMLS_CC)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to close statement"); - RETURN_FALSE; - } - - commitParm.cm_genParm.gp_callback = NULL; - commitParm.cm_genParm.gp_closure = NULL; - commitParm.cm_tranHandle = ii_link->tranHandle; - - IIapi_commit(&commitParm); - ii_sync(&(commitParm.cm_genParm)); - - if (ii_success(&(commitParm.cm_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - RETURN_FALSE; - } + /* clean up any un-freed statements/results */ + _free_ii_link_result_list(ii_link TSRMLS_CC); - ii_link->tranHandle = NULL; - } - else - { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "There is no active transaction to commit"); - } + if ( ii_link->tranHandle != NULL ) + { + if ( _commit_transaction(ii_link TSRMLS_CC) == II_FAIL ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occurred when committing the transaction"); + RETURN_FALSE; + } + } + else + { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "There appears to be no active transaction to commit"); + } - RETURN_TRUE; + RETURN_TRUE; } /* }}} */ -/* {{{ proto bool ingres_autocommit([resource link]) - Switch autocommit on or off */ +/* {{{ proto bool ingres_autocommit(resource link) + Switch auto-commit on or off */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_autocommit) +#else PHP_FUNCTION(ingres_autocommit) +#endif { - zval **link; - int argc; - int link_id = -1; - II_LINK *ii_link; - IIAPI_AUTOPARM autoParm; + zval *link; + II_LINK *ii_link; + IIAPI_AUTOPARM autoParm; - argc = ZEND_NUM_ARGS(); - if (argc > 1 || (argc && zend_get_parameters_ex(argc, &link) == FAILURE)) - { - WRONG_PARAM_COUNT; - } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r" , &link) == FAILURE) + { + RETURN_FALSE; + } - if (argc == 0) - { - link_id = IIG(default_link); - if (link_id == -1) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occured getting the default link" ); - RETURN_FALSE; - } + ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, &link, -1, "Ingres Link", le_ii_link, le_ii_plink); - } - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); + /* If we are emulating auto commit any active result-sets need to be freed and committed to change the */ + /* auto-commit state */ + if ((ii_link->auto_multi)) + { + /* if there are active result-sets */ + if (ii_link->result_list_ptr) + { + /* clean up any un-freed statements/results */ + _free_ii_link_result_list(ii_link TSRMLS_CC); + } + /* commit the previous statement before changing the auto-commit state */ + if (_commit_transaction(ii_link TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "An error occur when issuing an internal commit"); + } + ii_link->auto_multi = 0; + } + + if (_autocommit_transaction(ii_link TSRMLS_CC) == II_FAIL) + { + if ( ii_link->result_list_ptr ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to change the auto-commit state due to open transactions"); + } + else + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "An error occur when changing the auto-commit state"); + } + RETURN_FALSE; + }; + + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto bool ingres_autocommit_state(resource link) + Return the current auto-commit state TRUE=ON, FALSE=OFF*/ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_autocommit_state) +#else +PHP_FUNCTION(ingres_autocommit_state) +#endif +{ + zval *link; + II_LINK *ii_link; + IIAPI_AUTOPARM autoParm; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"r" , &link) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, &link, -1, "Ingres Link", le_ii_link, le_ii_plink); + + /* Return TRUE if auto-commit is on or we are emulating auto-commit) */ + if ((ii_link->auto_multi) || (ii_link->autocommit)) + { + RETURN_TRUE; + } + else + { + RETURN_FALSE; + } +} +/* }}} */ + +/* {{{ proto long ingres_next_error() + Gets the last ingres error code generated */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_next_error) +#else +PHP_FUNCTION(ingres_next_error) +#endif +{ + short int i; - autoParm.ac_genParm.gp_callback = NULL; - autoParm.ac_genParm.gp_closure = NULL; - autoParm.ac_connHandle = ii_link->connHandle; - autoParm.ac_tranHandle = ii_link->tranHandle; + IIAPI_GETEINFOPARM error_info; - IIapi_autocommit(&autoParm); - ii_sync(&(autoParm.ac_genParm)); - if (ii_success(&(autoParm.ac_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - RETURN_FALSE; - } + if (IIG(errorHandle) != NULL) + { + IIG(error_number) = 0; + if (IIG(error_text) != NULL ) + { + efree(IIG(error_text)); + IIG(error_text) = NULL; + } + for ( i = 0; i < (II_SQLSTATE_LEN + 1); i++ ) + { + IIG(error_sqlstate)[i] = '\0'; + } + error_info.ge_errorHandle = IIG(errorHandle); + IIapi_getErrorInfo(&error_info); - ii_link->autocommit = (ii_link->autocommit ? 0 : 1); - ii_link->tranHandle = autoParm.ac_tranHandle; - RETURN_TRUE; + switch (error_info.ge_status) + { + case IIAPI_ST_SUCCESS: + IIG(error_number) = error_info.ge_errorCode; + IIG(error_text) = estrdup(error_info.ge_message); + memcpy(IIG(error_sqlstate),error_info.ge_SQLSTATE, II_SQLSTATE_LEN + 1); + RETURN_TRUE; + break; + case IIAPI_ST_NO_DATA: + RETURN_FALSE; + break; + default: /* An error occured with IIapi_getErrorInfo() */ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "IIapi_getErrorInfo error, status returned was : %d", error_info.ge_status ); + RETURN_FALSE; + break; + } + } + else + { + RETURN_FALSE; + } } /* }}} */ /* {{{ proto long ingres_errno([resource link]) Gets the last ingres error code generated */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_errno) +#else PHP_FUNCTION(ingres_errno) +#endif { - php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); + php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto string ingres_error ([resource link]) - Gets a meaningful error message for the last error generated */ +/* {{{ proto long ingres_errno([resource link]) + Gets the last ingres error message generated */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_error) +#else PHP_FUNCTION(ingres_error) +#endif { - php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); + php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto string ingres_errsqlstate([resource link]) - Gets the last SQLSTATE generated for an error */ +/* {{{ proto long ingres_errsqlstate([resource link]) + Gets the last ingres error sqlstate code generated */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_errsqlstate) +#else PHP_FUNCTION(ingres_errsqlstate) +#endif { - php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); + php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); } /* }}} */ /* {{{ php_ii_error (INTERNAL_FUNCTION_PARAMETERS, int mode) */ - static void php_ii_error(INTERNAL_FUNCTION_PARAMETERS, int mode) { + zval *value = NULL; + II_LINK *ii_link; + char *resource; + char *type_name; + IIAPI_GETEINFOPARM error_info; + int type; - zval **link = NULL; - int link_id = -1; - int argc; - int len; - char *ptr; - long return_code; - II_LINK *ii_link; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"|z" , &value) == FAILURE) + { + RETURN_FALSE; + } - argc = ZEND_NUM_ARGS(); + switch (mode) + { + case 0: + RETVAL_LONG(IIG(error_number)); + break; + case 1: + RETVAL_STRING(IIG(error_text),1); + break; + case 2: + RETVAL_STRING(IIG(error_sqlstate),1); + break; + default: + break; + } +} +/* }}} */ - switch (argc) - { - case 1: - zend_get_parameters_ex(argc, &link); - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres Link", le_ii_link, le_ii_plink); - break; - case 0: - break; - default: - WRONG_PARAM_COUNT; - break; - } +/* {{{ proto long ingres_conn_errno([resource link]) + Gets the last ingres error code generated */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_conn_errno) +#else +PHP_FUNCTION(ingres_conn_errno) +#endif +{ + php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); +} +/* }}} */ - if (argc == 1) - { - switch (mode) - { - case 0: - return_code = ii_link->errorCode; - break; - case 1: - len = strlen(ii_link->errorText); - ptr = ecalloc(len + 1,1); - memcpy (ptr,ii_link->errorText,len+1); - break; - case 2: - len = sizeof(ii_link->sqlstate); - ptr = ecalloc(len + 1,1); - memcpy (ptr,ii_link->sqlstate,len+1); - break; - default: - break; - } - } - else - { - switch (mode) - { - case 0: - return_code = IIG(errorCode); - break; - case 1: - if ( IIG(errorText) != NULL ) - { - len = strlen(IIG(errorText)); - ptr = ecalloc(len + 1, 1); - memcpy (ptr, IIG(errorText), len + 1 ); - } - else - { - ptr = ecalloc(1,1); - sprintf (ptr, "\0"); - } - break; - case 2: - len = sizeof(IIG(sqlstate)); - ptr = ecalloc(len + 1, 1); - memcpy (ptr, IIG(sqlstate), len + 1 ); - break; - default: - break; - } +/* {{{ proto string ingres_conn_error ([resource link]) + Gets a meaningful error message for the last error generated */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_conn_error) +#else +PHP_FUNCTION(ingres_conn_error) +#endif +{ + php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); +} +/* }}} */ - } +/* {{{ proto string ingres_conn_errsqlstate([resource link]) + Gets the last SQLSTATE generated for an error */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_conn_errsqlstate) +#else +PHP_FUNCTION(ingres_conn_errsqlstate) +#endif +{ + php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); +} +/* }}} */ - switch (mode) - { - case 0: - RETVAL_LONG(return_code); - break; - case 1: - case 2: - RETVAL_STRING(ptr, 0); - break; - default: - break; - } +/* {{{ proto long ingres_stmt_errno([resource link]) + Gets the last ingres error code generated */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_stmt_errno) +#else +PHP_FUNCTION(ingres_stmt_errno) +#endif +{ + php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); +} +/* }}} */ + +/* {{{ proto string ingres_stmt_error ([resource link]) + Gets a meaningful error message for the last error generated */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_stmt_error) +#else +PHP_FUNCTION(ingres_stmt_error) +#endif +{ + php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); +} +/* }}} */ + +/* {{{ proto string ingres_stmt_errsqlstate([resource link]) + Gets the last SQLSTATE generated for an error */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_stmt_errsqlstate) +#else +PHP_FUNCTION(ingres_stmt_errsqlstate) +#endif +{ + php_ii_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); } /* }}} */ @@ -3213,55 +3895,55 @@ */ static long php_ii_paramcount(char *statement TSRMLS_DC) { - char *src; - char *dst; - int idx = 0; - int style = 0; - int laststyle = 0; - char ch; - char end_quote; - + char *src; + char *dst; + int idx = 0; + int style = 0; + int laststyle = 0; + char ch; + char end_quote; + end_quote = '\0'; - src = statement; - dst = statement; + src = statement; + dst = statement; - while ((ch = *src++) != '\0') - { - if (ch == end_quote) - { - end_quote = '\0'; - } else if (end_quote != '\0') - { - *dst++ = ch; - continue; - } else if (ch == '\'' || ch == '\"') - { - end_quote = ch; - } else if (ch == '{') - { - end_quote = '}'; - } - if (ch == '?') - { - /* X/Open standard */ - *dst++ = '?'; - idx++; - style = 3; - } - else { - *dst++ = ch; - continue; - } - - if (laststyle && style != laststyle) - { - return -1; - } - laststyle = style; - } + while ((ch = *src++) != '\0') + { + if (ch == end_quote) + { + end_quote = '\0'; + } else if (end_quote != '\0') + { + *dst++ = ch; + continue; + } else if (ch == '\'' || ch == '\"') + { + end_quote = ch; + } else if (ch == '{') + { + end_quote = '}'; + } + if (ch == '?') + { + /* X/Open standard */ + *dst++ = '?'; + idx++; + style = 3; + } + else { + *dst++ = ch; + continue; + } + + if (laststyle && style != laststyle) + { + return -1; + } + laststyle = style; + } - *dst = '\0'; - return(idx); + *dst = '\0'; + return(idx); } /* }}} */ @@ -3275,96 +3957,96 @@ */ static char *php_ii_check_procedure(char *statement, II_LINK *ii_link TSRMLS_DC) { - char *src; - char *end_space; - char *end_term; - char *end_bracket; - char *end_addr; - char exec_proc[19]; - char call_proc[6]; - char *tmp_procname; - int style = 0; - int start; - int proc_len; - int pos; + char *src; + char *end_space; + char *end_term; + char *end_bracket; + char *end_addr; + char exec_proc[19]; + char call_proc[6]; + char *tmp_procname; + int style = 0; + int start; + int proc_len; + int pos; - sprintf(exec_proc,"execute procedure "); - sprintf(call_proc,"call "); + sprintf(exec_proc,"execute procedure "); + sprintf(call_proc,"call "); - if (strncmp(statement,exec_proc,18) == 0 ) - { - style = 1; - } - else if (strncmp(statement,call_proc,5) == 0 ) - { - style = 2; - } - + if (strncmp(statement,exec_proc,18) == 0 ) + { + style = 1; + } + else if (strncmp(statement,call_proc,5) == 0 ) + { + style = 2; + } + if ( style != 0 ) - { - switch (style) - { - case 1: - start = 18; - break; - case 2: - start = 5; - break; - default: - /* should not be here */ - break; - } - src = statement; - src = src + start; - - /* look for a space, bracket or null terminator to determine end of */ - /* the procedure name, end_term should never be NULL */ - end_term = strchr(src,'\0'); - end_space = strchr(src,' '); - end_bracket = strchr(src,'('); - - if ( end_space == NULL && end_bracket == NULL ) - { - proc_len = end_term - src; - end_addr = end_term; - } - else if ( end_space != NULL && end_bracket == NULL ) - { - proc_len = end_space - src; - end_addr = end_space; - } - else if ( end_space == NULL && end_bracket != NULL ) - { - proc_len = end_bracket - src; - end_addr = end_bracket; - } - else if ( end_space != NULL && end_bracket != NULL ) - { - if ( end_space > end_bracket) - { - proc_len = end_bracket - src; - end_addr = end_bracket; - } - else - { - proc_len = end_space - src; - end_addr = end_space; - } - } - - tmp_procname = malloc(proc_len + 1); - for ( pos = 0; pos <= proc_len; pos++) - { - tmp_procname[pos] = src[pos]; - } - tmp_procname[proc_len]='\0'; - } - else - { - tmp_procname= NULL; - } + { + switch (style) + { + case 1: + start = 18; + break; + case 2: + start = 5; + break; + default: + /* should not be here */ + break; + } + src = statement; + src = src + start; + + /* look for a space, bracket or null terminator to determine end of */ + /* the procedure name, end_term should never be NULL */ + end_term = strchr(src,'\0'); + end_space = strchr(src,' '); + end_bracket = strchr(src,'('); + + if ( end_space == NULL && end_bracket == NULL ) + { + proc_len = end_term - src; + end_addr = end_term; + } + else if ( end_space != NULL && end_bracket == NULL ) + { + proc_len = end_space - src; + end_addr = end_space; + } + else if ( end_space == NULL && end_bracket != NULL ) + { + proc_len = end_bracket - src; + end_addr = end_bracket; + } + else if ( end_space != NULL && end_bracket != NULL ) + { + if ( end_space > end_bracket) + { + proc_len = end_bracket - src; + end_addr = end_bracket; + } + else + { + proc_len = end_space - src; + end_addr = end_space; + } + } + + tmp_procname = malloc(proc_len + 1); + for ( pos = 0; pos <= proc_len; pos++) + { + tmp_procname[pos] = src[pos]; + } + tmp_procname[proc_len]='\0'; + } + else + { + tmp_procname= NULL; + } - return tmp_procname; + return tmp_procname; } /* }}} */ @@ -3387,1243 +4069,1250 @@ } /* }}} */ -/* {{{ static short int php_ii_set_environment_options(zval **options, II_LINK *ii_link) */ +/* {{{ static short int php_ii_set_environment_options(zval *options, II_LINK *ii_link) */ /* Sets up options provided to ingres_connect() via a parameter array */ -static short int php_ii_set_environment_options (zval **options, II_LINK *ii_link TSRMLS_DC) +static short int php_ii_set_environment_options (zval *options, II_LINK *ii_link TSRMLS_DC) { -#ifdef IIAPI_VERSION_2 - II_LONG parameter_id; - IIAPI_SETENVPRMPARM setEnvPrmParm; - zval **data; - char *key; - long index; - int i; - int num_options; - char *temp_string; - long temp_long; - II_BOOL ignore; +#if defined(IIAPI_VERSION_2) + II_LONG parameter_id; + IIAPI_SETENVPRMPARM setEnvPrmParm; + zval *data; + char *key; + long index; + int i; + int num_options; + char *temp_string; + long temp_long; + II_BOOL ignore; - num_options = zend_hash_num_elements(Z_ARRVAL_PP(options)); - zend_hash_internal_pointer_reset(Z_ARRVAL_PP(options)); + num_options = zend_hash_num_elements(Z_ARRVAL_P(options)); + zend_hash_internal_pointer_reset(Z_ARRVAL_P(options)); - setEnvPrmParm.se_envHandle = ii_link->envHandle; + setEnvPrmParm.se_envHandle = ii_link->envHandle; - for ( i = 0; i < num_options; i++ ) - { - ignore = FALSE; + for ( i = 0; i < num_options; i++ ) + { + ignore = FALSE; + + if (zend_hash_get_current_key(Z_ARRVAL_P(options), &key, &index, 0) == HASH_KEY_IS_STRING) + { + zend_hash_get_current_data(Z_ARRVAL_P(options), (void*)&data); + + if ( strcmp("role", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("group", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("effective_user", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("dbms_password", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("table_structure", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("index_structure", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("login_local", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("timezone", key) == 0 ) + { + parameter_id = IIAPI_EP_TIMEZONE; + } + else if (strcmp( "date_format", key) == 0 ) + { + parameter_id = IIAPI_EP_DATE_FORMAT; + } + else if ( strcmp("decimal_separator", key) == 0 ) + { + parameter_id = IIAPI_EP_DECIMAL_CHAR; + } + else if ( strcmp("date_century_boundary", key) == 0 ) + { + parameter_id = IIAPI_EP_CENTURY_BOUNDARY; + } + else if ( strcmp("money_lort", key) == 0 ) /* leading or trailing money sign, default is leading*/ + { + parameter_id = IIAPI_EP_MONEY_LORT; + } + else if ( strcmp("money_sign", key) == 0 ) /* defaults to the ingres variable II_MONEY_FORMAT or "$" */ + { + parameter_id = IIAPI_EP_MONEY_SIGN; + } + else if ( strcmp("money_precision", key) == 0 ) /* defaults to 2 if not set */ + { + parameter_id = IIAPI_EP_MONEY_PRECISION; + } + else if ( strcmp("float4_precision", key) == 0 ) + { + parameter_id = IIAPI_EP_FLOAT4_PRECISION; + } + else if ( strcmp("float8_precision", key) == 0 ) + { + parameter_id = IIAPI_EP_FLOAT8_PRECISION; + } + else if ( strcmp("blob_segment_length", key) == 0 ) + { + parameter_id = IIAPI_EP_MAX_SEGMENT_LEN; + convert_to_long_ex(&data); + IIG(blob_segment_length) = Z_LVAL_P(data); + } + else + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown connection option '%s'",key ); + return II_FAIL; + } + } + else + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected index in connection options array."); + return II_FAIL; + } - if (zend_hash_get_current_key(Z_ARRVAL_PP(options), &key, &index, 0) == HASH_KEY_IS_STRING) - { - zend_hash_get_current_data(Z_ARRVAL_PP(options), (void**)&data); - - if ( strcmp("role", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("group", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("effective_user", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("dbms_password", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("table_structure", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("index_structure", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("login_local", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("timezone", key) == 0 ) - { - parameter_id = IIAPI_EP_TIMEZONE; - } - else if (strcmp( "date_format", key) == 0 ) - { - parameter_id = IIAPI_EP_DATE_FORMAT; - } - else if ( strcmp("decimal_separator", key) == 0 ) - { - parameter_id = IIAPI_EP_DECIMAL_CHAR; - } - else if ( strcmp("date_century_boundary", key) == 0 ) - { - parameter_id = IIAPI_EP_CENTURY_BOUNDARY; - } - else if ( strcmp("money_lort", key) == 0 ) /* leading or trailing money sign, default is leading*/ - { - parameter_id = IIAPI_EP_MONEY_LORT; - } - else if ( strcmp("money_sign", key) == 0 ) /* defaults to the ingres variable II_MONEY_FORMAT or "$" */ - { - parameter_id = IIAPI_EP_MONEY_SIGN; - } - else if ( strcmp("money_precision", key) == 0 ) /* defaults to 2 if not set */ - { - parameter_id = IIAPI_EP_MONEY_PRECISION; - } - else if ( strcmp("float4_precision", key) == 0 ) - { - parameter_id = IIAPI_EP_FLOAT4_PRECISION; - } - else if ( strcmp("float8_precision", key) == 0 ) - { - parameter_id = IIAPI_EP_FLOAT8_PRECISION; - } - else if ( strcmp("blob_segment_length", key) == 0 ) - { - parameter_id = IIAPI_EP_MAX_SEGMENT_LEN; - convert_to_long_ex(data); - IIG(blob_segment_length) = Z_LVAL_PP(data); - } - else - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown connection option '%s'",key ); - return II_FAIL; - } - } - else - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected index in connection options array."); - return II_FAIL; - } - - if (ignore != TRUE) { - - setEnvPrmParm.se_paramID = parameter_id; - - switch (Z_TYPE_PP(data)) - { - case IS_STRING: - convert_to_string_ex(data); - temp_string = Z_STRVAL_PP(data); - setEnvPrmParm.se_paramValue = temp_string; - break; - case IS_LONG: - convert_to_long_ex(data); - temp_long = Z_LVAL_PP(data); - setEnvPrmParm.se_paramValue = (II_PTR)&temp_long; - break; - case IS_BOOL: - convert_to_long_ex(data); - temp_long = Z_LVAL_PP(data); - setEnvPrmParm.se_paramValue = (II_PTR)&temp_long; - break; - default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option type, %l, in connection options", Z_TYPE_PP(data)); - return II_FAIL; - } - - IIapi_setEnvParam( &setEnvPrmParm ); - - if (setEnvPrmParm.se_status != IIAPI_ST_SUCCESS) - { - if ( Z_TYPE_PP(data) == IS_STRING ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to set option, %s, with value, %s", key, Z_STRVAL_PP(data)); - return II_FAIL; - } - else - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to set option, %s, with value, %ld. Error code %d.", key, Z_LVAL_PP(data), setEnvPrmParm.se_status ); - return II_FAIL; - } - } - } + if (ignore != TRUE) { - zend_hash_move_forward(Z_ARRVAL_PP(options)); + setEnvPrmParm.se_paramID = parameter_id; - } + switch (Z_TYPE_P(data)) + { + case IS_STRING: + convert_to_string_ex(&data); + temp_string = Z_STRVAL_P(data); + setEnvPrmParm.se_paramValue = temp_string; + break; + case IS_LONG: + convert_to_long_ex(&data); + temp_long = Z_LVAL_P(data); + setEnvPrmParm.se_paramValue = (II_PTR)&temp_long; + break; + case IS_BOOL: + convert_to_long_ex(&data); + temp_long = Z_LVAL_P(data); + setEnvPrmParm.se_paramValue = (II_PTR)&temp_long; + break; + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option type, %l, in connection options", Z_TYPE_P(data)); + return II_FAIL; + } + + IIapi_setEnvParam( &setEnvPrmParm ); + + if (setEnvPrmParm.se_status != IIAPI_ST_SUCCESS) + { + if ( Z_TYPE_P(data) == IS_STRING ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to set option, %s, with value, %s", key, Z_STRVAL_P(data)); + return II_FAIL; + } + else + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to set option, %s, with value, %ld. Error code %d.", key, Z_LVAL_P(data), setEnvPrmParm.se_status ); + return II_FAIL; + } + } + } + + zend_hash_move_forward(Z_ARRVAL_P(options)); + + } - return II_OK; + return II_OK; #else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Setting environment options requires Ingres II 2.5 or newer", key, Z_LVAL_PP(data)); - return II_FAIL; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Setting environment options requires Ingres II 2.5 or newer", key, Z_LVAL_P(data)); + return II_FAIL; #endif } /* }}} */ -/* {{{ static short int php_ii_set_connect_options(zval **options, II_LINK *ii_link, char *database TSRMLS_DC) */ +/* {{{ static short int php_ii_set_connect_options(zval *options, II_LINK *ii_link, char *database TSRMLS_DC) */ /* Sets up options provided to ingres_connect() via a parameter array */ -static short int php_ii_set_connect_options(zval **options, II_LINK *ii_link, char *database TSRMLS_DC) +static short int php_ii_set_connect_options(zval *options, II_LINK *ii_link, char *database TSRMLS_DC) { - II_LONG parameter_id; - IIAPI_SETCONPRMPARM setConPrmParm; - IIAPI_CONNPARM connParm; - IIAPI_DISCONNPARM disconnParm; - zval **data; - char *key; - long index; - int i; - int num_options; - char *temp_string; - long temp_long; - II_BOOL ignore; - - num_options = zend_hash_num_elements(Z_ARRVAL_PP(options)); - zend_hash_internal_pointer_reset(Z_ARRVAL_PP(options)); - - connParm.co_genParm.gp_callback = NULL; - connParm.co_genParm.gp_closure = NULL; - connParm.co_target = database; -#ifdef IIAPI_VERSION_2 - /* Use the environment handle in ii_link->connHandle */ - connParm.co_connHandle = ii_link->envHandle; -#else - connParm.co_connHandle = NULL; -#endif - connParm.co_tranHandle = NULL; - connParm.co_type = IIAPI_CT_SQL; - connParm.co_username = NULL; - connParm.co_password = NULL; - connParm.co_timeout = -1; + II_LONG parameter_id; + IIAPI_SETCONPRMPARM setConPrmParm; + IIAPI_CONNPARM connParm; + IIAPI_DISCONNPARM disconnParm; + zval *data; + char *key; + long index; + int i; + int num_options; + char *temp_string; + long temp_long; + II_BOOL ignore; + + num_options = zend_hash_num_elements(Z_ARRVAL_P(options)); + zend_hash_internal_pointer_reset(Z_ARRVAL_P(options)); + + connParm.co_genParm.gp_callback = NULL; + connParm.co_genParm.gp_closure = NULL; + connParm.co_target = database; +#if defined(IIAPI_VERSION_2) + /* Use the environment handle in ii_link->connHandle */ + connParm.co_connHandle = ii_link->envHandle; +#else + connParm.co_connHandle = NULL; +#endif + connParm.co_tranHandle = NULL; + connParm.co_type = IIAPI_CT_SQL; + connParm.co_username = NULL; + connParm.co_password = NULL; + connParm.co_timeout = -1; - IIapi_connect( &connParm ); + IIapi_connect( &connParm ); - if (!ii_sync(&(connParm.co_genParm)) || ii_success(&(connParm.co_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to connect to database (%s), to setup options", database); - return II_FAIL; - } + if (!ii_sync(&(connParm.co_genParm)) || ii_success(&(connParm.co_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to connect to database (%s), to setup options", database); + return II_FAIL; + } - ii_link->connHandle = connParm.co_connHandle; + ii_link->connHandle = connParm.co_connHandle; - disconnParm.dc_genParm.gp_callback = NULL; - disconnParm.dc_genParm.gp_closure = NULL; - disconnParm.dc_connHandle = ii_link->connHandle; + disconnParm.dc_genParm.gp_callback = NULL; + disconnParm.dc_genParm.gp_closure = NULL; + disconnParm.dc_connHandle = ii_link->connHandle; - IIapi_disconnect( &disconnParm ); + IIapi_disconnect( &disconnParm ); - if (!ii_sync(&(disconnParm.dc_genParm)) || ii_success(&(disconnParm.dc_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to disconnect during setup of options"); - return II_FAIL; - } + if (!ii_sync(&(disconnParm.dc_genParm)) || ii_success(&(disconnParm.dc_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to disconnect during setup of options"); + return II_FAIL; + } - ii_link->connHandle = NULL; + ii_link->connHandle = NULL; - for ( i = 0; i < num_options; i++ ) - { - ignore = FALSE; + for ( i = 0; i < num_options; i++ ) + { + ignore = FALSE; + + if (zend_hash_get_current_key(Z_ARRVAL_P(options), &key, &index, 0) == HASH_KEY_IS_STRING) + { + zend_hash_get_current_data(Z_ARRVAL_P(options), (void*)&data); + + if ( strcmp("role", key) == 0 ) + { + parameter_id = IIAPI_CP_APP_ID; + } + else if ( strcmp("group", key) == 0 ) + { + parameter_id = IIAPI_CP_GROUP_ID; + } + else if ( strcmp("effective_user", key) == 0 ) + { + parameter_id = IIAPI_CP_EFFECTIVE_USER; + } + else if ( strcmp("dbms_password", key) == 0 ) + { + parameter_id = IIAPI_CP_DBMS_PASSWORD; + } + else if ( strcmp("table_structure", key) == 0 ) + { + parameter_id = IIAPI_CP_RESULT_TBL; + } + else if ( strcmp("index_structure", key) == 0 ) + { + parameter_id = IIAPI_CP_SECONDARY_INX; + } +#if defined(IIAPI_VERSION_4) + else if ( strcmp("login_local", key) == 0 ) + { + parameter_id = IIAPI_CP_LOGIN_LOCAL; + } +#endif + else if ( strcmp("timezone", key) == 0 ) + { + ignore = TRUE; + } + else if (strcmp( "date_format", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("decimal_separator", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("date_century_boundary", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("money_lort", key) == 0 ) /* leading or trailing money sign, default is leading*/ + { + ignore = TRUE; + } + else if ( strcmp("money_sign", key) == 0 ) /* defaults to the ingres variable II_MONEY_FORMAT or "$" */ + { + ignore = TRUE; + } + else if ( strcmp("money_precision", key) == 0 ) /* defaults to 2 if not set */ + { + ignore = TRUE; + } + else if ( strcmp("float4_precision", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("float8_precision", key) == 0 ) + { + ignore = TRUE; + } + else if ( strcmp("blob_segment_length", key) == 0 ) + { + ignore = TRUE; + } + + else + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown connection option '%s'",key ); + return II_FAIL; + } + } + else + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected index in connection options array."); + return II_FAIL; + } + + if ( ignore != TRUE ) + { + + setConPrmParm.sc_genParm.gp_callback = NULL; +#if defined(IIAPI_VERSION_2) + setConPrmParm.sc_connHandle = ii_link->envHandle; +#else + setConPrmParm.sc_connHandle = NULL; +#endif + setConPrmParm.sc_paramID = parameter_id; - if (zend_hash_get_current_key(Z_ARRVAL_PP(options), &key, &index, 0) == HASH_KEY_IS_STRING) - { - zend_hash_get_current_data(Z_ARRVAL_PP(options), (void**)&data); - - if ( strcmp("role", key) == 0 ) - { - parameter_id = IIAPI_CP_APP_ID; - } - else if ( strcmp("group", key) == 0 ) - { - parameter_id = IIAPI_CP_GROUP_ID; - } - else if ( strcmp("effective_user", key) == 0 ) - { - parameter_id = IIAPI_CP_EFFECTIVE_USER; - } - else if ( strcmp("dbms_password", key) == 0 ) - { - parameter_id = IIAPI_CP_DBMS_PASSWORD; - } - else if ( strcmp("table_structure", key) == 0 ) - { - parameter_id = IIAPI_CP_RESULT_TBL; - } - else if ( strcmp("index_structure", key) == 0 ) - { - parameter_id = IIAPI_CP_SECONDARY_INX; - } -#ifdef IIAPI_VERSION_4 - else if ( strcmp("login_local", key) == 0 ) - { - parameter_id = IIAPI_CP_LOGIN_LOCAL; - } -#endif - else if ( strcmp("timezone", key) == 0 ) - { - ignore = TRUE; - } - else if (strcmp( "date_format", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("decimal_separator", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("date_century_boundary", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("money_lort", key) == 0 ) /* leading or trailing money sign, default is leading*/ - { - ignore = TRUE; - } - else if ( strcmp("money_sign", key) == 0 ) /* defaults to the ingres variable II_MONEY_FORMAT or "$" */ - { - ignore = TRUE; - } - else if ( strcmp("money_precision", key) == 0 ) /* defaults to 2 if not set */ - { - ignore = TRUE; - } - else if ( strcmp("float4_precision", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("float8_precision", key) == 0 ) - { - ignore = TRUE; - } - else if ( strcmp("blob_segment_length", key) == 0 ) - { - ignore = TRUE; - } - - else - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown connection option '%s'",key ); - return II_FAIL; - } - } - else - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected index in connection options array."); - return II_FAIL; - } - - if ( ignore != TRUE ) - { - - setConPrmParm.sc_genParm.gp_callback = NULL; -#ifdef IIAPI_VERSION_2 - setConPrmParm.sc_connHandle = ii_link->envHandle; -#else - setConPrmParm.sc_connHandle = NULL; -#endif - setConPrmParm.sc_paramID = parameter_id; - - switch (Z_TYPE_PP(data)) - { - case IS_STRING: - convert_to_string_ex(data); - temp_string = Z_STRVAL_PP(data); - setConPrmParm.sc_paramValue = temp_string; - break; - case IS_LONG: - convert_to_long_ex(data); - temp_long = Z_LVAL_PP(data); - setConPrmParm.sc_paramValue = (II_PTR)&temp_long; - break; - case IS_BOOL: - convert_to_long_ex(data); - temp_long = Z_LVAL_PP(data); - setConPrmParm.sc_paramValue = (II_PTR)&temp_long; - break; - default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option type, %l, in connection options", Z_TYPE_PP(data)); - return II_FAIL; - } - - IIapi_setConnectParam( &setConPrmParm ); - - if (!ii_sync(&(setConPrmParm.sc_genParm)) || ii_success(&(setConPrmParm.sc_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - if ( Z_TYPE_PP(data) == IS_STRING ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to set option, %s, with value, %s", key, Z_STRVAL_PP(data)); - return II_FAIL; - } - else - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to set option, %s, with value, %ld", key, Z_LVAL_PP(data)); - return II_FAIL; - } - } + switch (Z_TYPE_P(data)) + { + case IS_STRING: + convert_to_string_ex(&data); + temp_string = Z_STRVAL_P(data); + setConPrmParm.sc_paramValue = temp_string; + break; + case IS_LONG: + convert_to_long_ex(&data); + temp_long = Z_LVAL_P(data); + setConPrmParm.sc_paramValue = (II_PTR)&temp_long; + break; + case IS_BOOL: + convert_to_long_ex(&data); + temp_long = Z_LVAL_P(data); + setConPrmParm.sc_paramValue = (II_PTR)&temp_long; + break; + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option type, %l, in connection options", Z_TYPE_P(data)); + return II_FAIL; + } + + IIapi_setConnectParam( &setConPrmParm ); + + if (!ii_sync(&(setConPrmParm.sc_genParm)) || ii_success(&(setConPrmParm.sc_genParm), &ii_link->errorHandle TSRMLS_CC) == II_FAIL) + { + if ( Z_TYPE_P(data) == IS_STRING ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to set option, %s, with value, %s", key, Z_STRVAL_P(data)); + return II_FAIL; + } + else + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to set option, %s, with value, %ld", key, Z_LVAL_P(data)); + return II_FAIL; + } + } - ii_link->connHandle = setConPrmParm.sc_connHandle; - } + ii_link->connHandle = setConPrmParm.sc_connHandle; + } - zend_hash_move_forward(Z_ARRVAL_PP(options)); + zend_hash_move_forward(Z_ARRVAL_P(options)); - } - return II_OK; + } + return II_OK; } /* }}} */ /* {{{ static char *php_ii_convert_param_markers (char *statement TSRMLS_DC) */ /* takes a statement with ? param markers and converts them to ~V */ -static char *php_ii_convert_param_markers (char *statement TSRMLS_DC) +static char *php_ii_convert_param_markers (char *query, char *converted_query TSRMLS_DC) { - char *new_statement; - char ch, tmp_ch; - char *p, *tmp_p; - long parameter_count; - long statement_length; - int j; + char ch, tmp_ch; + char *p, *tmp_p; + long parameter_count; + long statement_length; + int j; /* work out how many param markers there are */ - /* used to know how much to memory to allocate */ - parameter_count = php_ii_paramcount (statement TSRMLS_CC); + /* used to know how much to memory to allocate */ + parameter_count = php_ii_paramcount (query TSRMLS_CC); - statement_length = strlen(statement); - new_statement = emalloc ( statement_length + (parameter_count*3) + 1); /* allow for space either side and a null*/ - sprintf(new_statement,"\0"); + sprintf(converted_query,"\0"); j = 0; - p = statement; - tmp_p = new_statement; - - while ( (ch = *p++) != '\0') - { - if ( ch == '?' ) - { - if ( *(p-2) != ' ') /* check for space before '?' */ - /* if there is no space we add '~V' */ - /* ingres will error with "Invalid operator '~V'" */ - { - *tmp_p = ' '; - *tmp_p++; - } - - *tmp_p = '~'; - *tmp_p++; - *tmp_p = 'V'; - - if ( *p != ' ') /* check for space after '?' */ - /* if there is no space we add '~V' */ - /* ingres will error with "Invalid operator '~V'" */ - { - *tmp_p++; - *tmp_p = ' '; - } - } - else - { - *tmp_p = ch; - } - tmp_p++; + p = query; + tmp_p = converted_query; - tmp_ch = *p; + while ( (ch = *p++) != '\0') + { + if ( ch == '?' ) + { + if ( *(p-2) != ' ') /* check for space before '?' */ + /* if there is no space we add '~V' */ + /* ingres will error with "Invalid operator '~V'" */ + { + *tmp_p = ' '; + *tmp_p++; + } + + *tmp_p = '~'; + *tmp_p++; + *tmp_p = 'V'; + + if ( *p != ' ') /* check for space after '?' */ + /* if there is no space we add '~V' */ + /* ingres will error with "Invalid operator '~V'" */ + { + *tmp_p++; + *tmp_p = ' '; + } + } + else + { + *tmp_p = ch; + } + tmp_p++; - } - *tmp_p = '\0'; /* terminate the new query */ + tmp_ch = *p; - efree(statement); - return new_statement; + } + *tmp_p = '\0'; /* terminate the new query */ } /* }}} */ /* {{{ proto string ingres_set_environment(resource link, array options) Gets the last SQLSTATE generated for an error */ +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_set_environment) +#else PHP_FUNCTION(ingres_set_environment) +#endif { + zval *link = NULL; + zval *options = NULL; + II_LINK *ii_link; - zval **link, **options; - int argc; - II_LINK *ii_link; - int link_id = -1; - - argc = ZEND_NUM_ARGS(); - if (argc > 2 || zend_get_parameters_ex(argc, &link, &options) == FAILURE) - { - WRONG_PARAM_COUNT; - } - - ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id , "Ingres Link", le_ii_link, le_ii_plink); + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC ,"ra" , &link, &options) == FAILURE) + { + RETURN_NULL(); + } - if ( php_ii_set_environment_options(options, ii_link TSRMLS_CC) == II_FAIL ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set environment options provided"); - RETURN_FALSE; - } + ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, &link, -1, "Ingres Link", le_ii_link, le_ii_plink); + if ( php_ii_set_environment_options(options, ii_link TSRMLS_CC) == II_FAIL ) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set environment options provided"); + RETURN_FALSE; + } } /* }}} */ -/* {{{ static short php_ii_bind_params (II_LINK *ii_link, zval **queryParams) */ +/* {{{ static short php_ii_bind_params (II_RESULT *ii_result, zval *queryParams) */ /* Binds and sends data for parameters passed via queryParams */ -static short php_ii_bind_params (INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, zval **queryParams, zval **paramtypes) +static short php_ii_bind_params (INTERNAL_FUNCTION_PARAMETERS, II_RESULT *ii_result, zval *queryParams, char *paramtypes) { - - zval **val; - IIAPI_SETDESCRPARM setDescrParm; - IIAPI_PUTPARMPARM putParmParm; - IIAPI_DESCRIPTOR *descriptorInfo; - IIAPI_DATAVALUE *columnData; - int param; - II_INT2 columnType; + zval **val = NULL; + IIAPI_SETDESCRPARM setDescrParm; + IIAPI_PUTPARMPARM putParmParm; + IIAPI_DESCRIPTOR *descriptorInfo; + IIAPI_DATAVALUE *columnData; + int param; + II_INT2 columnType; HashTable *arr_hash; HashPosition pointer; + + double tmp_double; + long tmp_long; + char *tmp_string = NULL; + char *tmp_lob = NULL; + char *tmp_lob_ptr; + char *key; + int key_len; + long index; + long lob_len; + long segment_length; + short with_procedure = 0; + char *types; + + UTF8 *string_start = NULL; + UTF16 *tmp_utf16_string = NULL; + UTF16 *tmp_utf16_string_ptr; + int utf16_string_len = 0; + ConversionResult result = conversionOK; -#ifdef IIAPI_VERSION_2 - IIAPI_FORMATPARM formatParm; -#else - IIAPI_CONVERTPARM convertParm; -#endif - - - double tmp_double; - long tmp_long; - char *tmp_string = NULL; - char *tmp_lob = NULL; - char *tmp_lob_ptr; - char *key; - int key_len; - long index; - long lob_len; - long segment_length; - short with_procedure = 0; - char *types; + if ( ii_result->paramCount > 0 ) + { + arr_hash = Z_ARRVAL_P(queryParams); + zend_hash_internal_pointer_reset_ex(arr_hash, &pointer); + } - int have_bom=0; + /* if we are sending params then we need to describe them into to Ingres */ + /* if no parameters have been provided to a procedure call there is always 1 */ + /* parameter, the procedure name */ + + setDescrParm.sd_genParm.gp_callback = NULL; + setDescrParm.sd_genParm.gp_closure = NULL; + setDescrParm.sd_stmtHandle = ii_result->stmtHandle; - if ( ii_link->paramCount > 0 ) - { - arr_hash = Z_ARRVAL_PP(queryParams); - zend_hash_internal_pointer_reset_ex(arr_hash, &pointer); - } + if ( ii_result->procname != NULL ) + { + /* bump descriptorCount to allow for procedure name */ + setDescrParm.sd_descriptorCount = ii_result->paramCount + 1; + with_procedure = 1; + } + else + { + setDescrParm.sd_descriptorCount = ii_result->paramCount; + } - /* if we are sending params then we need to describe them into to Ingres */ - /* if no parameters have been provided to a procedure call there is always 1 */ - /* parameter, the procedure name */ - - setDescrParm.sd_genParm.gp_callback = NULL; - setDescrParm.sd_genParm.gp_closure = NULL; - setDescrParm.sd_stmtHandle = ii_link->stmtHandle; + descriptorInfo = (IIAPI_DESCRIPTOR *) safe_emalloc(sizeof(IIAPI_DESCRIPTOR),setDescrParm.sd_descriptorCount, 0); + setDescrParm.sd_descriptor = descriptorInfo; - if ( ii_link->procname != NULL ) - { - /* bump descriptorCount to allow for procedure name */ - setDescrParm.sd_descriptorCount = ii_link->paramCount + 1; - with_procedure = 1; - } - else - { - setDescrParm.sd_descriptorCount = ii_link->paramCount; - } + if ( ii_result->procname == NULL ) + { + columnType = IIAPI_COL_QPARM; + } + else + { + columnType = IIAPI_COL_PROCPARM; + } - descriptorInfo = (IIAPI_DESCRIPTOR *) safe_emalloc(sizeof(IIAPI_DESCRIPTOR),setDescrParm.sd_descriptorCount, 0); - setDescrParm.sd_descriptor = descriptorInfo; + /* extract the paramtypes */ - if ( ii_link->procname == NULL ) - { - columnType = IIAPI_COL_QPARM; - } - else - { - columnType = IIAPI_COL_PROCPARM; - } + if ( paramtypes != NULL ) + { + types = emalloc(strlen(paramtypes)); + memcpy(types,paramtypes,strlen(paramtypes)); + } - /* extract the paramtypes */ + for ( param = 0 ; param < setDescrParm.sd_descriptorCount ; param++) + { - if ( paramtypes != NULL ) - { - types = emalloc(Z_STRLEN_PP(paramtypes)); - memcpy(types,Z_STRVAL_PP(paramtypes),Z_STRLEN_PP(paramtypes)); - } + if (( ii_result->procname != NULL) && (param == 0) ) + { + /* setup the first parameter as the procedure name */ + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_CHA_TYPE; + setDescrParm.sd_descriptor[param].ds_length = strlen(ii_result->procname); + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = IIAPI_COL_SVCPARM; + setDescrParm.sd_descriptor[param].ds_columnName = NULL; - for ( param = 0 ; param < setDescrParm.sd_descriptorCount ; param++) - { + } + else + { - if (( ii_link->procname != NULL) && (param == 0) ) - { - /* setup the first parameter as the procedure name */ - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_CHA_TYPE; - setDescrParm.sd_descriptor[param].ds_length = strlen(ii_link->procname); - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = IIAPI_COL_SVCPARM; - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - - } - else - { - - if (zend_hash_get_current_data_ex(arr_hash, (void **) &val, &pointer) == FAILURE) - { - efree(descriptorInfo); - return II_FAIL; - } - - if ((ii_link->procname != NULL) && (zend_hash_get_current_key_ex(arr_hash, &key, &key_len, &index, 0, &pointer) == FAILURE)) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error getting parameter key"); - efree(descriptorInfo); - ii_link->errorCode = -1; /* PHP error */ - return II_FAIL; - } - - if (( ii_link ->procname == NULL) && ( PZVAL_IS_REF(*val) )) { - php_error_docref(NULL TSRMLS_CC, E_ERROR,"Byref parameters can only be used against procedures"); - return II_FAIL; - } - - if ((ii_link ->procname != NULL) && ( PZVAL_IS_REF(*val) )) { - columnType = IIAPI_COL_PROCBYREFPARM; - } - - if ( ( paramtypes != NULL ) && ( Z_TYPE_PP(paramtypes) == IS_STRING )) - { - /* bind parameters using the types indicated */ - - switch (types[param - with_procedure]) - { - case 'B': /* long byte */ - convert_to_string_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_LBYTE_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = IIAPI_COL_QPARM; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case 'b': /* byte */ - case 'c': /* char */ - case 'd': /* date */ - case 't': /* text */ - convert_to_string_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_CHA_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case 'D': /* decimal */ - /* Treat the incoming decimal as a string so as not to loose */ - /* the actual value being stored if a PHP FLOAT type was used */ - convert_to_string_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_DEC_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = 16; - setDescrParm.sd_descriptor[param].ds_precision = 31; - setDescrParm.sd_descriptor[param].ds_scale = 15; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case 'f': /* float */ - convert_to_double_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_FLT_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = sizeof(Z_DVAL_PP(val)); - setDescrParm.sd_descriptor[param].ds_precision = 31; - setDescrParm.sd_descriptor[param].ds_scale = 15; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - convert_to_string_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_TXT_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case 'T': /* long text */ - case 'V': /* long varchar */ - convert_to_string_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_LVCH_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case 'i': /* integer */ - convert_to_long_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_INT_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = sizeof(Z_LVAL_PP(val)); - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case 'n': /* nchar NFC/NFD UTF-16*/ - convert_to_string_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_NCHA_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case 'N': /* nvarchar NFC/NFD UTF-16*/ - convert_to_string_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_NVCH_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - /* The first two bytes will contain the length */ - setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val) + 2; - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case 'v': /* varchar */ - convert_to_string_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_VCH_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val) + 2; - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - default: - break; - } - } - else - { - /* bind parameters based on what PHP thinks it has */ - - /* Process each parameter into our descriptor buffer */ - switch (Z_TYPE_PP(val)) - { - case IS_LONG: - /* TODO: does not handle int8 yet */ - convert_to_long_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_INT_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = sizeof(Z_LVAL_PP(val)); - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case IS_DOUBLE: - convert_to_double_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_FLT_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = sizeof(Z_DVAL_PP(val)); - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case IS_STRING: - convert_to_string_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_CHA_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = FALSE; - setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - case IS_NULL: - convert_to_string_ex(val); - setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_CHA_TYPE; - setDescrParm.sd_descriptor[param].ds_nullable = TRUE; - setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); - setDescrParm.sd_descriptor[param].ds_precision = 0; - setDescrParm.sd_descriptor[param].ds_scale = 0; - setDescrParm.sd_descriptor[param].ds_columnType = columnType; - if ( ii_link->procname == NULL ) - { - setDescrParm.sd_descriptor[param].ds_columnName = NULL; - } - else - { - setDescrParm.sd_descriptor[param].ds_columnName = key; - } - break; - default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "A parameter has been passed of unknown type" ); - if ( ii_link->procname == NULL ) - efree(descriptorInfo); - return II_FAIL; - } - } - - if (((ii_link->procname != NULL) && (param > 0)) || (ii_link->procname == NULL)) - { - zend_hash_move_forward_ex(arr_hash, &pointer); - } - - } + if (zend_hash_get_current_data_ex(arr_hash, (void **)&val, &pointer) == FAILURE) + { + efree(descriptorInfo); + return II_FAIL; + } + + if ((ii_result->procname != NULL) && (zend_hash_get_current_key_ex(arr_hash, &key, &key_len, &index, 0, &pointer) == FAILURE)) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error getting parameter key"); + efree(descriptorInfo); + return II_FAIL; + } + if ((ii_result->procname) && ((*val)->is_ref )) { + php_error_docref(NULL TSRMLS_CC, E_ERROR,"Byref parameters can only be used against procedures"); + return II_FAIL; + } + + if ((ii_result->procname != NULL) && ((*val)->is_ref)) { + columnType = IIAPI_COL_PROCBYREFPARM; + } + + if (paramtypes) + { + /* bind parameters using the types indicated */ + + switch (types[param - with_procedure]) + { + case 'B': /* long byte */ + convert_to_string_ex(val); + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_LBYTE_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case 'b': /* byte */ + case 'c': /* char */ + case 'd': /* date */ + case 't': /* text */ + convert_to_string_ex(val); + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_CHA_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case 'D': /* decimal */ + convert_to_double_ex(val); + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_DEC_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = sizeof(Z_DVAL_PP(val)); + setDescrParm.sd_descriptor[param].ds_precision = 31; + setDescrParm.sd_descriptor[param].ds_scale = 15; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case 'f': /* float */ + convert_to_double_ex(val); + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_FLT_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = sizeof(Z_DVAL_PP(val)); + setDescrParm.sd_descriptor[param].ds_precision = 31; + setDescrParm.sd_descriptor[param].ds_scale = 15; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + convert_to_string_ex(val); + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_TXT_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case 'T': /* long text */ + case 'V': /* long varchar */ + convert_to_string_ex(val); + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_LVCH_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case 'i': /* integer */ + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_INT_TYPE; + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + + if (Z_TYPE_PP(val) == IS_NULL) + { + setDescrParm.sd_descriptor[param].ds_nullable = TRUE; + setDescrParm.sd_descriptor[param].ds_length = sizeof(II_INT4); + } + else + { + convert_to_long_ex(val); + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = sizeof(Z_LVAL_PP(val)); + } + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case 'n': /* nchar NFC/NFD UTF-16*/ + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_NCHA_TYPE; + + /* If this is a NULL value being passed we should pick it up */ + if (Z_TYPE_PP(val) == IS_NULL) + { + setDescrParm.sd_descriptor[param].ds_nullable = TRUE; + setDescrParm.sd_descriptor[param].ds_length = 32; + } + else + { + convert_to_string_ex(val); + if (IIG(utf8)) { + tmp_utf16_string = emalloc((Z_STRLEN_PP(val) * 4)); + string_start = Z_STRVAL_PP(val); + tmp_utf16_string_ptr = tmp_utf16_string; + result = ConvertUTF8toUTF16((const UTF8 **) &string_start, string_start + Z_STRLEN_PP(val) + 1, &tmp_utf16_string_ptr, tmp_utf16_string_ptr + (Z_STRLEN_PP(val) * 4) , strictConversion); + utf16_string_len = ((tmp_utf16_string_ptr - 1) - (tmp_utf16_string + 1)) * 2; + setDescrParm.sd_descriptor[param].ds_length = utf16_string_len; + efree(tmp_utf16_string); + tmp_utf16_string = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); + } + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + } + + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case 'N': /* nvarchar NFC/NFD UTF-16*/ + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_NVCH_TYPE; + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + + if (Z_TYPE_PP(val) == IS_NULL) + { + setDescrParm.sd_descriptor[param].ds_length = 32; + setDescrParm.sd_descriptor[param].ds_nullable = TRUE; + } + else + { + convert_to_string_ex(val); + if (IIG(utf8)) { + /* Convert the UTF-8 data we have to UTF-16 so Ingres will store it */ + tmp_utf16_string = emalloc((Z_STRLEN_PP(val) * 4) + 2); + string_start = Z_STRVAL_PP(val); + tmp_utf16_string_ptr = tmp_utf16_string + 2; + result = ConvertUTF8toUTF16((const UTF8 **) &string_start, string_start + Z_STRLEN_PP(val) + 1, &tmp_utf16_string_ptr, tmp_utf16_string_ptr + (Z_STRLEN_PP(val) * 4) , strictConversion); + utf16_string_len = ((tmp_utf16_string_ptr - 1) - (tmp_utf16_string + 1)) * 2; + *((II_INT2*)(tmp_utf16_string)) = utf16_string_len/2; + efree(tmp_utf16_string); + tmp_utf16_string = NULL; + + setDescrParm.sd_descriptor[param].ds_length = utf16_string_len; + } + else /* assume UTF-16 */ + { + setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val) + 2; + } + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + } + + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case 'v': /* varchar */ + convert_to_string_ex(val); + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_VCH_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val) + 2; + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + default: + break; + } + } + else + { + /* bind parameters based on what PHP thinks it has */ + /* Process each parameter into our descriptor buffer */ + switch (Z_TYPE_PP(val)) + { + case IS_LONG: + /* TODO: does not handle int8 yet */ + convert_to_long_ex(val); + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_INT_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = sizeof(Z_LVAL_PP(val)); + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case IS_DOUBLE: + convert_to_double_ex(val); + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_FLT_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = sizeof(Z_DVAL_PP(val)); + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case IS_STRING: + convert_to_string_ex(val); + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_CHA_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = FALSE; + setDescrParm.sd_descriptor[param].ds_length = Z_STRLEN_PP(val); + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + case IS_NULL: + setDescrParm.sd_descriptor[param].ds_dataType = IIAPI_CHA_TYPE; + setDescrParm.sd_descriptor[param].ds_nullable = TRUE; + setDescrParm.sd_descriptor[param].ds_length = 0; + setDescrParm.sd_descriptor[param].ds_precision = 0; + setDescrParm.sd_descriptor[param].ds_scale = 0; + setDescrParm.sd_descriptor[param].ds_columnType = columnType; + if ( ii_result->procname == NULL ) + { + setDescrParm.sd_descriptor[param].ds_columnName = NULL; + } + else + { + setDescrParm.sd_descriptor[param].ds_columnName = key; + } + break; + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "A parameter has been passed of unknown type" ); + if ( ii_result->procname == NULL ) + efree(descriptorInfo); + return II_FAIL; + } + } + + if (((ii_result->procname != NULL) && (param > 0)) || (ii_result->procname == NULL)) + { + zend_hash_move_forward_ex(arr_hash, &pointer); + } + + } - } /* param=0; param < setDescrParm.sd_descriptorCount; param++ */ + } /* param=0; param < setDescrParm.sd_descriptorCount; param++ */ - if (((ii_link->procname == NULL) && (ii_link->paramCount > 0)) || ((ii_link->procname != NULL) && (setDescrParm.sd_descriptorCount > 1))) - { - zend_hash_internal_pointer_reset_ex(arr_hash, &pointer); - } + if (((ii_result->procname == NULL) && (ii_result->paramCount > 0)) || ((ii_result->procname != NULL) && (setDescrParm.sd_descriptorCount > 1))) + { + zend_hash_internal_pointer_reset_ex(arr_hash, &pointer); + } - IIapi_setDescriptor( &setDescrParm ); + IIapi_setDescriptor( &setDescrParm ); - if (ii_success(&(setDescrParm.sd_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - efree(descriptorInfo); - return II_FAIL; - } + if (ii_success(&(setDescrParm.sd_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + efree(descriptorInfo); + return II_FAIL; + } - /* Put query parameter values. */ - putParmParm.pp_genParm.gp_callback = NULL; - putParmParm.pp_genParm.gp_closure = NULL; - putParmParm.pp_stmtHandle = ii_link->stmtHandle; - putParmParm.pp_parmCount = 0; /* we will work this out as we go along */ + /* Put query parameter values. */ + putParmParm.pp_genParm.gp_callback = NULL; + putParmParm.pp_genParm.gp_closure = NULL; + putParmParm.pp_stmtHandle = ii_result->stmtHandle; + putParmParm.pp_parmCount = 0; /* we will work this out as we go along */ - columnData = (IIAPI_DATAVALUE *) safe_emalloc(sizeof(IIAPI_DATAVALUE),setDescrParm.sd_descriptorCount, 0); - putParmParm.pp_parmData = columnData; + columnData = (IIAPI_DATAVALUE *) safe_emalloc(sizeof(IIAPI_DATAVALUE),setDescrParm.sd_descriptorCount, 0); + putParmParm.pp_parmData = columnData; - for ( param = 0 ; param < setDescrParm.sd_descriptorCount ; param++) - { - putParmParm.pp_parmCount=1; /* New parameter */ - - if ((ii_link->procname != NULL) && (param == 0)) - { - /* place the procedure name as the first parameter */ - putParmParm.pp_parmData[0].dv_null = FALSE; - putParmParm.pp_parmData[0].dv_length = strlen(ii_link->procname); - putParmParm.pp_parmData[0].dv_value = ii_link->procname; - } - else - { - - if (zend_hash_get_current_data_ex(arr_hash, (void **) &val, &pointer) == FAILURE) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error getting parameter from array"); - efree(columnData); - efree(descriptorInfo); - return II_FAIL; - } - - switch (Z_TYPE_PP(val)) - { - case IS_LONG: - convert_to_long_ex(val); - putParmParm.pp_parmData[0].dv_null = FALSE; - putParmParm.pp_parmData[0].dv_length = sizeof(Z_LVAL_PP(val)); - tmp_long = Z_LVAL_PP(val); - putParmParm.pp_parmData[0].dv_value = &tmp_long; - break; - case IS_DOUBLE: - convert_to_double_ex(val); - putParmParm.pp_parmData[0].dv_null = FALSE; - putParmParm.pp_parmData[0].dv_length = sizeof(Z_DVAL_PP(val)); - tmp_double = Z_DVAL_PP(val); - putParmParm.pp_parmData[0].dv_value = &tmp_double; - break; - case IS_STRING: - convert_to_string_ex(val); - if ( paramtypes != NULL ) - { - switch (types[param - with_procedure] ) - { - case 'N': /* NVARCHAR */ - /* copy the data to a new buffer then set the size */ - /* of the string in chars at the begining of the buffer */ - tmp_string = emalloc(Z_STRLEN_PP(val) + 2); - memcpy(tmp_string + 2, Z_STRVAL_PP(val), Z_STRLEN_PP(val)); - /* set the 1st 2 bytes as the length of the string in chars */ - *((II_INT2*)(tmp_string)) = Z_STRLEN_PP(val)/2; - putParmParm.pp_parmData[0].dv_value = tmp_string; - putParmParm.pp_parmData[0].dv_length = Z_STRLEN_PP(val) + 2; - break; - case 'v': /* VARCHAR */ - /* copy the data to a new buffer then set the size */ - /* of the string at the begining of the buffer */ - tmp_string = emalloc(Z_STRLEN_PP(val) + 2); - memcpy(tmp_string + 2, Z_STRVAL_PP(val), Z_STRLEN_PP(val)); - /* set the 1st 2 bytes as the length of the string */ - *((II_INT2*)(tmp_string)) = Z_STRLEN_PP(val) ; - putParmParm.pp_parmData[0].dv_value = tmp_string; - putParmParm.pp_parmData[0].dv_length = Z_STRLEN_PP(val) + 2; - break; - case 'D': /* DECIMAL */ -#ifdef IIAPI_VERSION_2 - formatParm.fd_envHandle = ii_link->envHandle; - formatParm.fd_srcDesc.ds_dataType = IIAPI_CHA_TYPE; - formatParm.fd_srcDesc.ds_nullable = FALSE; - formatParm.fd_srcDesc.ds_length = Z_STRLEN_PP(val); - formatParm.fd_srcDesc.ds_precision = 0; - formatParm.fd_srcDesc.ds_scale = 0; - formatParm.fd_srcDesc.ds_columnType = IIAPI_COL_QPARM; - formatParm.fd_srcDesc.ds_columnName = NULL; - - formatParm.fd_srcValue.dv_null = FALSE; - formatParm.fd_srcValue.dv_length = Z_STRLEN_PP(val); - formatParm.fd_srcValue.dv_value = Z_STRVAL_PP(val); - - formatParm.fd_dstDesc.ds_dataType = IIAPI_DEC_TYPE; - formatParm.fd_dstDesc.ds_nullable = FALSE; - formatParm.fd_dstDesc.ds_length = 16; - formatParm.fd_dstDesc.ds_precision = 31; - formatParm.fd_dstDesc.ds_scale = 15; - formatParm.fd_dstDesc.ds_columnType = IIAPI_COL_QPARM; - formatParm.fd_dstDesc.ds_columnName = NULL; - - tmp_string = emalloc(16); - - formatParm.fd_dstValue.dv_null = FALSE; - formatParm.fd_dstValue.dv_length = 16; - formatParm.fd_dstValue.dv_value = tmp_string; - - IIapi_formatData( &formatParm ); - - if ( formatParm.fd_status != IIAPI_ST_SUCCESS ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error occured converting to DECIMAL. Value supplied was %s", Z_STRVAL_PP(val) ); - } - - putParmParm.pp_parmData[0].dv_length = formatParm.fd_dstValue.dv_length; -#else - convertParm.cv_srcDesc.ds_dataType = IIAPI_CHA_TYPE; - convertParm.cv_srcDesc.ds_nullable = FALSE; - convertParm.cv_srcDesc.ds_length = Z_STRLEN_PP(val); - convertParm.cv_srcDesc.ds_precision = 0; - convertParm.cv_srcDesc.ds_scale = 0; - convertParm.cv_srcDesc.ds_columnType = IIAPI_COL_QPARM; - convertParm.cv_srcDesc.ds_columnName = NULL; - - convertParm.cv_srcValue.dv_null = FALSE; - convertParm.cv_srcValue.dv_length = Z_STRLEN_PP(val); - convertParm.cv_srcValue.dv_value = Z_STRVAL_PP(val); - - convertParm.cv_dstDesc.ds_dataType = IIAPI_DEC_TYPE; - convertParm.cv_dstDesc.ds_nullable = FALSE; - convertParm.cv_dstDesc.ds_length = 16; - convertParm.cv_dstDesc.ds_precision = 31; - convertParm.cv_dstDesc.ds_scale = 15; - convertParm.cv_dstDesc.ds_columnType = IIAPI_COL_QPARM; - convertParm.cv_dstDesc.ds_columnName = NULL; - - tmp_string = emalloc(16); - - convertParm.cv_dstValue.dv_null = FALSE; - convertParm.cv_dstValue.dv_length = 16; - convertParm.cv_dstValue.dv_value = tmp_string; - - IIapi_convertData( &convertParm ); - - if ( convertParm.cv_status != IIAPI_ST_SUCCESS ) - { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error occured converting to DECIMAL. Value supplied was %s", Z_STRVAL_PP(val) ); - } - - putParmParm.pp_parmData[0].dv_length = convertParm.cv_dstValue.dv_length; -#endif /* IIAPI_VERSION_2 */ - putParmParm.pp_parmData[0].dv_value = tmp_string; - break; - case 'B': /* LONG BYTE */ - case 'L': /* LONG TEXT */ - case 'V': /* LONG VARCHAR */ - putParmParm.pp_parmCount--; /* decrement parameter count */ - - /* If any non LOB columns have been prepared we need to flush before "put"ing LOB data */ - if ( putParmParm.pp_parmCount ) - { - putParmParm.pp_moreSegments = 0; - - IIapi_putParms( &putParmParm ); - ii_sync(&(putParmParm.pp_genParm)); - - if (ii_success(&(putParmParm.pp_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - efree(descriptorInfo); - efree(columnData); - if ( paramtypes != NULL ) - { - efree (types); - if ( tmp_string != NULL) - { - efree (tmp_string); - } - } - - return II_FAIL; - } - } - - putParmParm.pp_parmCount = 1; /* soon to be "put" LOB */ - putParmParm.pp_moreSegments = 1; - - /* setup a buffer to stream the data in */ - tmp_lob = emalloc(IIG(blob_segment_length) + 2 ); - - tmp_lob_ptr = Z_STRVAL_PP(val); - /* Get the length of the new LOB */ - lob_len = Z_STRLEN_PP(val); - - while (putParmParm.pp_moreSegments) - { - if ( lob_len <= IIG(blob_segment_length) ) - { - putParmParm.pp_moreSegments = 0; - segment_length = lob_len; - } - else - { - putParmParm.pp_moreSegments = 1; - lob_len -= IIG(blob_segment_length); - segment_length = IIG(blob_segment_length); - } - *((II_UINT2*)tmp_lob) = (II_UINT2)segment_length; - memcpy( tmp_lob + 2, tmp_lob_ptr, segment_length); - - - putParmParm.pp_parmData[0].dv_null = FALSE; - putParmParm.pp_parmData[0].dv_length = segment_length + 2; - putParmParm.pp_parmData[0].dv_value = tmp_lob; - - IIapi_putParms( &putParmParm ); - ii_sync(&(putParmParm.pp_genParm)); - - if (ii_success(&(putParmParm.pp_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - efree(descriptorInfo); - efree(columnData); - efree(tmp_lob); - if ( paramtypes != NULL ) - { - efree (types); - if ( tmp_string != NULL) - { - efree (tmp_string); - } - } - - return II_FAIL; - } - - /* bump pointer for data by segment_length */ - tmp_lob_ptr += segment_length; - } - putParmParm.pp_parmCount = 0; - if (tmp_lob != NULL) - { - efree (tmp_lob); - tmp_lob = NULL; - } - break; - default: /* everything else */ - putParmParm.pp_parmData[0].dv_null = FALSE; - putParmParm.pp_parmData[0].dv_value = Z_STRVAL_PP(val); - putParmParm.pp_parmData[0].dv_length = Z_STRLEN_PP(val); - break; - } - } - else - { - putParmParm.pp_parmData[0].dv_null = FALSE; - putParmParm.pp_parmData[0].dv_length = Z_STRLEN_PP(val); - putParmParm.pp_parmData[0].dv_value = Z_STRVAL_PP(val); - } - putParmParm.pp_parmData[0].dv_null = FALSE; - break; - case IS_NULL: /* TODO need to check this */ - putParmParm.pp_parmData[0].dv_null = TRUE; - putParmParm.pp_parmData[0].dv_length = Z_STRLEN_PP(val); - putParmParm.pp_parmData[0].dv_value = Z_STRVAL_PP(val); - break; - default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error putting a parameter of unknown type" ); - return II_FAIL; - break; - } - } - - if (((ii_link->procname != NULL) && (param > 0)) || (ii_link->procname == NULL)) - { - zend_hash_move_forward_ex(arr_hash, &pointer); - } - - if ( putParmParm.pp_parmCount ) { - putParmParm.pp_moreSegments = 0; - - IIapi_putParms( &putParmParm ); - ii_sync(&(putParmParm.pp_genParm)); - - if (ii_success(&(putParmParm.pp_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - efree(descriptorInfo); - efree(columnData); - if ( paramtypes != NULL ) - { - efree (types); - if ( tmp_string != NULL) - { - efree (tmp_string); - } - } - return II_FAIL; - } - if (tmp_string != NULL ) - { - efree(tmp_string); - tmp_string = NULL; - } - } - /* Reset Parameter Count */ - putParmParm.pp_parmCount = 0; - } /* param = 0 ; param < ii_link->paramCount ; param++ */ - - if ( putParmParm.pp_parmCount ) { - - putParmParm.pp_moreSegments = 0; - - IIapi_putParms( &putParmParm ); - ii_sync(&(putParmParm.pp_genParm)); - - if (ii_success(&(putParmParm.pp_genParm), ii_link TSRMLS_CC) == II_FAIL) - { - efree(descriptorInfo); - efree(columnData); - if ( paramtypes != NULL ) - { - efree (types); - if ( tmp_string != NULL) - { - efree (tmp_string); - } - } - return II_FAIL; - } - } + for ( param = 0 ; param < setDescrParm.sd_descriptorCount ; param++) + { + putParmParm.pp_parmCount=1; /* New parameter */ + + if ((ii_result->procname != NULL) && (param == 0)) + { + /* place the procedure name as the first parameter */ + putParmParm.pp_parmData[0].dv_null = FALSE; + putParmParm.pp_parmData[0].dv_length = strlen(ii_result->procname); + putParmParm.pp_parmData[0].dv_value = ii_result->procname; + } + else + { - if ( setDescrParm.sd_descriptorCount ) - { - efree(descriptorInfo); - efree(columnData); - } + if (zend_hash_get_current_data_ex(arr_hash, (void **)&val, &pointer) == FAILURE) + { + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error getting parameter from array"); + efree(columnData); + efree(descriptorInfo); + return II_FAIL; + } + + switch (Z_TYPE_PP(val)) + { + case IS_LONG: + convert_to_long_ex(val); + putParmParm.pp_parmData[0].dv_null = FALSE; + putParmParm.pp_parmData[0].dv_length = sizeof(Z_LVAL_PP(val)); + tmp_long = Z_LVAL_PP(val); + putParmParm.pp_parmData[0].dv_value = &tmp_long; + break; + case IS_DOUBLE: + convert_to_double_ex(val); + putParmParm.pp_parmData[0].dv_null = FALSE; + putParmParm.pp_parmData[0].dv_length = sizeof(Z_DVAL_PP(val)); + tmp_double = Z_DVAL_PP(val); + putParmParm.pp_parmData[0].dv_value = &tmp_double; + break; + case IS_STRING: + convert_to_string_ex(val); + if ( paramtypes != NULL ) + { + switch (types[param - with_procedure] ) + { + case 'N': /* NVARCHAR */ + if (IIG(utf8)) { + /* Convert the UTF-8 data we have to UTF-16 so Ingres will store it */ + tmp_utf16_string = emalloc((Z_STRLEN_PP(val) * 4) + 2); + string_start = Z_STRVAL_PP(val); + tmp_utf16_string_ptr = tmp_utf16_string + 1; + result = ConvertUTF8toUTF16((const UTF8 **) &string_start, string_start + Z_STRLEN_PP(val) + 1, &tmp_utf16_string_ptr, tmp_utf16_string_ptr + (Z_STRLEN_PP(val) * 4) , strictConversion); + utf16_string_len = ((tmp_utf16_string_ptr - 1) - (tmp_utf16_string + 1)) * 2; + *((II_INT2*)(tmp_utf16_string)) = utf16_string_len/2; + putParmParm.pp_parmData[0].dv_value = tmp_utf16_string; + putParmParm.pp_parmData[0].dv_length = utf16_string_len + 2; + } + else /* assume UTF-16 */ + { + /* copy the data to a new buffer then set the size */ + /* of the string in chars at the beggining of the buffer */ + tmp_string = emalloc(Z_STRLEN_PP(val) + 2); + memcpy(tmp_string + 2, Z_STRVAL_PP(val), Z_STRLEN_PP(val)); + /* set the 1st 2 bytes as the length of the string in chars */ + *((II_INT2*)(tmp_string)) = Z_STRLEN_PP(val)/2; + putParmParm.pp_parmData[0].dv_value = tmp_string; + putParmParm.pp_parmData[0].dv_length = Z_STRLEN_PP(val) + 2; + } + + break; + case 'n': /* NCHAR - for UTF-8 source data only */ + if (IIG(utf8)) { + tmp_utf16_string = emalloc((Z_STRLEN_PP(val) * 4)); + string_start = Z_STRVAL_PP(val); + tmp_utf16_string_ptr = tmp_utf16_string; + result = ConvertUTF8toUTF16((const UTF8 **) &string_start, string_start + Z_STRLEN_PP(val) + 1, &tmp_utf16_string_ptr, tmp_utf16_string_ptr + (Z_STRLEN_PP(val) * 4) , strictConversion); + utf16_string_len = ((tmp_utf16_string_ptr - 1) - (tmp_utf16_string + 1)) * 2; + putParmParm.pp_parmData[0].dv_value = (II_PTR *)tmp_utf16_string; + putParmParm.pp_parmData[0].dv_length = utf16_string_len; + } + else + { + putParmParm.pp_parmData[0].dv_value = Z_STRVAL_PP(val); + putParmParm.pp_parmData[0].dv_length = Z_STRLEN_PP(val); + } + break; + case 'v': /* VARCHAR */ + /* copy the data to a new buffer then set the size */ + /* of the string at the begining of the buffer */ + tmp_string = emalloc(Z_STRLEN_PP(val) + 2); + memcpy(tmp_string + 2, Z_STRVAL_PP(val), Z_STRLEN_PP(val)); + /* set the 1st 2 bytes as the length of the string */ + *((II_INT2*)(tmp_string)) = Z_STRLEN_PP(val) ; + putParmParm.pp_parmData[0].dv_value = tmp_string; + putParmParm.pp_parmData[0].dv_length = Z_STRLEN_PP(val) + 2; + break; + case 'B': /* LONG BYTE */ + case 'L': /* LONG TEXT */ + case 'V': /* LONG VARCHAR */ + putParmParm.pp_parmCount--; /* decrement parameter count */ + + /* If any non LOB columns have been prepared we need to flush before "put"ing LOB data */ + if ( putParmParm.pp_parmCount ) + { + putParmParm.pp_moreSegments = 0; + + IIapi_putParms( &putParmParm ); + ii_sync(&(putParmParm.pp_genParm)); + + if (ii_success(&(putParmParm.pp_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + efree(descriptorInfo); + efree(columnData); + if ( paramtypes != NULL ) + { + efree (types); + if ( tmp_string != NULL) + { + efree (tmp_string); + } + } + + return II_FAIL; + } + } + + putParmParm.pp_parmCount = 1; /* soon to be "put" LOB */ + putParmParm.pp_moreSegments = 1; + + /* setup a buffer to stream the data in */ + tmp_lob = emalloc(IIG(blob_segment_length) + 2 ); + + tmp_lob_ptr = Z_STRVAL_PP(val); + /* Get the length of the new LOB */ + lob_len = Z_STRLEN_PP(val); + + while (putParmParm.pp_moreSegments) + { + if ( lob_len <= IIG(blob_segment_length) ) + { + putParmParm.pp_moreSegments = 0; + segment_length = lob_len; + } + else + { + putParmParm.pp_moreSegments = 1; + lob_len -= IIG(blob_segment_length); + segment_length = IIG(blob_segment_length); + } + *((II_UINT2*)tmp_lob) = (II_UINT2)segment_length; + memcpy( tmp_lob + 2, tmp_lob_ptr, segment_length); + + + putParmParm.pp_parmData[0].dv_null = FALSE; + putParmParm.pp_parmData[0].dv_length = segment_length + 2; + putParmParm.pp_parmData[0].dv_value = tmp_lob; + + IIapi_putParms( &putParmParm ); + ii_sync(&(putParmParm.pp_genParm)); + + if (ii_success(&(putParmParm.pp_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + efree(descriptorInfo); + efree(columnData); + efree(tmp_lob); + if ( paramtypes != NULL ) + { + efree (types); + if ( tmp_string != NULL) + { + efree (tmp_string); + } + } + + return II_FAIL; + } + + /* bump pointer for data by segment_length */ + tmp_lob_ptr += segment_length; + } + putParmParm.pp_parmCount = 0; + if (tmp_lob != NULL) + { + efree (tmp_lob); + tmp_lob = NULL; + } + break; + default: /* everything else */ + putParmParm.pp_parmData[0].dv_value = Z_STRVAL_PP(val); + putParmParm.pp_parmData[0].dv_length = Z_STRLEN_PP(val); + break; + } + } + else + { + putParmParm.pp_parmData[0].dv_length = Z_STRLEN_PP(val); + putParmParm.pp_parmData[0].dv_value = Z_STRVAL_PP(val); + } + putParmParm.pp_parmData[0].dv_null = FALSE; + break; + case IS_NULL: + putParmParm.pp_parmData[0].dv_null = TRUE; + putParmParm.pp_parmData[0].dv_length = 0; + putParmParm.pp_parmData[0].dv_value = NULL; + break; + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error putting a parameter of unknown type" ); + return II_FAIL; + break; + } + } - if ( paramtypes != NULL ) - { - efree (types); - if ( tmp_string != NULL) - { - efree (tmp_string); - tmp_string = NULL; - } - } + if (((ii_result->procname != NULL) && (param > 0)) || (ii_result->procname == NULL)) + { + zend_hash_move_forward_ex(arr_hash, &pointer); + } - if (tmp_string != NULL) - { - efree (tmp_string); - tmp_string = NULL; - } + if ( putParmParm.pp_parmCount ) { + putParmParm.pp_moreSegments = 0; + + IIapi_putParms( &putParmParm ); + ii_sync(&(putParmParm.pp_genParm)); + + if (ii_success(&(putParmParm.pp_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + efree(descriptorInfo); + efree(columnData); + if ( paramtypes != NULL ) + { + efree (types); + types = NULL; + if ( tmp_string != NULL) + { + efree (tmp_string); + tmp_string = NULL; + } + if ( tmp_utf16_string != NULL) + { + efree (tmp_utf16_string); + tmp_utf16_string = NULL; + } + } + return II_FAIL; + } + if (tmp_string != NULL ) + { + efree(tmp_string); + tmp_string = NULL; + } + if ( tmp_utf16_string != NULL) + { + efree (tmp_utf16_string); + tmp_utf16_string = NULL; + } + } + /* Reset Parameter Count */ + putParmParm.pp_parmCount = 0; + } /* param = 0 ; param < ii_result->paramCount ; param++ */ + + if ( putParmParm.pp_parmCount ) { + + putParmParm.pp_moreSegments = 0; + + IIapi_putParms( &putParmParm ); + ii_sync(&(putParmParm.pp_genParm)); + + if (ii_success(&(putParmParm.pp_genParm), &ii_result->errorHandle TSRMLS_CC) == II_FAIL) + { + efree(descriptorInfo); + efree(columnData); + if ( paramtypes != NULL ) + { + efree (types); + if ( tmp_string != NULL) + { + efree (tmp_string); + } + } + return II_FAIL; + } + } + + if ( setDescrParm.sd_descriptorCount ) + { + efree(descriptorInfo); + efree(columnData); + } + + if ( paramtypes != NULL ) + { + efree (types); + if ( tmp_string != NULL) + { + efree (tmp_string); + tmp_string = NULL; + } + } + + if (tmp_string != NULL) + { + efree (tmp_string); + tmp_string = NULL; + } - return II_OK; + return II_OK; } /* }}} */ -#endif /* HAVE_II */ +#endif /* HAVE_INGRES */ /* * Local variables: @@ -4631,6 +5320,6 @@ * shift-width: 4 * c-basic-offset: 4 * End: - * vim600: sw=4 ts=4 fdm=marker ff=unix + * vim600: sw=4 ts=4 fdm=marker ff=unix fileencoding=latin1 expandtab * vim<600: sw=4 ts=4 */ http://cvs.php.net/viewvc.cgi/pecl/ingres/ii.h?r1=1.31&r2=1.32&diff_format=u Index: pecl/ingres/ii.h diff -u pecl/ingres/ii.h:1.31 pecl/ingres/ii.h:1.32 --- pecl/ingres/ii.h:1.31 Fri Apr 27 07:42:27 2007 +++ pecl/ingres/ii.h Thu Sep 13 10:59:08 2007 @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PECL :: ingres | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2004 The PHP Group | + | Copyright (c) 1997-2007 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -21,43 +21,48 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.h,v 1.31 2007/04/27 07:42:27 grantc Exp $ */ +/* $Id: ii.h,v 1.32 2007/09/13 10:59:08 grantc Exp $ */ #ifndef II_H #define II_H -#if HAVE_II +#if HAVE_INGRES #include "php_ii.h" #include "iiapi.h" +typedef struct _ii_result_entry { + char *next_result_ptr; + int result_id; +} ii_result_entry; + typedef struct _II_LINK { - int autocommit; - II_PTR connHandle; - II_PTR tranHandle; - II_PTR stmtHandle; - II_PTR envHandle; - II_LONG fieldCount; - IIAPI_DESCRIPTOR *descriptor; - II_CHAR *errorText; - II_CHAR sqlstate[6]; - II_LONG errorCode; - int paramCount; - char *cursor_id; - long cursor_mode; - char *procname; + II_PTR connHandle; + II_PTR tranHandle; + II_PTR stmtHandle; + II_PTR envHandle; + II_PTR errorHandle; /* error handle */ + int autocommit; + ii_result_entry *result_list_ptr; + int auto_multi; /* Enable multiple cursors when autocommit is enabled */ } II_LINK; typedef struct _II_RESULT { - II_PTR stmtHandle; - II_PTR connHandle; - II_PTR tranHandle; - II_LONG fieldCount; - IIAPI_DESCRIPTOR *descriptor; - int paramCount; - char *cursor_id; + II_PTR stmtHandle; /* statement handle for the result */ + II_PTR connHandle; /* connection associated with this result */ + II_PTR tranHandle; /* transaction handle */ + II_PTR errorHandle; /* error handle */ + II_LONG fieldCount; + IIAPI_DESCRIPTOR *descriptor; + int paramCount; + char *cursor_id; + long cursor_mode; + char *procname; +#if defined IIAPI_VERSION_6 + int scrollable; /* is this a scrollable cursor */ +#endif + int link_id; /* the link to which this result belongs */ } II_RESULT; - #define II_FAIL 0 #define II_OK 1 #define II_NO_DATA 2 @@ -112,8 +117,10 @@ #define INGRES_SQL_EXECUTE_PROCEDURE 14 #define INGRES_SQL_CALL 15 #define INGRES_SQL_COPY 16 +#define INGRES_SQL_CREATE 17 +#define INGRES_SQL_ALTER 18 -#define INGRES_NO_OF_COMMANDS 16 +#define INGRES_NO_OF_COMMANDS 18 static struct { @@ -137,34 +144,49 @@ { "EXECUTE PROCEDURE", INGRES_SQL_EXECUTE_PROCEDURE }, { "CALL", INGRES_SQL_CALL }, { "COPY", INGRES_SQL_COPY }, + { "CREATE", INGRES_SQL_CREATE }, + { "ALTER", INGRES_SQL_ALTER }, }; + static int ii_sync(IIAPI_GENPARM *genParm); -static int ii_success(IIAPI_GENPARM *genParm, II_LINK *ii_link TSRMLS_DC); +static int ii_success(IIAPI_GENPARM *genParm, II_PTR *connHandle TSRMLS_DC); -static int _close_statement(II_LINK *ii_link TSRMLS_DC); +static int _close_statement(II_RESULT *ii_result TSRMLS_DC); static int _rollback_transaction(II_LINK *ii_link TSRMLS_DC); +static int _commit_transaction(II_LINK *ii_link TSRMLS_DC); static void _close_ii_link(II_LINK *link TSRMLS_DC); static void _close_ii_plink(zend_rsrc_list_entry *link TSRMLS_DC); -static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS); -static void php_ii_set_default_link(int id TSRMLS_DC); +static int _close_ii_result(II_RESULT *result TSRMLS_DC); static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent); -static char *php_ii_field_name(II_LINK *ii_link, int index TSRMLS_DC); -static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, int info_type); -static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int result_type); +static char *php_ii_field_name(II_RESULT *ii_result, int index TSRMLS_DC); +static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, II_RESULT *ii_result, long index, int info_type); +static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_RESULT *ii_result, int result_type, long row_position, II_INT2 row_count); static void php_ii_error(INTERNAL_FUNCTION_PARAMETERS, int mode); static long php_ii_paramcount(char *statement TSRMLS_DC); -static void php_ii_gen_cursor_id(II_LINK *ii_link TSRMLS_DC); +static void php_ii_gen_cursor_id(II_RESULT *ii_result TSRMLS_DC); static char *php_ii_check_procedure(char *statement, II_LINK *ii_link TSRMLS_DC); -static short int php_ii_set_connect_options(zval **options, II_LINK *ii_link, char *database TSRMLS_DC); -static char * php_ii_convert_param_markers ( char *statement TSRMLS_DC); -static short php_ii_bind_params (INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, zval **queryParams, zval **paramtypes); -static II_LONG php_ii_convert_data ( II_LONG destType, int destSize, int precision, II_LINK *ii_link, IIAPI_DATAVALUE *columnData, IIAPI_GETCOLPARM getColParm, int field, int column TSRMLS_DC ); -static short int php_ii_set_environment_options (zval **options, II_LINK *ii_link TSRMLS_DC); +static short int php_ii_set_connect_options(zval *options, II_LINK *ii_link, char *database TSRMLS_DC); +static char *php_ii_convert_param_markers (char *query, char *converted_query TSRMLS_DC); +static short php_ii_bind_params (INTERNAL_FUNCTION_PARAMETERS, II_RESULT *ii_result, zval *queryParams, char *paramtypes); +static II_LONG php_ii_convert_data ( II_LONG destType, int destSize, int precision, II_RESULT *ii_result, IIAPI_DATAVALUE *columnData, IIAPI_GETCOLPARM getColParm, int field, int column TSRMLS_DC ); +static short int php_ii_set_environment_options (zval *options, II_LINK *ii_link TSRMLS_DC); +static void _ii_init_link (INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link ); +static void _ii_init_result (INTERNAL_FUNCTION_PARAMETERS, II_RESULT *ii_result, II_LINK *ii_link ); +static void _free_ii_link_result_list (II_LINK *ii_link TSRMLS_DC); static int php_ii_query_type(char *statement TSRMLS_DC); +static int _rollback_transaction(II_LINK *ii_link TSRMLS_DC); +static short php_ii_result_remove ( II_RESULT *ii_result, long result_id TSRMLS_DC ); + + + + + + + #endif /* HAVE_II */ -#endif /* II_H */ +#endif /* II_H */ /* @@ -173,6 +195,6 @@ * shift-width: 4 * c-basic-offset: 4 * End: - * vim600: sw=4 ts=4 fdm=marker ff=unix + * vim600: sw=4 ts=4 fdm=marker ff=unix expandtab * vim<600: sw=4 ts=4 */ http://cvs.php.net/viewvc.cgi/pecl/ingres/package.xml?r1=1.22&r2=1.23&diff_format=u Index: pecl/ingres/package.xml diff -u pecl/ingres/package.xml:1.22 pecl/ingres/package.xml:1.23 --- pecl/ingres/package.xml:1.22 Wed Mar 7 12:30:11 2007 +++ pecl/ingres/package.xml Thu Sep 13 10:59:08 2007 @@ -14,22 +14,29 @@ <email>grant.croker@ingres.com</email> <active>yes</active> </lead> - <date>2007-03-07</date> + <date>2007-09-11</date> <time>17:00:00</time> <version> - <release>1.4.3</release> - <api>1.4.3</api> + <release>2.0.0</release> + <api>2.0.0</api> </version> <stability> <release>beta</release> <api>beta</api> </stability> <license uri="http://www.php.net/license">PHP</license> - <notes>This release incorporates a single change that stablizes the Ingres PECL extension under multi-threaded webservers such as Apache worker or Microsoft IIS. Users of these web servers are strongly recommended to install this update. - -The following changes were submitted: - - Wait for disconnect to complete to prevent thread terminating uncleanly [grantc 07-03-07] - </notes> + <notes>A major overall for the Ingres extension including the following changes + - Support for multiple concurrent result-sets + - Automatic coercion between UTF-8 and UTF-16 + - Bi-directional scrolling cursors + - New functions: + - ingres_free_results() - free the memory associated with a given result set + - ingres_autocommit_state() - return the current auto-commit state + - ingres_next_error() - fetch additional errors if any + + As previously noted in the ingres-1.x README(.html) file, the implementation + of concurrent resultsets requred a backwards compatibility (bc) break. See + the updated README(.html) for more information regarding this change.</notes> <contents> <dir name="/"> <dir name="tests"> @@ -77,13 +84,13 @@ <file baseinstalldir="ingres" name="config.m4" role="src" /> <file baseinstalldir="ingres" name="config.w32" role="src" /> <file baseinstalldir="ingres" name="CREDITS" role="doc" /> - <file baseinstalldir="ingres" name="ingres.ini" role="doc" /> <file baseinstalldir="ingres" name="ii.c" role="src" /> <file baseinstalldir="ingres" name="ii.h" role="src" /> + <file baseinstalldir="ingres" name="convertUTF.c" role="src" /> + <file baseinstalldir="ingres" name="convertUTF.h" role="src" /> <file baseinstalldir="ingres" name="php_ii.h" role="src" /> <file baseinstalldir="ingres" name="README" role="doc" /> <file baseinstalldir="ingres" name="README.html" role="doc" /> - <file baseinstalldir="ingres" name="ingres.ini" role="doc" /> <file baseinstalldir="ingres" name="TODO" role="doc" /> </dir> <!-- / --> </contents> http://cvs.php.net/viewvc.cgi/pecl/ingres/php_ii.h?r1=1.34&r2=1.35&diff_format=u Index: pecl/ingres/php_ii.h diff -u pecl/ingres/php_ii.h:1.34 pecl/ingres/php_ii.h:1.35 --- pecl/ingres/php_ii.h:1.34 Wed Mar 7 12:30:11 2007 +++ pecl/ingres/php_ii.h Thu Sep 13 10:59:08 2007 @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PECL :: ingres | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2004 The PHP Group | + | Copyright (c) 1997-2007 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -21,12 +21,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ii.h,v 1.34 2007/03/07 12:30:11 grantc Exp $ */ +/* $Id: php_ii.h,v 1.35 2007/09/13 10:59:08 grantc Exp $ */ #ifndef PHP_II_H #define PHP_II_H -#if HAVE_II +#if HAVE_INGRES #include<iiapi.h> extern zend_module_entry ingres_module_entry; #define phpext_ingres_ptr &ingres_module_entry @@ -37,12 +37,49 @@ #define PHP_II_API #endif -PHP_MINIT_FUNCTION(ii); -PHP_MSHUTDOWN_FUNCTION(ii); -PHP_RINIT_FUNCTION(ii); -PHP_RSHUTDOWN_FUNCTION(ii); -PHP_MINFO_FUNCTION(ii); - +PHP_MINIT_FUNCTION(ingres); +PHP_MSHUTDOWN_FUNCTION(ingres); +PHP_RINIT_FUNCTION(ingres); +PHP_RSHUTDOWN_FUNCTION(ingres); +PHP_MINFO_FUNCTION(ingres); + +#ifdef HAVE_INGRES2 +PHP_FUNCTION(ingres2_connect); +PHP_FUNCTION(ingres2_pconnect); +PHP_FUNCTION(ingres2_close); +PHP_FUNCTION(ingres2_query); +PHP_FUNCTION(ingres2_num_rows); +PHP_FUNCTION(ingres2_num_fields); +PHP_FUNCTION(ingres2_field_name); +PHP_FUNCTION(ingres2_field_type); +PHP_FUNCTION(ingres2_field_nullable); +PHP_FUNCTION(ingres2_field_length); +PHP_FUNCTION(ingres2_field_precision); +PHP_FUNCTION(ingres2_field_scale); +PHP_FUNCTION(ingres2_fetch_array); +PHP_FUNCTION(ingres2_fetch_row); +PHP_FUNCTION(ingres2_fetch_object); +PHP_FUNCTION(ingres2_rollback); +PHP_FUNCTION(ingres2_commit); +PHP_FUNCTION(ingres2_autocommit); +PHP_FUNCTION(ingres2_conn_errno); +PHP_FUNCTION(ingres2_conn_error); +PHP_FUNCTION(ingres2_conn_errsqlstate); +PHP_FUNCTION(ingres2_stmt_errno); +PHP_FUNCTION(ingres2_stmt_error); +PHP_FUNCTION(ingres2_stmt_errsqlstate); +PHP_FUNCTION(ingres2_error); +PHP_FUNCTION(ingres2_errno); +PHP_FUNCTION(ingres2_errsqlstate); +PHP_FUNCTION(ingres2_prepare); +PHP_FUNCTION(ingres2_execute); +PHP_FUNCTION(ingres2_cursor); +PHP_FUNCTION(ingres2_set_environment); +PHP_FUNCTION(ingres2_fetch_proc_return); +PHP_FUNCTION(ingres2_free_result); +PHP_FUNCTION(ingres2_autocommit_state); +PHP_FUNCTION(ingres2_next_error); +#else PHP_FUNCTION(ingres_connect); PHP_FUNCTION(ingres_pconnect); PHP_FUNCTION(ingres_close); @@ -61,6 +98,12 @@ PHP_FUNCTION(ingres_rollback); PHP_FUNCTION(ingres_commit); PHP_FUNCTION(ingres_autocommit); +PHP_FUNCTION(ingres_conn_errno); +PHP_FUNCTION(ingres_conn_error); +PHP_FUNCTION(ingres_conn_errsqlstate); +PHP_FUNCTION(ingres_stmt_errno); +PHP_FUNCTION(ingres_stmt_error); +PHP_FUNCTION(ingres_stmt_errsqlstate); PHP_FUNCTION(ingres_error); PHP_FUNCTION(ingres_errno); PHP_FUNCTION(ingres_errsqlstate); @@ -69,6 +112,10 @@ PHP_FUNCTION(ingres_cursor); PHP_FUNCTION(ingres_set_environment); PHP_FUNCTION(ingres_fetch_proc_return); +PHP_FUNCTION(ingres_free_result); +PHP_FUNCTION(ingres_autocommit_state); +PHP_FUNCTION(ingres_next_error); +#endif ZEND_BEGIN_MODULE_GLOBALS(ii) long allow_persistent; @@ -82,9 +129,12 @@ long num_links; long default_link; - char sqlstate[7]; - long errorCode; - char *errorText; + II_PTR *errorHandle; + + char *error_text; + char error_sqlstate[ II_SQLSTATE_LEN + 1 ]; + + long error_number; long report_db_warnings; /* switch on/off the E_WARNINGS generated by ii_success. Default is to have them on */ @@ -94,18 +144,22 @@ II_PTR *envHandle; /* environment handle */ - long blob_segment_length; /* size of memory to read when puting/fetching */ + long blob_segment_length; /* size of memory to read when putting/fetching */ /* a blob */ long trace_connect; /* enable / disable tracing of php_ii_do_connect */ long connect_timeout; /* in ms - default -1, no timeout, if not set */ long array_index_start; /* start value for x in array[x], default 1*/ + + short utf8; /* convert unicode data to / from UTF-8 */ + short auto_multi; /* Enable multiple cursors when auto commit is enabled */ + short reuse_connection; /* should ingres_connect() reuse existing connections? */ ZEND_END_MODULE_GLOBALS(ii) #define II_ASSOC (1<<0) #define II_NUM (1<<1) #define II_BOTH (II_ASSOC|II_NUM) -#define II_VERSION "1.4.3" +#define II_VERSION "2.0.0-alpha" #define II_CURSOR_UPDATE 0 /* default */ #define II_CURSOR_READONLY 1 @@ -124,6 +178,46 @@ #endif + +#ifdef HAVE_INGRES2 + +#define INGRES_INI_ALLOW_PERSISTENT "ingres2.allow_persistent" +#define INGRES_INI_MAX_PERSISTENT "ingres2.max_persistent" +#define INGRES_INI_MAX_LINKS "ingres2.max_links" +#define INGRES_INI_DEFAULT_DATABASE "ingres2.default_database" +#define INGRES_INI_DEFAULT_USER "ingres2.default_user" +#define INGRES_INI_DEFAULT_PASSWORD "ingres2.default_password" +#define INGRES_INI_REPORT_DB_WARNINGS "ingres2.report_db_warnings" +#define INGRES_INI_CURSOR_MODE "ingres2.cursor_mode" +#define INGRES_INI_BLOB_SEGMENT_LENGTH "ingres2.blob_segment_length" +#define INGRES_INI_TRACE_CONNECT "ingres2.trace_connect" +#define INGRES_INI_TIMEOUT "ingres2.timeout" +#define INGRES_INI_ARRAY_INDEX_START "ingres2.array_index_start" +#define INGRES_INI_AUTO "ingres2.auto" +#define INGRES_INI_UTF8 "ingres2.utf8" +#define INGRES_INI_REUSE_CONNECTION "ingres2.reuse_connection" + +#else + +#define INGRES_INI_ALLOW_PERSISTENT "ingres.allow_persistent" +#define INGRES_INI_MAX_PERSISTENT "ingres.max_persistent" +#define INGRES_INI_MAX_LINKS "ingres.max_links" +#define INGRES_INI_DEFAULT_DATABASE "ingres.default_database" +#define INGRES_INI_DEFAULT_USER "ingres.default_user" +#define INGRES_INI_DEFAULT_PASSWORD "ingres.default_password" +#define INGRES_INI_REPORT_DB_WARNINGS "ingres.report_db_warnings" +#define INGRES_INI_CURSOR_MODE "ingres.cursor_mode" +#define INGRES_INI_BLOB_SEGMENT_LENGTH "ingres.blob_segment_length" +#define INGRES_INI_TRACE_CONNECT "ingres.trace_connect" +#define INGRES_INI_TIMEOUT "ingres.timeout" +#define INGRES_INI_ARRAY_INDEX_START "ingres.array_index_start" +#define INGRES_INI_AUTO "ingres.auto" +#define INGRES_INI_UTF8 "ingres.utf8" +#define INGRES_INI_REUSE_CONNECTION "ingres.reuse_connection" + +#endif /* HAVE_INGRES2 */ + + #endif /* PHP_II_H */ /* @@ -132,6 +226,6 @@ * shift-width: 4 * c-basic-offset: 4 * End: - * vim600: sw=4 ts=4 fdm=marker ff=unix + * vim600: sw=4 ts=4 fdm=marker ff=unix expandtab * vim<600: sw=4 ts=4 */ http://cvs.php.net/viewvc.cgi/pecl/ingres/convertUTF.c?view=markup&rev=1.1 Index: pecl/ingres/convertUTF.c +++ pecl/ingres/convertUTF.c /* * Copyright 2001-2004 Unicode, Inc. * * Disclaimer * * This source code is provided as is by Unicode, Inc. No claims are * made as to fitness for any particular purpose. No warranties of any * kind are expressed or implied. The recipient agrees to determine * applicability of information provided. If this file has been * purchased on magnetic or optical media from Unicode, Inc., the * sole remedy for any claim will be exchange of defective media * within 90 days of receipt. * * Limitations on Rights to Redistribute This Code * * Unicode, Inc. hereby grants the right to freely use the information * supplied in this file in the creation of products supporting the * Unicode Standard, and to make copies of this file in any form * for internal or external distribution as long as this notice * remains attached. */ /* --------------------------------------------------------------------- Conversions between UTF32, UTF-16, and UTF-8. Source code file. Author: Mark E. Davis, 1994. Rev History: Rick McGowan, fixes & updates May 2001. Sept 2001: fixed const & error conditions per mods suggested by S. Parent & A. Lillich. June 2002: Tim Dodd added detection and handling of incomplete source sequences, enhanced error detection, added casts to eliminate compiler warnings. July 2003: slight mods to back out aggressive FFFE detection. Jan 2004: updated switches in from-UTF8 conversions. Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions. See the header file "convertUTF.h" for complete documentation. ------------------------------------------------------------------------ */ #include "convertUTF.h" #ifdef CVTUTF_DEBUG #include <stdio.h> #endif static const int halfShift = 10; /* used for shifting by 10 bits */ static const UTF32 halfBase = 0x0010000UL; static const UTF32 halfMask = 0x3FFUL; #define UNI_SUR_HIGH_START (UTF32)0xD800 #define UNI_SUR_HIGH_END (UTF32)0xDBFF #define UNI_SUR_LOW_START (UTF32)0xDC00 #define UNI_SUR_LOW_END (UTF32)0xDFFF #define false 0 #define true 1 /* --------------------------------------------------------------------- */ ConversionResult ConvertUTF32toUTF16 ( const UTF32** sourceStart, const UTF32* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) { ConversionResult result = conversionOK; const UTF32* source = *sourceStart; UTF16* target = *targetStart; while (source < sourceEnd) { UTF32 ch; if (target >= targetEnd) { result = targetExhausted; break; } ch = *source++; if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */ /* UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values */ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) { if (flags == strictConversion) { --source; /* return to the illegal value itself */ result = sourceIllegal; break; } else { *target++ = UNI_REPLACEMENT_CHAR; } } else { *target++ = (UTF16)ch; /* normal case */ } } else if (ch > UNI_MAX_LEGAL_UTF32) { if (flags == strictConversion) { result = sourceIllegal; } else { *target++ = UNI_REPLACEMENT_CHAR; } } else { /* target is a character in range 0xFFFF - 0x10FFFF. */ if (target + 1 >= targetEnd) { --source; /* Back up source pointer! */ result = targetExhausted; break; } ch -= halfBase; *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START); *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START); } } *sourceStart = source; *targetStart = target; return result; } /* --------------------------------------------------------------------- */ ConversionResult ConvertUTF16toUTF32 ( const UTF16** sourceStart, const UTF16* sourceEnd, UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) { ConversionResult result = conversionOK; const UTF16* source = *sourceStart; UTF32* target = *targetStart; UTF32 ch, ch2; while (source < sourceEnd) { const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */ ch = *source++; /* If we have a surrogate pair, convert to UTF32 first. */ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) { /* If the 16 bits following the high surrogate are in the source buffer... */ if (source < sourceEnd) { ch2 = *source; /* If it's a low surrogate, convert to UTF32. */ if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) { ch = ((ch - UNI_SUR_HIGH_START) << halfShift) + (ch2 - UNI_SUR_LOW_START) + halfBase; ++source; } else if (flags == strictConversion) { /* it's an unpaired high surrogate */ --source; /* return to the illegal value itself */ result = sourceIllegal; break; } } else { /* We don't have the 16 bits following the high surrogate. */ --source; /* return to the high surrogate */ result = sourceExhausted; break; } } else if (flags == strictConversion) { /* UTF-16 surrogate values are illegal in UTF-32 */ if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) { --source; /* return to the illegal value itself */ result = sourceIllegal; break; } } if (target >= targetEnd) { source = oldSource; /* Back up source pointer! */ result = targetExhausted; break; } *target++ = ch; } *sourceStart = source; *targetStart = target; #ifdef CVTUTF_DEBUG if (result == sourceIllegal) { fprintf(stderr, "ConvertUTF16toUTF32 illegal seq 0x%04x,%04x\n", ch, ch2); fflush(stderr); } #endif return result; } /* --------------------------------------------------------------------- */ /* * Index into the table below with the first byte of a UTF-8 sequence to * get the number of trailing bytes that are supposed to follow it. * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is * left as-is for anyone who may want to do such conversion, which was * allowed in earlier algorithms. */ static const char trailingBytesForUTF8[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5 }; /* * Magic values subtracted from a buffer value during UTF8 conversion. * This table contains as many values as there might be trailing bytes * in a UTF-8 sequence. */ static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, 0x03C82080UL, 0xFA082080UL, 0x82082080UL }; /* * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed * into the first byte, depending on how many bytes follow. There are * as many entries in this table as there are UTF-8 sequence types. * (I.e., one byte sequence, two byte... etc.). Remember that sequencs * for *legal* UTF-8 will be 4 or fewer bytes total. */ static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC }; /* --------------------------------------------------------------------- */ /* The interface converts a whole buffer to avoid function-call overhead. * Constants have been gathered. Loops & conditionals have been removed as * much as possible for efficiency, in favor of drop-through switches. * (See "Note A" at the bottom of the file for equivalent code.) * If your compiler supports it, the "isLegalUTF8" call can be turned * into an inline function. */ /* --------------------------------------------------------------------- */ ConversionResult ConvertUTF16toUTF8 ( const UTF16** sourceStart, const UTF16* sourceEnd, UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) { ConversionResult result = conversionOK; const UTF16* source = *sourceStart; UTF8* target = *targetStart; while (source < sourceEnd) { UTF32 ch; unsigned short bytesToWrite = 0; const UTF32 byteMask = 0xBF; const UTF32 byteMark = 0x80; const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */ ch = *source++; /* If we have a surrogate pair, convert to UTF32 first. */ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) { /* If the 16 bits following the high surrogate are in the source buffer... */ if (source < sourceEnd) { UTF32 ch2 = *source; /* If it's a low surrogate, convert to UTF32. */ if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) { ch = ((ch - UNI_SUR_HIGH_START) << halfShift) + (ch2 - UNI_SUR_LOW_START) + halfBase; ++source; } else if (flags == strictConversion) { /* it's an unpaired high surrogate */ --source; /* return to the illegal value itself */ result = sourceIllegal; break; } } else { /* We don't have the 16 bits following the high surrogate. */ --source; /* return to the high surrogate */ result = sourceExhausted; break; } } else if (flags == strictConversion) { /* UTF-16 surrogate values are illegal in UTF-32 */ if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) { --source; /* return to the illegal value itself */ result = sourceIllegal; break; } } /* Figure out how many bytes the result will require */ if (ch < (UTF32)0x80) { bytesToWrite = 1; } else if (ch < (UTF32)0x800) { bytesToWrite = 2; } else if (ch < (UTF32)0x10000) { bytesToWrite = 3; } else if (ch < (UTF32)0x110000) { bytesToWrite = 4; } else { bytesToWrite = 3; ch = UNI_REPLACEMENT_CHAR; } target += bytesToWrite; if (target > targetEnd) { source = oldSource; /* Back up source pointer! */ target -= bytesToWrite; result = targetExhausted; break; } switch (bytesToWrite) { /* note: everything falls through. */ case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; case 1: *--target = (UTF8)(ch | firstByteMark[bytesToWrite]); } target += bytesToWrite; } *sourceStart = source; *targetStart = target; return result; } /* --------------------------------------------------------------------- */ /* * Utility routine to tell whether a sequence of bytes is legal UTF-8. * This must be called with the length pre-determined by the first byte. * If not calling this from ConvertUTF8to*, then the length can be set by: * length = trailingBytesForUTF8[*source]+1; * and the sequence is illegal right away if there aren't that many bytes * available. * If presented with a length > 4, this returns false. The Unicode * definition of UTF-8 goes up to 4-byte sequences. */ static Boolean isLegalUTF8(const UTF8 *source, int length) { UTF8 a; const UTF8 *srcptr = source+length; switch (length) { default: return false; /* Everything else falls through when "true"... */ case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false; case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false; case 2: if ((a = (*--srcptr)) > 0xBF) return false; switch (*source) { /* no fall-through in this inner switch */ case 0xE0: if (a < 0xA0) return false; break; case 0xED: if (a > 0x9F) return false; break; case 0xF0: if (a < 0x90) return false; break; case 0xF4: if (a > 0x8F) return false; break; default: if (a < 0x80) return false; } case 1: if (*source >= 0x80 && *source < 0xC2) return false; } if (*source > 0xF4) return false; return true; } /* --------------------------------------------------------------------- */ /* * Exported function to return whether a UTF-8 sequence is legal or not. * This is not used here; it's just exported. */ Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) { int length = trailingBytesForUTF8[*source]+1; if (source+length > sourceEnd) { return false; } return isLegalUTF8(source, length); } /* --------------------------------------------------------------------- */ ConversionResult ConvertUTF8toUTF16 ( const UTF8** sourceStart, const UTF8* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) { ConversionResult result = conversionOK; const UTF8* source = *sourceStart; UTF16* target = *targetStart; while (source < sourceEnd) { UTF32 ch = 0; unsigned short extraBytesToRead = trailingBytesForUTF8[*source]; if (source + extraBytesToRead >= sourceEnd) { result = sourceExhausted; break; } /* Do this check whether lenient or strict */ if (! isLegalUTF8(source, extraBytesToRead+1)) { result = sourceIllegal; break; } /* * The cases all fall through. See "Note A" below. */ switch (extraBytesToRead) { case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */ case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */ case 3: ch += *source++; ch <<= 6; case 2: ch += *source++; ch <<= 6; case 1: ch += *source++; ch <<= 6; case 0: ch += *source++; } ch -= offsetsFromUTF8[extraBytesToRead]; if (target >= targetEnd) { source -= (extraBytesToRead+1); /* Back up source pointer! */ result = targetExhausted; break; } if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */ /* UTF-16 surrogate values are illegal in UTF-32 */ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) { if (flags == strictConversion) { source -= (extraBytesToRead+1); /* return to the illegal value itself */ result = sourceIllegal; break; } else { *target++ = UNI_REPLACEMENT_CHAR; } } else { *target++ = (UTF16)ch; /* normal case */ } } else if (ch > UNI_MAX_UTF16) { if (flags == strictConversion) { result = sourceIllegal; source -= (extraBytesToRead+1); /* return to the start */ break; /* Bail out; shouldn't continue */ } else { *target++ = UNI_REPLACEMENT_CHAR; } } else { /* target is a character in range 0xFFFF - 0x10FFFF. */ if (target + 1 >= targetEnd) { source -= (extraBytesToRead+1); /* Back up source pointer! */ result = targetExhausted; break; } ch -= halfBase; *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START); *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START); } } *sourceStart = source; *targetStart = target; return result; } /* --------------------------------------------------------------------- */ ConversionResult ConvertUTF32toUTF8 ( const UTF32** sourceStart, const UTF32* sourceEnd, UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) { ConversionResult result = conversionOK; const UTF32* source = *sourceStart; UTF8* target = *targetStart; while (source < sourceEnd) { UTF32 ch; unsigned short bytesToWrite = 0; const UTF32 byteMask = 0xBF; const UTF32 byteMark = 0x80; ch = *source++; if (flags == strictConversion ) { /* UTF-16 surrogate values are illegal in UTF-32 */ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) { --source; /* return to the illegal value itself */ result = sourceIllegal; break; } } /* * Figure out how many bytes the result will require. Turn any * illegally large UTF32 things (> Plane 17) into replacement chars. */ if (ch < (UTF32)0x80) { bytesToWrite = 1; } else if (ch < (UTF32)0x800) { bytesToWrite = 2; } else if (ch < (UTF32)0x10000) { bytesToWrite = 3; } else if (ch <= UNI_MAX_LEGAL_UTF32) { bytesToWrite = 4; } else { bytesToWrite = 3; ch = UNI_REPLACEMENT_CHAR; result = sourceIllegal; } target += bytesToWrite; if (target > targetEnd) { --source; /* Back up source pointer! */ target -= bytesToWrite; result = targetExhausted; break; } switch (bytesToWrite) { /* note: everything falls through. */ case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; case 1: *--target = (UTF8) (ch | firstByteMark[bytesToWrite]); } target += bytesToWrite; } *sourceStart = source; *targetStart = target; return result; } /* --------------------------------------------------------------------- */ ConversionResult ConvertUTF8toUTF32 ( const UTF8** sourceStart, const UTF8* sourceEnd, UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) { ConversionResult result = conversionOK; const UTF8* source = *sourceStart; UTF32* target = *targetStart; while (source < sourceEnd) { UTF32 ch = 0; unsigned short extraBytesToRead = trailingBytesForUTF8[*source]; if (source + extraBytesToRead >= sourceEnd) { result = sourceExhausted; break; } /* Do this check whether lenient or strict */ if (! isLegalUTF8(source, extraBytesToRead+1)) { result = sourceIllegal; break; } /* * The cases all fall through. See "Note A" below. */ switch (extraBytesToRead) { case 5: ch += *source++; ch <<= 6; case 4: ch += *source++; ch <<= 6; case 3: ch += *source++; ch <<= 6; case 2: ch += *source++; ch <<= 6; case 1: ch += *source++; ch <<= 6; case 0: ch += *source++; } ch -= offsetsFromUTF8[extraBytesToRead]; if (target >= targetEnd) { source -= (extraBytesToRead+1); /* Back up the source pointer! */ result = targetExhausted; break; } if (ch <= UNI_MAX_LEGAL_UTF32) { /* * UTF-16 surrogate values are illegal in UTF-32, and anything * over Plane 17 (> 0x10FFFF) is illegal. */ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) { if (flags == strictConversion) { source -= (extraBytesToRead+1); /* return to the illegal value itself */ result = sourceIllegal; break; } else { *target++ = UNI_REPLACEMENT_CHAR; } } else { *target++ = ch; } } else { /* i.e., ch > UNI_MAX_LEGAL_UTF32 */ result = sourceIllegal; *target++ = UNI_REPLACEMENT_CHAR; } } *sourceStart = source; *targetStart = target; return result; } /* --------------------------------------------------------------------- Note A. The fall-through switches in UTF-8 reading code save a temp variable, some decrements & conditionals. The switches are equivalent to the following loop: { int tmpBytesToRead = extraBytesToRead+1; do { ch += *source++; --tmpBytesToRead; if (tmpBytesToRead) ch <<= 6; } while (tmpBytesToRead > 0); } In UTF-8 writing code, the switches on "bytesToWrite" are similarly unrolled loops. --------------------------------------------------------------------- */ http://cvs.php.net/viewvc.cgi/pecl/ingres/convertUTF.h?view=markup&rev=1.1 Index: pecl/ingres/convertUTF.h +++ pecl/ingres/convertUTF.h /* * Copyright 2001-2004 Unicode, Inc. * * Disclaimer * * This source code is provided as is by Unicode, Inc. No claims are * made as to fitness for any particular purpose. No warranties of any * kind are expressed or implied. The recipient agrees to determine * applicability of information provided. If this file has been * purchased on magnetic or optical media from Unicode, Inc., the * sole remedy for any claim will be exchange of defective media * within 90 days of receipt. * * Limitations on Rights to Redistribute This Code * * Unicode, Inc. hereby grants the right to freely use the information * supplied in this file in the creation of products supporting the * Unicode Standard, and to make copies of this file in any form * for internal or external distribution as long as this notice * remains attached. */ /* --------------------------------------------------------------------- Conversions between UTF32, UTF-16, and UTF-8. Header file. Several funtions are included here, forming a complete set of conversions between the three formats. UTF-7 is not included here, but is handled in a separate source file. Each of these routines takes pointers to input buffers and output buffers. The input buffers are const. Each routine converts the text between *sourceStart and sourceEnd, putting the result into the buffer between *targetStart and targetEnd. Note: the end pointers are *after* the last item: e.g. *(sourceEnd - 1) is the last item. The return result indicates whether the conversion was successful, and if not, whether the problem was in the source or target buffers. (Only the first encountered problem is indicated.) After the conversion, *sourceStart and *targetStart are both updated to point to the end of last text successfully converted in the respective buffers. Input parameters: sourceStart - pointer to a pointer to the source buffer. The contents of this are modified on return so that it points at the next thing to be converted. targetStart - similarly, pointer to pointer to the target buffer. sourceEnd, targetEnd - respectively pointers to the ends of the two buffers, for overflow checking only. These conversion functions take a ConversionFlags argument. When this flag is set to strict, both irregular sequences and isolated surrogates will cause an error. When the flag is set to lenient, both irregular sequences and isolated surrogates are converted. Whether the flag is strict or lenient, all illegal sequences will cause an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>, or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code must check for illegal sequences. When the flag is set to lenient, characters over 0x10FFFF are converted to the replacement character; otherwise (when the flag is set to strict) they constitute an error. Output parameters: The value "sourceIllegal" is returned from some routines if the input sequence is malformed. When "sourceIllegal" is returned, the source value will point to the illegal value that caused the problem. E.g., in UTF-8 when a sequence is malformed, it points to the start of the malformed sequence. Author: Mark E. Davis, 1994. Rev History: Rick McGowan, fixes & updates May 2001. Fixes & updates, Sept 2001. ------------------------------------------------------------------------ */ /* --------------------------------------------------------------------- The following 4 definitions are compiler-specific. The C standard does not guarantee that wchar_t has at least 16 bits, so wchar_t is no less portable than unsigned short! All should be unsigned values to avoid sign extension during bit mask & shift operations. ------------------------------------------------------------------------ */ typedef unsigned long UTF32; /* at least 32 bits */ typedef unsigned short UTF16; /* at least 16 bits */ typedef unsigned char UTF8; /* typically 8 bits */ typedef unsigned char Boolean; /* 0 or 1 */ /* Some fundamental constants */ #define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD #define UNI_MAX_BMP (UTF32)0x0000FFFF #define UNI_MAX_UTF16 (UTF32)0x0010FFFF #define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF #define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF typedef enum { conversionOK, /* conversion successful */ sourceExhausted, /* partial character in source, but hit end */ targetExhausted, /* insuff. room in target for conversion */ sourceIllegal /* source sequence is illegal/malformed */ } ConversionResult; typedef enum { strictConversion = 0, lenientConversion } ConversionFlags; ConversionResult ConvertUTF8toUTF16 ( const UTF8** sourceStart, const UTF8* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags); ConversionResult ConvertUTF16toUTF8 ( const UTF16** sourceStart, const UTF16* sourceEnd, UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags); ConversionResult ConvertUTF8toUTF32 ( const UTF8** sourceStart, const UTF8* sourceEnd, UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags); ConversionResult ConvertUTF32toUTF8 ( const UTF32** sourceStart, const UTF32* sourceEnd, UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags); ConversionResult ConvertUTF16toUTF32 ( const UTF16** sourceStart, const UTF16* sourceEnd, UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags); ConversionResult ConvertUTF32toUTF16 ( const UTF32** sourceStart, const UTF32* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags); Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd); /* --------------------------------------------------------------------- */