Skip to content

Commit e5b2590

Browse files
alexandre-dauboisalexandre-daubois
authored
Improve database naming in ext/pdo_pgsql for better para-tests (#11872)
1 parent 633e745 commit e5b2590

10 files changed

+63
-54
lines changed

‎ext/pdo_pgsql/tests/bug46274.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ try {
2121
} catch (Exception $e) {
2222
}
2323

24-
$db->query('CREATE TABLE test_one_blob (id SERIAL NOT NULL, blob1 BYTEA)');
24+
$db->query('DROP TABLE IF EXISTS test_one_blob_46274_1 CASCADE');
25+
$db->query('CREATE TABLE test_one_blob_46274_1 (id SERIAL NOT NULL, blob1 BYTEA)');
2526

26-
$stmt = $db->prepare("INSERT INTO test_one_blob (blob1) VALUES (:foo)");
27+
$stmt = $db->prepare("INSERT INTO test_one_blob_46274_1 (blob1) VALUES (:foo)");
2728

2829
$data = 'foo';
2930
$blob = fopen('php://memory', 'a');
@@ -49,7 +50,7 @@ $blob = NULL;
4950
$stmt->bindparam(':foo', $blob, PDO::PARAM_LOB);
5051
$stmt->execute();
5152

52-
$res = $db->query("SELECT blob1 from test_one_blob");
53+
$res = $db->query("SELECT blob1 from test_one_blob_46274_1");
5354
// Resource
5455
var_dump($res->fetch());
5556

@@ -62,7 +63,7 @@ var_dump($res->fetch());
6263
// NULL
6364
var_dump($res->fetch());
6465

65-
$db->query('DROP TABLE test_one_blob');
66+
$db->query('DROP TABLE test_one_blob_46274_1');
6667

6768
?>
6869
--EXPECT--

‎ext/pdo_pgsql/tests/bug46274_2.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ try {
2121
} catch (Exception $e) {
2222
}
2323

24-
$db->query('CREATE TABLE test_one_blob (id SERIAL NOT NULL, blob1 BYTEA)');
24+
$db->query('DROP TABLE IF EXISTS test_one_blob_46274_2 CASCADE');
25+
$db->query('CREATE TABLE test_one_blob_46274_2 (id SERIAL NOT NULL, blob1 BYTEA)');
2526

26-
$stmt = $db->prepare("INSERT INTO test_one_blob (blob1) VALUES (:foo)");
27+
$stmt = $db->prepare("INSERT INTO test_one_blob_46274_2 (blob1) VALUES (:foo)");
2728

2829
$data = 'foo';
2930
$blob = fopen('php://memory', 'a');
@@ -49,7 +50,7 @@ $blob = NULL;
4950
$stmt->bindparam(':foo', $blob, PDO::PARAM_LOB);
5051
$stmt->execute();
5152

52-
$res = $db->query("SELECT blob1 from test_one_blob");
53+
$res = $db->query("SELECT blob1 from test_one_blob_46274_2");
5354
// Resource
5455
var_dump($x = $res->fetch());
5556
var_dump(fread($x['blob1'], 10));
@@ -65,7 +66,7 @@ var_dump(fread($x['blob1'], 10));
6566
// NULL
6667
var_dump($res->fetch());
6768

68-
$db->query('DROP TABLE test_one_blob');
69+
$db->query('DROP TABLE test_one_blob_46274_2');
6970

7071
?>
7172
--EXPECTF--

‎ext/pdo_pgsql/tests/bug70861.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ try {
2121
} catch (Exception $e) {
2222
}
2323

24-
$db->query('DROP TABLE IF EXISTS test_blob_crash CASCADE');
25-
$db->query('CREATE TABLE test_blob_crash (id SERIAL NOT NULL, blob1 BYTEA)');
24+
$db->query('DROP TABLE IF EXISTS test_blob_crash_70861 CASCADE');
25+
$db->query('CREATE TABLE test_blob_crash_70861 (id SERIAL NOT NULL, blob1 BYTEA)');
2626

2727
class HelloWrapper {
2828
public function stream_open() { return true; }

‎ext/pdo_pgsql/tests/bug72633.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
1818

1919
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
2020

21-
$db->query('CREATE TABLE test_last_id (id SERIAL NOT NULL, field1 VARCHAR(10))');
21+
$db->query('DROP TABLE IF EXISTS test_last_id_72633 CASCADE');
22+
$db->query('CREATE TABLE test_last_id_72633 (id SERIAL NOT NULL, field1 VARCHAR(10))');
2223

23-
$stmt = $db->prepare("INSERT INTO test_last_id (field1) VALUES ('test')");
24+
$stmt = $db->prepare("INSERT INTO test_last_id_72633 (field1) VALUES ('test')");
2425

2526
$stmt->execute();
2627

@@ -31,9 +32,9 @@ var_dump($db->lastInsertId());
3132
/**
3233
* Sequence name informed
3334
*/
34-
var_dump($db->lastInsertId('test_last_id_id_seq'));
35+
var_dump($db->lastInsertId('test_last_id_72633_id_seq'));
3536

36-
$db->query('DROP TABLE test_last_id');
37+
$db->query('DROP TABLE test_last_id_72633');
3738

3839
?>
3940
--EXPECTREGEX--

‎ext/pdo_pgsql/tests/bug_33876.phpt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
1616
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
1717

1818
$db->exec("SET LC_MESSAGES='C'");
19-
$db->exec('CREATE TABLE test (foo varchar(5) NOT NULL, bar bool NOT NULL)');
20-
$db->exec("INSERT INTO test VALUES('false','f')");
21-
$db->exec("INSERT INTO test VALUES('true', 't')");
19+
$db->query('DROP TABLE IF EXISTS b33876 CASCADE');
20+
$db->exec('CREATE TABLE b33876 (foo varchar(5) NOT NULL, bar bool NOT NULL)');
21+
$db->exec("INSERT INTO b33876 VALUES('false','f')");
22+
$db->exec("INSERT INTO b33876 VALUES('true', 't')");
2223

23-
$res = $db->prepare('SELECT foo from test where bar = ?');
24+
$res = $db->prepare('SELECT foo from b33876 where bar = ?');
2425

2526
# this is the portable approach to binding a bool
2627
$res->bindValue(1, false, PDO::PARAM_BOOL);
@@ -55,7 +56,7 @@ else
5556
echo "EMUL\n";
5657

5758

58-
$res = $db->prepare('SELECT foo from test where bar = ?', array(
59+
$res = $db->prepare('SELECT foo from b33876 where bar = ?', array(
5960
PDO::ATTR_EMULATE_PREPARES => true));
6061

6162
# this is the portable approach to binding a bool

‎ext/pdo_pgsql/tests/bug_49985.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
1515
$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
1616
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
1717

18-
$db->exec("CREATE TABLE test (a int PRIMARY KEY)");
18+
$db->query('DROP TABLE IF EXISTS b49985 CASCADE');
19+
$db->exec("CREATE TABLE b49985 (a int PRIMARY KEY)");
1920

2021
for ($i = 0; $i < 3; $i++) {
2122
try {
2223
$db->beginTransaction();
23-
$stmt = $db->prepare("INSERT INTO test (a) VALUES (?)");
24+
$stmt = $db->prepare("INSERT INTO b49985 (a) VALUES (?)");
2425
var_dump($stmt->execute(array(1)));
2526
$db->commit();
2627
} catch (Exception $e) {
@@ -32,5 +33,5 @@ for ($i = 0; $i < 3; $i++) {
3233
?>
3334
--EXPECTF--
3435
bool(true)
35-
SQLSTATE[23505]: %stest_pkey%s
36-
SQLSTATE[23505]: %stest_pkey%s
36+
SQLSTATE[23505]: %sb49985_pkey%s
37+
SQLSTATE[23505]: %sb49985_pkey%s

‎ext/pdo_pgsql/tests/copy_from.phpt

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
1616
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
1717
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
1818

19-
$db->exec('CREATE TABLE test (a integer not null primary key, b text, c integer)');
19+
$db->query('DROP TABLE IF EXISTS test_copy_from CASCADE');
20+
$db->exec('CREATE TABLE test_copy_from (a integer not null primary key, b text, c integer)');
2021

2122
echo "Preparing test file and array for CopyFrom tests\n";
2223

@@ -40,27 +41,27 @@ file_put_contents($filenameWithDifferentNullValuesAndSelectedFields, implode("\n
4041

4142
echo "Testing pgsqlCopyFromArray() with default parameters\n";
4243
$db->beginTransaction();
43-
var_dump($db->pgsqlCopyFromArray('test',$tableRows));
44+
var_dump($db->pgsqlCopyFromArray('test_copy_from',$tableRows));
4445

45-
$stmt = $db->query("select * from test");
46+
$stmt = $db->query("select * from test_copy_from");
4647
foreach($stmt as $r) {
4748
var_dump($r);
4849
}
4950
$db->rollback();
5051

5152
echo "Testing pgsqlCopyFromArray() with different field separator and not null indicator\n";
5253
$db->beginTransaction();
53-
var_dump($db->pgsqlCopyFromArray('test',$tableRowsWithDifferentNullValues,";","NULL"));
54-
$stmt = $db->query("select * from test");
54+
var_dump($db->pgsqlCopyFromArray('test_copy_from',$tableRowsWithDifferentNullValues,";","NULL"));
55+
$stmt = $db->query("select * from test_copy_from");
5556
foreach($stmt as $r) {
5657
var_dump($r);
5758
}
5859
$db->rollback();
5960

6061
echo "Testing pgsqlCopyFromArray() with only selected fields\n";
6162
$db->beginTransaction();
62-
var_dump($db->pgsqlCopyFromArray('test',$tableRowsWithDifferentNullValuesAndSelectedFields,";","NULL",'a,c'));
63-
$stmt = $db->query("select * from test");
63+
var_dump($db->pgsqlCopyFromArray('test_copy_from',$tableRowsWithDifferentNullValuesAndSelectedFields,";","NULL",'a,c'));
64+
$stmt = $db->query("select * from test_copy_from");
6465
foreach($stmt as $r) {
6566
var_dump($r);
6667
}
@@ -77,27 +78,27 @@ $db->rollback();
7778

7879
echo "Testing pgsqlCopyFromFile() with default parameters\n";
7980
$db->beginTransaction();
80-
var_dump($db->pgsqlCopyFromFile('test',$filename));
81+
var_dump($db->pgsqlCopyFromFile('test_copy_from',$filename));
8182

82-
$stmt = $db->query("select * from test");
83+
$stmt = $db->query("select * from test_copy_from");
8384
foreach($stmt as $r) {
8485
var_dump($r);
8586
}
8687
$db->rollback();
8788

8889
echo "Testing pgsqlCopyFromFile() with different field separator and not null indicator\n";
8990
$db->beginTransaction();
90-
var_dump($db->pgsqlCopyFromFile('test',$filenameWithDifferentNullValues,";","NULL"));
91-
$stmt = $db->query("select * from test");
91+
var_dump($db->pgsqlCopyFromFile('test_copy_from',$filenameWithDifferentNullValues,";","NULL"));
92+
$stmt = $db->query("select * from test_copy_from");
9293
foreach($stmt as $r) {
9394
var_dump($r);
9495
}
9596
$db->rollback();
9697

9798
echo "Testing pgsqlCopyFromFile() with only selected fields\n";
9899
$db->beginTransaction();
99-
var_dump($db->pgsqlCopyFromFile('test',$filenameWithDifferentNullValuesAndSelectedFields,";","NULL",'a,c'));
100-
$stmt = $db->query("select * from test");
100+
var_dump($db->pgsqlCopyFromFile('test_copy_from',$filenameWithDifferentNullValuesAndSelectedFields,";","NULL",'a,c'));
101+
$stmt = $db->query("select * from test_copy_from");
101102
foreach($stmt as $r) {
102103
var_dump($r);
103104
}
@@ -115,7 +116,7 @@ $db->rollback();
115116
echo "Testing pgsqlCopyFromFile() with non existing file\n";
116117
$db->beginTransaction();
117118
try {
118-
var_dump($db->pgsqlCopyFromFile('test',"nonexisting/foo.csv",";","NULL",'a,c'));
119+
var_dump($db->pgsqlCopyFromFile('test_copy_from',"nonexisting/foo.csv",";","NULL",'a,c'));
119120
} catch (Exception $e) {
120121
echo "Exception: {$e->getMessage()}\n";
121122
}

‎ext/pdo_pgsql/tests/copy_to.phpt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
1616
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
1717
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
1818

19-
$db->exec('CREATE TABLE test (a integer not null primary key, b text, c integer)');
19+
$db->query('DROP TABLE IF EXISTS test_copy_to CASCADE');
20+
$db->exec('CREATE TABLE test_copy_to (a integer not null primary key, b text, c integer)');
2021

2122
$db->beginTransaction();
2223

2324
echo "Preparing test table for CopyTo tests\n";
24-
$stmt = $db->prepare("INSERT INTO test (a, b, c) values (?, ?, ?)");
25+
$stmt = $db->prepare("INSERT INTO test_copy_to (a, b, c) values (?, ?, ?)");
2526

2627
for($i=0;$i<3;$i++) {
2728
$firstParameter = $i;
@@ -36,11 +37,11 @@ for($i=0;$i<3;$i++) {
3637
$db->commit();
3738

3839
echo "Testing pgsqlCopyToArray() with default parameters\n";
39-
var_dump($db->pgsqlCopyToArray('test'));
40+
var_dump($db->pgsqlCopyToArray('test_copy_to'));
4041
echo "Testing pgsqlCopyToArray() with different field separator and not null indicator\n";
41-
var_dump($db->pgsqlCopyToArray('test',";","NULL"));
42+
var_dump($db->pgsqlCopyToArray('test_copy_to',";","NULL"));
4243
echo "Testing pgsqlCopyToArray() with only selected fields\n";
43-
var_dump($db->pgsqlCopyToArray('test',";","NULL",'a,c'));
44+
var_dump($db->pgsqlCopyToArray('test_copy_to',";","NULL",'a,c'));
4445

4546
echo "Testing pgsqlCopyToArray() with error\n";
4647
try {
@@ -52,13 +53,13 @@ try {
5253
echo "Testing pgsqlCopyToFile() with default parameters\n";
5354

5455
$filename="test_pgsqlCopyToFile.csv";
55-
var_dump($db->pgsqlCopyToFile('test',$filename));
56+
var_dump($db->pgsqlCopyToFile('test_copy_to',$filename));
5657
echo file_get_contents($filename);
5758
echo "Testing pgsqlCopyToFile() with different field separator and not null indicator\n";
58-
var_dump($db->pgsqlCopyToFile('test',$filename,";","NULL"));
59+
var_dump($db->pgsqlCopyToFile('test_copy_to',$filename,";","NULL"));
5960
echo file_get_contents($filename);
6061
echo "Testing pgsqlCopyToFile() with only selected fields\n";
61-
var_dump($db->pgsqlCopyToFile('test',$filename,";","NULL",'a,c'));
62+
var_dump($db->pgsqlCopyToFile('test_copy_to',$filename,";","NULL",'a,c'));
6263
echo file_get_contents($filename);
6364

6465
echo "Testing pgsqlCopyToFile() with error\n";
@@ -70,7 +71,7 @@ try {
7071

7172
echo "Testing pgsqlCopyToFile() to unwritable file\n";
7273
try {
73-
var_dump($db->pgsqlCopyToFile('test', 'nonexistent/foo.csv'));
74+
var_dump($db->pgsqlCopyToFile('test_copy_to', 'nonexistent/foo.csv'));
7475
} catch (Exception $e) {
7576
echo "Exception: {$e->getMessage()}\n";
7677
}

‎ext/pdo_pgsql/tests/is_in_transaction.phpt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
1616
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
1717
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
1818

19-
$db->exec('CREATE TABLE test (a integer not null primary key, b text)');
19+
$db->query('DROP TABLE IF EXISTS test_is_in_transaction CASCADE');
20+
$db->exec('CREATE TABLE test_is_in_transaction (a integer not null primary key, b text)');
2021

2122
$db->beginTransaction();
2223
try {
2324
echo "Test PDO::PGSQL_TRANSACTION_INTRANS\n";
2425
var_dump($db->inTransaction());
2526

26-
$stmt = $db->prepare("INSERT INTO test (a, b) values (?, ?)");
27+
$stmt = $db->prepare("INSERT INTO test_is_in_transaction (a, b) values (?, ?)");
2728
$stmt->bindValue(1, 1);
2829
$stmt->bindValue(2, "test insert");
2930
$stmt->execute();
@@ -36,7 +37,7 @@ var_dump($db->inTransaction());
3637
$db->beginTransaction();
3738

3839
try {
39-
$stmt = $db->prepare("INSERT INTO test (a, b) values (?, ?)");
40+
$stmt = $db->prepare("INSERT INTO test_is_in_transaction (a, b) values (?, ?)");
4041
$stmt->bindValue(1, "error");
4142
$stmt->bindValue(2, "test insert");
4243
$stmt->execute();

‎ext/pdo_pgsql/tests/large_objects.phpt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
1616
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
1717
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
1818

19-
$db->exec('CREATE TABLE test (blobid integer not null primary key, bloboid OID)');
19+
$db->query('DROP TABLE IF EXISTS test_large_objects CASCADE');
20+
$db->exec('CREATE TABLE test_large_objects (blobid integer not null primary key, bloboid OID)');
2021

2122
$db->beginTransaction();
2223
$oid = $db->pgsqlLOBCreate();
2324
try {
2425
$stm = $db->pgsqlLOBOpen($oid, 'w+b');
2526
fwrite($stm, "Hello dude\n");
2627

27-
$stmt = $db->prepare("INSERT INTO test (blobid, bloboid) values (?, ?)");
28+
$stmt = $db->prepare("INSERT INTO test_large_objects (blobid, bloboid) values (?, ?)");
2829
$stmt->bindValue(1, 1);
2930
/* bind as LOB; the oid from the pgsql stream will be inserted instead
3031
* of the stream contents. Binding other streams will attempt to bind
@@ -35,7 +36,7 @@ $stmt->execute();
3536
$stm = null;
3637

3738
/* Pull it out */
38-
$stmt = $db->prepare("SELECT * from test");
39+
$stmt = $db->prepare("SELECT * from test_large_objects");
3940
$stmt->bindColumn('bloboid', $lob, PDO::PARAM_LOB);
4041
$stmt->execute();
4142
echo "Fetching:\n";
@@ -46,7 +47,7 @@ while (($row = $stmt->fetch(PDO::FETCH_ASSOC))) {
4647
echo "Fetched!\n";
4748

4849
/* Try again, with late bind */
49-
$stmt = $db->prepare("SELECT * from test");
50+
$stmt = $db->prepare("SELECT * from test_large_objects");
5051
$stmt->execute();
5152
$stmt->bindColumn('bloboid', $lob, PDO::PARAM_LOB);
5253
echo "Fetching late bind:\n";
@@ -57,7 +58,7 @@ while (($row = $stmt->fetch(PDO::FETCH_ASSOC))) {
5758
echo "Fetched!\n";
5859

5960
/* Try again, with NO bind */
60-
$stmt = $db->prepare("SELECT * from test");
61+
$stmt = $db->prepare("SELECT * from test_large_objects");
6162
$stmt->execute();
6263
$stmt->bindColumn('bloboid', $lob, PDO::PARAM_LOB);
6364
echo "Fetching NO bind:\n";

0 commit comments

Comments
 (0)