Merge pull request #10484 from annando/use-account-view

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

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 864f2ded3f19cedbe1f62e9b7ee459830b07121f..4779487283a169535153c34b9b743615f2f4b298 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -162,15 +162,30 @@ class DBStructure
 
        public static function writeStructure()
        {
-               Renderer::registerTemplateEngine('Friendica\Render\FriendicaSmartyEngine');
-
                $tables = [];
                foreach (self::definition(null) as $name => $definition) {
-                       $indexes = [];
+                       $indexes  = [[
+                               'name'   => 'Name',
+                               'fields' => 'Fields',
+                       ],
+                       [
+                               'name'   => '-',
+                               'fields' => '-',
+                       ]];
+
+                       $lengths = ['name' => 4, 'fields' => 6];
                        foreach ($definition['indexes'] as $key => $value) {
-                               $indexes[] = ['name' => $key, 'fields' => implode(', ', $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',