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

MDL-31985 remove LOB sizes from code and UI

Browse Source
This commit is contained in:
Petr Skoda
2012-03-11 13:42:37 +01:00
parent 05aae0a571
commit f13489df50
7 changed files with 24 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ddl/mysql_sql_generator.php
+2 -20
View File
@@ -202,28 +202,10 @@ class mysql_sql_generator extends sql_generator {
$dbtype .= '(' . $xmldb_length . ')';
break;
case XMLDB_TYPE_TEXT:
if (empty($xmldb_length)) {
$xmldb_length = 'small';
}
if ($xmldb_length == 'small') {
$dbtype = 'TEXT';
} else if ($xmldb_length == 'medium') {
$dbtype = 'MEDIUMTEXT';
} else {
$dbtype = 'LONGTEXT';
}
$dbtype = 'LONGTEXT';
break;
case XMLDB_TYPE_BINARY:
if (empty($xmldb_length)) {
$xmldb_length = 'small';
}
if ($xmldb_length == 'small') {
$dbtype = 'BLOB';
} else if ($xmldb_length == 'medium') {
$dbtype = 'MEDIUMBLOB';
} else {
$dbtype = 'LONGBLOB';
}
$dbtype = 'LONGBLOB';
break;
case XMLDB_TYPE_DATETIME:
$dbtype = 'DATETIME';
lib/xmldb/xmldb.xsd
+1
View File
@@ -34,6 +34,7 @@
<xs:simpleType name="fieldLength" >
<xs:restriction base="xs:string" >
<!-- TODO: Moodle 2.5 - Drop LOB sizes, keep only numbers -->
<xs:pattern value='(\d+)|(small|medium|big)'/>
</xs:restriction >
</xs:simpleType >
lib/xmldb/xmldb_field.php
+10 -44
View File
@@ -75,7 +75,7 @@ class xmldb_field extends xmldb_object {
* Set all the attributes of one xmldb_field
*
* @param string type XMLDB_TYPE_INTEGER, XMLDB_TYPE_NUMBER, XMLDB_TYPE_CHAR, XMLDB_TYPE_TEXT, XMLDB_TYPE_BINARY
* @param string precision length for integers and chars, two-comma separated numbers for numbers and 'small', 'medium', 'big' for texts and binaries
* @param string precision length for integers and chars, two-comma separated numbers for numbers
* @param string unsigned XMLDB_UNSIGNED or null (or false)
* @param string notnull XMLDB_NOTNULL or null (or false)
* @param string sequence XMLDB_SEQUENCE or null (or false)
@@ -97,6 +97,11 @@ class xmldb_field extends xmldb_object {
$this->sequence = !empty($sequence) ? true : false;
$this->setDefault($default);
if ($this->type == XMLDB_TYPE_BINARY || $this->type == XMLDB_TYPE_TEXT) {
$this->length = null;
$this->decimals = null;
}
$this->previous = $previous;
}
@@ -266,19 +271,10 @@ class xmldb_field extends xmldb_object {
$result = false;
}
}
/// Check for big, medium, small to be applied to text and binary
/// Remove length from text and binary
if ($this->type == XMLDB_TYPE_TEXT ||
$this->type == XMLDB_TYPE_BINARY) {
if (!$length) {
$length == 'big';
}
if ($length != 'big' &&
$length != 'medium' &&
$length != 'small') {
$this->errormsg = 'Incorrect LENGTH attribute for text and binary fields (only big, medium and small allowed)';
$this->debug($this->errormsg);
$result = false;
}
$length = null;
}
/// Finally, set the length
$this->length = $length;
@@ -549,36 +545,10 @@ class xmldb_field extends xmldb_object {
$this->length = $adofield->max_length;
}
if ($this->type == XMLDB_TYPE_TEXT) {
switch (strtolower($adofield->type)) {
case 'tinytext':
case 'text':
$this->length = 'small';
break;
case 'mediumtext':
$this->length = 'medium';
break;
case 'longtext':
$this->length = 'big';
break;
default:
$this->length = 'small';
}
$this->length = null;
}
if ($this->type == XMLDB_TYPE_BINARY) {
switch (strtolower($adofield->type)) {
case 'tinyblob':
case 'blob':
$this->length = 'small';
break;
case 'mediumblob':
$this->length = 'medium';
break;
case 'longblob':
$this->length = 'big';
break;
default:
$this->length = 'small';
}
$this->length = null;
}
/// Calculate the decimals of the field
if ($adofield->max_length > 0 &&
@@ -709,10 +679,6 @@ class xmldb_field extends xmldb_object {
$o .= ')';
}
}
if ($this->type == XMLDB_TYPE_TEXT ||
$this->type == XMLDB_TYPE_BINARY) {
$o .= ' (' . $this->length . ')';
}
/// not null
if ($this->notnull) {
$o .= ' not null';
lib/xmldb/xmldb_table.php
+1 -1
View File
@@ -721,7 +721,7 @@ class xmldb_table extends xmldb_object {
*
* @param string name name of the field
* @param string type XMLDB_TYPE_INTEGER, XMLDB_TYPE_NUMBER, XMLDB_TYPE_CHAR, XMLDB_TYPE_TEXT, XMLDB_TYPE_BINARY
* @param string precision length for integers and chars, two-comma separated numbers for numbers and 'small', 'medium', 'big' for texts and binaries
* @param string precision length for integers and chars, two-comma separated numbers for numbers
* @param string unsigned XMLDB_UNSIGNED or null (or false)
* @param string notnull XMLDB_NOTNULL or null (or false)
* @param string sequence XMLDB_SEQUENCE or null (or false)