Merge pull request #10536 from annando/dfrn2

[friendica.git] / src / Database / DBStructure.php

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index d1975f504235148479b018cd6c53ed87b7f683a8..d7f1179d023d3fd03c52daff6098f6a58d5f13ab 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -81,7 +81,8 @@ class DBStructure
 
                $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']);
@@ -162,38 +163,104 @@ class DBStructure
 
        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)
@@ -1243,7 +1310,7 @@ class DBStructure
                                if ($verbose) {
                                        echo "Zero contact added\n";
                                }
-                       }               
+                       }
                } elseif (self::existsTable('contact') && $verbose) {
                        echo "Zero contact already added\n";
                } elseif ($verbose) {
@@ -1267,7 +1334,7 @@ class DBStructure
 
                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]);
@@ -1302,8 +1369,8 @@ class DBStructure
                } 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");