Further fixes wrt. bug #72668

Not only SQLite3::querySingle(), but also SQLite3::query() and
SQLite3Stmt::execute() were affected.

diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index 4513b77d0f93f8f50ac01a9f0f2818dd4bd33c71..c901e536a09e4e5a596c88576fd3e8150799cc0f 100644 (file)
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -578,7 +578,9 @@ PHP_METHOD(sqlite3, query)
                        break;
                }
                default:
-                       php_sqlite3_error(db_obj, "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db));
+                       if (!EG(exception)) {
+                               php_sqlite3_error(db_obj, "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db));
+                       }
                        sqlite3_finalize(stmt_obj->stmt);
                        stmt_obj->initialised = 0;
                        zval_dtor(return_value);
@@ -690,7 +692,9 @@ PHP_METHOD(sqlite3, querySingle)
                        break;
                }
                default:
-                       php_sqlite3_error(db_obj, "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db));
+                       if (!EG(exception)) {
+                               php_sqlite3_error(db_obj, "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db));
+                       }
                        RETVAL_FALSE;
        }
        sqlite3_finalize(stmt);
@@ -1637,7 +1641,9 @@ PHP_METHOD(sqlite3stmt, execute)
                        sqlite3_reset(stmt_obj->stmt);
 
                default:
-                       php_sqlite3_error(stmt_obj->db_obj, "Unable to execute statement: %s", sqlite3_errmsg(sqlite3_db_handle(stmt_obj->stmt)));
+                       if (!EG(exception)) {
+                               php_sqlite3_error(stmt_obj->db_obj, "Unable to execute statement: %s", sqlite3_errmsg(sqlite3_db_handle(stmt_obj->stmt)));
+                       }
                        zval_dtor(return_value);
                        RETURN_FALSE;
        }

diff --git a/ext/sqlite3/tests/bug72668.phpt b/ext/sqlite3/tests/bug72668.phpt
new file mode 100644 (file)
index 0000000..2845fa0
--- /dev/null
+++ b/ext/sqlite3/tests/bug72668.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Bug #72668 (Spurious warning when exception is thrown in user defined function)
+--SKIPIF--
+<?php
+if (!extension_loaded('sqlite3')) die('skip'); ?>
+--FILE--
+<?php
+function my_udf_md5($string) {
+       throw new \Exception("test exception\n");
+}
+
+$db = new SQLite3(':memory:');
+$db->createFunction('my_udf_md5', 'my_udf_md5');
+
+try {
+       $result = $db->query('SELECT my_udf_md5("test")');
+       var_dump($result);
+}
+catch(\Exception $e) {
+       echo "Exception: ".$e->getMessage();
+}
+try {
+       $result = $db->querySingle('SELECT my_udf_md5("test")');
+       var_dump($result);
+}
+catch(\Exception $e) {
+       echo "Exception: ".$e->getMessage();
+}
+$statement = $db->prepare('SELECT my_udf_md5("test")');
+try {
+       $result = $statement->execute();
+       var_dump($result);
+}
+catch(\Exception $e) {
+       echo "Exception: ".$e->getMessage();
+}
+?>
+--EXPECT--
+Exception: test exception
+Exception: test exception
+Exception: test exception