diff options
author | Christoph M. Becker <cmb@php.net> | 2016-06-27 17:09:55 +0200 |
---|---|---|
committer | Christoph M. Becker <cmb@php.net> | 2016-06-27 17:09:55 +0200 |
commit | 0f03224d59cc746da4922a2c5a06122c0c21adc8 (patch) | |
tree | 256839b0ebe94858ee5b3861026d97adad5d39e3 | |
parent | ad32c7b538de017d8273ecd00bb3710d7a9c586a (diff) | |
parent | 1314db71091a171e9c2a6b27a4a74c628e76ada9 (diff) | |
download | php-git-0f03224d59cc746da4922a2c5a06122c0c21adc8.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
-rw-r--r-- | ext/sqlite3/sqlite3.c | 6 | ||||
-rw-r--r-- | ext/sqlite3/tests/bug70628.phpt | 55 |
2 files changed, 61 insertions, 0 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 741a6ad0c2..9436c158b5 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -1333,6 +1333,12 @@ PHP_METHOD(sqlite3stmt, clear) RETURN_FALSE; } + if (stmt_obj->bound_params) { + zend_hash_destroy(stmt_obj->bound_params); + FREE_HASHTABLE(stmt_obj->bound_params); + stmt_obj->bound_params = NULL; + } + RETURN_TRUE; } /* }}} */ diff --git a/ext/sqlite3/tests/bug70628.phpt b/ext/sqlite3/tests/bug70628.phpt new file mode 100644 index 0000000000..3d807baaa8 --- /dev/null +++ b/ext/sqlite3/tests/bug70628.phpt @@ -0,0 +1,55 @@ +--TEST-- +Bug #70628 (Clearing bindings on an SQLite3 statement doesn't work) +--SKIPIF-- +<?php +if (!extension_loaded('sqlite3')) die('skip'); ?> +--FILE-- +<?php +$db = new SQLite3(':memory:'); + +$db->exec("CREATE TABLE Dogs (Id INTEGER PRIMARY KEY, Breed TEXT, Name TEXT, Age INTEGER)"); + +$sth = $db->prepare("INSERT INTO Dogs (Breed, Name, Age) VALUES (:breed,:name,:age)"); + +$sth->bindValue(':breed', 'canis', SQLITE3_TEXT); +$sth->bindValue(':name', 'jack', SQLITE3_TEXT); +$sth->bindValue(':age', 7, SQLITE3_INTEGER); +$sth->execute(); + +$sth->clear(); +$sth->reset(); + +$sth->bindValue(':breed', 'russel', SQLITE3_TEXT); +$sth->bindValue(':age', 3, SQLITE3_INTEGER); +$sth->execute(); + +$res = $db->query('SELECT * FROM Dogs'); +while (($row = $res->fetchArray(SQLITE3_ASSOC))) { + var_dump($row); +} +$res->finalize(); + +$sth->close(); +$db->close(); +?> +--EXPECT-- +array(4) { + ["Id"]=> + int(1) + ["Breed"]=> + string(5) "canis" + ["Name"]=> + string(4) "jack" + ["Age"]=> + int(7) +} +array(4) { + ["Id"]=> + int(2) + ["Breed"]=> + string(6) "russel" + ["Name"]=> + NULL + ["Age"]=> + int(3) +} |