Skip to content

Commit 5ab45c7

Browse files
KentarouTakedaKentarouTakeda
committed
refactor(ext/pgsql/tests): fixed hard-coded object names and unified style
1 parent 293b0b0 commit 5ab45c7

18 files changed

+188
-141
lines changed

‎ext/pgsql/tests/06copy_2.phpt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,28 @@ pgsql
88
<?php
99

1010
include('inc/config.inc');
11+
$table_name = 'table_06copy_2';
1112

1213
$db = pg_connect($conn_str);
1314

14-
pg_query($db, 'CREATE TABLE test_copy (x int)');
15+
pg_query($db, "CREATE TABLE {$table_name} (x int)");
1516

16-
pg_query($db, 'COPY test_copy FROM STDIN');
17+
pg_query($db, "COPY {$table_name} FROM STDIN");
1718

1819
pg_put_line($db, "1\n");
1920
pg_put_line($db, "\\N\n");
2021
pg_put_line($db, "\\.\n");
2122
pg_end_copy($db);
2223

23-
var_dump(pg_fetch_all_columns(pg_query($db, 'SELECT * FROM test_copy ORDER BY 1')));
24+
var_dump(pg_fetch_all_columns(pg_query($db, "SELECT * FROM {$table_name} ORDER BY 1")));
2425
?>
2526
--CLEAN--
2627
<?php
2728
include('inc/config.inc');
28-
$db = pg_connect($conn_str);
29+
$table_name = 'table_06copy_2';
2930

