Skip to content

fix: qualify and order the foreign key lookup in rex_sql_table #6623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gharlan merged 2 commits into from
Aug 5, 2026
+15 −2
Merged

fix: qualify and order the foreign key lookup in rex_sql_table #6623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78895a0
fix: qualify and order the foreign key lookup in rex_sql_table
tyrant88 Aug 5, 2026
969b2dc
fix: restrict the foreign key lookup to referential constraint rows
tyrant88 Aug 5, 2026
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
11 changes: 9 additions & 2 deletions redaxo/src/core/lib/sql/table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,19 @@ private function __construct(string $name, int $db = 1)
$this->indexesExisting[$indexName] = $indexName;
}

// KEY_COLUMN_USAGE spans all schemas and also lists unique/primary keys, so the join must be qualified.
// INFORMATION_SCHEMA gives no ordering guarantee, and the column order of a composite key ends up in the DDL.
/** @var list<array{CONSTRAINT_NAME: string, COLUMN_NAME: string, REFERENCED_TABLE_NAME: string, REFERENCED_COLUMN_NAME: string, UPDATE_RULE: rex_sql_foreign_key::*, DELETE_RULE: rex_sql_foreign_key::*}> $foreignKeyParts */
$foreignKeyParts = $this->sql->getArray('
SELECT c.CONSTRAINT_NAME, c.REFERENCED_TABLE_NAME, c.UPDATE_RULE, c.DELETE_RULE, k.COLUMN_NAME, k.REFERENCED_COLUMN_NAME
FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS c
INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE k ON c.CONSTRAINT_NAME = k.CONSTRAINT_NAME
WHERE c.CONSTRAINT_SCHEMA = DATABASE() AND c.TABLE_NAME = ?', [$name]);
INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE k
ON c.CONSTRAINT_SCHEMA = k.CONSTRAINT_SCHEMA
AND c.CONSTRAINT_NAME = k.CONSTRAINT_NAME
AND c.TABLE_NAME = k.TABLE_NAME
Comment thread
gharlan marked this conversation as resolved.
AND k.POSITION_IN_UNIQUE_CONSTRAINT IS NOT NULL
WHERE c.CONSTRAINT_SCHEMA = DATABASE() AND c.TABLE_NAME = ?
ORDER BY c.CONSTRAINT_NAME, k.ORDINAL_POSITION', [$name]);
$foreignKeys = [];
foreach ($foreignKeyParts as $part) {
$foreignKeys[$part['CONSTRAINT_NAME']][] = $part;
Expand Down
6 changes: 6 additions & 0 deletions redaxo/src/core/tests/sql/sql_table_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,12 @@ public function testAddForeignKey(): void
$table = rex_sql_table::get(self::TABLE);

self::assertEquals($fk, $table->getForeignKey('test1_fk_config'));

// assertEquals compares arrays order-insensitively, so the column order needs its own assertion.
self::assertSame(
['config_namespace' => 'namespace', 'config_key' => 'key'],
$table->getForeignKey('test1_fk_config')?->getColumns(),
);
}

public function testEnsureForeignKey(): void
Expand Down