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 3ca202e2086630e896ffe90f04f686ac05de1ae3..583e018504a32c14193f7c1a90323709db765eea 100644 (file)
--- 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 89a51291a6baea9e2b449c446cb34ff6369dff04..1c42fd4a0515926178eed4cd85fe73fbfbe03bc4 100644 (file)
--- 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;
        }