abies Tue Aug 12 09:19:36 2003 EDT Modified files: /php-src/ext/interbase interbase.c Log: Fixed bug #23936 (fail to select and fetch) Index: php-src/ext/interbase/interbase.c diff -u php-src/ext/interbase/interbase.c:1.133 php-src/ext/interbase/interbase.c:1.134 --- php-src/ext/interbase/interbase.c:1.133 Tue Aug 12 07:35:26 2003 +++ php-src/ext/interbase/interbase.c Tue Aug 12 09:19:36 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.133 2003/08/12 11:35:26 abies Exp $ */ +/* $Id: interbase.c,v 1.134 2003/08/12 13:19:36 abies Exp $ */ /* TODO: Arrays, roles? @@ -64,6 +64,11 @@ #if HAVE_IBASE #include <ibase.h> + +#ifndef SQLDA_CURRENT_VERSION +#define SQLDA_CURRENT_VERSION SQLDA_VERSION1 +#endif + #include <time.h> #include "ext/standard/fsock.h" #include "ext/standard/info.h" @@ -687,7 +692,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.133 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.134 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "Yes"); #endif @@ -1180,7 +1185,7 @@ IB_QUERY->out_sqlda = (XSQLDA *) emalloc(XSQLDA_LENGTH(1)); IB_QUERY->out_sqlda->sqln = 1; - IB_QUERY->out_sqlda->version = SQLDA_VERSION1; + IB_QUERY->out_sqlda->version = SQLDA_CURRENT_VERSION; if (isc_dsql_prepare(IB_STATUS, &IB_QUERY->trans, &IB_QUERY->stmt, 0, query, dialect, IB_QUERY->out_sqlda)) { _php_ibase_error(TSRMLS_C); @@ -1191,8 +1196,8 @@ if (IB_QUERY->out_sqlda->sqld > IB_QUERY->out_sqlda->sqln) { IB_QUERY->out_sqlda = erealloc(IB_QUERY->out_sqlda, XSQLDA_LENGTH(IB_QUERY->out_sqlda->sqld)); IB_QUERY->out_sqlda->sqln = IB_QUERY->out_sqlda->sqld; - IB_QUERY->out_sqlda->version = SQLDA_VERSION1; - if (isc_dsql_describe(IB_STATUS, &IB_QUERY->stmt, SQLDA_VERSION1, IB_QUERY->out_sqlda)) { + IB_QUERY->out_sqlda->version = SQLDA_CURRENT_VERSION; + if (isc_dsql_describe(IB_STATUS, &IB_QUERY->stmt, SQLDA_CURRENT_VERSION, IB_QUERY->out_sqlda)) { _php_ibase_error(TSRMLS_C); goto _php_ibase_alloc_query_error; } @@ -1201,8 +1206,8 @@ /* maybe have input placeholders? */ IB_QUERY->in_sqlda = emalloc(XSQLDA_LENGTH(1)); IB_QUERY->in_sqlda->sqln = 1; - IB_QUERY->in_sqlda->version = SQLDA_VERSION1; - if (isc_dsql_describe_bind(IB_STATUS, &IB_QUERY->stmt, SQLDA_VERSION1, IB_QUERY->in_sqlda)) { + IB_QUERY->in_sqlda->version = SQLDA_CURRENT_VERSION; + if (isc_dsql_describe_bind(IB_STATUS, &IB_QUERY->stmt, SQLDA_CURRENT_VERSION, IB_QUERY->in_sqlda)) { _php_ibase_error(TSRMLS_C); goto _php_ibase_alloc_query_error; } @@ -1211,8 +1216,8 @@ if (IB_QUERY->in_sqlda->sqln < IB_QUERY->in_sqlda->sqld) { IB_QUERY->in_sqlda = erealloc(IB_QUERY->in_sqlda, XSQLDA_LENGTH(IB_QUERY->in_sqlda->sqld)); IB_QUERY->in_sqlda->sqln = IB_QUERY->in_sqlda->sqld; - IB_QUERY->in_sqlda->version = SQLDA_VERSION1; - if (isc_dsql_describe_bind(IB_STATUS, &IB_QUERY->stmt, SQLDA_VERSION1, IB_QUERY->in_sqlda)) { + IB_QUERY->in_sqlda->version = SQLDA_CURRENT_VERSION; + if (isc_dsql_describe_bind(IB_STATUS, &IB_QUERY->stmt, SQLDA_CURRENT_VERSION, IB_QUERY->in_sqlda)) { _php_ibase_error(TSRMLS_C); goto _php_ibase_alloc_query_error; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php