Refactor ext/pgsql test

ext/pgsql/tests/01createdb.phpt

@@ -9,14 +9,14 @@ pgsql
 // create test table
 
 include('inc/config.inc');
+$table_name = 'table_01createdb';
+$table_name_92 = 'table_01createdb_92';
+$view_name   = "view_01createdb";
 
 $db = pg_connect($conn_str);
 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++) {
-        pg_query($db,"INSERT INTO ".$table_name." VALUES ($i, 'ABC');");
-    }
+    pg_query($db, "CREATE TABLE {$table_name} (num int, str text, bin bytea)"); // Create table here
 }
 else {
     echo pg_last_error()."\n";
@@ -25,18 +25,28 @@ else {
 $v = pg_version($db);
 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
+    pg_query($db, "CREATE TABLE {$table_name_92} (textary text[],  jsn json)"); // Create table here
 }
 else {
     echo pg_last_error()."\n";
 }
 
 // Create view here
-pg_query($db,$view_def);
+pg_query($db, "CREATE VIEW {$view_name} AS SELECT * FROM {$table_name}");
 
 pg_close($db);
 
 echo "OK";
 ?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = 'table_01createdb';
+$table_name_92 = 'table_01createdb_92';
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name} cascade");
+pg_query($db, "drop table if exists {$table_name_92} cascade");
+?>
 --EXPECT--
 OK

ext/pgsql/tests/03sync_query.phpt

@@ -8,8 +8,11 @@ pgsql
 <?php
 
 include('inc/config.inc');
+$table_name = "table_03sync_query";
 
 $db = pg_connect($conn_str);
+pg_query($db, "create table {$table_name} (num int, str text, bin bytea)");
+pg_query($db, "insert into {$table_name} default values");
 
 $result = pg_query($db, "SELECT * FROM ".$table_name.";");
 if (!($rows   = pg_num_rows($result)))
@@ -134,6 +137,14 @@ pg_close($db);
 
 echo "OK";
 ?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = "table_03sync_query";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name}");
+?>
 --EXPECT--
 Argument #3 must be greater than or equal to 0
 Argument #3 must be less than the number of fields for this result set

ext/pgsql/tests/04async_query.phpt

@@ -8,8 +8,11 @@ pgsql
 <?php
 
 include('inc/config.inc');
+$table_name = "table_04async_query";
 
 $db = pg_connect($conn_str);
+pg_query($db, "create table {$table_name} (num int, str text, bin bytea)");
+pg_query($db, "insert into {$table_name} default values");
 
 if (!pg_send_query($db, "SELECT * FROM ".$table_name.";")) {
     echo "pg_send_query() error\n";
@@ -63,5 +66,13 @@ pg_free_result($result);
 
 echo "OK";
 ?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = "table_04async_query";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name}");
+?>
 --EXPECT--
 OK

ext/pgsql/tests/06_bug73498.phpt

@@ -8,14 +8,29 @@ pgsql
 <?php
 
 include('inc/config.inc');
+$table_name = "table_06_bug73498";
+$view_name = "view_06_bug73498";
 
 $db = pg_connect($conn_str);
+pg_query($db, "create table {$table_name} (num int, str text, bin bytea)");
+pg_query($db, "create view {$view_name} as select * from {$table_name}");
+pg_query($db, "insert into {$table_name} default values");
 
 $rows = pg_copy_to($db, "(select * from {$view_name})");
 
 var_dump(gettype($rows));
 var_dump(count($rows) > 0);
 
+?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = "table_06_bug73498";
+$view_name = "view_06_bug73498";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop view {$view_name}");
+pg_query($db, "drop table {$table_name}");
 ?>
 --EXPECT--
 string(5) "array"

ext/pgsql/tests/06copy.phpt

@@ -8,8 +8,10 @@ pgsql
 <?php
 
 include('inc/config.inc');
+$table_name = "table_06copy";
 
 $db = pg_connect($conn_str);
