<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
$old_tables = ['fserver', 'gcign', 'gcontact', 'gcontact-relation', 'gfollower' ,'glink', 'item-delivery-data',
'item-activity', 'item-content', 'item_id', 'participation', 'poll', 'poll_result', 'queue', 'retriever_rule',
- 'deliverq', 'dsprphotoq', 'ffinder', 'sign', 'spam', 'term', 'user-item', 'thread', 'item'];
+ 'deliverq', 'dsprphotoq', 'ffinder', 'sign', 'spam', 'term', 'user-item', 'thread', 'item', 'challenge',
+ 'auth_codes', 'tokens', 'clients', 'profile_check', 'host'];
$tables = DBA::selectToArray(['INFORMATION_SCHEMA' => 'TABLES'], ['TABLE_NAME'],
['TABLE_SCHEMA' => DBA::databaseName(), 'TABLE_TYPE' => 'BASE TABLE']);
echo DI::l10n()->t('These tables are not used for friendica and will be deleted when you execute "dbstructure drop -e":') . "\n\n";
}
- foreach ($tables as $table) {
- if (in_array($table['TABLE_NAME'], $old_tables)) {
+ foreach ($old_tables as $table) {
+ if (in_array($table, array_column($tables, 'TABLE_NAME'))) {
if ($execute) {
- $sql = 'DROP TABLE ' . DBA::quoteIdentifier($table['TABLE_NAME']) . ';';
+ $sql = 'DROP TABLE ' . DBA::quoteIdentifier($table) . ';';
echo $sql . "\n";
$result = DBA::e($sql);
self::printUpdateError($sql);
}
} else {
- echo $table['TABLE_NAME'] . "\n";
+ echo $table . "\n";
}
}
}
return;
}
- foreach ($tables AS $table) {
+ foreach ($tables as $table) {
$sql = "ALTER TABLE " . DBA::quoteIdentifier($table['table_name']) . " ENGINE=InnoDB ROW_FORMAT=DYNAMIC;";
echo $sql . "\n";
public static function writeStructure()
{
- Renderer::registerTemplateEngine('Friendica\Render\FriendicaSmartyEngine');
-
$tables = [];
foreach (self::definition(null) as $name => $definition) {
$indexes = [[
echo "-- " . FRIENDICA_PLATFORM . " " . FRIENDICA_VERSION . " (" . FRIENDICA_CODENAME, ")\n";
echo "-- DB_UPDATE_VERSION " . DB_UPDATE_VERSION . "\n";
echo "-- ------------------------------------------\n\n\n";
- foreach ($database AS $name => $structure) {
+ foreach ($database as $name => $structure) {
echo "--\n";
echo "-- TABLE $name\n";
echo "--\n";
$primary_keys = [];
$foreign_keys = [];
- foreach ($structure["fields"] AS $fieldname => $field) {
+ foreach ($structure["fields"] as $fieldname => $field) {
$sql_rows[] = "`" . DBA::escape($fieldname) . "` " . self::FieldCommand($field);
if (!empty($field['primary'])) {
$primary_keys[] = $fieldname;
}
if (!empty($structure["indexes"])) {
- foreach ($structure["indexes"] AS $indexname => $fieldnames) {
+ foreach ($structure["indexes"] as $indexname => $fieldnames) {
$sql_index = self::createIndex($indexname, $fieldnames, "");
if (!is_null($sql_index)) {
$sql_rows[] = $sql_index;
}
}
- foreach ($foreign_keys AS $fieldname => $parameters) {
+ foreach ($foreign_keys as $fieldname => $parameters) {
$sql_rows[] = self::foreignCommand($name, $fieldname, $parameters);
}
}
$names = "";
- foreach ($fieldnames AS $fieldname) {
+ foreach ($fieldnames as $fieldname) {
if ($names != "") {
$names .= ",";
}
}
if (DBA::isResult($tables)) {
- foreach ($tables AS $table) {
+ foreach ($tables as $table) {
$table = current($table);
Logger::info('updating structure', ['table' => $table]);
}
// Compare it
- foreach ($definition AS $name => $structure) {
+ foreach ($definition as $name => $structure) {
$is_new_table = false;
- $group_by = "";
$sql3 = "";
- $is_unique = false;
- $temp_name = $name;
if (!isset($database[$name])) {
$r = self::createTable($name, $structure, $verbose, $action);
if (!DBA::isResult($r)) {
}
$is_new_table = true;
} else {
- foreach ($structure["indexes"] AS $indexname => $fieldnames) {
- if (isset($database[$name]["indexes"][$indexname])) {
- $current_index_definition = implode(",", $database[$name]["indexes"][$indexname]);
- } else {
- $current_index_definition = "__NOT_SET__";
- }
- $new_index_definition = implode(",", $fieldnames);
- if ($current_index_definition != $new_index_definition) {
- if ($fieldnames[0] == "UNIQUE") {
- $is_unique = true;
- if ($ignore == "") {
- $temp_name = "temp-" . $name;
- }
- }
- }
- }
-
/*
* Drop the index if it isn't present in the definition
* or the definition differ from current status
if ($current_index_definition != $new_index_definition && substr($indexname, 0, 6) != 'local_') {
$sql2 = self::dropIndex($indexname);
if ($sql3 == "") {
- $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
} else {
$sql3 .= ", " . $sql2;
}
}
}
// Compare the field structure field by field
- foreach ($structure["fields"] AS $fieldname => $parameters) {
+ foreach ($structure["fields"] as $fieldname => $parameters) {
if (!isset($database[$name]["fields"][$fieldname])) {
$sql2 = self::addTableField($fieldname, $parameters);
if ($sql3 == "") {
- $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
} else {
$sql3 .= ", " . $sql2;
}
if ($current_field_definition != $new_field_definition) {
$sql2 = self::modifyTableField($fieldname, $parameters);
if ($sql3 == "") {
- $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
} else {
$sql3 .= ", " . $sql2;
}
* Don't create keys if table is new
*/
if (!$is_new_table) {
- foreach ($structure["indexes"] AS $indexname => $fieldnames) {
+ foreach ($structure["indexes"] as $indexname => $fieldnames) {
if (isset($database[$name]["indexes"][$indexname])) {
$current_index_definition = implode(",", $database[$name]["indexes"][$indexname]);
} else {
if ($current_index_definition != $new_index_definition) {
$sql2 = self::createIndex($indexname, $fieldnames);
- // Fetch the "group by" fields for unique indexes
- $group_by = self::groupBy($fieldnames);
if ($sql2 != "") {
if ($sql3 == "") {
- $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
} else {
$sql3 .= ", " . $sql2;
}
// Foreign keys
// Compare the field structure field by field
- foreach ($structure["fields"] AS $fieldname => $parameters) {
+ foreach ($structure["fields"] as $fieldname => $parameters) {
if (empty($parameters['foreign'])) {
continue;
}
$sql2 = self::addForeignKey($name, $fieldname, $parameters);
if ($sql3 == "") {
- $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
} else {
$sql3 .= ", " . $sql2;
}
$sql2 = self::dropForeignKey($param['CONSTRAINT_NAME']);
if ($sql3 == "") {
- $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
} else {
$sql3 .= ", " . $sql2;
}
$sql2 = "COMMENT = '" . DBA::escape($structurecomment) . "'";
if ($sql3 == "") {
- $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
} else {
$sql3 .= ", " . $sql2;
}
$sql2 = "ENGINE = '" . DBA::escape($structure['engine']) . "'";
if ($sql3 == "") {
- $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
} else {
$sql3 .= ", " . $sql2;
}
$sql2 = "DEFAULT COLLATE utf8mb4_general_ci";
if ($sql3 == "") {
- $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
} else {
$sql3 .= ", " . $sql2;
}
// Now have a look at the field collations
// Compare the field structure field by field
- foreach ($structure["fields"] AS $fieldname => $parameters) {
+ foreach ($structure["fields"] as $fieldname => $parameters) {
// Compare the field definition
$field_definition = ($database[$name]["fields"][$fieldname] ?? '') ?: ['Collation' => ''];
if ($field_definition['Collation'] != $parameters['Collation']) {
$sql2 = self::modifyTableField($fieldname, $parameters);
if (($sql3 == "") || (substr($sql3, -2, 2) == "; ")) {
- $sql3 .= "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+ $sql3 .= "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
} else {
$sql3 .= ", " . $sql2;
}
$sql3 .= ";";
}
- $field_list = '';
- if ($is_unique && $ignore == '') {
- foreach ($database[$name]["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 && ($temp_name != $name)) {
- if ($ignore != "") {
- echo "SET session old_alter_table=1;\n";
- } else {
- echo "DROP TABLE IF EXISTS `" . $temp_name . "`;\n";
- echo "CREATE TABLE `" . $temp_name . "` LIKE `" . $name . "`;\n";
- }
- }
-
echo $sql3 . "\n";
-
- if ($is_unique && ($temp_name != $name)) {
- if ($ignore != "") {
- echo "SET session old_alter_table=0;\n";
- } else {
- echo "INSERT INTO `" . $temp_name . "` SELECT " . DBA::anyValueFallback($field_list) . " FROM `" . $name . "`" . $group_by . ";\n";
- echo "DROP TABLE `" . $name . "`;\n";
- echo "RENAME TABLE `" . $temp_name . "` TO `" . $name . "`;\n";
- }
- }
}
if ($action) {
DI::config()->set('system', 'maintenance_reason', DI::l10n()->t('%s: updating %s table.', DateTimeFormat::utcNow() . ' ' . date('e'), $name));
}
- // Ensure index conversion to unique removes duplicates
- if ($is_unique && ($temp_name != $name)) {
- if ($ignore != "") {
- DBA::e("SET session old_alter_table=1;");
- } else {
- $r = DBA::e("DROP TABLE IF EXISTS `" . $temp_name . "`;");
- if (!DBA::isResult($r)) {
- $errors .= self::printUpdateError($sql3);
- return $errors;
- }
-
- $r = DBA::e("CREATE TABLE `" . $temp_name . "` LIKE `" . $name . "`;");
- if (!DBA::isResult($r)) {
- $errors .= self::printUpdateError($sql3);
- return $errors;
- }
- }
- }
-
$r = DBA::e($sql3);
if (!DBA::isResult($r)) {
$errors .= self::printUpdateError($sql3);
}
- if ($is_unique && ($temp_name != $name)) {
- if ($ignore != "") {
- DBA::e("SET session old_alter_table=0;");
- } else {
- $r = DBA::e("INSERT INTO `" . $temp_name . "` SELECT " . $field_list . " FROM `" . $name . "`" . $group_by . ";");
- if (!DBA::isResult($r)) {
- $errors .= self::printUpdateError($sql3);
- return $errors;
- }
- $r = DBA::e("DROP TABLE `" . $name . "`;");
- if (!DBA::isResult($r)) {
- $errors .= self::printUpdateError($sql3);
- return $errors;
- }
- $r = DBA::e("RENAME TABLE `" . $temp_name . "` TO `" . $name . "`;");
- if (!DBA::isResult($r)) {
- $errors .= self::printUpdateError($sql3);
- return $errors;
- }
- }
- }
}
}
}
}
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"]])) {
$indexdata[$index["Key_name"]] = ["UNIQUE"];
}
$fielddata = [];
if (DBA::isResult($fields)) {
- foreach ($fields AS $field) {
+ foreach ($fields as $field) {
$search = ['tinyint(1)', 'tinyint(3) unsigned', 'tinyint(4)', 'smallint(5) unsigned', 'smallint(6)', 'mediumint(8) unsigned', 'mediumint(9)', 'bigint(20)', 'int(10) unsigned', 'int(11)'];
$replace = ['boolean', 'tinyint unsigned', 'tinyint', 'smallint unsigned', 'smallint', 'mediumint unsigned', 'mediumint', 'bigint', 'int unsigned', 'int'];
$field['COLUMN_TYPE'] = str_replace($search, $replace, $field['COLUMN_TYPE']);
return sprintf("DROP FOREIGN KEY `%s`", $constraint);
}
- /**
- * 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") {
- return "";
- }
-
- array_shift($fieldnames);
-
- $names = "";
- foreach ($fieldnames AS $fieldname) {
- if ($names != "") {
- $names .= ",";
- }
-
- if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
- $names .= "`" . DBA::escape($matches[1]) . "`";
- } else {
- $names .= "`" . DBA::escape($fieldname) . "`";
- }
- }
-
- $sql = sprintf(" GROUP BY %s", $names);
- return $sql;
- }
-
/**
* Renames columns or the primary key of a table
*
$table = DBA::escape($table);
- foreach ($columns AS $column) {
+ foreach ($columns as $column) {
$sql = "SHOW COLUMNS FROM `" . $table . "` LIKE '" . $column . "';";
$stmt = DBA::p($sql);
echo "permissionset: Table not found\n";
}
- if (!self::existsForeignKeyForField('tokens', 'client_id')) {
+ if (self::existsTable('tokens') && self::existsTable('clients') && !self::existsForeignKeyForField('tokens', 'client_id')) {
$tokens = DBA::p("SELECT `tokens`.`id` FROM `tokens`
LEFT JOIN `clients` ON `clients`.`client_id` = `tokens`.`client_id`
WHERE `clients`.`client_id` IS NULL");
projects / friendica.git / blobdiff