diff options
author | Remi Collet <remi@php.net> | 2013-06-19 12:26:21 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2013-06-19 12:26:21 +0200 |
commit | 67bde2f8ac4a6c5a8d36f7aebfd2a4a1621142d0 (patch) | |
tree | be5c44e87793e49bc5f8503d7aa7d12cfe6f083a | |
parent | c666239265048abd3cc0b2c48493a5db1eacc28e (diff) | |
download | php-git-67bde2f8ac4a6c5a8d36f7aebfd2a4a1621142d0.tar.gz |
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
-rw-r--r-- | ext/pdo_pgsql/tests/bug46274.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug46274_2.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_pgsql/tests/bug_49985.phpt | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/pdo_pgsql/tests/bug46274.phpt b/ext/pdo_pgsql/tests/bug46274.phpt index 8a85c9fe0c..40706ecaa3 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 317160c37a..df60f34540 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 26dcfc617d..e1d7df82a0 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 |