moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-21834 DDL tests - static caches aren't good for multiple connections in same request

Browse source
This commit is contained in:
Eloy Lafuente 2010-03-17 02:17:26 +00:00
parent 019cf6ce82
commit 237e66198d
1 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/ddl/sql_generator.php
View file

@ -947,17 +947,6 @@ abstract class sql_generator {
$name = ''; $name = '';
/// Implement one basic cache to avoid object name duplication
/// and to speed up repeated queries for the same objects
if (!isset($used_names)) {
static $used_names = array();
}
/// If this exact object has been requested, return it
if (array_key_exists($tablename.'-'.$fields.'-'.$suffix, $used_names)) {
return $used_names[$tablename.'-'.$fields.'-'.$suffix];
}
/// Use standard naming. See http://docs.moodle.org/en/XMLDB_key_and_index_naming /// Use standard naming. See http://docs.moodle.org/en/XMLDB_key_and_index_naming
$tablearr = explode ('_', $tablename); $tablearr = explode ('_', $tablename);
foreach ($tablearr as $table) { foreach ($tablearr as $table) {
@ -980,7 +969,7 @@ abstract class sql_generator {
} }
/// If the calculated name is in the cache, or if we detect it by introspecting the DB let's modify if /// If the calculated name is in the cache, or if we detect it by introspecting the DB let's modify if
if (in_array($namewithsuffix, $used_names) || $this->isNameInUse($namewithsuffix, $suffix, $tablename)) { if ($this->isNameInUse($namewithsuffix, $suffix, $tablename)) {
$counter = 2; $counter = 2;
/// If have free space, we add 2 /// If have free space, we add 2
if (strlen($namewithsuffix) < $this->names_max_length) { if (strlen($namewithsuffix) < $this->names_max_length) {
@ -994,7 +983,7 @@ abstract class sql_generator {
$newnamewithsuffix = $newnamewithsuffix . '_' . $suffix; $newnamewithsuffix = $newnamewithsuffix . '_' . $suffix;
} }
/// Now iterate until not used name is found, incrementing the counter /// Now iterate until not used name is found, incrementing the counter
while (in_array($newnamewithsuffix, $used_names) || $this->isNameInUse($newnamewithsuffix, $suffix, $tablename)) { while ($this->isNameInUse($newnamewithsuffix, $suffix, $tablename)) {
$counter++; $counter++;
$newname = substr($name, 0, strlen($newname)-1) . $counter; $newname = substr($name, 0, strlen($newname)-1) . $counter;
$newnamewithsuffix = $newname; $newnamewithsuffix = $newname;
@ -1005,9 +994,6 @@ abstract class sql_generator {
$namewithsuffix = $newnamewithsuffix; $namewithsuffix = $newnamewithsuffix;
} }
/// Add the name to the cache
$used_names[$tablename.'-'.$fields.'-'.$suffix] = $namewithsuffix;
/// Quote it if necessary (reserved words) /// Quote it if necessary (reserved words)
$namewithsuffix = $this->getEncQuoted($namewithsuffix); $namewithsuffix = $this->getEncQuoted($namewithsuffix);