abies Tue Aug 12 21:28:33 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/interbase interbase.c
Log:
Fixed bug #23936 (fail to select and fetch) MFH
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.91.2.13
php-src/ext/interbase/interbase.c:1.91.2.14
--- php-src/ext/interbase/interbase.c:1.91.2.13 Thu Jul 24 05:15:05 2003
+++ php-src/ext/interbase/interbase.c Tue Aug 12 21:28:32 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.91.2.13 2003/07/24 09:15:05 sniper Exp $ */
+/* $Id: interbase.c,v 1.91.2.14 2003/08/13 01:28:32 abies Exp $ */
/* TODO: Arrays, roles?
@@ -53,6 +53,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"
@@ -628,7 +633,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.91.2.13 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.91.2.14 $");
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, "Dynamic Module", "yes");
#endif
@@ -1080,9 +1085,9 @@
goto _php_ibase_alloc_query_error;
}
- IB_QUERY->out_sqlda = (XSQLDA *) emalloc(XSQLDA_LENGTH(0));
- IB_QUERY->out_sqlda->sqln = 0;
- IB_QUERY->out_sqlda->version = SQLDA_VERSION1;
+ IB_QUERY->out_sqlda = (XSQLDA *) emalloc(XSQLDA_LENGTH(1));
+ IB_QUERY->out_sqlda->sqln = 1;
+ 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);
@@ -1093,18 +1098,18 @@
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;
}
}
/* maybe have input placeholders? */
- IB_QUERY->in_sqlda = emalloc(XSQLDA_LENGTH(0));
- IB_QUERY->in_sqlda->sqln = 0;
- 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 = emalloc(XSQLDA_LENGTH(1));
+ IB_QUERY->in_sqlda->sqln = 1;
+ 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;
}
@@ -1113,8 +1118,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
