Skip to content

Commit e69e7fa

Browse files
kocsismatekocsismate
committed
Parallelize pdo tests (dblib, firebird, oci, odbc, pgsql)
It becomes possibly by using different symbols in all tests.
1 parent 3093f17 commit e69e7fa

File tree

117 files changed

+1135
-744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+1135
-744
lines changed

‎ext/pdo/tests/bug_34630.phpt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ $driver = $db->getAttribute(PDO::ATTR_DRIVER_NAME);
1919
$is_oci = $driver == 'oci';
2020

2121
if ($is_oci) {
22-
$db->exec('CREATE TABLE test (id int NOT NULL PRIMARY KEY, val BLOB)');
22+
$db->exec('CREATE TABLE test34630 (id int NOT NULL PRIMARY KEY, val BLOB)');
2323
} else {
24-
$db->exec('CREATE TABLE test (id int NOT NULL PRIMARY KEY, val VARCHAR(256))');
24+
$db->exec('CREATE TABLE test34630 (id int NOT NULL PRIMARY KEY, val VARCHAR(256))');
2525
}
2626
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
2727

@@ -34,17 +34,23 @@ if ($is_oci) {
3434
* the empty blob will be committed implicitly when the statement is
3535
* executed */
3636
$db->beginTransaction();
37-
$insert = $db->prepare("insert into test (id, val) values (1, EMPTY_BLOB()) RETURNING val INTO :blob");
37+
$insert = $db->prepare("insert into test34630 (id, val) values (1, EMPTY_BLOB()) RETURNING val INTO :blob");
3838
} else {
39-
$insert = $db->prepare("insert into test (id, val) values (1, :blob)");
39+
$insert = $db->prepare("insert into test34630 (id, val) values (1, :blob)");
4040
}
4141
$insert->bindValue(':blob', $fp, PDO::PARAM_LOB);
4242
$insert->execute();
4343
$insert = null;
4444

4545
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
46-
var_dump($db->query("SELECT * from test")->fetchAll(PDO::FETCH_ASSOC));
46+
var_dump($db->query("SELECT * from test34630")->fetchAll(PDO::FETCH_ASSOC));
4747

