Really fix tests

Author: kocsismate

ext/pdo/tests/pdo_008.phpt

@@ -16,7 +16,9 @@ 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'), ('B', 'A'), ('C', 'C')");
+$db->exec("INSERT INTO test008 VALUES('A', 'A')");
+$db->exec("INSERT INTO test008 VALUES('B', 'A')");
+$db->exec("INSERT INTO test008 VALUES('C', 'C')");
 
 $stmt = $db->prepare('SELECT val, id from test008');
 

ext/pdo/tests/pdo_test.inc

@@ -75,20 +75,20 @@ class PDOTest {
             return;
         }
 
-        if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) === "oci") {
-            $db->exec(<<<SQL
-                BEGIN
-                    EXECUTE IMMEDIATE 'DROP TABLE $tableName';
-                EXCEPTION
-                    WHEN OTHERS THEN
-                        IF SQLCODE != -942 THEN
-                            RAISE;
-                        END IF;
+        match ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
+            "oci" => $db->exec(<<<SQL
+                 BEGIN
+                     EXECUTE IMMEDIATE 'DROP TABLE $tableName';
+                 EXCEPTION
+                     WHEN OTHERS THEN
+                         IF SQLCODE != -942 THEN
+                             RAISE;
+                         END IF;
                     END;
-            SQL
-            );
-        } else {
-            $db->exec("DROP TABLE IF EXISTS $tableName");
+                SQL
+            ),
+            "firebird" => $db->exec("DROP TABLE $tableName"),
+            default => $db->exec("DROP TABLE IF EXISTS $tableName"),
         }
     }
 }

ext/pdo_firebird/tests/bug_47415.phpt

@@ -39,7 +39,7 @@ unset($dbh);
 --CLEAN--
 <?php
 require 'testdb.inc';
-$dbh->exec("DROP TABLE IF EXISTS test47415");
+$dbh->exec("DROP TABLE test47415");
 ?>
 --EXPECT--
 bool(false)

ext/pdo_firebird/tests/bug_48877.phpt

@@ -14,7 +14,9 @@ require("testdb.inc");
 $value = '2';
 
 $dbh->exec('CREATE TABLE test48877 (A integer)');
-$dbh->exec("INSERT INTO test48877 VALUES ('1'), ('2'), ('3')");
+$dbh->exec("INSERT INTO test48877 VALUES ('1')");
+$dbh->exec("INSERT INTO test48877 VALUES ('2')");
+$dbh->exec("INSERT INTO test48877 VALUES ('3')");
 $dbh->commit();
 
 $query = "SELECT * FROM test48877 WHERE A = :paramno";
@@ -38,7 +40,7 @@ unset($dbh);
 --CLEAN--
 <?php
 require 'testdb.inc';
-$dbh->exec("DROP TABLE IF EXISTS test48877");
+$dbh->exec("DROP TABLE test48877");
 ?>
 --EXPECT--
 bool(false)

ext/pdo_firebird/tests/bug_53280.phpt

@@ -38,7 +38,7 @@ unset($dbh);
 --CLEAN--
 <?php
 require 'testdb.inc';
-$dbh->exec("DROP TABLE IF EXISTS test53280");
+$dbh->exec("DROP TABLE test53280");
 ?>
 --EXPECT--
 array(1) {

ext/pdo_firebird/tests/bug_62024.phpt

@@ -46,7 +46,7 @@ unset($dbh);
 --CLEAN--
 <?php
 require 'testdb.inc';
-$dbh->exec("DROP TABLE IF EXISTS test62024");
+$dbh->exec("DROP TABLE test62024");
 ?>
 --EXPECT--
 bool(true)

ext/pdo_firebird/tests/bug_64037.phpt

@@ -13,7 +13,9 @@ require("testdb.inc");
 
 $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
 $dbh->exec("CREATE TABLE test64037 (ID INTEGER NOT NULL, TEXT VARCHAR(10), COST NUMERIC(15, 2))");
-$dbh->exec("INSERT INTO test64037 (ID, TEXT, COST) VALUES (1, 'test', -1.0), (2, 'test', -0.99), (3, 'test', -1.01)");
+$dbh->exec("INSERT INTO test64037 (ID, TEXT, COST) VALUES (1, 'test', -1.0)");
+$dbh->exec("INSERT INTO test64037 (ID, TEXT, COST) VALUES (2, 'test', -0.99)");
+$dbh->exec("INSERT INTO test64037 (ID, TEXT, COST) VALUES (3, 'test', -1.01)");
 
 $dbh->commit();
 
@@ -38,7 +40,7 @@ unset($dbh);
 --CLEAN--
 <?php
 require 'testdb.inc';
-$dbh->exec("DROP TABLE IF EXISTS test64037");
+$dbh->exec("DROP TABLE test64037");
 ?>
 --EXPECT--
 string(5) "-1.00"

ext/pdo_firebird/tests/bug_72583.phpt

@@ -22,7 +22,7 @@ unset($dbh);
 --CLEAN--
 <?php
 require 'testdb.inc';
-$dbh->exec("DROP TABLE IF EXISTS test72583");
+$dbh->exec("DROP TABLE test72583");
 ?>
 --EXPECT--
 integer

ext/pdo_firebird/tests/bug_72931.phpt

@@ -21,7 +21,7 @@ unset($dbh);
 --CLEAN--
 <?php
 require 'testdb.inc';
-$dbh->exec("DROP TABLE IF EXISTS test72931");
+$dbh->exec("DROP TABLE test72931");
 ?>
 --EXPECT--
 1

ext/pdo_firebird/tests/bug_73087.phpt

@@ -28,7 +28,7 @@ echo 'OK';
 --CLEAN--
 <?php
 require 'testdb.inc';
-$dbh->exec("DROP TABLE IF EXISTS test73087");
+$dbh->exec("DROP TABLE test73087");
 ?>
 --EXPECT--
 OK