summaryrefslogtreecommitdiff
path: root/ext/fbsql/php_fbsql.c
diff options
context:
space:
mode:
authorFrank M. Kromann <fmk@php.net>2001-11-10 07:43:23 +0000
committerFrank M. Kromann <fmk@php.net>2001-11-10 07:43:23 +0000
commit95ee25ace64e72dbce048202c9f9964bd13a464d (patch)
tree21e4fa9b1698dc4e07cc32a202724c1a357a2a79 /ext/fbsql/php_fbsql.c
parentad6607332beb2de60a2ddea72dde794825b6eb7d (diff)
downloadphp-git-95ee25ace64e72dbce048202c9f9964bd13a464d.tar.gz
Make fbsql_list_fields work as documented
Diffstat (limited to 'ext/fbsql/php_fbsql.c')
-rw-r--r--ext/fbsql/php_fbsql.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index b6668fa344..faafa24ccb 100644
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -2014,7 +2014,7 @@ PHP_FUNCTION(fbsql_list_fields)
RETURN_FALSE;
}
- sprintf(sql, "EXTRACT TABLE %s;", tableName);
+ sprintf(sql, "SELECT * FROM %s WHERE 1=0;", tableName);
phpfbQuery(INTERNAL_FUNCTION_PARAM_PASSTHRU, sql, phpLink);
}
@@ -2738,12 +2738,9 @@ static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
char* key;
FBCPList* value;
- if (result->rowCount == 0 || result->rowIndex >= result->rowCount) {
- RETURN_FALSE;
- }
-
value = (FBCPList*)fbcplValueAtIndex(result->list, result->rowIndex);
key = (char*)fbcplKeyAtIndex(result->list, result->rowIndex);
+
if (key && key[0] == 2)
key = NULL;