diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-25 17:07:41 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-25 17:07:41 +0200 |
| commit | ccf39dd55243054535be02261485d56fbe5539d5 (patch) | |
| tree | 7305f7204da8a9ece8f377426f0b07f965563fcf | |
| parent | f5e56cf9707a1be547cc29f568d6f60dbdbb1e4c (diff) | |
| parent | 64e3e932fc38dc7e59805dfb28acae173503018b (diff) | |
| download | php-git-ccf39dd55243054535be02261485d56fbe5539d5.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/sqlite3/sqlite3.c
# ext/sqlite3/tests/bug72668.phpt
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 8 | ||||
| -rw-r--r-- | ext/sqlite3/tests/bug72668.phpt | 25 |
2 files changed, 27 insertions, 6 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index c9b6686689..2cb6a5225c 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -567,7 +567,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); @@ -1626,7 +1628,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 index ccb238f8e4..2845fa0a7c 100644 --- a/ext/sqlite3/tests/bug72668.phpt +++ b/ext/sqlite3/tests/bug72668.phpt @@ -6,19 +6,36 @@ if (!extension_loaded('sqlite3')) die('skip'); ?> --FILE-- <?php function my_udf_md5($string) { - throw new \Exception("test exception\n"); + throw new \Exception("test exception\n"); } $db = new SQLite3(':memory:'); $db->createFunction('my_udf_md5', 'my_udf_md5'); try { - $result = $db->querySingle('SELECT my_udf_md5("test")'); - var_dump($result); + $result = $db->query('SELECT my_udf_md5("test")'); + var_dump($result); } catch(\Exception $e) { - echo "Exception: ".$e->getMessage(); + 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 |