Skip to content

Parallelize pdo tests (dblib, firebird, oci, odbc, pgsql) #12395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Oct 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions ext/pdo/tests/bug_34630.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ $driver = $db->getAttribute(PDO::ATTR_DRIVER_NAME);
$is_oci = $driver == 'oci';

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

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

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

?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test34630");
?>
--EXPECT--
array(1) {
Expand Down
12 changes: 9 additions & 3 deletions ext/pdo/tests/bug_35671.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();

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

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

$parm = array(
":value1" => 15,
Expand All @@ -29,8 +29,14 @@ $parm = array(
$insert->execute($parm);
$insert = null;

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

?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test35671");
?>
--EXPECT--
array(1) {
Expand Down
12 changes: 9 additions & 3 deletions ext/pdo/tests/bug_36428.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,17 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';

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

?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test36428");
?>
--EXPECTF--
array(1) {
Expand Down
12 changes: 9 additions & 3 deletions ext/pdo/tests/bug_36798.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,21 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();

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

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

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

?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test36798");
?>
--EXPECT--
array(1) {
Expand Down
14 changes: 10 additions & 4 deletions ext/pdo/tests/bug_38253.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,25 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$pdo = PDOTest::factory();

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

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

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

?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test38253");
?>
--EXPECTF--
Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: No fetch class specified in %s on line %d
Expand Down
12 changes: 9 additions & 3 deletions ext/pdo/tests/bug_38394.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,22 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';

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

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

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

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

var_dump($db->query("SELECT * FROM test")->fetchAll(PDO::FETCH_ASSOC));
var_dump($db->query("SELECT * FROM test38394")->fetchAll(PDO::FETCH_ASSOC));
?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test38394");
?>
--EXPECT--
array(2) {
Expand Down
12 changes: 9 additions & 3 deletions ext/pdo/tests/bug_39398.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,20 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';

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

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

var_dump($db->query("SELECT * FROM test")->fetchAll(PDO::FETCH_ASSOC));
var_dump($db->query("SELECT * FROM test39398")->fetchAll(PDO::FETCH_ASSOC));
?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test39398");
?>
--EXPECT--
array(1) {
Expand Down
14 changes: 9 additions & 5 deletions ext/pdo/tests/bug_39656.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();

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

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

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

@$db->exec("DROP TABLE test");
echo "Done\n";
?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test39656");
?>
--EXPECT--
array(4) {
["id"]=>
Expand Down
10 changes: 8 additions & 2 deletions ext/pdo/tests/bug_40285.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,19 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();

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

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

echo "Done\n";
?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test40285");
?>
--EXPECT--
Done
12 changes: 9 additions & 3 deletions ext/pdo/tests/bug_42917.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,22 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();

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

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

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

?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test42917");
?>
--EXPECT--
array(5) {
Expand Down
12 changes: 9 additions & 3 deletions ext/pdo/tests/bug_43130.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,24 @@ $db = PDOTest::factory();
if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql')
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, 1);

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

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

$stmt = $db->prepare("SELECT a FROM test WHERE b=:id-value");
$stmt = $db->prepare("SELECT a FROM test43130 WHERE b=:id-value");
$stmt->bindParam(':id-value', $id);
$id = '1';
$stmt->execute();
var_dump($stmt->fetch(PDO::FETCH_COLUMN));
?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test43130");
?>
--EXPECTF--
Warning: PDOStatement::execute(): SQLSTATE[HY093]: Invalid parameter number: parameter was not defined in %s on line %d
bool(false)
22 changes: 14 additions & 8 deletions ext/pdo/tests/bug_44173.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();

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


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

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

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

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

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

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


?>
--CLEAN--
<?php
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
PDOTest::dropTableIfExists($db, "test44173");
?>
--EXPECT--
PDO::query() expects exactly 2 arguments for the fetch mode provided, 4 given
Expand Down
Loading