summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2016-07-12 15:27:57 +0200
committerJulien Pauli <jpauli@php.net>2016-07-12 15:27:57 +0200
commitc96a9ca6f5630495fe2b34ca709111160a156684 (patch)
treebd0d79640a317302dac46860ac78fe16978cd1e5
parent3e8dbb3e5d763166e6f03903c931161d5f2706ed (diff)
parent642e44b98f18d867052aa7e02476aae9c8881201 (diff)
downloadphp-git-c96a9ca6f5630495fe2b34ca709111160a156684.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Fix test for #52384
-rw-r--r--ext/pdo/tests/bug_52384.phpt10
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/pdo/tests/bug_52384.phpt b/ext/pdo/tests/bug_52384.phpt
index 45449fd93a..b6eac4fb11 100644
--- a/ext/pdo/tests/bug_52384.phpt
+++ b/ext/pdo/tests/bug_52384.phpt
@@ -22,7 +22,13 @@ $n = null;
$lob = str_repeat('a',1000);
$dob = '1978-10-17';
-$sth = $db->prepare('SELECT 1 WHERE 1');
+$errmode = $db->getAttribute(PDO::ATTR_ERRMODE);
+$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
+$db->exec("DROP table bug_52384");
+$db->setAttribute(PDO::ATTR_ERRMODE, $errmode);
+$db->exec("CREATE table bug_52384 (calories int, colour varchar(64), tf int, n int, lob varchar(255), dob varchar(255))");
+
+$sth = $db->prepare('SELECT 1 FROM bug_52384 WHERE calories=:calories AND colour=:colour AND tf=:tf AND n=:n AND lob=:lob AND dob=:dob');
$sth->bindParam(':calories', $calories, PDO::PARAM_INT);
$sth->bindValue(':colour', $colour, PDO::PARAM_STR);
$sth->bindValue(':tf', $tf, PDO::PARAM_BOOL);
@@ -34,7 +40,7 @@ $sth->debugDumpParams();
unset($dbh);
?>
--EXPECT--
-SQL: [16] SELECT 1 WHERE 1
+SQL: [113] SELECT 1 FROM bug_52384 WHERE calories=:calories AND colour=:colour AND tf=:tf AND n=:n AND lob=:lob AND dob=:dob
Params: 6
Key: Name: [9] :calories
paramno=-1