Address review comments

Author: kocsismate

ext/pdo/tests/bug_34630.phpt

@@ -50,7 +50,7 @@ var_dump($db->query("SELECT * from test34630")->fetchAll(PDO::FETCH_ASSOC));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test34630");
+PDOTest::dropTableIfExists($db, "test34630");
 ?>
 --EXPECT--
 array(1) {

ext/pdo/tests/bug_35671.phpt

@@ -36,7 +36,7 @@ var_dump($db->query("SELECT * from test35671")->fetchAll(PDO::FETCH_ASSOC));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test35671");
+PDOTest::dropTableIfExists($db, "test35671");
 ?>
 --EXPECT--
 array(1) {

ext/pdo/tests/bug_36428.phpt

@@ -26,7 +26,7 @@ var_dump($res->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_PROPS_LATE, 'SimpleXMLElemen
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test36428");
+PDOTest::dropTableIfExists($db, "test36428");
 ?>
 --EXPECTF--
 array(1) {

ext/pdo/tests/bug_36798.phpt

@@ -29,7 +29,7 @@ $db = PDOTest::factory();
 $db->exec("CREATE TABLE test36798 (id INTEGER)");
 $db->exec("INSERT INTO test36798 (id) VALUES (1)");
 
-$stmt = $db->prepare("SELECT '�' as test FROM test36798 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);
@@ -40,7 +40,7 @@ var_dump( $row );
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test36798");
+PDOTest::dropTableIfExists($db, "test36798");
 ?>
 --EXPECT--
 array(1) {

ext/pdo/tests/bug_38253.phpt

@@ -33,7 +33,7 @@ var_dump($stmt->fetchAll());
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test38253");
+PDOTest::dropTableIfExists($db, "test38253");
 ?>
 --EXPECTF--
 Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: No fetch class specified in %s on line %d

ext/pdo/tests/bug_38394.phpt

@@ -31,7 +31,7 @@ var_dump($db->query("SELECT * FROM test38394")->fetchAll(PDO::FETCH_ASSOC));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test38394");
+PDOTest::dropTableIfExists($db, "test38394");
 ?>
 --EXPECT--
 array(2) {

ext/pdo/tests/bug_39398.phpt

@@ -28,7 +28,7 @@ var_dump($db->query("SELECT * FROM test39398")->fetchAll(PDO::FETCH_ASSOC));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test39398");
+PDOTest::dropTableIfExists($db, "test39398");
 ?>
 --EXPECT--
 array(1) {

ext/pdo/tests/bug_39656.phpt

@@ -38,7 +38,7 @@ echo "Done\n";
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test39656");
+PDOTest::dropTableIfExists($db, "test39656");
 ?>
 --EXPECT--
 array(4) {

ext/pdo/tests/bug_40285.phpt

@@ -28,7 +28,7 @@ echo "Done\n";
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test40285");
+PDOTest::dropTableIfExists($db, "test40285");
 ?>
 --EXPECT--
 Done

ext/pdo/tests/bug_42917.phpt

@@ -30,7 +30,7 @@ var_dump($res->fetchAll());
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test42917");
+PDOTest::dropTableIfExists($db, "test42917");
 ?>
 --EXPECT--
 array(5) {

ext/pdo/tests/bug_43130.phpt

@@ -39,7 +39,7 @@ var_dump($stmt->fetch(PDO::FETCH_COLUMN));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test43130");
+PDOTest::dropTableIfExists($db, "test43130");
 ?>
 --EXPECTF--
 Warning: PDOStatement::execute(): SQLSTATE[HY093]: Invalid parameter number: parameter was not defined in %s on line %d

ext/pdo/tests/bug_44173.phpt

@@ -76,7 +76,7 @@ try {
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test44173");
+PDOTest::dropTableIfExists($db, "test44173");
 ?>
 --EXPECT--
 PDO::query() expects exactly 2 arguments for the fetch mode provided, 4 given

ext/pdo/tests/bug_44409.phpt

@@ -45,7 +45,7 @@ print_r($stmt->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_SERIALIZE, "bug44409"));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test44409");
+PDOTest::dropTableIfExists($db, "test44409");
 ?>
 --EXPECTF--
 Deprecated: %s implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d

ext/pdo/tests/bug_50458.phpt

@@ -25,7 +25,7 @@ var_dump($res->fetchAll(PDO::FETCH_FUNC, function($a) { return strtoupper($a); }
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test50458");
+PDOTest::dropTableIfExists($db, "test50458");
 ?>
 --EXPECT--
 array(1) {

ext/pdo/tests/bug_52098.phpt

@@ -53,7 +53,7 @@ echo $obj->lucky();
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test52098");
+PDOTest::dropTableIfExists($db, "test52098");
 ?>
 --EXPECT--
 Calling object method 'foo'

ext/pdo/tests/bug_64172.phpt

@@ -47,7 +47,7 @@ var_dump($db->errorInfo());
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test64172");
+PDOTest::dropTableIfExists($db, "test64172");
 ?>
 --EXPECTF--
 ===FAIL===

ext/pdo/tests/bug_65946.phpt

@@ -45,7 +45,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test65946");
+PDOTest::dropTableIfExists($db, "test65946");
 ?>
 --EXPECT--
 array(1) {

ext/pdo/tests/bug_71447.phpt

@@ -99,7 +99,7 @@ var_dump($stmt->fetchColumn());
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test71447");
+PDOTest::dropTableIfExists($db, "test71447");
 ?>
 --EXPECT--
 string(10) ""abc":8000"

ext/pdo/tests/bug_71885.phpt

@@ -52,7 +52,7 @@ try {
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test71885");
+PDOTest::dropTableIfExists($db, "test71885");
 ?>
 --EXPECT--
 bool(true)

ext/pdo/tests/bug_73234.phpt

@@ -48,7 +48,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test73234");
+PDOTest::dropTableIfExists($db, "test73234");
 ?>
 --EXPECT--
 array(2) {

ext/pdo/tests/gh8626.phpt

@@ -21,7 +21,6 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 
-$db->exec('DROP TABLE test8626');
 $db->exec('CREATE TABLE test8626 (x int NOT NULL)');
 
 $stmt = $db->prepare('INSERT INTO test8626 VALUES(?)');
@@ -43,7 +42,7 @@ var_dump(array_slice($errorInfo, 0, 3)); // odbc, dblib
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test8626");
+PDOTest::dropTableIfExists($db, "test8626");
 ?>
 --EXPECTF--
 bool(false)

ext/pdo/tests/pdo_001.phpt

@@ -16,9 +16,7 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test001(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test001 VALUES(1, 'A')");
-$db->exec("INSERT INTO test001 VALUES(2, 'B')");
-$db->exec("INSERT INTO test001 VALUES(3, 'C')");
+$db->exec("INSERT INTO test001 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
 
 $stmt = $db->prepare('SELECT * from test001');
 $stmt->execute();
@@ -29,7 +27,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test001");
+PDOTest::dropTableIfExists($db, "test001");
 ?>
 --EXPECT--
 array(3) {

ext/pdo/tests/pdo_002.phpt

@@ -16,9 +16,7 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test002(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test002 VALUES(1, 'A')");
-$db->exec("INSERT INTO test002 VALUES(2, 'B')");
-$db->exec("INSERT INTO test002 VALUES(3, 'C')");
+$db->exec("INSERT INTO test002 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
 
 $stmt = $db->prepare('SELECT * from test002');
 $stmt->execute();
@@ -29,7 +27,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_NUM));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test002");
+PDOTest::dropTableIfExists($db, "test002");
 ?>
 --EXPECT--
 array(3) {

ext/pdo/tests/pdo_003.phpt

@@ -16,9 +16,7 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test003(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test003 VALUES(1, 'A')");
-$db->exec("INSERT INTO test003 VALUES(2, 'B')");
-$db->exec("INSERT INTO test003 VALUES(3, 'C')");
+$db->exec("INSERT INTO test003 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
 
 $stmt = $db->prepare('SELECT * from test003');
 $stmt->execute();
@@ -29,7 +27,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_BOTH));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test003");
+PDOTest::dropTableIfExists($db, "test003");
 ?>
 --EXPECT--
 array(3) {

ext/pdo/tests/pdo_004.phpt

@@ -16,9 +16,7 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test004(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test004 VALUES(1, 'A')");
-$db->exec("INSERT INTO test004 VALUES(2, 'B')");
-$db->exec("INSERT INTO test004 VALUES(3, 'C')");
+$db->exec("INSERT INTO test004 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
 
 $stmt = $db->prepare('SELECT * from test004');
 $stmt->execute();
@@ -29,7 +27,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_OBJ));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test004");
+PDOTest::dropTableIfExists($db, "test004");
 ?>
 --EXPECTF--
 array(3) {

ext/pdo/tests/pdo_005.phpt

@@ -16,9 +16,7 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test005(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))');
-$db->exec("INSERT INTO test005 VALUES(1, 'A', 'AA')");
-$db->exec("INSERT INTO test005 VALUES(2, 'B', 'BB')");
-$db->exec("INSERT INTO test005 VALUES(3, 'C', 'CC')");
+$db->exec("INSERT INTO test005 VALUES(1, 'A', 'AA'), (2, 'B', 'BB'), (3, 'C', 'CC')");
 
 $stmt = $db->prepare('SELECT id, val, val2 from test');
 
@@ -55,7 +53,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_CLASS, 'TestDerived', array(0)));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test005");
+PDOTest::dropTableIfExists($db, "test005");
 ?>
 --EXPECTF--
 array(3) {

ext/pdo/tests/pdo_006.phpt

@@ -16,9 +16,7 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test006(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test006 VALUES(1, 'A')");
-$db->exec("INSERT INTO test006 VALUES(2, 'A')");
-$db->exec("INSERT INTO test006 VALUES(3, 'C')");
+$db->exec("INSERT INTO test006 VALUES(1, 'A'), (2, 'A'), (3, 'C')");
 
 $stmt = $db->prepare('SELECT val, id from test006');
 
@@ -33,7 +31,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_ASSOC|PDO::FETCH_GROUP));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test006");
+PDOTest::dropTableIfExists($db, "test006");
 ?>
 --EXPECT--
 array(2) {

ext/pdo/tests/pdo_007.phpt

@@ -16,9 +16,7 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test007(id CHAR(1) NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test007 VALUES('A', 'A')");
-$db->exec("INSERT INTO test007 VALUES('B', 'A')");
-$db->exec("INSERT INTO test007 VALUES('C', 'C')");
+$db->exec("INSERT INTO test007 VALUES('A', 'A', ('B', 'A'), ('C', 'C')");
 
 $stmt = $db->prepare('SELECT id, val from test007');
 
@@ -33,7 +31,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_ASSOC|PDO::FETCH_UNIQUE));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test007");
+PDOTest::dropTableIfExists($db, "test007");
 ?>
 --EXPECT--
 array(3) {

ext/pdo/tests/pdo_008.phpt

@@ -16,9 +16,7 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test008(id CHAR(1) NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test008 VALUES('A', 'A')");
-$db->exec("INSERT INTO test008 VALUES('B', 'A')");
-$db->exec("INSERT INTO test008 VALUES('C', 'C')");
+$db->exec("INSERT INTO test008 VALUES('A', 'A'), ('B', 'A'), ('C', 'C')");
 
 $stmt = $db->prepare('SELECT val, id from test008');
 
@@ -30,7 +28,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_NUM|PDO::FETCH_UNIQUE));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test008");
+PDOTest::dropTableIfExists($db, "test008");
 ?>
 --EXPECT--
 array(2) {

ext/pdo/tests/pdo_009.phpt

@@ -16,14 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE classtypes009(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)');
-$db->exec('INSERT INTO classtypes009 VALUES(0, \'stdClass\')');
-$db->exec('INSERT INTO classtypes009 VALUES(1, \'Test1\')');
-$db->exec('INSERT INTO classtypes009 VALUES(2, \'Test2\')');
+$db->exec("INSERT INTO classtypes009 VALUES(0, 'stdClass'), (1, 'Test1'), (2, 'Test2')");
 $db->exec('CREATE TABLE test009(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10))');
-$db->exec('INSERT INTO test009 VALUES(1, 0, \'A\')');
-$db->exec('INSERT INTO test009 VALUES(2, 1, \'B\')');
-$db->exec('INSERT INTO test009 VALUES(3, 2, \'C\')');
-$db->exec('INSERT INTO test009 VALUES(4, 3, \'D\')');
+$db->exec('INSERT INTO test009 VALUES(1, 0, 'A'), (2, 1, 'B'), (3, 2, 'C'), (4, 3, 'D')');
 
 $stmt = $db->prepare('SELECT classtypes.name, test.id AS id, test.val AS val FROM test009 LEFT JOIN classtypes009 ON test.classtype=classtypes.id');
 
@@ -71,8 +66,8 @@ var_dump($stmt->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_CLASSTYPE, 'Test3'));
 <?php
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
-$db->exec("DROP TABLE test009");
-$db->exec("DROP TABLE classtypes009");
+PDOTest::dropTableIfExists($db, "test009");
+PDOTest::dropTableIfExists($db, "classtypes009");
 ?>
 --EXPECTF--
 array(4) {