Refactor ext/pgsql test

ext/pgsql/tests/00version.phpt

@@ -3,12 +3,12 @@ PostgreSQL version
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 // Get postgresql version for easier debugging.
 // Execute run-test.php with --keep-all to get version string in 00version.log or 00version.out
-include('config.inc');
+include('inc/config.inc');
 
 $db = pg_connect($conn_str);
 var_dump(pg_version($db));

ext/pgsql/tests/01createdb.phpt

@@ -3,20 +3,20 @@ PostgreSQL create db
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 // create test table
 
-include('config.inc');
+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/02connection.phpt

@@ -3,12 +3,12 @@ PostgreSQL connection
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 // connection function tests
 
-include('config.inc');
+include('inc/config.inc');
 
 $db = pg_pconnect($conn_str);
 var_dump($db);

ext/pgsql/tests/03sync_query.phpt

@@ -3,13 +3,16 @@ PostgreSQL sync query
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 
-include('config.inc');
+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)))
@@ -83,7 +86,7 @@ if (function_exists('pg_result_error_field')) {
 pg_num_rows(pg_query($db, "SELECT * FROM ".$table_name.";"));
 pg_num_fields(pg_query($db, "SELECT * FROM ".$table_name.";"));
 pg_field_name($result, 0);
-pg_field_num($result, $field_name);
+pg_field_num($result, "num");
 pg_field_size($result, 0);
 pg_field_type($result, 0);
 pg_field_prtlen($result, 0);
@@ -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

@@ -3,13 +3,16 @@ PostgreSQL async query
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 
-include('config.inc');
+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";
@@ -46,7 +49,7 @@ for ($i=0; $i < $rows; $i++)
 pg_num_rows(pg_query($db, "SELECT * FROM ".$table_name.";"));
 pg_num_fields(pg_query($db, "SELECT * FROM ".$table_name.";"));
 pg_field_name($result, 0);
-pg_field_num($result, $field_name);
+pg_field_num($result, "num");
 pg_field_size($result, 0);
 pg_field_type($result, 0);
 pg_field_prtlen($result, 0);
@@ -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/05large_object.phpt

@@ -3,11 +3,11 @@ PostgreSQL large object
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 
-include('config.inc');
+include('inc/config.inc');
 
 $db = pg_connect($conn_str);
 

ext/pgsql/tests/06_bug73498.phpt

@@ -3,19 +3,34 @@ Bug 73498 Incorrect DELIMITER syntax for pg_copy_to()
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 
-include('config.inc');
+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

@@ -3,13 +3,15 @@ PostgreSQL copy functions
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 
-include('config.inc');
+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/06copy_2.phpt

@@ -3,27 +3,33 @@ PostgreSQL copy functions, part 2
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 
-include('config.inc');
+include('inc/config.inc');
+$table_name = 'table_06copy_2';
 
 $db = pg_connect($conn_str);
 
-pg_query($db, 'CREATE TABLE test_copy (x int)');
+pg_query($db, "CREATE TABLE {$table_name} (x int)");
 
-pg_query($db, 'COPY test_copy FROM STDIN');
+pg_query($db, "COPY {$table_name} FROM STDIN");
 
 pg_put_line($db, "1\n");
 pg_put_line($db, "\\N\n");
 pg_put_line($db, "\\.\n");
 pg_end_copy($db);
 
-var_dump(pg_fetch_all_columns(pg_query($db, 'SELECT * FROM test_copy ORDER BY 1')));
-
-pg_query($db, 'DROP TABLE test_copy');
+var_dump(pg_fetch_all_columns(pg_query($db, "SELECT * FROM {$table_name} ORDER BY 1")));
+?>
+--CLEAN--
+<?php
+include('inc/config.inc');
+$table_name = 'table_06copy_2';
 
+$db = pg_connect($conn_str);
+pg_query($db, "DROP TABLE {$table_name}");
 ?>
 --EXPECT--
 array(2) {

ext/pgsql/tests/07optional.phpt

@@ -3,12 +3,12 @@ PostgreSQL optional functions
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 // optional functions
 
-include('config.inc');
+include('inc/config.inc');
 
 $db = pg_connect($conn_str);
 $enc = pg_client_encoding($db);

ext/pgsql/tests/08escape.phpt

@@ -3,11 +3,13 @@ PostgreSQL escape functions
 --EXTENSIONS--
 pgsql
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php include("inc/skipif.inc"); ?>
 --FILE--
 <?php
 
-include 'config.inc';
+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/09notice.phpt

@@ -5,15 +5,15 @@ pgsql
 --SKIPIF--
 <?php
 
-include("skipif.inc");
+include("inc/skipif.inc");
 
 _skip_lc_messages($conn);
 
 ?>
 --FILE--
 <?php
-include 'config.inc';
-include 'lcmess.inc';
+include 'inc/config.inc';
+include 'inc/lcmess.inc';
 
 ini_set('pgsql.log_notice', TRUE);
 ini_set('pgsql.ignore_notice', FALSE);

ext/pgsql/tests/10pg_convert.phpt

@@ -4,14 +4,14 @@ PostgreSQL pg_convert()
 pgsql
 --SKIPIF--
 <?php
-include("skipif.inc");
+include("inc/skipif.inc");
 skip_bytea_not_escape();
 ?>
 --FILE--
 <?php
 error_reporting(E_ALL);
 
-include 'config.inc';
+include 'inc/config.inc';
 
 $db = pg_connect($conn_str);