Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions src/Db/Action/AddForeignKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public static function build(
$referencedColumns = [$referencedColumns]; // str to array
}

if (is_string($referencedTable)) {
$referencedTable = new TableMetadata($referencedTable);
if ($referencedTable instanceof TableMetadata) {
$referencedTable = $referencedTable->getName();
}

// Shimming old 4.x
Expand All @@ -66,15 +66,13 @@ public static function build(
unset($options['constraint']);
}

$fk = new ForeignKey();
$fk->setReferencedTable($referencedTable)
->setColumns($columns)
->setReferencedColumns($referencedColumns)
->setOptions($options);

if ($name !== null) {
$fk->setName($name);
}
$fk = new ForeignKey(
name: $name ?? '',
columns: (array)$columns,
referencedTable: $referencedTable,
referencedColumns: $referencedColumns,
);
$fk->setOptions($options);

return new AddForeignKey($table, $fk);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Db/Adapter/MysqlAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ protected function getForeignKeySqlDefinition(ForeignKey $foreignKey): string
foreach ($foreignKey->getReferencedColumns() as $column) {
$refColumnNames[] = $this->quoteColumnName($column);
}
$def .= ' REFERENCES ' . $this->quoteTableName($foreignKey->getReferencedTable()->getName()) . ' (' . implode(',', $refColumnNames) . ')';
$def .= ' REFERENCES ' . $this->quoteTableName($foreignKey->getReferencedTable()) . ' (' . implode(',', $refColumnNames) . ')';
$onDelete = $foreignKey->getOnDelete();
if ($onDelete) {
$def .= ' ON DELETE ' . $onDelete;
Expand Down
2 changes: 1 addition & 1 deletion src/Db/Adapter/PostgresAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, string $ta
);
$def = ' CONSTRAINT ' . $this->quoteColumnName($constraintName) .
' FOREIGN KEY ("' . implode('", "', $foreignKey->getColumns()) . '")' .
" REFERENCES {$this->quoteTableName($foreignKey->getReferencedTable()->getName())} (\"" .
" REFERENCES {$this->quoteTableName($foreignKey->getReferencedTable())} (\"" .
implode('", "', $foreignKey->getReferencedColumns()) . '")';
if ($foreignKey->getOnDelete()) {
$def .= " ON DELETE {$foreignKey->getOnDelete()}";
Expand Down
2 changes: 1 addition & 1 deletion src/Db/Adapter/SqliteAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -1676,7 +1676,7 @@ protected function getForeignKeySqlDefinition(ForeignKey $foreignKey): string
foreach ($foreignKey->getReferencedColumns() as $column) {
$refColumnNames[] = $this->quoteColumnName($column);
}
$def .= ' REFERENCES ' . $this->quoteTableName($foreignKey->getReferencedTable()->getName()) . ' (' . implode(',', $refColumnNames) . ')';
$def .= ' REFERENCES ' . $this->quoteTableName($foreignKey->getReferencedTable()) . ' (' . implode(',', $refColumnNames) . ')';
if ($foreignKey->getOnDelete()) {
$def .= ' ON DELETE ' . $foreignKey->getOnDelete();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Db/Adapter/SqlserverAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, string $ta

$def = ' CONSTRAINT ' . $this->quoteColumnName($constraintName);
$def .= ' FOREIGN KEY ("' . implode('", "', $foreignKey->getColumns()) . '")';
$def .= " REFERENCES {$this->quoteTableName($foreignKey->getReferencedTable()->getName())} (\"" . implode('", "', $foreignKey->getReferencedColumns()) . '")';
$def .= " REFERENCES {$this->quoteTableName($foreignKey->getReferencedTable())} (\"" . implode('", "', $foreignKey->getReferencedColumns()) . '")';
if ($foreignKey->getOnDelete()) {
$def .= " ON DELETE {$foreignKey->getOnDelete()}";
}
Expand Down
Loading
Loading