48+
?>
49+
--CLEAN--
50+
<?php
51+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
52+
$db = PDOTest::factory();
53+
$db->exec("DROP TABLE test34630");
4854
?>
4955
--EXPECT--
5056
array(1) {

‎ext/pdo/tests/bug_35671.phpt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
1515
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

18-
$db->exec('CREATE TABLE test (field1 VARCHAR(32), field2 VARCHAR(32), field3 VARCHAR(32))');
18+
$db->exec('CREATE TABLE test35671 (field1 VARCHAR(32), field2 VARCHAR(32), field3 VARCHAR(32))');
1919
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
2020

21-
$insert = $db->prepare("insert into test (field1, field2, field3) values (:value1, :value2, :value3)");
21+
$insert = $db->prepare("insert into test35671 (field1, field2, field3) values (:value1, :value2, :value3)");
2222

2323
$parm = array(
2424
":value1" => 15,
@@ -29,8 +29,14 @@ $parm = array(
2929
$insert->execute($parm);
3030
$insert = null;
3131

32-
var_dump($db->query("SELECT * from test")->fetchAll(PDO::FETCH_ASSOC));
32+
var_dump($db->query("SELECT * from test35671")->fetchAll(PDO::FETCH_ASSOC));
3333

34+
?>
35+
--CLEAN--
36+
<?php
37+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
38+
$db = PDOTest::factory();
39+
$db->exec("DROP TABLE test35671");
3440
?>
3541
--EXPECT--
3642
array(1) {

‎ext/pdo/tests/bug_36428.phpt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,17 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
1616
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1717

1818
$db = PDOTest::factory();
19-
$db->exec("CREATE TABLE test (a VARCHAR(10))");
20-
$db->exec("INSERT INTO test (a) VALUES ('xyz')");
21-
$res = $db->query("SELECT a FROM test");
19+
$db->exec("CREATE TABLE test36428 (a VARCHAR(10))");
20+
$db->exec("INSERT INTO test36428 (a) VALUES ('xyz')");
21+
$res = $db->query("SELECT a FROM test36428");
2222
var_dump($res->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_PROPS_LATE, 'SimpleXMLElement', array('<root/>')));
2323

24+
?>
25+
--CLEAN--
26+
<?php
27+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
28+
$db = PDOTest::factory();
29+
$db->exec("DROP TABLE test36428");
2430
?>
2531
--EXPECTF--
2632
array(1) {

‎ext/pdo/tests/bug_36798.phpt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,24 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
2626
$db = PDOTest::factory();
2727

2828
@$db->exec("SET NAMES 'LATIN1'"); // needed for PostgreSQL
29-
$db->exec("CREATE TABLE test (id INTEGER)");
30-
$db->exec("INSERT INTO test (id) VALUES (1)");
29+
$db->exec("CREATE TABLE test36798 (id INTEGER)");
30+
$db->exec("INSERT INTO test36798 (id) VALUES (1)");
3131

32-
$stmt = $db->prepare("SELECT 'Ã' as test FROM test WHERE id = :id");
32+
$stmt = $db->prepare("SELECT '�' as test FROM test36798 WHERE id = :id");
3333
$stmt->execute(array(":id" => 1));
3434

3535
$row = $stmt->fetch(PDO::FETCH_NUM);
3636
var_dump( $row );
3737

38+
?>
39+
--CLEAN--
40+
<?php
41+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
42+
$db = PDOTest::factory();
43+
$db->exec("DROP TABLE test36798");
3844
?>
3945
--EXPECT--
4046
array(1) {
4147
[0]=>
42-
string(1) "Ã"
48+
string(1) "�"
4349
}

‎ext/pdo/tests/bug_38253.phpt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,25 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
1515
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$pdo = PDOTest::factory();
1717

18-
$pdo->exec ("create table test (id integer primary key, n varchar(255))");
19-
$pdo->exec ("INSERT INTO test (id, n) VALUES (1, 'hi')");
18+
$pdo->exec ("create table test38253 (id integer primary key, n varchar(255))");
19+
$pdo->exec ("INSERT INTO test38253 (id, n) VALUES (1, 'hi')");
2020

2121
$pdo->setAttribute (PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_CLASS);
22-
$stmt = $pdo->prepare ("SELECT * FROM test");
22+
$stmt = $pdo->prepare ("SELECT * FROM test38253");
2323
$stmt->execute();
2424
var_dump($stmt->fetchAll());
2525

2626
$pdo->setAttribute (PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_FUNC);
27-
$stmt = $pdo->prepare ("SELECT * FROM test");
27+
$stmt = $pdo->prepare ("SELECT * FROM test38253");
2828
$stmt->execute();
2929
var_dump($stmt->fetchAll());
3030

31+
?>
32+
--CLEAN--
33+
<?php
34+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
35+
$db = PDOTest::factory();
36+
$db->exec("DROP TABLE test38253");
3137
?>
3238
--EXPECTF--
3339
Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: No fetch class specified in %s on line %d

‎ext/pdo/tests/bug_38394.phpt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,22 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
1616
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1717

1818
$db = PDOTest::factory();
19-
$db->exec("CREATE TABLE test (a INT, b INT, c INT)");
20-
$s = $db->prepare("INSERT INTO test (a,b,c) VALUES (:a,:b,:c)");
19+
$db->exec("CREATE TABLE test38394 (a INT, b INT, c INT)");
20+
$s = $db->prepare("INSERT INTO test38394 (a,b,c) VALUES (:a,:b,:c)");
2121

2222
$s->execute(array('a' => 1, 'b' => 2, 'c' => 3));
2323

2424
@$s->execute(array('a' => 5, 'b' => 6, 'c' => 7, 'd' => 8));
2525

2626
$s->execute(array('a' => 9, 'b' => 10, 'c' => 11));
2727

28-
var_dump($db->query("SELECT * FROM test")->fetchAll(PDO::FETCH_ASSOC));
28+
var_dump($db->query("SELECT * FROM test38394")->fetchAll(PDO::FETCH_ASSOC));
29+
?>
30+
--CLEAN--
31+
<?php
32+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
33+
$db = PDOTest::factory();
34+
$db->exec("DROP TABLE test38394");
2935
?>
3036
--EXPECT--
3137
array(2) {

‎ext/pdo/tests/bug_39398.phpt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,20 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
1515
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616

1717
$db = PDOTest::factory();
18-
$db->exec("CREATE TABLE test (test INT)");
18+
$db->exec("CREATE TABLE test39398 (test INT)");
1919

2020
$boolean = 1;
21-
$stmt = $db->prepare('INSERT INTO test VALUES (:boolean)');
21+
$stmt = $db->prepare('INSERT INTO test39398 VALUES (:boolean)');
2222
$stmt->bindValue(':boolean', isset($boolean), PDO::PARAM_INT);
2323
$stmt->execute();
2424

25-
var_dump($db->query("SELECT * FROM test")->fetchAll(PDO::FETCH_ASSOC));
25+
var_dump($db->query("SELECT * FROM test39398")->fetchAll(PDO::FETCH_ASSOC));
26+
?>
27+
--CLEAN--
28+
<?php
29+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
30+
$db = PDOTest::factory();
31+
$db->exec("DROP TABLE test39398");
2632
?>
2733
--EXPECT--
2834
array(1) {

‎ext/pdo/tests/bug_39656.phpt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
1616
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1717
$db = PDOTest::factory();
1818

19-
@$db->exec("DROP TABLE test");
2019
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
2120

22-
$db->exec("CREATE TABLE test (id INTEGER NOT NULL PRIMARY KEY, usr VARCHAR( 256 ) NOT NULL)");
23-
$db->exec("INSERT INTO test (id, usr) VALUES (1, 'user')");
21+
$db->exec("CREATE TABLE test39656 (id INTEGER NOT NULL PRIMARY KEY, usr VARCHAR( 256 ) NOT NULL)");
22+
$db->exec("INSERT INTO test39656 (id, usr) VALUES (1, 'user')");
2423

25-
$stmt = $db->prepare("SELECT * FROM test WHERE id = ?");
24+
$stmt = $db->prepare("SELECT * FROM test39656 WHERE id = ?");
2625
$stmt->bindValue(1, 1, PDO::PARAM_INT );
2726
$stmt->execute();
2827
$row = $stmt->fetch();
@@ -33,9 +32,14 @@ $stmt->closeCursor();
3332
$row = $stmt->fetch(); // this line will crash CLI
3433
var_dump( $row );
3534

36-
@$db->exec("DROP TABLE test");
3735
echo "Done\n";
3836
?>
37+
--CLEAN--
38+
<?php
39+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
40+
$db = PDOTest::factory();
41+
$db->exec("DROP TABLE test39656");
42+
?>
3943
--EXPECT--
4044
array(4) {
4145
["id"]=>

‎ext/pdo/tests/bug_40285.phpt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,19 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
1616
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1717
$db = PDOTest::factory();
1818

19-
$db->exec('CREATE TABLE test (field1 VARCHAR(32), field2 VARCHAR(32), field3 VARCHAR(32), field4 INT)');
19+
$db->exec('CREATE TABLE test40285 (field1 VARCHAR(32), field2 VARCHAR(32), field3 VARCHAR(32), field4 INT)');
2020

2121
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
22-
$s = $db->prepare("INSERT INTO test VALUES( ':id', 'name', 'section', 22)" );
22+
$s = $db->prepare("INSERT INTO test40285 VALUES( ':id', 'name', 'section', 22)" );
2323
$s->execute();
2424

2525
echo "Done\n";
2626
?>
27+
--CLEAN--
28+
<?php
29+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
30+
$db = PDOTest::factory();
31+
$db->exec("DROP TABLE test40285");
32+
?>
2733
--EXPECT--
2834
Done

‎ext/pdo/tests/bug_42917.phpt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,22 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
1515
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

18-
$db->exec("CREATE TABLE test (a varchar(100), b varchar(100), c varchar(100))");
18+
$db->exec("CREATE TABLE test42917 (a varchar(100), b varchar(100), c varchar(100))");
1919

2020
for ($i = 0; $i < 5; $i++) {
21-
$db->exec("INSERT INTO test (a,b,c) VALUES('test".$i."','".$i."','".$i."')");
21+
$db->exec("INSERT INTO test42917 (a,b,c) VALUES('test".$i."','".$i."','".$i."')");
2222
}
2323

24-
$res = $db->query("SELECT a,b FROM test");
24+
$res = $db->query("SELECT a,b FROM test42917");
2525
$res->setFetchMode(PDO::FETCH_KEY_PAIR);
2626
var_dump($res->fetchAll());
2727

28+
?>
29+
--CLEAN--
30+
<?php
31+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
32+
$db = PDOTest::factory();
33+
$db->exec("DROP TABLE test42917");
2834
?>
2935
--EXPECT--
3036
array(5) {

‎ext/pdo/tests/bug_43130.phpt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,24 @@ $db = PDOTest::factory();
2323
if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql')
2424
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, 1);
2525

26-
$db->exec("CREATE TABLE test (a varchar(100), b varchar(100), c varchar(100))");
26+
$db->exec("CREATE TABLE test43130 (a varchar(100), b varchar(100), c varchar(100))");
2727

2828
for ($i = 0; $i < 5; $i++) {
29-
$db->exec("INSERT INTO test (a,b,c) VALUES('test".$i."','".$i."','".$i."')");
29+
$db->exec("INSERT INTO test43130 (a,b,c) VALUES('test".$i."','".$i."','".$i."')");
3030
}
3131

32-
$stmt = $db->prepare("SELECT a FROM test WHERE b=:id-value");
32+
$stmt = $db->prepare("SELECT a FROM test43130 WHERE b=:id-value");
3333
$stmt->bindParam(':id-value', $id);
3434
$id = '1';
3535
$stmt->execute();
3636
var_dump($stmt->fetch(PDO::FETCH_COLUMN));
3737
?>
38+
--CLEAN--
39+
<?php
40+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
41+
$db = PDOTest::factory();
42+
$db->exec("DROP TABLE test43130");
43+
?>
3844
--EXPECTF--
3945
Warning: PDOStatement::execute(): SQLSTATE[HY093]: Invalid parameter number: parameter was not defined in %s on line %d
4046
bool(false)

‎ext/pdo/tests/bug_44173.phpt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
1515
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

18-
$db->exec("CREATE TABLE test (x int)");
19-
$db->exec("INSERT INTO test VALUES (1)");
18+
$db->exec("CREATE TABLE test44173 (x int)");
19+
$db->exec("INSERT INTO test44173 VALUES (1)");
2020

2121

2222
// Bug entry [2] -- 1 is PDO::FETCH_LAZY
2323
try {
24-
$stmt = $db->query("SELECT * FROM test", PDO::FETCH_LAZY, 0, []);
24+
$stmt = $db->query("SELECT * FROM test44173", PDO::FETCH_LAZY, 0, []);
2525
var_dump($stmt);
2626
} catch (\TypeError $e) {
2727
echo $e->getMessage(), \PHP_EOL;
@@ -30,14 +30,14 @@ try {
3030

3131
// Bug entry [3]
3232
try {
33-
$stmt = $db->query("SELECT * FROM test", 'abc');
33+
$stmt = $db->query("SELECT * FROM test44173", 'abc');
3434
} catch (TypeError $e) {
3535
echo $e->getMessage(), "\n";
3636
}
3737

3838
// Bug entry [4]
3939
try {
40-
$stmt = $db->query("SELECT * FROM test", PDO::FETCH_CLASS, 0, 0, 0);
40+
$stmt = $db->query("SELECT * FROM test44173", PDO::FETCH_CLASS, 0, 0, 0);
4141
var_dump($stmt);
4242
} catch (\ArgumentCountError $e) {
4343
echo $e->getMessage(), \PHP_EOL;
@@ -46,7 +46,7 @@ try {
4646

4747
// Bug entry [5]
4848
try {
49-
$stmt = $db->query("SELECT * FROM test", PDO::FETCH_INTO);
49+
$stmt = $db->query("SELECT * FROM test44173", PDO::FETCH_INTO);
5050
var_dump($stmt);
5151
} catch (\ArgumentCountError $e) {
5252
echo $e->getMessage(), \PHP_EOL;
@@ -55,7 +55,7 @@ try {
5555

5656
// Bug entry [6]
5757
try {
58-
$stmt = $db->query("SELECT * FROM test", PDO::FETCH_COLUMN);
58+
$stmt = $db->query("SELECT * FROM test44173", PDO::FETCH_COLUMN);
5959
var_dump($stmt);
6060
} catch (\ArgumentCountError $e) {
6161
echo $e->getMessage(), \PHP_EOL;
@@ -64,13 +64,19 @@ try {
6464

6565
// Bug entry [7]
6666
try {
67-
$stmt = $db->query("SELECT * FROM test", PDO::FETCH_CLASS);
67+
$stmt = $db->query("SELECT * FROM test44173", PDO::FETCH_CLASS);
6868
var_dump($stmt);
6969
} catch (\ArgumentCountError $e) {
7070
echo $e->getMessage(), \PHP_EOL;
7171
}
7272

7373

74+
?>
75+
--CLEAN--
76+
<?php
77+
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
78+
$db = PDOTest::factory();
79+
$db->exec("DROP TABLE test44173");
7480
?>
7581
--EXPECT--
7682
PDO::query() expects exactly 2 arguments for the fetch mode provided, 4 given

0 commit comments

Comments
 (0)