diff options
| author | Anatol Belski <ab@php.net> | 2017-10-27 15:04:29 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-27 15:04:29 +0200 |
| commit | 36b27f2ba599e95dfff2420d64083897684d9c1a (patch) | |
| tree | 1f448a0d0f6df0eb496cb9441084aa270c65a6d7 | |
| parent | 211dacd7b5c945580e763f7322be85b8be7d92ec (diff) | |
| parent | 24b1bb0abd83f59c6d8ca79a0decdfd739f5aae6 (diff) | |
| download | php-git-36b27f2ba599e95dfff2420d64083897684d9c1a.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix test compat for PostgreSQL 10
| -rw-r--r-- | ext/pgsql/tests/pg_update_001.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pgsql/tests/pg_update_001.phpt b/ext/pgsql/tests/pg_update_001.phpt index 60db35c157..85a86f3d23 100644 --- a/ext/pgsql/tests/pg_update_001.phpt +++ b/ext/pgsql/tests/pg_update_001.phpt @@ -24,7 +24,7 @@ var_dump(pg_update($conn, 'foo', array('id' => 10), array('id' => 1), PGSQL_DML_ pg_update($conn, 'phptests.foo', array('id' => 100), array('id2' => 2)); var_dump(pg_update($conn, 'phptests.foo', array('id' => 100), array('id2' => 2), PGSQL_DML_STRING)); -$rs = pg_query('SELECT * FROM foo UNION SELECT * FROM phptests.foo'); +$rs = pg_query('SELECT * FROM foo UNION SELECT * FROM phptests.foo ORDER BY id'); while ($row = pg_fetch_assoc($rs)) { var_dump($row); } |