Additional fixes

SakiTakamachi · SakiTakamachi · commit d9ec0d13aba3 · 2023-11-24T18:54:18.000+09:00
diff --git a/ext/pdo_mysql/tests/bug63185.phpt b/ext/pdo_mysql/tests/bug63185.phpt
@@ -16,7 +16,6 @@ $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 $procedure = 'test_procedure_error_at_second_63185';
 
-$pdo->exec("DROP PROCEDURE IF EXISTS {$procedure}");
 $pdo->exec("CREATE PROCEDURE {$procedure} ()
 	BEGIN
 		SELECT 'x' AS foo;
diff --git a/ext/pdo_mysql/tests/bug76815.phpt b/ext/pdo_mysql/tests/bug76815.phpt
@@ -17,8 +17,6 @@ $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 $func = 'bug76815_pdo_mysql_f';
 $procedure = 'bug76815_pdo_mysql_p';
 
-$pdo->query("DROP FUNCTION IF EXISTS {$func}");
-$pdo->query("DROP PROCEDURE IF EXISTS {$procedure}");
 $pdo->query("CREATE FUNCTION {$func}() RETURNS VARCHAR(5) DETERMINISTIC BEGIN RETURN 'x12345'; END");
 $pdo->query("CREATE PROCEDURE {$procedure}() BEGIN SELECT {$func}(); END");
 
diff --git a/ext/pdo_mysql/tests/bug_39858.phpt b/ext/pdo_mysql/tests/bug_39858.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(50000);
 ?>
 --FILE--
 <?php
@@ -17,7 +16,6 @@ $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
 function bug_39858($db) {
     $procedure = 'bug_39858_pdo_mysql_p';
 
-    $db->exec("DROP PROCEDURE IF EXISTS {$procedure}");
     $db->exec("
         CREATE PROCEDURE {$procedure}()
             NOT DETERMINISTIC
diff --git a/ext/pdo_mysql/tests/bug_41125.phpt b/ext/pdo_mysql/tests/bug_41125.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(40100);
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/bug_41997.phpt b/ext/pdo_mysql/tests/bug_41997.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(50000);
 ?>
 --FILE--
 <?php
@@ -16,7 +15,6 @@ $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
 
 $procedure = 'bug_41997_pdo_mysql_p';
 
-$db->exec("DROP PROCEDURE IF EXISTS {$procedure}");
 $db->exec("CREATE PROCEDURE {$procedure}() BEGIN SELECT 1 AS 'one'; END");
 
 $stmt = $db->query("CALL {$procedure}()");
diff --git a/ext/pdo_mysql/tests/bug_42499.phpt b/ext/pdo_mysql/tests/bug_42499.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(40100);
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/bug_44707.phpt b/ext/pdo_mysql/tests/bug_44707.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(40100);
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/bug_50323.phpt b/ext/pdo_mysql/tests/bug_50323.phpt
@@ -54,7 +54,7 @@ MySQLPDOTest::skip();
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 $db = MySQLPDOTest::factory();
 
-@$db->exec('DROP DATABASE IF EXISTS `crazy;dbname`');
+$db->exec('DROP DATABASE IF EXISTS `crazy;dbname`');
 ?>
 --EXPECT--
 done!
diff --git a/ext/pdo_mysql/tests/bug_61411.phpt b/ext/pdo_mysql/tests/bug_61411.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(40106);
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/bug_pecl_7976.phpt b/ext/pdo_mysql/tests/bug_pecl_7976.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(50000);
 ?>
 --FILE--
 <?php
@@ -15,7 +14,6 @@ $db = MySQLPDOTest::factory();
 
 function bug_pecl_7976($db) {
     $procedure = 'bug_pecl_7976_pdo_mysql_p';
-    $db->exec("DROP PROCEDURE IF EXISTS {$procedure}");
     $db->exec("CREATE PROCEDURE {$procedure}() BEGIN SELECT '1' AS _one; END;");
 
     $stmt = $db->query("CALL {$procedure}()");
diff --git a/ext/pdo_mysql/tests/inc/mysql_pdo_test.inc b/ext/pdo_mysql/tests/inc/mysql_pdo_test.inc
@@ -1,6 +1,6 @@
 <?php
 require_once __DIR__ . '/config.inc';
-require_once __DIR__ . '/../../../../ext/pdo/tests/pdo_test.inc';
+require_once dirname(__DIR__, 4) . '/ext/pdo/tests/pdo_test.inc';
 
 foreach ($env as $k => $v) {
     define($k, $v);
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt
@@ -12,6 +12,8 @@ MySQLPDOTest::skip();
     require_once __DIR__ . '/inc/mysql_pdo_test.inc';
     $db = MySQLPDOTest::factory();
 
+    $procedure = 'pdo_mysql_attr_oracle_nulls_p';
+
     try {
         $db->setAttribute(PDO::ATTR_ORACLE_NULLS, []);
     } catch (\TypeError $e) {
@@ -47,10 +49,10 @@ MySQLPDOTest::skip();
     $db->setAttribute(PDO::ATTR_EMULATE_PREPARES, 0);
     $db->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false);
 
-    if ($have_procedures && (false !== $db->exec('DROP PROCEDURE IF EXISTS p')) &&
-        (false !== $db->exec("CREATE PROCEDURE p() BEGIN SELECT NULL as z, '' AS a, ' ' AS b, TRIM(' ') as c, ' d' AS d, ' e' AS e; END;"))) {
+    if ($have_procedures && (false !== $db->exec("DROP PROCEDURE IF EXISTS {$procedure}")) &&
+        (false !== $db->exec("CREATE PROCEDURE {$procedure}() BEGIN SELECT NULL as z, '' AS a, ' ' AS b, TRIM(' ') as c, ' d' AS d, ' e' AS e; END;"))) {
         // requires MySQL 5+
-        $stmt = $db->prepare('CALL p()');
+        $stmt = $db->prepare("CALL {$procedure}()");
         $stmt->execute();
         do {
             var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
@@ -63,11 +65,14 @@ MySQLPDOTest::skip();
 
     }
 
-    if ($have_procedures)
-        @$db->exec('DROP PROCEDURE IF EXISTS p');
-
     print "done!";
 ?>
+--CLEAN--
+<?php
+require_once __DIR__ . '/inc/mysql_pdo_test.inc';
+$db = MySQLPDOTest::factory();
+$db->exec("DROP PROCEDURE IF EXISTS pdo_mysql_attr_oracle_nulls_p");
+?>
 --EXPECTF--
 Attribute value must be of type int for selected attribute, array given
 Attribute value must be of type int for selected attribute, stdClass given
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec.phpt
@@ -30,6 +30,8 @@ MySQLPDOTest::skip();
     require_once __DIR__ . '/inc/mysql_pdo_test.inc';
     $db = MySQLPDOTest::factory();
 
+    $procedure = 'pdo_mysql_exec_p';
+
     /* affected rows related */
     try {
         exec_and_count(2, $db, 'DROP TABLE IF EXISTS test_mysql_exec', 0);
@@ -66,11 +68,11 @@ MySQLPDOTest::skip();
         // let's try to play with stored procedures
         try {
             $ignore_exception = true;
-            exec_and_count(18, $db, 'DROP PROCEDURE IF EXISTS p', 0);
-            exec_and_count(19, $db, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(255)) BEGIN SELECT VERSION() INTO ver_param; END;', 0);
+            exec_and_count(18, $db, "DROP PROCEDURE IF EXISTS {$procedure}", 0);
+            exec_and_count(19, $db, "CREATE PROCEDURE {$procedure}(OUT ver_param VARCHAR(255)) BEGIN SELECT VERSION() INTO ver_param; END;", 0);
             // we got this far without problems. If there's an issue from now on, its a failure
             $ignore_exception = false;
-            exec_and_count(20, $db, 'CALL p(@version)', 1);
+            exec_and_count(20, $db, "CALL {$procedure}(@version)", 1);
             $stmt = $db->query('SELECT @version AS p_version');
             $tmp = $stmt->fetchAll(PDO::FETCH_ASSOC);
             if (count($tmp) > 1 || !isset($tmp[0]['p_version'])) {
@@ -92,7 +94,7 @@ MySQLPDOTest::skip();
                         $tmp[0]['_version'], gettype($tmp[0]['_version']));
                 }
             }
-            exec_and_count(25, $db, 'DROP PROCEDURE IF EXISTS p', 0);
+            exec_and_count(25, $db, "DROP PROCEDURE IF EXISTS {$procedure}", 0);
 
         } catch (PDOException $e) {
             // ignore it, we might not have sufficient permissions
@@ -103,13 +105,14 @@ MySQLPDOTest::skip();
         }
 
         // stored function
+        $func = 'pdo_mysql_exec_f';
         try {
             $ignore_exception = true;
-            exec_and_count(27, $db, 'DROP FUNCTION IF EXISTS f', 0);
-            exec_and_count(28, $db, 'CREATE FUNCTION f( ver_param VARCHAR(255)) RETURNS VARCHAR(255) DETERMINISTIC RETURN ver_param;', 0);
+            exec_and_count(27, $db, "DROP FUNCTION IF EXISTS {$func}", 0);
+            exec_and_count(28, $db, "CREATE FUNCTION {$func}( ver_param VARCHAR(255)) RETURNS VARCHAR(255) DETERMINISTIC RETURN ver_param;", 0);
             // we got this far without problems. If there's an issue from now on, its a failure
             $ignore_exception = false;
-            $stmt = $db->query('SELECT f(VERSION()) AS f_version');
+            $stmt = $db->query("SELECT {$func}(VERSION()) AS f_version");
             $tmp = $stmt->fetchAll(PDO::FETCH_ASSOC);
             if (count($tmp) > 1 || !isset($tmp[0]['f_version'])) {
                 printf("[029] Data seems wrong, dumping\n");
@@ -129,7 +132,7 @@ MySQLPDOTest::skip();
                         $tmp[0]['_version'], gettype($tmp[0]['_version']));
                 }
             }
-            exec_and_count(32, $db, 'DROP FUNCTION IF EXISTS f', 0);
+            exec_and_count(32, $db, "DROP FUNCTION IF EXISTS {$func}", 0);
 
         } catch (PDOException $e) {
             // ignore it, we might not have sufficient permissions
@@ -169,6 +172,8 @@ MySQLPDOTest::skip();
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 $db = MySQLPDOTest::factory();
 $db->query('DROP TABLE IF EXISTS test_mysql_exec');
+$db->query('DROP PROCEDURE IF EXISTS pdo_mysql_exec_p');
+$db->query('DROP FUNCTION IF EXISTS pdo_mysql_exec_f');
 ?>
 --EXPECTF--
 Warning: PDO::exec(): SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'THIS IS NOT VALID SQL, I HOPE' at line 1 in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt b/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(50000);
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(50100);
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(50000);
 MySQLPDOTest::skipNotMySQLnd();
 ?>
 --FILE--
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
@@ -6,7 +6,6 @@ pdo_mysql
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
-MySQLPDOTest::skipVersionThanLess(50000);
 ?>
 --FILE--
 <?php
