X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FDBStructure.php;h=2b0e3d1e358966d3768cdfa418b08eb764fb57fd;hb=5350e0852d718494934252328d17a094fd1bc73e;hp=c002c277c23fb31840c86ecaa561b2114d40044c;hpb=a8fb90f42fe9f9d4e275f95a7680fddaa1cf12eb;p=friendica.git

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index c002c277c2..2b0e3d1e35 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -82,7 +82,7 @@ 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', 'challenge',
-			'auth_codes', 'clients', 'tokens'];
+			'auth_codes', 'clients', 'tokens', 'profile_check', 'host'];
 
 		$tables = DBA::selectToArray(['INFORMATION_SCHEMA' => 'TABLES'], ['TABLE_NAME'],
 			['TABLE_SCHEMA' => DBA::databaseName(), 'TABLE_TYPE' => 'BASE TABLE']);
@@ -135,7 +135,7 @@ class DBStructure
 			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";
 
@@ -271,7 +271,7 @@ class DBStructure
 		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";
@@ -368,7 +368,7 @@ class DBStructure
 		$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;
@@ -379,7 +379,7 @@ class DBStructure
 		}
 
 		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;
@@ -387,7 +387,7 @@ class DBStructure
 			}
 		}
 
-		foreach ($foreign_keys AS $fieldname => $parameters) {
+		foreach ($foreign_keys as $fieldname => $parameters) {
 			$sql_rows[] = self::foreignCommand($name, $fieldname, $parameters);
 		}
 
@@ -460,7 +460,7 @@ class DBStructure
 		}
 
 		$names = "";
-		foreach ($fieldnames AS $fieldname) {
+		foreach ($fieldnames as $fieldname) {
 			if ($names != "") {
 				$names .= ",";
 			}
@@ -569,7 +569,7 @@ class DBStructure
 		}
 
 		if (DBA::isResult($tables)) {
-			foreach ($tables AS $table) {
+			foreach ($tables as $table) {
 				$table = current($table);
 
 				Logger::info('updating structure', ['table' => $table]);
@@ -591,12 +591,9 @@ class DBStructure
 		}
 
 		// 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)) {
@@ -604,23 +601,6 @@ class DBStructure
 				}
 				$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
@@ -636,18 +616,18 @@ class DBStructure
 					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;
 						}
@@ -675,7 +655,7 @@ class DBStructure
 						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;
 							}
@@ -690,7 +670,7 @@ class DBStructure
 			 * 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 {
@@ -700,11 +680,9 @@ class DBStructure
 					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;
 							}
@@ -716,7 +694,7 @@ class DBStructure
 
 				// 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;
 					}
@@ -729,7 +707,7 @@ class DBStructure
 						$sql2 = self::addForeignKey($name, $fieldname, $parameters);
 
 						if ($sql3 == "") {
-							$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+							$sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
 						} else {
 							$sql3 .= ", " . $sql2;
 						}
@@ -740,7 +718,7 @@ class DBStructure
 					$sql2 = self::dropForeignKey($param['CONSTRAINT_NAME']);
 
 					if ($sql3 == "") {
-						$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+						$sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
 					} else {
 						$sql3 .= ", " . $sql2;
 					}
@@ -752,7 +730,7 @@ class DBStructure
 						$sql2 = "COMMENT = '" . DBA::escape($structurecomment) . "'";
 
 						if ($sql3 == "") {
-							$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+							$sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
 						} else {
 							$sql3 .= ", " . $sql2;
 						}
@@ -764,7 +742,7 @@ class DBStructure
 						$sql2 = "ENGINE = '" . DBA::escape($structure['engine']) . "'";
 
 						if ($sql3 == "") {
-							$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+							$sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
 						} else {
 							$sql3 .= ", " . $sql2;
 						}
@@ -776,7 +754,7 @@ class DBStructure
 						$sql2 = "DEFAULT COLLATE utf8mb4_general_ci";
 
 						if ($sql3 == "") {
-							$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
+							$sql3 = "ALTER" . $ignore . " TABLE `" . $name . "` " . $sql2;
 						} else {
 							$sql3 .= ", " . $sql2;
 						}
@@ -789,7 +767,7 @@ class DBStructure
 
 				// 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' => ''];
 
@@ -803,7 +781,7 @@ class DBStructure
 					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;
 						}
@@ -816,36 +794,8 @@ class DBStructure
 					$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) {
@@ -853,50 +803,10 @@ class DBStructure
 						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;
-							}
-						}
-					}
 				}
 			}
 		}
@@ -950,7 +860,7 @@ class DBStructure
 		}
 
 		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"];
 				}
@@ -971,7 +881,7 @@ class DBStructure
 
 		$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']);
@@ -1060,37 +970,6 @@ class DBStructure
 		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
 	 *
@@ -1176,7 +1055,7 @@ class DBStructure
 
 		$table = DBA::escape($table);
 
-		foreach ($columns AS $column) {
+		foreach ($columns as $column) {
 			$sql = "SHOW COLUMNS FROM `" . $table . "` LIKE '" . $column . "';";
 
 			$stmt = DBA::p($sql);