+pg_query($db, "create table {$table_name} (num int, str text, bin bytea)");
 
 $rows = pg_copy_to($db, $table_name);
 
@@ -19,6 +21,14 @@ pg_copy_from($db, $table_name, $rows);
 
 echo "OK";
 
+?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = "table_06copy";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name}");
 ?>
 --EXPECT--
 OK

ext/pgsql/tests/08escape.phpt

@@ -8,6 +8,8 @@ pgsql
 <?php
 
 include 'inc/config.inc';
+$table_name = "table_08escape";
+
 define('FILE_NAME', __DIR__ . '/php.gif');
 
 // pg_escape_string() test
@@ -42,6 +44,7 @@ else {
 // Test using database
 $data = file_get_contents(FILE_NAME);
 $db   = pg_connect($conn_str);
+pg_query($db, "create table {$table_name} (num int, str text, bin bytea)");
 
 // Insert binary to DB
 $escaped_data = pg_escape_bytea($db, $data);
@@ -97,6 +100,14 @@ else {
     var_dump($expect);
 }
 
+?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = "table_08escape";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name}");
 ?>
 --EXPECTF--
 Deprecated: pg_escape_string(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d

ext/pgsql/tests/10pg_convert_9.phpt

@@ -12,8 +12,11 @@ skip_bytea_not_hex();
 error_reporting(E_ALL);
 
 include 'inc/config.inc';
+$table_name = "table_10pg_convert_9";
 
 $db = pg_connect($conn_str);
+pg_query($db, "create table {$table_name} (num int, str text, bin bytea)");
+
 pg_query($db, "SET standard_conforming_strings = 0");
 
 $fields = array('num'=>'1234', 'str'=>'AAA', 'bin'=>'BBB');
@@ -49,6 +52,14 @@ try {
     echo $e->getMessage(), \PHP_EOL;
 }
 ?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = "table_10pg_convert_9";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name}");
