bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Add support for FULLTEXT indices in Database\DBStructure

Browse source
This commit is contained in:
Hypolite Petovan 2018-12-23 15:40:49 -05:00
parent 21783f61b4
commit d53ff9c34d
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Database/DBStructure.php
View file

@ -220,9 +220,9 @@ class DBStructure
throw new Exception("Invalid parameter 'method' in self::createIndex(): '$method'"); throw new Exception("Invalid parameter 'method' in self::createIndex(): '$method'");
} }
if ($fieldnames[0] == "UNIQUE") { if (in_array($fieldnames[0], ["UNIQUE", "FULLTEXT"])) {
array_shift($fieldnames); $index_type = array_shift($fieldnames);
$method .= ' UNIQUE'; $method .= " " . $index_type;
} }
$names = ""; $names = "";
@ -407,9 +407,7 @@ class DBStructure
$sql2 = self::createIndex($indexname, $fieldnames); $sql2 = self::createIndex($indexname, $fieldnames);
// Fetch the "group by" fields for unique indexes // Fetch the "group by" fields for unique indexes
if ($fieldnames[0] == "UNIQUE") { $group_by = self::groupBy($fieldnames);
$group_by = self::groupBy($indexname, $fieldnames);
}
if ($sql2 != "") { if ($sql2 != "") {
if ($sql3 == "") { if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2; $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
@ -610,8 +608,12 @@ class DBStructure
if (DBA::isResult($indexes)) { if (DBA::isResult($indexes)) {
foreach ($indexes AS $index) { foreach ($indexes AS $index) {
if ($index['Key_name'] != 'PRIMARY' && $index['Non_unique'] == '0' && !isset($indexdata[$index["Key_name"]])) { if ($index["Key_name"] != "PRIMARY" && $index["Non_unique"] == "0" && !isset($indexdata[$index["Key_name"]])) {
$indexdata[$index["Key_name"]] = ['UNIQUE']; $indexdata[$index["Key_name"]] = ["UNIQUE"];
}
if ($index["Index_type"] == "FULLTEXT" && !isset($indexdata[$index["Key_name"]])) {
$indexdata[$index["Key_name"]] = ["FULLTEXT"];
} }
$column = $index["Column_name"]; $column = $index["Column_name"];
@ -676,7 +678,13 @@ class DBStructure
return ($sql); return ($sql);
} }
private static function groupBy($indexname, $fieldnames) /**
* Constructs a GROUP BY clause from a UNIQUE index definition.
*
* @param array $fieldnames
* @return string
*/
private static function groupBy(array $fieldnames)
{ {
if ($fieldnames[0] != "UNIQUE") { if ($fieldnames[0] != "UNIQUE") {
return ""; return "";