$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', 'clients', 'tokens', 'profile_check'];
$tables = DBA::selectToArray(['INFORMATION_SCHEMA' => 'TABLES'], ['TABLE_NAME'],
['TABLE_SCHEMA' => DBA::databaseName(), 'TABLE_TYPE' => 'BASE TABLE']);
public static function writeStructure()
{
- Renderer::registerTemplateEngine('Friendica\Render\FriendicaSmartyEngine');
-
$tables = [];
foreach (self::definition(null) as $name => $definition) {
- $fields = [];
+ $indexes = [[
+ 'name' => 'Name',
+ 'fields' => 'Fields',
+ ],
+ [
+ 'name' => '-',
+ 'fields' => '-',
+ ]];
+
+ $lengths = ['name' => 4, 'fields' => 6];
+ foreach ($definition['indexes'] as $key => $value) {
+ $fieldlist = implode(', ', $value);
+ $indexes[] = ['name' => $key, 'fields' => $fieldlist];
+ $lengths['name'] = max($lengths['name'], strlen($key));
+ $lengths['fields'] = max($lengths['fields'], strlen($fieldlist));
+ }
+
+ array_walk_recursive($indexes, function(&$value, $key) use ($lengths)
+ {
+ $value = str_pad($value, $lengths[$key], $value === '-' ? '-' : ' ');
+ });
+
+ $foreign = [];
+ $fields = [[
+ 'name' => 'Field',
+ 'comment' => 'Description',
+ 'type' => 'Type',
+ 'null' => 'Null',
+ 'primary' => 'Key',
+ 'default' => 'Default',
+ 'extra' => 'Extra',
+ ],
+ [
+ 'name' => '-',
+ 'comment' => '-',
+ 'type' => '-',
+ 'null' => '-',
+ 'primary' => '-',
+ 'default' => '-',
+ 'extra' => '-',
+ ]];
+ $lengths = [
+ 'name' => 5,
+ 'comment' => 11,
+ 'type' => 4,
+ 'null' => 4,
+ 'primary' => 3,
+ 'default' => 7,
+ 'extra' => 5,
+ ];
foreach ($definition['fields'] as $key => $value) {
$field = [];
$field['name'] = $key;
$field['comment'] = $value['comment'] ?? '';
$field['type'] = $value['type'];
- $field['notnull'] = ($value['not null'] ?? false) ? 'YES' : 'NO';
+ $field['null'] = ($value['not null'] ?? false) ? 'NO' : 'YES';
$field['primary'] = ($value['primary'] ?? false) ? 'PRI' : '';
- $field['default'] = $value['default'] ?? '';
+ $field['default'] = $value['default'] ?? 'NULL';
$field['extra'] = $value['extra'] ?? '';
-
+
+ foreach ($field as $fieldname => $fieldvalue) {
+ $lengths[$fieldname] = max($lengths[$fieldname] ?? 0, strlen($fieldvalue));
+ }
$fields[] = $field;
+
+ if (!empty($value['foreign'])) {
+ $foreign[] = [
+ 'field' => $key,
+ 'targettable' => array_keys($value['foreign'])[0],
+ 'targetfield' => array_values($value['foreign'])[0]
+ ];
+ }
}
+
+ array_walk_recursive($fields, function(&$value, $key) use ($lengths)
+ {
+ $value = str_pad($value, $lengths[$key], $value === '-' ? '-' : ' ');
+ });
+
$tables[] = ['name' => $name, 'comment' => $definition['comment']];
$content = Renderer::replaceMacros(Renderer::getMarkupTemplate('structure.tpl'), [
'$name' => $name,
'$comment' => $definition['comment'],
'$fields' => $fields,
+ '$indexes' => $indexes,
+ '$foreign' => $foreign,
]);
$filename = DI::basePath() . '/doc/database/db_' . $name . '.md';
file_put_contents($filename, $content);
}
+ asort($tables);
$content = Renderer::replaceMacros(Renderer::getMarkupTemplate('tables.tpl'), [
- '$tables' => $tables,
+ '$tables' => $tables,
]);
$filename = DI::basePath() . '/doc/database.md';
- file_put_contents($filename, $content);
+ file_put_contents($filename, $content);
}
public static function printStructure($basePath)
// Compare it
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;
}
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;
}
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;
}
$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;
}
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;
- }
- }
- }
}
}
}
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
*
if ($verbose) {
echo "Zero contact added\n";
}
- }
+ }
} elseif (self::existsTable('contact') && $verbose) {
echo "Zero contact already added\n";
} elseif ($verbose) {
if (self::existsTable('permissionset')) {
if (!DBA::exists('permissionset', ['id' => 0])) {
- DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);
+ DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);
$lastid = DBA::lastInsertId();
if ($lastid != 0) {
DBA::update('permissionset', ['id' => 0], ['id' => $lastid]);
} elseif ($verbose) {
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");