From: Wez Furlong <wez@php.net>
Date: Tue, 22 Apr 2003 00:19:48 +0000 (+0000)
Subject: allow sqlite_query() to accept the query string and database resource in
X-Git-Tag: SPL_ALPHA~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb22d78db8dde4cc49d509a8c1935ab6fc5a04ed;p=php

allow sqlite_query() to accept the query string and database resource in
either order.

Forgot to bump the package version number displayed by phpinfo()...
Bump to 0.9a
---

diff --git a/ext/sqlite/package.xml b/ext/sqlite/package.xml
index 3ca202e208..583e018504 100644
--- a/ext/sqlite/package.xml
+++ b/ext/sqlite/package.xml
@@ -26,7 +26,7 @@
   <license>PHP</license>
   <release>
     <state>beta</state>
-    <version>0.9</version>
+    <version>0.9a</version>
     <date>2003-04-21</date>
 	<notes>
 		Added:
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 89a51291a6..1c42fd4a05 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#define PHP_SQLITE_MODULE_VERSION	"0.7"
+#define PHP_SQLITE_MODULE_VERSION	"0.9a"
 
 #include "php.h"
 #include "php_ini.h"
@@ -858,7 +858,9 @@ PHP_FUNCTION(sqlite_query)
 	const char *tail;
 	const char **rowdata, **colnames;
 
-	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sr", &sql, &sql_len, &zdb)) {
+	if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
+				ZEND_NUM_ARGS() TSRMLS_CC, "sr", &sql, &sql_len, &zdb) && 
+			FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &sql, &sql_len, &zdb)) {
 		return;
 	}