Browse Source

Fix GROUP BY in dbstructure

https://github.com/friendica/friendica/issues/3440
pull/3442/head
Alexandre Alapetite 4 years ago
parent
commit
f838430535
3 changed files with 10 additions and 4 deletions
  1. +1
    -1
      boot.php
  2. +8
    -2
      include/dbstructure.php
  3. +1
    -1
      update.php

+ 1
- 1
boot.php View File

@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.2-dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1223 );
define ( 'DB_UPDATE_VERSION', 1224 );
/**
* @brief Constant with a HTML line break.


+ 8
- 2
include/dbstructure.php View File

@ -398,6 +398,12 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
$sql3 .= ";";
}
$field_list = '';
foreach ($structure['fields'] AS $fieldname => $parameters) {
$field_list .= 'ANY_VALUE(`' . $fieldname . '`),';
}
$field_list = rtrim($field_list, ',');
if ($verbose) {
// Ensure index conversion to unique removes duplicates
if ($is_unique) {
@ -414,7 +420,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
if ($ignore != "") {
echo "SET session old_alter_table=0;\n";
} else {
echo "INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";\n";
echo "INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";\n";
echo "DROP TABLE `".$name."`;\n";
echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
}
@ -445,7 +451,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
if ($ignore != "") {
$db->q("SET session old_alter_table=0;");
} else {
$r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";");
$r = $db->q("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
if (!dbm::is_result($r)) {
$errors .= print_update_error($db, $sql3);
return $errors;


+ 1
- 1
update.php View File

@ -1,6 +1,6 @@
<?php
define('UPDATE_VERSION' , 1223);
define('UPDATE_VERSION' , 1224);
/**
*


Loading…
Cancel
Save