X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FDBStructure.php;h=f652272a4743ebf0c38ee0ab711e2a3b8c63d1c4;hb=f26226229a45af4053055b8a5ea7aa0f7aa33e0c;hp=888ac73e67d098c7b9afe5dbda6d05ece291e3dd;hpb=31db9dbef7f6a4f98a6c29d15493bcffb0c39929;p=friendica.git

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 888ac73e67..f652272a47 100644
--- 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'] ?? '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)
@@ -606,6 +673,11 @@ class DBStructure
 						$current_field_definition = DBA::cleanQuery(implode(",", $field_definition));
 						$new_field_definition = DBA::cleanQuery(implode(",", $parameters));
 						if ($current_field_definition != $new_field_definition) {
+							// When the field structure changes then we will not perform the special index handling for MySQL.
+							// See issue #10768
+							$is_unique = false;
+							$temp_name = $name;
+			
 							$sql2 = self::modifyTableField($fieldname, $parameters);
 							if ($sql3 == "") {
 								$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
@@ -1243,7 +1315,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 +1339,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 +1374,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");