Merge branch 'PHP-7.4'

jackie-chen · Jun 4, 2019 · b1bdae7 · b1bdae7
2 parents 0b0333b + 3f7210e
commit b1bdae7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ext/pgsql/tests/08escape.phpt b/ext/pgsql/tests/08escape.phpt
@@ -43,13 +43,13 @@ $db   = pg_connect($conn_str);
 
 // Insert binary to DB
 $escaped_data = pg_escape_bytea($data);
-pg_query("DELETE FROM ".$table_name." WHERE num = -9999;");
-$sql = "INSERT INTO ".$table_name." (num, bin) VALUES (-9999, CAST ('".$escaped_data."' AS BYTEA));";
+pg_query("DELETE FROM ".$table_name." WHERE num = 10000;");
+$sql = "INSERT INTO ".$table_name." (num, bin) VALUES (10000, CAST ('".$escaped_data."' AS BYTEA));";
 pg_query($db, $sql);
 
 // Retrieve binary from DB
 for ($i = 0; $i < 2; $i++) {
-	$sql = "SELECT bin::bytea FROM ".$table_name." WHERE num = -9999";
+	$sql = "SELECT bin::bytea FROM ".$table_name." WHERE num = 10000";
 	$result = pg_query($db, $sql);
 	$row = pg_fetch_array($result, 0, PGSQL_ASSOC);
 

diff --git a/ext/pgsql/tests/17result.phpt b/ext/pgsql/tests/17result.phpt
@@ -10,7 +10,7 @@ include 'config.inc';
 
 $db = pg_connect($conn_str);
 
-$sql = "SELECT * FROM $table_name";
+$sql = "SELECT * FROM $table_name ORDER BY num";
 $result = pg_query($db, $sql) or die('Cannot query db');
 $rows = pg_num_rows($result);