Commit: 67bde2f8ac4a6c5a8d36f7aebfd2a4a1621142d0 Author: Remi Collet <r...@php.net> Wed, 19 Jun 2013 12:26:21 +0200 Parents: c666239265048abd3cc0b2c48493a5db1eacc28e Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=67bde2f8ac4a6c5a8d36f7aebfd2a4a1621142d0 Log: Related to bug #65047 (Test skip on client / server version) bug46274.phpt and bug46274_2.phpt Make query silent (when server don't know bytea_output option) bug_49985.phpt Make result "locale" independent Bugs: https://bugs.php.net/65047 https://bugs.php.net/46274 Changed paths: M ext/pdo_pgsql/tests/bug46274.phpt M ext/pdo_pgsql/tests/bug46274_2.phpt M ext/pdo_pgsql/tests/bug_49985.phpt Diff: diff --git a/ext/pdo_pgsql/tests/bug46274.phpt b/ext/pdo_pgsql/tests/bug46274.phpt index 8a85c9f..40706ec 100644 --- a/ext/pdo_pgsql/tests/bug46274.phpt +++ b/ext/pdo_pgsql/tests/bug46274.phpt @@ -15,7 +15,7 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true); try { - $db->query("SET bytea_output = 'escape'"); + @$db->query("SET bytea_output = 'escape'"); } catch (Exception $e) { } diff --git a/ext/pdo_pgsql/tests/bug46274_2.phpt b/ext/pdo_pgsql/tests/bug46274_2.phpt index 317160c..df60f34 100644 --- a/ext/pdo_pgsql/tests/bug46274_2.phpt +++ b/ext/pdo_pgsql/tests/bug46274_2.phpt @@ -15,7 +15,7 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); try { - $db->query("SET bytea_output = 'escape'"); + @$db->query("SET bytea_output = 'escape'"); } catch (Exception $e) { } diff --git a/ext/pdo_pgsql/tests/bug_49985.phpt b/ext/pdo_pgsql/tests/bug_49985.phpt index 26dcfc6..e1d7df8 100644 --- a/ext/pdo_pgsql/tests/bug_49985.phpt +++ b/ext/pdo_pgsql/tests/bug_49985.phpt @@ -30,6 +30,6 @@ for ($i = 0; $i < 3; $i++) { ?> --EXPECTF-- bool(true) -SQLSTATE[23505]: %s"test_pkey" -SQLSTATE[23505]: %s"test_pkey" +SQLSTATE[23505]: %stest_pkey%s +SQLSTATE[23505]: %stest_pkey%s -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
