tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Issue 8635: Create foreign keys without constraint name

Browse source
This commit is contained in:
Michael 2020-05-16 20:57:04 +00:00
parent dffa55bf16
commit ecde6b0066
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Database/DBStructure.php
View file

@ -483,8 +483,8 @@ class DBStructure
} }
} }
foreach ($existing_foreign_keys as $constraint => $param) { foreach ($existing_foreign_keys as $param) {
$sql2 = self::dropForeignKey($constraint); $sql2 = self::dropForeignKey($param['CONSTRAINT_NAME']);
if ($sql3 == "") { if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2; $sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
@ -693,8 +693,8 @@ class DBStructure
if (DBA::isResult($foreign_keys)) { if (DBA::isResult($foreign_keys)) {
foreach ($foreign_keys as $foreign_key) { foreach ($foreign_keys as $foreign_key) {
$constraint = $foreign_key['CONSTRAINT_NAME']; $parameters = ['foreign' => [$foreign_key['REFERENCED_TABLE_NAME'] => $foreign_key['REFERENCED_COLUMN_NAME']]];
unset($foreign_key['CONSTRAINT_NAME']); $constraint = self::getConstraintName($table, $foreign_key['COLUMN_NAME'], $parameters);
$foreigndata[$constraint] = $foreign_key; $foreigndata[$constraint] = $foreign_key;
} }
} }
@ -783,10 +783,7 @@ class DBStructure
$foreign_table = array_keys($parameters['foreign'])[0]; $foreign_table = array_keys($parameters['foreign'])[0];
$foreign_field = array_values($parameters['foreign'])[0]; $foreign_field = array_values($parameters['foreign'])[0];
$constraint = self::getConstraintName($tablename, $fieldname, $parameters); $sql = "FOREIGN KEY (`" . $fieldname . "`) REFERENCES `" . $foreign_table . "` (`" . $foreign_field . "`)";
$sql = "CONSTRAINT `" . $constraint . "` FOREIGN KEY (`" . $fieldname . "`)" .
" REFERENCES `" . $foreign_table . "` (`" . $foreign_field . "`)";
if (!empty($parameters['foreign']['on update'])) { if (!empty($parameters['foreign']['on update'])) {
$sql .= " ON UPDATE " . strtoupper($parameters['foreign']['on update']); $sql .= " ON UPDATE " . strtoupper($parameters['foreign']['on update']);