+?>
 --EXPECT--
 array(3) {
   [""num""]=>

ext/pgsql/tests/10pg_convert_json_array.phpt

@@ -12,8 +12,10 @@ skip_server_version('9.2');
 error_reporting(E_ALL);
 
 include 'inc/config.inc';
+$table_name_92 = "table_10pg_convert_json_array_92";
 
 $db = pg_connect($conn_str);
+pg_query($db, "create table {$table_name_92} (textary text[],  jsn json)");
 
 $fields = array(
     'textary'=>'{"meeting", "lunch", "training", "presentation"}',
@@ -28,6 +30,14 @@ if (!pg_insert($db, $table_name_92, $fields)) {
     echo "OK\n";
 }
 
+?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name_92 = "table_10pg_convert_json_array_92";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name_92}");
 ?>
 --EXPECT--
 array(2) {

ext/pgsql/tests/11pg_meta_data.phpt

@@ -9,13 +9,23 @@ pgsql
 error_reporting(E_ALL);
 
 include 'inc/config.inc';
+$table_name = "table_11pg_meta_data";
 
 $db = pg_connect($conn_str);
+pg_query($db, "create table {$table_name} (num int, str text, bin bytea)");
 
 $meta = pg_meta_data($db, $table_name);
 
 var_dump($meta);
 ?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = "table_11pg_meta_data";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name}");
+?>
 --EXPECT--
 array(3) {
   ["num"]=>

ext/pgsql/tests/12pg_insert_9.phpt

@@ -12,8 +12,11 @@ skip_bytea_not_hex();
 error_reporting(E_ALL);
 
 include 'inc/config.inc';
+$table_name = "table_12pg_insert_9";
 
 $db = pg_connect($conn_str);
+pg_query($db, "create table {$table_name} (num int, str text, bin bytea)");
+
 pg_query($db, "SET standard_conforming_strings = 0");
 
 $fields = array('num'=>'1234', 'str'=>'AAA', 'bin'=>'BBB');
@@ -53,9 +56,17 @@ try {
 
 echo "Ok\n";
 ?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = "table_12pg_insert_9";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name}");
+?>
 --EXPECTF--
-INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES (1234,E'AAA',E'\\x424242');
-INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES ('1234','AAA','BBB');
+INSERT INTO "table_12pg_insert_9" ("num","str","bin") VALUES (1234,E'AAA',E'\\x424242');
+INSERT INTO "table_12pg_insert_9" ("num","str","bin") VALUES ('1234','AAA','BBB');
 object(PgSql\Result)#%d (0) {
 }
 Array of values must be an associative array with string keys

ext/pgsql/tests/13pg_select_9.phpt

@@ -12,11 +12,15 @@ skip_server_version('9.0', '<');
 error_reporting(E_ALL);
 
 include 'inc/config.inc';
+$table_name = "table_13pg_select_9";
 
 $db = pg_connect($conn_str);
+pg_query($db, "create table {$table_name} (num int, str text, bin bytea)");
+pg_query($db, "insert into {$table_name} values(1234, 'AAA', 'BBB')");
+pg_query($db, "insert into {$table_name} values(1234, 'AAA', 'BBB')");
+
 pg_query($db, "SET bytea_output = 'hex'");
 
-$fields = array('num'=>'1234', 'str'=>'ABC', 'bin'=>'XYZ');
 $ids = array('num'=>'1234');
 
 $res = pg_select($db, $table_name, $ids) or print "Error\n";
@@ -54,6 +58,14 @@ try {
 
 echo "Ok\n";
 
+?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = "table_13pg_select_9";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name}");
 ?>
 --EXPECT--
 array(2) {
@@ -76,8 +88,8 @@ array(2) {
     string(8) "\x424242"
   }
 }
-SELECT * FROM "php_pgsql_test" WHERE "num"=1234;
-SELECT * FROM "php_pgsql_test" WHERE "num"='1234';
+SELECT * FROM "table_13pg_select_9" WHERE "num"=1234;
+SELECT * FROM "table_13pg_select_9" WHERE "num"='1234';
 Array of values must be an associative array with string keys
 Array of values must be an associative array with string keys
 Values must be of type string|int|float|bool|null, array given

ext/pgsql/tests/14pg_update_9.phpt

@@ -12,8 +12,13 @@ skip_bytea_not_hex();
 error_reporting(E_ALL);
 
 include 'inc/config.inc';
+$table_name = "table_14pg_update_9";
 
 $db = pg_connect($conn_str);
+pg_query($db, "create table {$table_name} (num int, str text, bin bytea)");
+pg_query($db, "insert into {$table_name} values(1, 'ABC', null)");
+pg_query($db, "insert into {$table_name} values(1, 'ABC', null)");
+
 pg_query($db, "SET standard_conforming_strings = 0");
 
 $fields = array('num'=>'1234', 'str'=>'ABC', 'bin'=>'XYZ');
@@ -25,7 +30,15 @@ echo pg_update($db, $table_name, $fields, $ids, PGSQL_DML_STRING|PGSQL_DML_ESCAP
 
 echo "Ok\n";
 ?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = "table_14pg_update_9";
+
+$db = pg_connect($conn_str);
+pg_query($db, "drop table {$table_name}");
+?>
 --EXPECT--
-UPDATE "php_pgsql_test" SET "num"=1234,"str"=E'ABC',"bin"=E'\\x58595a' WHERE "num"=1234;
-UPDATE "php_pgsql_test" SET "num"='1234',"str"='ABC',"bin"='XYZ' WHERE "num"='1234';
+UPDATE "table_14pg_update_9" SET "num"=1234,"str"=E'ABC',"bin"=E'\\x58595a' WHERE "num"=1234;
+UPDATE "table_14pg_update_9" SET "num"='1234',"str"='ABC',"bin"='XYZ' WHERE "num"='1234';
 Ok