diff options
| author | Matteo Beccati <mbeccati@php.net> | 2013-06-19 11:53:21 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2013-06-19 11:53:21 +0200 |
| commit | 77032bcd9cd746e44857876beee40f80b6ed451f (patch) | |
| tree | 8edc3345547a52fd7b5b8f7285098d141d03b904 /ext/pdo_pgsql | |
| parent | 07a38ea80c93eaa83b7683cffc0c8affb72ab2e8 (diff) | |
| parent | 9b8259cdfa0f6b54984bb3268b17e7a36fa448d8 (diff) | |
| download | php-git-77032bcd9cd746e44857876beee40f80b6ed451f.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #65047 (Test skip on client / server version)
Remove broken client version checking
Clean up leftover file after the test
Diffstat (limited to 'ext/pdo_pgsql')
| -rw-r--r-- | ext/pdo_pgsql/tests/bug46274.phpt | 5 | ||||
| -rw-r--r-- | ext/pdo_pgsql/tests/bug46274_2.phpt | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ext/pdo_pgsql/tests/bug46274.phpt b/ext/pdo_pgsql/tests/bug46274.phpt index c34839ad43..8a85c9fe0c 100644 --- a/ext/pdo_pgsql/tests/bug46274.phpt +++ b/ext/pdo_pgsql/tests/bug46274.phpt @@ -14,6 +14,11 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true); +try { + $db->query("SET bytea_output = 'escape'"); +} catch (Exception $e) { +} + $db->query('CREATE TABLE test_one_blob (id SERIAL NOT NULL, blob1 BYTEA)'); $stmt = $db->prepare("INSERT INTO test_one_blob (blob1) VALUES (:foo)"); diff --git a/ext/pdo_pgsql/tests/bug46274_2.phpt b/ext/pdo_pgsql/tests/bug46274_2.phpt index eb675afe9e..317160c37a 100644 --- a/ext/pdo_pgsql/tests/bug46274_2.phpt +++ b/ext/pdo_pgsql/tests/bug46274_2.phpt @@ -14,6 +14,11 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); +try { + $db->query("SET bytea_output = 'escape'"); +} catch (Exception $e) { +} + $db->query('CREATE TABLE test_one_blob (id SERIAL NOT NULL, blob1 BYTEA)'); $stmt = $db->prepare("INSERT INTO test_one_blob (blob1) VALUES (:foo)"); |