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

MDL-48228 database: Make utf8mb4 the default character set for mysql.

Browse Source 
Thanks to Jetha Chan for providing the initial patch that this is
based on.
This commit is contained in:
Adrian Greeve
2017-03-01 09:03:12 +08:00
parent 0f59b6dd75
commit 0bbefd81cd
8 changed files with 354 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ddl/mysql_sql_generator.php
+8 -2
View File
@@ -218,6 +218,9 @@ class mysql_sql_generator extends sql_generator {
}
}
$utf8mb4rowformat = $this->mdb->get_row_format_sql($engine, $collation);
$rowformat = ($utf8mb4rowformat == '') ? $rowformat : $utf8mb4rowformat;
$sqlarr = parent::getCreateTableSQL($xmldb_table);
// This is a very nasty hack that tries to use just one query per created table
@@ -238,7 +241,7 @@ class mysql_sql_generator extends sql_generator {
if (strpos($collation, 'utf8_') === 0) {
$sql .= "\n DEFAULT CHARACTER SET utf8";
}
$sql .= "\n DEFAULT COLLATE = $collation";
$sql .= "\n DEFAULT COLLATE = $collation ";
}
if ($rowformat) {
$sql .= $rowformat;
@@ -326,10 +329,13 @@ class mysql_sql_generator extends sql_generator {
* @return array of sql statements
*/
public function getCreateTempTableSQL($xmldb_table) {
$engine = $this->mdb->get_dbengine();
// Do we know collation?
$collation = $this->mdb->get_dbcollation();
$this->temptables->add_temptable($xmldb_table->getName());
$rowformat = $this->mdb->get_row_format_sql($engine, $collation);
$sqlarr = parent::getCreateTableSQL($xmldb_table);
// Let's inject the extra MySQL tweaks.
@@ -341,7 +347,7 @@ class mysql_sql_generator extends sql_generator {
if (strpos($collation, 'utf8_') === 0) {
$sqlarr[$i] .= " DEFAULT CHARACTER SET utf8";
}
$sqlarr[$i] .= " DEFAULT COLLATE $collation";
$sqlarr[$i] .= " DEFAULT COLLATE $collation $rowformat";
}
}
}