diff options
Diffstat (limited to 'ext/odbc')
| -rw-r--r-- | ext/odbc/birdstep.c | 709 | ||||
| -rw-r--r-- | ext/odbc/config.m4 | 73 | ||||
| -rw-r--r-- | ext/odbc/php_birdstep.h | 95 | ||||
| -rw-r--r-- | ext/odbc/php_odbc.c | 74 | ||||
| -rw-r--r-- | ext/odbc/php_odbc.h | 4 | ||||
| -rw-r--r-- | ext/odbc/php_odbc_includes.h | 37 | ||||
| -rw-r--r-- | ext/odbc/tests/odbc_data_source_001.phpt | 7 |
7 files changed, 25 insertions, 974 deletions
diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c deleted file mode 100644 index 18aa62b22f..0000000000 --- a/ext/odbc/birdstep.c +++ /dev/null @@ -1,709 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2017 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: Nikolay P. Romanyuk <mag@redcom.ru> | - +----------------------------------------------------------------------+ - */ - -/* $Id$ */ - -/* - * TODO: - * birdstep_fetch_into(), - * Check all on real life apps. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "php.h" - -#if WIN32 -# include "config.w32.h" -# ifdef PHP_EXPORTS -# define PHPAPI __declspec(dllexport) -# else -# define PHPAPI __declspec(dllimport) -# endif -#else -# include <php_config.h> -# define PHPAPI -# define THREAD_LS -#endif - -#ifdef HAVE_BIRDSTEP -#include "php_birdstep.h" -#include "ext/standard/info.h" -#include "php_ini.h" - -/* {{{ arginfo */ -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_connect, 0, 0, 3) - ZEND_ARG_INFO(0, server) - ZEND_ARG_INFO(0, user) - ZEND_ARG_INFO(0, pass) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_close, 0, 0, 1) - ZEND_ARG_INFO(0, id) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_exec, 0, 0, 2) - ZEND_ARG_INFO(0, index) - ZEND_ARG_INFO(0, exec_str) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fetch, 0, 0, 1) - ZEND_ARG_INFO(0, index) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_result, 0, 0, 2) - ZEND_ARG_INFO(0, index) - ZEND_ARG_INFO(0, col) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_freeresult, 0, 0, 1) - ZEND_ARG_INFO(0, index) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_autocommit, 0, 0, 1) - ZEND_ARG_INFO(0, index) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_off_autocommit, 0, 0, 1) - ZEND_ARG_INFO(0, index) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_commit, 0, 0, 1) - ZEND_ARG_INFO(0, index) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_rollback, 0, 0, 1) - ZEND_ARG_INFO(0, index) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fieldname, 0, 0, 2) - ZEND_ARG_INFO(0, index) - ZEND_ARG_INFO(0, col) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fieldnum, 0, 0, 1) - ZEND_ARG_INFO(0, index) -ZEND_END_ARG_INFO() -/* }}} */ - -const zend_function_entry birdstep_functions[] = { - PHP_FE(birdstep_connect, arginfo_birdstep_connect) - PHP_FE(birdstep_close, arginfo_birdstep_close) - PHP_FE(birdstep_exec, arginfo_birdstep_exec) - PHP_FE(birdstep_fetch, arginfo_birdstep_fetch) - PHP_FE(birdstep_result, arginfo_birdstep_result) - PHP_FE(birdstep_freeresult, arginfo_birdstep_freeresult) - PHP_FE(birdstep_autocommit, arginfo_birdstep_autocommit) - PHP_FE(birdstep_off_autocommit, arginfo_birdstep_off_autocommit) - PHP_FE(birdstep_commit, arginfo_birdstep_commit) - PHP_FE(birdstep_rollback, arginfo_birdstep_rollback) - PHP_FE(birdstep_fieldnum, arginfo_birdstep_fieldnum) - PHP_FE(birdstep_fieldname, arginfo_birdstep_fieldname) -/* - * Temporary Function aliases until the next major upgrade to PHP. - * These should allow users to continue to use their current scripts, - * but should in reality warn the user that this functionality is - * deprecated. - */ - PHP_FALIAS(velocis_connect, birdstep_connect, arginfo_birdstep_connect) - PHP_FALIAS(velocis_close, birdstep_close, arginfo_birdstep_close) - PHP_FALIAS(velocis_exec, birdstep_exec, arginfo_birdstep_exec) - PHP_FALIAS(velocis_fetch, birdstep_fetch, arginfo_birdstep_fetch) - PHP_FALIAS(velocis_result, birdstep_result, arginfo_birdstep_result) - PHP_FALIAS(velocis_freeresult, birdstep_freeresult, arginfo_birdstep_freeresult) - PHP_FALIAS(velocis_autocommit, birdstep_autocommit, arginfo_birdstep_autocommit) - PHP_FALIAS(velocis_off_autocommit, birdstep_off_autocommit, arginfo_birdstep_off_autocommit) - PHP_FALIAS(velocis_commit, birdstep_commit, arginfo_birdstep_commit) - PHP_FALIAS(velocis_rollback, birdstep_rollback, arginfo_birdstep_rollback) - PHP_FALIAS(velocis_fieldnum, birdstep_fieldnum, arginfo_birdstep_fieldnum) - PHP_FALIAS(velocis_fieldname, birdstep_fieldname, arginfo_birdstep_fieldname) -/* End temporary aliases */ - PHP_FE_END -}; - -zend_module_entry birdstep_module_entry = { - STANDARD_MODULE_HEADER, - "birdstep", - birdstep_functions, - PHP_MINIT(birdstep), - PHP_MSHUTDOWN(birdstep), - PHP_RINIT(birdstep), - NULL, - PHP_MINFO(birdstep), - PHP_BIRDSTEP_VERSION, - STANDARD_MODULE_PROPERTIES -}; - -#ifdef COMPILE_DL_ODBC -ZEND_GET_MODULE(birdstep) -#endif - -THREAD_LS birdstep_module php_birdstep_module; -THREAD_LS static HENV henv; - -#define PHP_GET_BIRDSTEP_RES_IDX(id) if (!(res = birdstep_find_result(list, id))) { php_error_docref(NULL, E_WARNING, "Birdstep: Not result index (%ld)", id); RETURN_FALSE; } -#define PHP_BIRDSTEP_CHK_LNK(id) if (!(conn = birdstep_find_conn(list, id))) { php_error_docref(NULL, E_WARNING, "Birdstep: Not connection index (%ld)", id); RETURN_FALSE; } - - -static void _close_birdstep_link(zend_rsrc_list_entry *rsrc) -{ - VConn *conn = (VConn *)rsrc->ptr; - - if ( conn ) { - efree(conn); - } -} - -static void _free_birdstep_result(zend_rsrc_list_entry *rsrc) -{ - Vresult *res = (Vresult *)rsrc->ptr; - - if ( res && res->values ) { - register int i; - for ( i=0; i < res->numcols; i++ ) { - if ( res->values[i].value ) - efree(res->values[i].value); - } - efree(res->values); - } - if ( res ) { - efree(res); - } -} - -PHP_MINIT_FUNCTION(birdstep) -{ - SQLAllocEnv(&henv); - - if ( cfg_get_long("birdstep.max_links",&php_birdstep_module.max_links) == FAILURE ) { - php_birdstep_module.max_links = -1; - } - php_birdstep_module.num_links = 0; - php_birdstep_module.le_link = zend_register_list_destructors_ex(_close_birdstep_link, NULL, "birdstep link", module_number); - php_birdstep_module.le_result = zend_register_list_destructors_ex(_free_birdstep_result, NULL, "birdstep result", module_number); - - return SUCCESS; -} - -PHP_RINIT_FUNCTION(birdstep) -{ - return SUCCESS; -} - - -PHP_MINFO_FUNCTION(birdstep) -{ - php_info_print_table_start(); - php_info_print_table_row(2, "RAIMA Birdstep Support", "enabled" ); - php_info_print_table_end(); -} - -PHP_MSHUTDOWN_FUNCTION(birdstep) -{ - SQLFreeEnv(henv); - return SUCCESS; -} - -/* Some internal functions. Connections and result manupulate */ - -static int birdstep_add_conn(HashTable *list,VConn *conn,HDBC hdbc) -{ - int ind; - - ind = zend_list_insert(conn,php_birdstep_module.le_link); - conn->hdbc = hdbc; - conn->index = ind; - - return(ind); -} - -static VConn * birdstep_find_conn(HashTable *list,int ind) -{ - VConn *conn; - int type; - - conn = zend_list_find(ind,&type); - if ( !conn || type != php_birdstep_module.le_link ) { - return(NULL); - } - return(conn); -} - -static void birdstep_del_conn(HashTable *list,int ind) -{ - zend_list_delete(ind); -} - -static int birdstep_add_result(HashTable *list,Vresult *res,VConn *conn) -{ - int ind; - - ind = zend_list_insert(res,php_birdstep_module.le_result); - res->conn = conn; - res->index = ind; - - return(ind); -} - -static Vresult * birdstep_find_result(HashTable *list,int ind) -{ - Vresult *res; - int type; - - res = zend_list_find(ind,&type); - if ( !res || type != php_birdstep_module.le_result ) { - return(NULL); - } - return(res); -} - -static void birdstep_del_result(HashTable *list,int ind) -{ - zend_list_delete(ind); -} - -/* Users functions */ - -/* {{{ proto int birdstep_connect(string server, string user, string pass) - */ -PHP_FUNCTION(birdstep_connect) -{ - char *serv, *user, *pass; - size_t serv_len, user_len, pass_len; - RETCODE stat; - HDBC hdbc; - VConn *new; - zend_long ind; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "sss", &serv, &serv_len, &user, &user_len, &pass, &pass_len) == FAILURE) { - return; - } - - if ( php_birdstep_module.max_links != -1 && php_birdstep_module.num_links == php_birdstep_module.max_links ) { - php_error_docref(NULL, E_WARNING, "Birdstep: Too many open connections (%d)",php_birdstep_module.num_links); - RETURN_FALSE; - } - - stat = SQLAllocConnect(henv,&hdbc); - if ( stat != SQL_SUCCESS ) { - php_error_docref(NULL, E_WARNING, "Birdstep: Could not allocate connection handle"); - RETURN_FALSE; - } - stat = SQLConnect(hdbc, serv, SQL_NTS, user, SQL_NTS, pass, SQL_NTS); - if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) { - php_error_docref(NULL, E_WARNING, "Birdstep: Could not connect to server \"%s\" for %s", serv, user); - SQLFreeConnect(hdbc); - RETURN_FALSE; - } - new = (VConn *)emalloc(sizeof(VConn)); - ind = birdstep_add_conn(list,new,hdbc); - php_birdstep_module.num_links++; - RETURN_LONG(ind); -} -/* }}} */ - -/* {{{ proto bool birdstep_close(int id) - */ -PHP_FUNCTION(birdstep_close) -{ - zend_long id; - VConn *conn; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &id) == FAILURE) { - return; - } - - PHP_BIRDSTEP_CHK_LNK(id); - - SQLDisconnect(conn->hdbc); - SQLFreeConnect(conn->hdbc); - birdstep_del_conn(list, id); - php_birdstep_module.num_links--; - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto int birdstep_exec(int index, string exec_str) - */ -PHP_FUNCTION(birdstep_exec) -{ - char *query; - zend_long ind; - size_t query_len, indx; - VConn *conn; - Vresult *res; - RETCODE stat; - SWORD cols,i,colnamelen; - SDWORD rows,coldesc; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "ls", &ind, &query, &query_len) == FAILURE) { - return; - } - - PHP_BIRDSTEP_CHK_LNK(ind); - - res = (Vresult *)emalloc(sizeof(Vresult)); - stat = SQLAllocStmt(conn->hdbc,&res->hstmt); - if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) { - php_error_docref(NULL, E_WARNING, "Birdstep: SQLAllocStmt return %d",stat); - efree(res); - RETURN_FALSE; - } - stat = SQLExecDirect(res->hstmt,query,SQL_NTS); - if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) { - php_error_docref(NULL, E_WARNING, "Birdstep: Cannot execute \"%s\" query",query); - SQLFreeStmt(res->hstmt,SQL_DROP); - efree(res); - RETURN_FALSE; - } - /* Success query */ - stat = SQLNumResultCols(res->hstmt,&cols); - if ( stat != SQL_SUCCESS ) { - php_error_docref(NULL, E_WARNING, "Birdstep: SQLNumResultCols return %d",stat); - SQLFreeStmt(res->hstmt,SQL_DROP); - efree(res); - RETURN_FALSE; - } - if ( !cols ) { /* Was INSERT, UPDATE, DELETE, etc. query */ - stat = SQLRowCount(res->hstmt,&rows); - if ( stat != SQL_SUCCESS ) { - php_error_docref(NULL, E_WARNING, "Birdstep: SQLNumResultCols return %d",stat); - SQLFreeStmt(res->hstmt,SQL_DROP); - efree(res); - RETURN_FALSE; - } - SQLFreeStmt(res->hstmt,SQL_DROP); - efree(res); - RETURN_LONG(rows); - } else { /* Was SELECT query */ - res->values = (VResVal *)safe_emalloc(sizeof(VResVal), cols, 0); - res->numcols = cols; - for ( i = 0; i < cols; i++ ) { - SQLColAttributes(res->hstmt,i+1,SQL_COLUMN_NAME, - res->values[i].name,sizeof(res->values[i].name), - &colnamelen,NULL); - SQLColAttributes(res->hstmt,i+1,SQL_COLUMN_TYPE, - NULL,0,NULL,&res->values[i].valtype); - switch ( res->values[i].valtype ) { - case SQL_LONGVARBINARY: - case SQL_LONGVARCHAR: - res->values[i].value = NULL; - continue; - default: - break; - } - SQLColAttributes(res->hstmt,i+1,SQL_COLUMN_DISPLAY_SIZE, - NULL,0,NULL,&coldesc); - res->values[i].value = (char *)emalloc(coldesc+1); - SQLBindCol(res->hstmt,i+1,SQL_C_CHAR, res->values[i].value,coldesc+1, &res->values[i].vallen); - } - } - res->fetched = 0; - indx = birdstep_add_result(list,res,conn); - RETURN_LONG(indx); -} -/* }}} */ - -/* {{{ proto bool birdstep_fetch(int index) - */ -PHP_FUNCTION(birdstep_fetch) -{ - zend_long ind; - Vresult *res; - RETCODE stat; - UDWORD row; - UWORD RowStat[1]; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &ind) == FAILURE) { - return; - } - - PHP_GET_BIRDSTEP_RES_IDX(ind); - - stat = SQLExtendedFetch(res->hstmt,SQL_FETCH_NEXT,1,&row,RowStat); - if ( stat == SQL_NO_DATA_FOUND ) { - SQLFreeStmt(res->hstmt,SQL_DROP); - birdstep_del_result(list,Z_LVAL_PP(ind)); - RETURN_FALSE; - } - if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) { - php_error_docref(NULL, E_WARNING, "Birdstep: SQLFetch return error"); - SQLFreeStmt(res->hstmt,SQL_DROP); - birdstep_del_result(list,Z_LVAL_PP(ind)); - RETURN_FALSE; - } - res->fetched = 1; - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto mixed birdstep_result(int index, mixed col) - */ -PHP_FUNCTION(birdstep_result) -{ - zval **col; - zend_long ind; - Vresult *res; - RETCODE stat; - int i,sql_c_type; - UDWORD row; - UWORD RowStat[1]; - SWORD indx = -1; - char *field = NULL; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "lZ", &ind, &col) == FAILURE) { - return; - } - - PHP_GET_BIRDSTEP_RES_IDX(ind); - - if ( Z_TYPE_PP(col) == IS_STRING ) { - field = Z_STRVAL_PP(col); - } else { - convert_to_long_ex(col); - indx = Z_LVAL_PP(col); - } - if ( field ) { - for ( i = 0; i < res->numcols; i++ ) { - if ( !strcasecmp(res->values[i].name,field)) { - indx = i; - break; - } - } - if ( indx < 0 ) { - php_error_docref(NULL, E_WARNING, "Field %s not found",field); - RETURN_FALSE; - } - } else { - if ( indx < 0 || indx >= res->numcols ) { - php_error_docref(NULL, E_WARNING, "Birdstep: Field index not in range"); - RETURN_FALSE; - } - } - if ( !res->fetched ) { - stat = SQLExtendedFetch(res->hstmt,SQL_FETCH_NEXT,1,&row,RowStat); - if ( stat == SQL_NO_DATA_FOUND ) { - SQLFreeStmt(res->hstmt,SQL_DROP); - birdstep_del_result(list,Z_LVAL_PP(ind)); - RETURN_FALSE; - } - if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) { - php_error_docref(NULL, E_WARNING, "Birdstep: SQLFetch return error"); - SQLFreeStmt(res->hstmt,SQL_DROP); - birdstep_del_result(list,Z_LVAL_PP(ind)); - RETURN_FALSE; - } - res->fetched = 1; - } - switch ( res->values[indx].valtype ) { - case SQL_LONGVARBINARY: - sql_c_type = SQL_C_BINARY; - goto l1; - case SQL_LONGVARCHAR: - sql_c_type = SQL_C_CHAR; -l1: - if ( !res->values[indx].value ) { - res->values[indx].value = emalloc(4096); - } - stat = SQLGetData(res->hstmt,indx+1,sql_c_type, - res->values[indx].value,4095,&res->values[indx].vallen); - if ( stat == SQL_NO_DATA_FOUND ) { - SQLFreeStmt(res->hstmt,SQL_DROP); - birdstep_del_result(list,Z_LVAL_PP(ind)); - RETURN_FALSE; - } - if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) { - php_error_docref(NULL, E_WARNING, "Birdstep: SQLGetData return error"); - SQLFreeStmt(res->hstmt,SQL_DROP); - birdstep_del_result(list,Z_LVAL_PP(ind)); - RETURN_FALSE; - } - if ( res->values[indx].valtype == SQL_LONGVARCHAR ) { - RETURN_STRING(res->values[indx].value,TRUE); - } else { - RETURN_LONG((zend_long)res->values[indx].value); - } - default: - if ( res->values[indx].value != NULL ) { - RETURN_STRING(res->values[indx].value,TRUE); - } - } -} -/* }}} */ - -/* {{{ proto bool birdstep_freeresult(int index) - */ -PHP_FUNCTION(birdstep_freeresult) -{ - zend_long ind; - Vresult *res; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &ind) == FAILURE) { - return; - } - - PHP_GET_BIRDSTEP_RES_IDX(ind); - - SQLFreeStmt(res->hstmt,SQL_DROP); - birdstep_del_result(list, ind); - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto bool birdstep_autocommit(int index) - */ -PHP_FUNCTION(birdstep_autocommit) -{ - zend_long id; - RETCODE stat; - VConn *conn; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &id) == FAILURE) { - return; - } - - PHP_BIRDSTEP_CHK_LNK(id); - - stat = SQLSetConnectOption(conn->hdbc,SQL_AUTOCOMMIT,SQL_AUTOCOMMIT_ON); - if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) { - php_error_docref(NULL, E_WARNING, "Birdstep: Set autocommit_on option failure"); - RETURN_FALSE; - } - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto bool birdstep_off_autocommit(int index) - */ -PHP_FUNCTION(birdstep_off_autocommit) -{ - zend_long id; - RETCODE stat; - VConn *conn; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &id) == FAILURE) { - return; - } - - PHP_BIRDSTEP_CHK_LNK(id); - - stat = SQLSetConnectOption(conn->hdbc,SQL_AUTOCOMMIT,SQL_AUTOCOMMIT_OFF); - if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) { - php_error_docref(NULL, E_WARNING, "Birdstep: Set autocommit_off option failure"); - RETURN_FALSE; - } - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto bool birdstep_commit(int index) - */ -PHP_FUNCTION(birdstep_commit) -{ - zend_long id; - RETCODE stat; - VConn *conn; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &id) == FAILURE) { - return; - } - - PHP_BIRDSTEP_CHK_LNK(id) - - stat = SQLTransact(NULL,conn->hdbc,SQL_COMMIT); - if ( stat != SQL_SUCCESS ) { - php_error_docref(NULL, E_WARNING, "Birdstep: Commit failure"); - RETURN_FALSE; - } - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto bool birdstep_rollback(int index) - */ -PHP_FUNCTION(birdstep_rollback) -{ - zend_long id; - RETCODE stat; - VConn *conn; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &id) == FAILURE) { - return; - } - - PHP_BIRDSTEP_CHK_LNK(id); - - stat = SQLTransact(NULL,conn->hdbc,SQL_ROLLBACK); - if ( stat != SQL_SUCCESS ) { - php_error_docref(NULL, E_WARNING, "Birdstep: Rollback failure"); - RETURN_FALSE; - } - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto string birdstep_fieldname(int index, int col) - */ -PHP_FUNCTION(birdstep_fieldname) -{ - zend_long ind, col; - Vresult *res; - SWORD indx; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll", &ind, &col) == FAILURE) { - return; - } - - PHP_GET_BIRDSTEP_RES_IDX(ind); - - indx = col; - if ( indx < 0 || indx >= res->numcols ) { - php_error_docref(NULL, E_WARNING, "Birdstep: Field index not in range"); - RETURN_FALSE; - } - RETURN_STRING(res->values[indx].name,TRUE); -} -/* }}} */ - -/* {{{ proto int birdstep_fieldnum(int index) - */ -PHP_FUNCTION(birdstep_fieldnum) -{ - zend_long ind; - Vresult *res; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &ind) == FAILURE) { - return; - } - - PHP_GET_BIRDSTEP_RES_IDX(ind); - - RETURN_LONG(res->numcols); -} -/* }}} */ - -#endif /* HAVE_BIRDSTEP */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index ecee15fd1c..fab38019a3 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -220,28 +220,6 @@ You need to source your DB2 environment before running PHP configure: fi if test -z "$ODBC_TYPE"; then -PHP_ARG_WITH(ODBCRouter,, -[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]]) - - AC_MSG_CHECKING(for ODBCRouter.com support) - if test "$PHP_ODBCROUTER" != "no"; then - if test "$PHP_ODBCROUTER" = "yes"; then - PHP_ODBCROUTER=/usr - fi - ODBC_INCDIR=$PHP_ODBCROUTER/include - ODBC_LIBDIR=$PHP_ODBCROUTER/lib - ODBC_LFLAGS=-L$ODBC_LIBDIR - ODBC_INCLUDE=-I$ODBC_INCDIR - ODBC_LIBS=-lodbcsdk - ODBC_TYPE=ODBCRouter - AC_DEFINE(HAVE_ODBC_ROUTER,1,[ ]) - AC_MSG_RESULT([$ext_output]) - else - AC_MSG_RESULT(no) - fi -fi - -if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(empress,, [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] (Empress Version >= 8.60 required)]) @@ -309,55 +287,6 @@ PHP_ARG_WITH(empress-bcs,, fi if test -z "$ODBC_TYPE"; then -PHP_ARG_WITH(birdstep,, -[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) - - AC_MSG_CHECKING(for Birdstep support) - if test "$PHP_BIRDSTEP" != "no"; then - if test "$PHP_BIRDSTEP" = "yes"; then - ODBC_INCDIR=/usr/local/birdstep/include - ODBC_LIBDIR=/usr/local/birdstep/lib - else - ODBC_INCDIR=$PHP_BIRDSTEP/include - ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR - fi - - case $host_alias in - *aix*[)] - AC_DEFINE(AIX,1,[ ]);; - *hpux*[)] - AC_DEFINE(HPUX,1,[ ]);; - *linux*[)] - AC_DEFINE(LINUX,1,[ ]);; - *qnx*[)] - AC_DEFINE(NEUTRINO,1,[ ]);; - i?86-*-solaris*[)] - AC_DEFINE(ISOLARIS,1,[ ]);; - sparc-*-solaris*[)] - AC_DEFINE(SOLARIS,1,[ ]);; - *unixware*[)] - AC_DEFINE(UNIXWARE,1,[ ]);; - esac - - ODBC_INCLUDE=-I$ODBC_INCDIR - ODBC_TYPE=birdstep - ODBC_LFLAGS=-L$ODBC_LIBDIR - ODBC_LIBS="-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi -lutil" - - if test -f "$ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME"; then - ODBC_LIBS="-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32 -lCrpc32 -lutil" - elif test -f "$ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME"; then - ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil" - fi - - AC_DEFINE(HAVE_BIRDSTEP,1,[ ]) - AC_MSG_RESULT([$ext_output]) - else - AC_MSG_RESULT(no) - fi -fi - -if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(custom-odbc,, [ --with-custom-odbc[=DIR] Include user defined ODBC support. DIR is ODBC install base directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and @@ -536,7 +465,7 @@ dnl if test -n "$ODBC_TYPE"; then if test "$ODBC_TYPE" != "dbmaker"; then PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD) - if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then + if test "$ODBC_TYPE" != "solid"; then AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ]) fi fi diff --git a/ext/odbc/php_birdstep.h b/ext/odbc/php_birdstep.h deleted file mode 100644 index 43787ca478..0000000000 --- a/ext/odbc/php_birdstep.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2017 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: Nikolay P. Romanyuk <mag@redcom.ru> | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -#ifndef PHP_BIRDSTEP_H -#define PHP_BIRDSTEP_H - -#if defined(HAVE_BIRDSTEP) && !HAVE_UODBC -#define UNIX -#include <sql.h> -#include <sqlext.h> - -#include "php_version.h" -#define PHP_BIRDSTEP_VERSION PHP_VERSION - -typedef struct VConn { - HDBC hdbc; - zend_long index; -} VConn; - -typedef struct { - char name[32]; - char *value; - zend_long vallen; - SDWORD valtype; -} VResVal; - -typedef struct Vresult { - HSTMT hstmt; - VConn *conn; - zend_long index; - VResVal *values; - zend_long numcols; - int fetched; -} Vresult; - -typedef struct { - zend_long num_links; - zend_long max_links; - int le_link,le_result; -} birdstep_module; - -extern zend_module_entry birdstep_module_entry; -#define birdstep_module_ptr &birdstep_module_entry - -/* birdstep.c functions */ -PHP_MINIT_FUNCTION(birdstep); -PHP_RINIT_FUNCTION(birdstep); -PHP_MINFO_FUNCTION(birdstep); -PHP_MSHUTDOWN_FUNCTION(birdstep); - -PHP_FUNCTION(birdstep_connect); -PHP_FUNCTION(birdstep_close); -PHP_FUNCTION(birdstep_exec); -PHP_FUNCTION(birdstep_fetch); -PHP_FUNCTION(birdstep_result); -PHP_FUNCTION(birdstep_freeresult); -PHP_FUNCTION(birdstep_autocommit); -PHP_FUNCTION(birdstep_off_autocommit); -PHP_FUNCTION(birdstep_commit); -PHP_FUNCTION(birdstep_rollback); -PHP_FUNCTION(birdstep_fieldnum); -PHP_FUNCTION(birdstep_fieldname); - -extern birdstep_module php_birdstep_module; - -#else - -#define birdstep_module_ptr NULL - -#endif /* HAVE_BIRDSTEP */ -#endif /* PHP_BIRDSTEP_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index bfaa0b89ac..1cb127a012 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -15,7 +15,7 @@ | Authors: Stig Sæther Bakken <ssb@php.net> | | Andreas Karajannis <Andreas.Karajannis@gmd.de> | | Frank M. Kromann <frank@kromann.info> Support for DB/2 CLI | - | Kevin N. Shallow <kshallow@tampabay.rr.com> Birdstep Support| + | Kevin N. Shallow <kshallow@tampabay.rr.com> | | Daniel R. Kalowsky <kalowsky@php.net> | +----------------------------------------------------------------------+ */ @@ -258,7 +258,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_primarykeys, 0, 0, 4) ZEND_END_ARG_INFO() #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) -#if !defined(HAVE_BIRDSTEP) ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedurecolumns, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, qualifier) @@ -266,7 +265,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedurecolumns, 0, 0, 1) ZEND_ARG_INFO(0, proc) ZEND_ARG_INFO(0, column) ZEND_END_ARG_INFO() -#endif ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedures, 0, 0, 1) ZEND_ARG_INFO(0, connection_id) @@ -305,7 +303,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_statistics, 0, 0, 6) ZEND_ARG_INFO(0, accuracy) ZEND_END_ARG_INFO() -#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP) +#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35) ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tableprivileges, 0, 0, 4) ZEND_ARG_INFO(0, connection_id) ZEND_ARG_INFO(0, qualifier) @@ -325,7 +323,7 @@ ZEND_END_ARG_INFO() /* {{{ odbc_functions[] */ -const zend_function_entry odbc_functions[] = { +static const zend_function_entry odbc_functions[] = { PHP_FE(odbc_autocommit, arginfo_odbc_autocommit) PHP_FE(odbc_binmode, arginfo_odbc_binmode) PHP_FE(odbc_close, arginfo_odbc_close) @@ -370,17 +368,15 @@ const zend_function_entry odbc_functions[] = { PHP_FE(odbc_statistics, arginfo_odbc_statistics) PHP_FE(odbc_tables, arginfo_odbc_tables) PHP_FE(odbc_primarykeys, arginfo_odbc_primarykeys) -#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP) /* not supported now */ +#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35) /* not supported now */ PHP_FE(odbc_columnprivileges, arginfo_odbc_columnprivileges) PHP_FE(odbc_tableprivileges, arginfo_odbc_tableprivileges) #endif #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) /* not supported */ PHP_FE(odbc_foreignkeys, arginfo_odbc_foreignkeys) PHP_FE(odbc_procedures, arginfo_odbc_procedures) -#if !defined(HAVE_BIRDSTEP) PHP_FE(odbc_procedurecolumns, arginfo_odbc_procedurecolumns) #endif -#endif PHP_FALIAS(odbc_do, odbc_exec, arginfo_odbc_exec) PHP_FALIAS(odbc_field_precision, odbc_field_len, arginfo_odbc_field_len) PHP_FE_END @@ -1596,7 +1592,11 @@ PHP_FUNCTION(odbc_data_source) (SQLSMALLINT)sizeof(desc), &len2); - if (rc != SQL_SUCCESS) { + if (SQL_NO_DATA == rc) { + /* System has no data sources, no error. Signal it by returning NULL, + not false. */ + RETURN_NULL(); + } else if (rc != SQL_SUCCESS) { /* ummm.... he did it */ odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLDataSources"); RETURN_FALSE; @@ -2447,45 +2447,6 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int SQLSetConnectOption((*conn)->hdbc, SQL_TRANSLATE_OPTION, SQL_SOLID_XLATOPT_NOCNV); #endif -#ifdef HAVE_ODBC_ROUTER - { -#define CONNSTRSIZE 2048 - char *lpszConnStr = emalloc(CONNSTRSIZE); - if (lpszConnStr && db) { - short cbszConnStr; - if (strstr(db, ";")) { - /* the caller has apparently passed a connection-string */ - if (strstr(db, "uid") || strstr(db, "UID")) { - uid = NULL; - } - if (strstr(db, "pwd") || strstr(db, "PWD")) { - pwd = NULL; - } - strlcpy( lpszConnStr, db, CONNSTRSIZE); - } - else { - strcpy(lpszConnStr, "DSN="); - strlcat(lpszConnStr, db, CONNSTRSIZE); - } - if (uid) { - if (uid[0]) { - strlcat(lpszConnStr, ";UID=", CONNSTRSIZE); - strlcat(lpszConnStr, uid, CONNSTRSIZE); - strlcat(lpszConnStr, ";", CONNSTRSIZE); - } - if (pwd) { - if (pwd[0]) { - strlcat(lpszConnStr, "PWD=", CONNSTRSIZE); - strlcat(lpszConnStr, pwd, CONNSTRSIZE); - strlcat(lpszConnStr, ";", CONNSTRSIZE); - } - } - } - rc = SQLDriverConnect((*conn)->hdbc, NULL, lpszConnStr, SQL_NTS, lpszConnStr, CONNSTRSIZE, &cbszConnStr, SQL_DRIVER_NOPROMPT); - efree(lpszConnStr); - } - } -#else #ifdef HAVE_OPENLINK { char dsnbuf[1024]; @@ -2540,7 +2501,6 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int rc = SQLConnect((*conn)->hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, SQL_NTS); #endif #endif -#endif if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { odbc_sql_error(*conn, SQL_NULL_HSTMT, "SQLConnect"); SQLFreeConnect((*conn)->hdbc); @@ -2615,8 +2575,6 @@ try_and_get_another_connection: /* the link is not in the persistent list */ if ((le = zend_hash_str_find_ptr(&EG(persistent_list), hashed_details, hashed_len)) == NULL) { - zend_resource new_le; - if (ODBCG(max_links) != -1 && ODBCG(num_links) >= ODBCG(max_links)) { php_error_docref(NULL, E_WARNING, "Too many open links (%ld)", ODBCG(num_links)); efree(hashed_details); @@ -2633,11 +2591,7 @@ try_and_get_another_connection: RETURN_FALSE; } - new_le.type = le_pconn; - new_le.ptr = db_conn; - new_le.handle = -1; - if (zend_hash_str_update_mem(&EG(persistent_list), hashed_details, hashed_len, &new_le, - sizeof(zend_resource)) == NULL) { + if (zend_register_persistent_resource(hashed_details, hashed_len, db_conn, le_pconn) == NULL) { free(db_conn); efree(hashed_details); RETURN_FALSE; @@ -2696,7 +2650,7 @@ try_and_get_another_connection: p = zend_hash_index_find_ptr(&EG(regular_list), conn_id); /* check if the connection is still there */ if (p && p->ptr && (p->type == le_conn || p->type == le_pconn)) { - GC_REFCOUNT(p)++; + GC_ADDREF(p); RETVAL_RES(p); efree(hashed_details); return; @@ -3289,7 +3243,7 @@ PHP_FUNCTION(odbc_columns) } /* }}} */ -#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP) +#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) /* {{{ proto resource odbc_columnprivileges(resource connection_id, string catalog, string schema, string table, string column) Returns a result identifier that can be used to fetch a list of columns and associated privileges for the specified table */ PHP_FUNCTION(odbc_columnprivileges) @@ -3558,7 +3512,7 @@ PHP_FUNCTION(odbc_primarykeys) } /* }}} */ -#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP) +#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) /* {{{ proto resource odbc_procedurecolumns(resource connection_id [, string qualifier, string owner, string proc, string column]) Returns a result identifier containing the list of input and output parameters, as well as the columns that make up the result set for the specified procedures */ PHP_FUNCTION(odbc_procedurecolumns) @@ -3838,7 +3792,7 @@ PHP_FUNCTION(odbc_statistics) } /* }}} */ -#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP) +#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) /* {{{ proto resource odbc_tableprivileges(resource connection_id, string qualifier, string owner, string name) Returns a result identifier containing a list of tables and the privileges associated with each table */ PHP_FUNCTION(odbc_tableprivileges) diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h index b55f43b3ce..ee5f6da295 100644 --- a/ext/odbc/php_odbc.h +++ b/ext/odbc/php_odbc.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ | Authors: Stig Sæther Bakken <ssb@php.net> | | Andreas Karajannis <Andreas.Karajannis@gmd.de> | - | Kevin N. Shallow <kshallow@tampabay.rr.com> (Birdstep) | + | Kevin N. Shallow <kshallow@tampabay.rr.com> | +----------------------------------------------------------------------+ */ @@ -35,7 +35,7 @@ extern zend_module_entry odbc_module_entry; #include "php_version.h" #define PHP_ODBC_VERSION PHP_VERSION -#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) || defined(HAVE_IBMDB2) || defined(HAVE_UNIXODBC) || defined(HAVE_BIRDSTEP) || defined(HAVE_IODBC) +#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) || defined(HAVE_IBMDB2) || defined(HAVE_UNIXODBC) || defined(HAVE_IODBC) # define PHP_ODBC_HAVE_FETCH_HASH 1 #endif diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index 43d3360966..4dbb188c41 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ | Authors: Stig Sæther Bakken <ssb@php.net> | | Andreas Karajannis <Andreas.Karajannis@gmd.de> | - | Kevin N. Shallow <kshallow@tampabay.rr.com> (Birdstep) | + | Kevin N. Shallow <kshallow@tampabay.rr.com> | +----------------------------------------------------------------------+ */ @@ -39,9 +39,7 @@ # include <cli0defs.h> # include <cli0env.h> #elif defined(HAVE_SOLID_35) -# if !defined(PHP_WIN32) -# include <sqlunix.h> -# endif /* end: #if !defined(PHP_WIN32) */ +# include <sqlunix.h> # include <sqltypes.h> # include <sqlucode.h> # include <sqlext.h> @@ -121,20 +119,6 @@ PHP_FUNCTION(solid_fetch_prev); #include <sqlext.h> #define HAVE_SQL_EXTENDED_FETCH 1 -#elif defined(HAVE_ODBC_ROUTER) /* ODBCRouter.com */ - -#ifdef CHAR -#undef CHAR -#endif - -#ifdef SQLCHAR -#undef SQLCHAR -#endif - -#define ODBC_TYPE "ODBCRouter" -#include <odbcsdk.h> -#undef HAVE_SQL_EXTENDED_FETCH - #elif defined(HAVE_OPENLINK) /* OpenLink ODBC drivers */ #define ODBC_TYPE "Openlink" @@ -150,23 +134,6 @@ PHP_FUNCTION(solid_fetch_prev); #define SQLUSMALLINT UWORD #endif -#elif defined(HAVE_BIRDSTEP) /* Raima Birdstep */ - -#define ODBC_TYPE "Birdstep" -#define UNIX -/* - * Extended Fetch in the Birdstep ODBC API is incapable of returning zend_long varchar (memo) fields. - * So the following line has been commented-out to accommodate. - KNS - * - * #define HAVE_SQL_EXTENDED_FETCH 1 - */ -#include <sql.h> -#include <sqlext.h> -#define SQLINTEGER SDWORD -#define SQLSMALLINT SWORD -#define SQLUSMALLINT UWORD - - #elif defined(HAVE_DBMAKER) /* DBMaker */ #define ODBC_TYPE "DBMaker" diff --git a/ext/odbc/tests/odbc_data_source_001.phpt b/ext/odbc/tests/odbc_data_source_001.phpt index b3e29dde5c..6900f13205 100644 --- a/ext/odbc/tests/odbc_data_source_001.phpt +++ b/ext/odbc/tests/odbc_data_source_001.phpt @@ -1,7 +1,12 @@ --TEST-- odbc_data_source(): Basic test --SKIPIF-- -<?php include 'skipif.inc'; ?> +<?php + include 'skipif.inc'; + if (odbc_data_source($conn, SQL_FETCH_FIRST) === NULL) { + die("skip no data sources defined on this system"); + } +?> --FILE-- <?php |