L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-40883 ddl: make sure object name never exceeds max length

Browse Source 
Many thanks to Ray Bon for finding the problem
This commit is contained in:
Marina Glancy
2013-11-08 11:58:35 +11:00
parent d214057cad
commit dcde391b44
1 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ddl/sql_generator.php
+9 -30
View File
@@ -1086,40 +1086,19 @@ abstract class sql_generator {
$name .= substr(trim($field),0,3);
}
// Prepend the prefix
$name = $this->prefix . $name;
$name = trim($this->prefix . $name);
$name = substr(trim($name), 0, $this->names_max_length - 1 - strlen($suffix)); //Max names_max_length
// Add the suffix
$namewithsuffix = $name;
if ($suffix) {
$namewithsuffix = $namewithsuffix . '_' . $suffix;
}
// Make sure name does not exceed the maximum name length and add suffix.
$maxlengthwithoutsuffix = $this->names_max_length - strlen($suffix) - ($suffix ? 1 : 0);
$namewithsuffix = substr($name, 0, $maxlengthwithoutsuffix) . ($suffix ? ('_' . $suffix) : '');
// 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)) {
$counter = 2;
// If have free space, we add 2
if (strlen($namewithsuffix) < $this->names_max_length) {
$newname = $name . $counter;
// Else replace the last char by 2
} else {
$newname = substr($name, 0, strlen($name)-1) . $counter;
}
$newnamewithsuffix = $newname;
if ($suffix) {
$newnamewithsuffix = $newnamewithsuffix . '_' . $suffix;
}
$counter = 1;
while (in_array($namewithsuffix, $used_names) || $this->isNameInUse($namewithsuffix, $suffix, $tablename)) {
// Now iterate until not used name is found, incrementing the counter
while (in_array($newnamewithsuffix, $used_names) || $this->isNameInUse($newnamewithsuffix, $suffix, $tablename)) {
$counter++;
$newname = substr($name, 0, strlen($newname)-1) . $counter;
$newnamewithsuffix = $newname;
if ($suffix) {
$newnamewithsuffix = $newnamewithsuffix . '_' . $suffix;
}
}
$namewithsuffix = $newnamewithsuffix;
$counter++;
$namewithsuffix = substr($name, 0, $maxlengthwithoutsuffix - strlen($counter)) .
$counter . ($suffix ? ('_' . $suffix) : '');
}
// Add the name to the cache