friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

We only need to define the collation.

This commit is contained in:
Michael 2017-04-14 12:22:36 +00:00
parent 2930601719
commit d7537e7346
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/dbstructure.php
View File

@ -263,16 +263,19 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
} }
} else { } else {
// Compare the field definition // Compare the field definition
// At first remove the collation from the array that is about to be compared
$field_definition = $database[$name]["fields"][$fieldname]; $field_definition = $database[$name]["fields"][$fieldname];
$collation = $field_definition['Collation'];
unset($field_definition['Collation']); // Define the default collation if not given
if (!isset($parameters['Collation']) AND !is_null($field_definition['Collation'])) {
$parameters['Collation'] = 'utf8mb4_general_ci';
} else {
$parameters['Collation'] = null;
}
$current_field_definition = implode(",", $field_definition); $current_field_definition = implode(",", $field_definition);
$new_field_definition = implode(",", $parameters); $new_field_definition = implode(",", $parameters);
if (($current_field_definition != $new_field_definition) OR if ($current_field_definition != $new_field_definition) {
(!is_null($collation) AND ($collation != 'utf8mb4_general_ci'))) { $sql2 = db_modify_table_field($fieldname, $parameters);
$sql2 = db_modify_table_field($fieldname, $parameters, $collation);
if ($sql3 == "") { if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
} else { } else {
@ -315,7 +318,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
if (isset($database[$name]["table_status"]["Collation"])) { if (isset($database[$name]["table_status"]["Collation"])) {
if ($database[$name]["table_status"]["Collation"] != 'utf8mb4_general_ci') { if ($database[$name]["table_status"]["Collation"] != 'utf8mb4_general_ci') {
$sql2 = "DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci"; $sql2 = "DEFAULT COLLATE utf8mb4_general_ci";
if ($sql3 == "") { if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
@ -404,11 +407,11 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
return $errors; return $errors;
} }
function db_field_command($parameters, $collation = null, $create = true) { function db_field_command($parameters, $create = true) {
$fieldstruct = $parameters["type"]; $fieldstruct = $parameters["type"];
if (!is_null($collation)) { if (!is_null($parameters["Collation"])) {
$fieldstruct .= " CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci"; $fieldstruct .= " COLLATE ".$parameters["Collation"];
} }
if ($parameters["not null"]) if ($parameters["not null"])
@ -455,7 +458,7 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
$sql = implode(",\n\t", $sql_rows); $sql = implode(",\n\t", $sql_rows);
$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=utf8mb4"; $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT COLLATE utf8mb4_general_ci";
if ($verbose) if ($verbose)
echo $sql.";\n"; echo $sql.";\n";
@ -470,8 +473,8 @@ function db_add_table_field($fieldname, $parameters) {
return($sql); return($sql);
} }
function db_modify_table_field($fieldname, $parameters, $collation) { function db_modify_table_field($fieldname, $parameters) {
$sql = sprintf("MODIFY `%s` %s", dbesc($fieldname), db_field_command($parameters, $collation, false)); $sql = sprintf("MODIFY `%s` %s", dbesc($fieldname), db_field_command($parameters, false));
return($sql); return($sql);
} }