mirror of
https://github.com/moodle/moodle.git
synced 2025-03-19 23:20:09 +01:00
Merge branch 'MDL-79638-401' of https://github.com/andrewnicols/moodle into MOODLE_401_STABLE
This commit is contained in:
commit
0257e1696f
@ -643,7 +643,7 @@ abstract class testing_util {
|
||||
$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) {
|
||||
if (version_compare($version['version'], '5.7.4', '<')) {
|
||||
// Everything that comes from Oracle is evil!
|
||||
//
|
||||
// See http://dev.mysql.com/doc/refman/5.6/en/alter-table.html
|
||||
@ -652,31 +652,27 @@ abstract class testing_util {
|
||||
// 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...
|
||||
// This also impacts MySQL < 5.7.4.
|
||||
$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;
|
||||
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();
|
||||
}
|
||||
$rs->close();
|
||||
}
|
||||
|
||||
foreach ($data as $table => $records) {
|
||||
|
85
lib/testing/tests/util_test.php
Normal file
85
lib/testing/tests/util_test.php
Normal file
@ -0,0 +1,85 @@
|
||||
<?php
|
||||
// This file is part of Moodle - http://moodle.org/
|
||||
//
|
||||
// Moodle is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Moodle is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
namespace core\testing;
|
||||
|
||||
/**
|
||||
* Testing util tests.
|
||||
*
|
||||
* @package core
|
||||
* @category phpunit
|
||||
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
|
||||
* @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;
|
||||
case 'mysql':
|
||||
$version = $DB->get_server_info();
|
||||
if (version_compare($version['version'], '5.7.4', '<')) {
|
||||
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);
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user