30-
pg_query($db, 'DROP TABLE test_copy');
31+
$db = pg_connect($conn_str);
32+
pg_query($db, "DROP TABLE {$table_name}");
3133
?>
3234
--EXPECT--
3335
array(2) {

‎ext/pgsql/tests/80_bug24499.phpt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ require_once('inc/skipif.inc');
1010
<?php
1111

1212
require_once('inc/config.inc');
13+
$table_name = 'table_80_bug24499';
1314

1415
$dbh = @pg_connect($conn_str);
1516
if (!$dbh) {
1617
die ("Could not connect to the server");
1718
}
1819

19-
pg_query($dbh, "CREATE TABLE id (id SERIAL, t INT)");
20+
pg_query($dbh, "CREATE TABLE {$table_name} (id SERIAL, t INT)");
2021

2122
for ($i=0; $i<4; $i++) {
22-
pg_query($dbh, "INSERT INTO id (t) VALUES ($i)");
23+
pg_query($dbh, "INSERT INTO {$table_name} (t) VALUES ($i)");
2324
}
2425

2526
class Id
@@ -29,8 +30,9 @@ class Id
2930
public function getId()
3031
{
3132
global $dbh;
33+
global $table_name;
3234

33-
$q = pg_query($dbh, "SELECT id FROM id");
35+
$q = pg_query($dbh, "SELECT id FROM {$table_name}");
3436
print_r(pg_fetch_array($q));
3537
print_r(pg_fetch_array($q));
3638
$id = pg_fetch_object($q);
@@ -50,9 +52,10 @@ echo "Done\n";
5052
--CLEAN--
5153
<?php
5254
require_once('inc/config.inc');
53-
$dbh = pg_connect($conn_str);
55+
$table_name = 'table_80_bug24499';
5456

55-
pg_query($dbh, "DROP TABLE id CASCADE");
57+
$dbh = pg_connect($conn_str);
58+
pg_query($dbh, "DROP TABLE {$table_name} CASCADE");
5659
?>
5760
--EXPECTF--
5861
Array

‎ext/pgsql/tests/80_bug27597.phpt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,25 @@ require_once('inc/skipif.inc');
1010
<?php
1111

1212
require_once(__DIR__ . '/inc/config.inc');
13+
$table_name = 'table_80_bug27597';
1314

1415
$dbh = @pg_connect($conn_str);
1516
if (!$dbh) {
1617
die ("Could not connect to the server");
1718
}
1819

19-
pg_query($dbh, "CREATE TABLE id (id INT)");
20+
pg_query($dbh, "CREATE TABLE {$table_name} (id INT)");
2021

2122
for ($i=0; $i<4; $i++) {
22-
pg_query($dbh, "INSERT INTO id (id) VALUES ($i)");
23+
pg_query($dbh, "INSERT INTO {$table_name} (id) VALUES ($i)");
2324
}
2425

2526
function xi_fetch_array($res, $type = PGSQL_ASSOC) {
2627
$a = pg_fetch_array($res, NULL, $type) ;
2728
return $a ;
2829
}
2930

30-
$res = pg_query($dbh, "SELECT * FROM id");
31+
$res = pg_query($dbh, "SELECT * FROM {$table_name}");
3132
$i = 0; // endless-loop protection
3233
while($row = xi_fetch_array($res)) {
3334
print_r($row);
@@ -43,9 +44,10 @@ pg_close($dbh);
4344
--CLEAN--
4445
<?php
4546
require_once('inc/config.inc');
46-
$dbh = pg_connect($conn_str);
47+
$table_name = 'table_80_bug27597';
4748

48-
pg_query($dbh, "DROP TABLE id");
49+
$dbh = pg_connect($conn_str);
50+
pg_query($dbh, "DROP TABLE {$table_name}");
4951
?>
5052
--EXPECT--
5153
Array

‎ext/pgsql/tests/80_bug39971.phpt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,28 @@ require_once('inc/skipif.inc');
1010
<?php
1111

1212
require_once('inc/config.inc');
13+
$table_name = 'table_80_bug39971';
1314

1415
$dbh = pg_connect($conn_str);
1516

16-
pg_query($dbh, "CREATE TABLE php_test (id SERIAL, tm timestamp NOT NULL)");
17+
pg_query($dbh, "CREATE TABLE {$table_name} (id SERIAL, tm timestamp NOT NULL)");
1718

1819
$values = array('tm' => 'now()');
19-
pg_insert($dbh, 'php_test', $values);
20+
pg_insert($dbh, $table_name, $values);
2021

2122
$ids = array('id' => 1);
22-
pg_update($dbh, 'php_test', $values, $ids);
23+
pg_update($dbh, $table_name, $values, $ids);
2324

2425
pg_close($dbh);
2526
?>
2627
===DONE===
2728
--CLEAN--
2829
<?php
2930
require_once('inc/config.inc');
30-
$dbh = pg_connect($conn_str);
31+
$table_name = 'table_80_bug39971';
3132

32-
pg_query($dbh, "DROP TABLE php_test");
33+
$dbh = pg_connect($conn_str);
34+
pg_query($dbh, "DROP TABLE {$table_name}");
3335
?>
3436
--EXPECT--
3537
===DONE===

‎ext/pgsql/tests/80_bug42783.phpt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,28 @@ require_once('inc/skipif.inc');
1010
<?php
1111

1212
require_once('inc/config.inc');
13+
$table_name = 'table_80_bug42783';
1314

1415
$dbh = @pg_connect($conn_str);
1516
if (!$dbh) {
1617
die ("Could not connect to the server");
1718
}
1819

19-
pg_query($dbh, "CREATE TABLE php_test (id SERIAL PRIMARY KEY, time TIMESTAMP NOT NULL DEFAULT now())");
20+
pg_query($dbh, "CREATE TABLE {$table_name} (id SERIAL PRIMARY KEY, time TIMESTAMP NOT NULL DEFAULT now())");
2021

21-
pg_insert($dbh, 'php_test', array());
22+
pg_insert($dbh, $table_name, array());
2223

23-
var_dump(pg_fetch_assoc(pg_query($dbh, "SELECT * FROM php_test")));
24+
var_dump(pg_fetch_assoc(pg_query($dbh, "SELECT * FROM {$table_name}")));
2425

2526
pg_close($dbh);
2627
?>
2728
--CLEAN--
2829
<?php
2930
require_once('inc/config.inc');
30-
$dbh = pg_connect($conn_str);
31+
$table_name = 'table_80_bug42783';
3132

32-
pg_query($dbh, "DROP TABLE php_test");
33+
$dbh = pg_connect($conn_str);
34+
pg_query($dbh, "DROP TABLE {$table_name}");
3335
?>
3436
--EXPECTF--
3537
array(2) {

‎ext/pgsql/tests/bug37100.phpt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,21 @@ skip_bytea_not_escape();
1111
<?php
1212

1313
include 'inc/config.inc';
14+
$table_name = 'table_bug37100';
1415

1516
$db = pg_connect($conn_str);
1617
@pg_query("SET bytea_output = 'escape'");
1718

18-
pg_query('CREATE TABLE test_bug (binfield byteA) ;');
19-
pg_query("INSERT INTO test_bug VALUES (decode('0103AA000812','hex'))");
19+
pg_query("CREATE TABLE {$table_name} (binfield byteA) ;");
20+
pg_query("INSERT INTO {$table_name} VALUES (decode('0103AA000812','hex'))");
2021

2122

22-
$data = pg_query("SELECT binfield FROM test_bug");
23+
$data = pg_query("SELECT binfield FROM {$table_name}");
2324
$res = pg_fetch_result($data,0);
2425
var_dump($res);
2526
var_dump(bin2hex(pg_unescape_bytea($res)));
2627

27-
$sql = "BEGIN; DECLARE mycursor BINARY CURSOR FOR SELECT binfield FROM test_bug; FETCH ALL IN mycursor;";
28+
$sql = "BEGIN; DECLARE mycursor BINARY CURSOR FOR SELECT binfield FROM {$table_name}; FETCH ALL IN mycursor;";
2829

2930
$data = pg_query($sql);
3031
$res = pg_fetch_result($data,0);
@@ -37,9 +38,10 @@ pg_close($db);
3738
--CLEAN--
3839
<?php
3940
require_once('inc/config.inc');
40-
$db = pg_connect($conn_str);
41+
$table_name = 'table_bug37100';
4142

42-
pg_query('DROP TABLE test_bug');
43+
$db = pg_connect($conn_str);
44+
pg_query("DROP TABLE {$table_name}");
4345
?>
4446
--EXPECT--
4547
string(24) "\001\003\252\000\010\022"

‎ext/pgsql/tests/bug37100_9.phpt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,20 @@ skip_bytea_not_hex();
1111
<?php
1212

1313
include 'inc/config.inc';
14+
$table_name = 'ttable_bug37100_9';
1415

1516
$db = pg_connect($conn_str);
1617

17-
pg_query($db, 'CREATE TABLE test_bug (binfield byteA) ;');
18-
pg_query($db, "INSERT INTO test_bug VALUES (decode('0103AA000812','hex'))");
18+
pg_query($db, "CREATE TABLE {$table_name} (binfield byteA) ;");
19+
pg_query($db, "INSERT INTO {$table_name} VALUES (decode('0103AA000812','hex'))");
1920

2021

21-
$data = pg_query($db, "SELECT binfield FROM test_bug");
22+
$data = pg_query($db, "SELECT binfield FROM {$table_name}");
2223
$res = pg_fetch_result($data, null, 0);
2324
var_dump($res);
2425
var_dump(bin2hex(pg_unescape_bytea($res)));
2526

26-
$sql = "BEGIN; DECLARE mycursor BINARY CURSOR FOR SELECT binfield FROM test_bug; FETCH ALL IN mycursor;";
27+
$sql = "BEGIN; DECLARE mycursor BINARY CURSOR FOR SELECT binfield FROM {$table_name}; FETCH ALL IN mycursor;";
2728

2829
$data = pg_query($db, $sql);
2930
$res = pg_fetch_result($data, null, 0);
@@ -41,9 +42,10 @@ pg_close($db);
4142
--CLEAN--
4243
<?php
4344
require_once('inc/config.inc');
44-
$db = pg_connect($conn_str);
45+
$table_name = 'ttable_bug37100_9';
4546

46-
pg_query($db, 'DROP TABLE test_bug');
47+
$db = pg_connect($conn_str);
48+
pg_query($db, "DROP TABLE {$table_name}");
4749
?>
4850
--EXPECT--
4951
string(14) "\x0103aa000812"

‎ext/pgsql/tests/bug64609.phpt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ skip_server_version('8.3', '<');
1212
error_reporting(E_ALL);
1313

1414
include 'inc/config.inc';
15+
$table_name = 'table_bug64609';
16+
$type_name = 'type_bug64609';
1517

1618
$db = pg_connect($conn_str);
1719
pg_query($db, "BEGIN");
18-
pg_query($db, "CREATE TYPE t_enum AS ENUM ('ok', 'ko')");
19-
pg_query($db, "CREATE TABLE test_enum (a t_enum)");
20+
pg_query($db, "CREATE TYPE {$type_name} AS ENUM ('ok', 'ko')");
21+
pg_query($db, "CREATE TABLE {$table_name} (a {$type_name})");
2022

2123
$fields = array('a' => 'ok');
22-
$converted = pg_convert($db, 'test_enum', $fields);
24+
$converted = pg_convert($db, $table_name, $fields);
2325

2426
pg_query($db, "ROLLBACK");
2527

‎ext/pgsql/tests/bug65119.phpt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ include("inc/skipif.inc");
99
--FILE--
1010
<?php
1111
include 'inc/config.inc';
12+
$table_name = 'table_bug65119';
1213

1314
function test(Array $values, $conn_str) {
15+
global $table_name;
1416
$connection = pg_pconnect($conn_str, PGSQL_CONNECT_FORCE_NEW);
1517
pg_query($connection, "begin");
16-
pg_query($connection, "CREATE TABLE bug65119 (i INTEGER)");
17-
pg_copy_from($connection, "bug65119", $values, "\t", "NULL");
18+
pg_query($connection, "CREATE TABLE {$table_name} (i INTEGER)");
19+
pg_copy_from($connection, $table_name, $values, "\t", "NULL");
1820
pg_query($connection, "rollback");
1921
}
2022

‎ext/pgsql/tests/bug71998.phpt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ pgsql
1010
// http://stackoverflow.com/a/17871737/3358424
1111

1212
include('inc/config.inc');
13+
$table_name = 'table_bug71998';
1314

1415
$db = pg_connect($conn_str);
1516

16-
pg_query($db, "CREATE TABLE tmp_statistics (id integer NOT NULL, remote_addr inet);");
17+
pg_query($db, "CREATE TABLE {$table_name} (id integer NOT NULL, remote_addr inet);");
1718

1819
$ips = array(
1920
/* IPv4*/
@@ -59,7 +60,7 @@ foreach ($ips as $ip) {
5960
$data = array("id" => ++$i, "remote_addr" => $ip);
6061
$r = true;
6162
try {
62-
@pg_insert($db, 'tmp_statistics', $data);
63+
@pg_insert($db, $table_name, $data);
6364
} catch (\ValueError $e) {
6465
echo $e->getMessage() . PHP_EOL;
6566
$r = false;
@@ -70,11 +71,11 @@ foreach ($ips as $ip) {
7071
//echo pg_last_error($db);
7172
}
7273

73-
//pg_query($db, "INSERT INTO tmp_statistics (id, remote_addr) VALUES (2, '127.0.0.1')"); // OK, record inserted
74+
//pg_query($db, "INSERT INTO {$table_name} (id, remote_addr) VALUES (2, '127.0.0.1')"); // OK, record inserted
7475
}
7576

7677

77-
$r = pg_query($db, "SELECT * FROM tmp_statistics");
78+
$r = pg_query($db, "SELECT * FROM {$table_name}");
7879
while (false != ($row = pg_fetch_row($r))) {
7980
var_dump($row);
8081
}
@@ -86,9 +87,11 @@ pg_close($db);
8687
--CLEAN--
8788
<?php
8889
require_once('inc/config.inc');
90+
$table_name = 'table_bug71998';
91+
8992
$db = @pg_connect($conn_str);
9093

91-
pg_query($db, "DROP TABLE tmp_statistics");
94+
pg_query($db, "DROP TABLE {$table_name}");
9295
?>
9396
--EXPECT--
9497
pg_insert(): Field "remote_addr" must be a valid IPv4 or IPv6 address string, "256.257.258.259" given

0 commit comments

Comments
 (0)