if a php bolean makes it as far as the parameter callback, it must really need

to be boolean; express is as native pgsql 't' or 'f'.

Add a test case for Bug #33876, which is a partially bogus bug.

diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index 9e6420eeb48e9cb5bd85a35e522887bb7db646dd..88e0e4620fd46e299bc9f0d86e332807bbaacf25 100644 (file)
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -203,6 +203,10 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *
                                                        Z_TYPE_P(param->parameter) == IS_NULL) {
                                                S->param_values[param->paramno] = NULL;
                                                S->param_lengths[param->paramno] = 0;
+                                       } else if (Z_TYPE_P(param->parameter) == IS_BOOL) {
+                                               S->param_values[param->paramno] = Z_BVAL_P(param->parameter) ? "t" : "f";
+                                               S->param_lengths[param->paramno] = 1;
+                                               S->param_formats[param->paramno] = 1;
                                        } else {
                                                convert_to_string(param->parameter);
                                                S->param_values[param->paramno] = Z_STRVAL_P(param->parameter);

diff --git a/ext/pdo_pgsql/tests/bug_33876.phpt b/ext/pdo_pgsql/tests/bug_33876.phpt
new file mode 100644 (file)
index 0000000..ea10622
--- /dev/null
+++ b/ext/pdo_pgsql/tests/bug_33876.phpt
@@ -0,0 +1,150 @@
+--TEST--
+PDO PgSQL Bug #33876
+--SKIPIF--
+<?php
+if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
+require 'ext/pdo_pgsql/tests/config.inc';
+require 'ext/pdo/tests/pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+require 'ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory('ext/pdo_pgsql/tests/common.phpt');
+$db->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_SILENT);
+
+$db->exec('CREATE TABLE test (foo varchar(5) NOT NULL, bar bool NOT NULL)');
+$db->exec("INSERT INTO test VALUES('false','f')");
+$db->exec("INSERT INTO test VALUES('true', 't')");
+
+$res = $db->prepare('SELECT foo from test where bar = ?');
+
+# this is the portable approach to binding a bool
+$res->bindValue(1, false, PDO_PARAM_BOOL);
+if (!$res->execute())
+       print_r($res->errorInfo());
+else
+       print_r($res->fetchAll(PDO_FETCH_ASSOC));
+
+# this is the portable approach to binding a bool
+$res->bindValue(1, true, PDO_PARAM_BOOL);
+if (!$res->execute())
+       print_r($res->errorInfo());
+else
+       print_r($res->fetchAll(PDO_FETCH_ASSOC));
+
+
+# true gets cast to string (because the implied default is string)
+# true-as-string is 1, so this "works"
+if (!$res->execute(array(true)))
+       print_r($res->errorInfo());
+else
+       print_r($res->fetchAll(PDO_FETCH_ASSOC));
+
+# Expected to fail; unless told otherwise, PDO assumes string inputs
+# false -> "" as string, which pgsql doesn't like
+if (!$res->execute(array(false)))
+       print_r($res->errorInfo());
+else
+       print_r($res->fetchAll(PDO_FETCH_ASSOC));
+
+# And now using emulator prepares
+echo "EMUL\n";
+
+
+$res = $db->prepare('SELECT foo from test where bar = ?', array(
+       PDO_PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT => true));
+
+# this is the portable approach to binding a bool
+$res->bindValue(1, false, PDO_PARAM_BOOL);
+if (!$res->execute())
+       print_r($res->errorInfo());
+else
+       print_r($res->fetchAll(PDO_FETCH_ASSOC));
+
+# this is the portable approach to binding a bool
+$res->bindValue(1, true, PDO_PARAM_BOOL);
+if (!$res->execute())
+       print_r($res->errorInfo());
+else
+       print_r($res->fetchAll(PDO_FETCH_ASSOC));
+
+
+# true gets cast to string (because the implied default is string)
+# true-as-string is 1, so this "works"
+if (!$res->execute(array(true)))
+       print_r($res->errorInfo());
+else
+       print_r($res->fetchAll(PDO_FETCH_ASSOC));
+
+# Expected to fail; unless told otherwise, PDO assumes string inputs
+# false -> "" as string, which pgsql doesn't like
+if (!$res->execute(array(false)))
+       print_r($res->errorInfo());
+else
+       print_r($res->fetchAll(PDO_FETCH_ASSOC));
+
+
+
+--EXPECT--
+Array
+(
+    [0] => Array
+        (
+            [foo] => false
+        )
+
+)
+Array
+(
+    [0] => Array
+        (
+            [foo] => true
+        )
+
+)
+Array
+(
+    [0] => Array
+        (
+            [foo] => true
+        )
+
+)
+Array
+(
+    [0] => 22P02
+    [1] => 7
+    [2] => ERROR:  invalid input syntax for type boolean: ""
+)
+EMUL
+Array
+(
+    [0] => Array
+        (
+            [foo] => false
+        )
+
+)
+Array
+(
+    [0] => Array
+        (
+            [foo] => true
+        )
+
+)
+Array
+(
+    [0] => Array
+        (
+            [foo] => true
+        )
+
+)
+Array
+(
+    [0] => 22P02
+    [1] => 7
+    [2] => ERROR:  invalid input syntax for type boolean: ""
+)