From f3de0635a14f544510aa7f5f500d19f17307f5f9 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 10 Oct 2023 23:25:58 +0800 Subject: [PATCH 1/2] MDL-79638 phpunit: Remove mysql/mariadb hack This hack was introduced to work around a bug in MySQL 5.6.14 and MariaDB at the time. https://bugs.mysql.com/bug.php?id=69882 It was addressed a few months later in 5.6.16, and 5.7.4. MariaDB merged version 5.6.16 of MySQL's InnoDB engine in MariaDB 10.0.11 and got hte patch from there. Moodle has required MySQL 8.0, and MariaDB 10.6.7 since Moodle 4.2 and it is therefore safe to remove these hacks. --- lib/testing/classes/util.php | 65 ------------------------------------ 1 file changed, 65 deletions(-) diff --git a/lib/testing/classes/util.php b/lib/testing/classes/util.php index 737c7532472..700a5dccb76 100644 --- a/lib/testing/classes/util.php +++ b/lib/testing/classes/util.php @@ -640,45 +640,6 @@ abstract class testing_util { $updatedtables = self::$tableupdated; } - $borkedmysql = false; - if ($DB->get_dbfamily() === 'mysql') { - $version = $DB->get_server_info(); - if (version_compare($version['version'], '5.6.0') == 1 and version_compare($version['version'], '5.6.16') == -1) { - // Everything that comes from Oracle is evil! - // - // See http://dev.mysql.com/doc/refman/5.6/en/alter-table.html - // You cannot reset the counter to a value less than or equal to to the value that is currently in use. - // - // From 5.6.16 release notes: - // InnoDB: The ALTER TABLE INPLACE algorithm would fail to decrease the auto-increment value. - // (Bug #17250787, Bug #69882) - $borkedmysql = true; - - } else if (version_compare($version['version'], '10.0.0') == 1) { - // And MariaDB is no better! - // Let's hope they pick the patch sometime later... - $borkedmysql = true; - } - } - - if ($borkedmysql) { - $mysqlsequences = array(); - $prefix = $DB->get_prefix(); - $rs = $DB->get_recordset_sql("SHOW TABLE STATUS LIKE ?", array($prefix.'%')); - foreach ($rs as $info) { - $table = strtolower($info->name); - if (strpos($table, $prefix) !== 0) { - // Incorrect table match caused by _ char. - continue; - } - if (!is_null($info->auto_increment)) { - $table = preg_replace('/^'.preg_quote($prefix, '/').'/', '', $table); - $mysqlsequences[$table] = $info->auto_increment; - } - } - $rs->close(); - } - foreach ($data as $table => $records) { // If table is not modified then no need to do anything. // $updatedtables tables is set after the first run, so check before checking for specific table update. @@ -686,32 +647,6 @@ abstract class testing_util { continue; } - if ($borkedmysql) { - if (empty($records)) { - if (!isset($empties[$table])) { - // Table has been modified and is not empty. - $DB->delete_records($table, null); - } - continue; - } - - if (isset($structure[$table]['id']) and $structure[$table]['id']->auto_increment) { - $current = $DB->get_records($table, array(), 'id ASC'); - if ($current == $records) { - if (isset($mysqlsequences[$table]) and $mysqlsequences[$table] == $structure[$table]['id']->auto_increment) { - continue; - } - } - } - - // Use TRUNCATE as a workaround and reinsert everything. - $DB->delete_records($table, null); - foreach ($records as $record) { - $DB->import_record($table, $record, false, true); - } - continue; - } - if (empty($records)) { if (!isset($empties[$table])) { // Table has been modified and is not empty. From a4cf2b2a59081aa4ba497c270f2b4f545a312a20 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 10 Oct 2023 23:56:19 +0800 Subject: [PATCH 2/2] MDL-79638 phpunit: Add unit test for increment resets --- lib/testing/tests/util_test.php | 80 +++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 lib/testing/tests/util_test.php diff --git a/lib/testing/tests/util_test.php b/lib/testing/tests/util_test.php new file mode 100644 index 00000000000..59b233cce4a --- /dev/null +++ b/lib/testing/tests/util_test.php @@ -0,0 +1,80 @@ +. + +namespace core\testing; + +/** + * Testing util tests. + * + * @package core + * @category phpunit + * @copyright 2023 Andrew Lyons + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class util_test extends \advanced_testcase { + /** + * Note: This test is required for the other two parts because the first time + * a table is written to it may not have had the initial value reset. + * + * @coversNothing + */ + public function test_increment_reset_part_one(): void { + global $DB; + + switch ($DB->get_dbfamily()) { + case 'mssql': + $this->markTestSkipped('MSSQL does not support sequences'); + return; + } + + $this->resetAfterTest(); + $DB->insert_record('config_plugins', [ + 'plugin' => 'example', + 'name' => 'test_increment', + 'value' => 0, + ]); + } + + /** + * @coversNothing + * @depends test_increment_reset_part_one + */ + public function test_increment_reset_part_two(): int { + global $DB; + + $this->resetAfterTest(); + return $DB->insert_record('config_plugins', [ + 'plugin' => 'example', + 'name' => 'test_increment', + 'value' => 0, + ]); + } + + /** + * @depends test_increment_reset_part_two + */ + public function test_increment_reset_part_three(int $previousid): void { + global $DB; + + $this->resetAfterTest(); + $id = $DB->insert_record('config_plugins', [ + 'plugin' => 'example', + 'name' => 'test_increment', + 'value' => 0, + ]); + $this->assertEquals($previousid, $id); + } +}