summaryrefslogtreecommitdiff
path: root/ext/pgsql
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-02-19 17:11:00 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-03-11 11:32:20 +0100
commit852485d8ecd784153e41e565a0a87abf99cf4e0d (patch)
tree3c8be88c2c98b5f1b2f9ea51e5d3a20c10baf3ff /ext/pgsql
parent6bfb119e18e5241b6719a4ad69223d91c465a58e (diff)
downloadphp-git-852485d8ecd784153e41e565a0a87abf99cf4e0d.tar.gz
Adjust tests for zpp TypeError change
Diffstat (limited to 'ext/pgsql')
-rw-r--r--ext/pgsql/tests/01createdb.phpt4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pgsql/tests/01createdb.phpt b/ext/pgsql/tests/01createdb.phpt
index aa2e43748f..45062c3b49 100644
--- a/ext/pgsql/tests/01createdb.phpt
+++ b/ext/pgsql/tests/01createdb.phpt
@@ -9,7 +9,7 @@ PostgreSQL create db
include('config.inc');
$db = pg_connect($conn_str);
-if (!@pg_num_rows(@pg_query($db, "SELECT * FROM ".$table_name)))
+if (!($q = @pg_query($db, "SELECT * FROM ".$table_name)) || !@pg_num_rows($q))
{
pg_query($db,$table_def); // Create table here
for ($i=0; $i < $num_test_record; $i++) {
@@ -21,7 +21,7 @@ else {
}
$v = pg_version();
-if (version_compare($v['server'], '9.2', '>=') && !@pg_num_rows(@pg_query($db, "SELECT * FROM ".$table_name_92)))
+if (version_compare($v['server'], '9.2', '>=') && (!($q = @pg_query($db, "SELECT * FROM ".$table_name_92)) || !@pg_num_rows($q)))
{
pg_query($db,$table_def_92); // Create table here
}