Merge #19331 - Fix #17182 - FK Relationship View constraint name natural ordering

williamdes · williamdes · commit de85bcb05cd6 · 2026-01-17T14:32:52.000+01:00
Pull-request: #19331 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/docs/config.rst b/docs/config.rst
@@ -3612,9 +3612,9 @@ Various display setting
     :type: boolean
     :default: true
 
-    Sorts database and table names according to natural order (for
-    example, t1, t2, t10). Currently implemented in the navigation panel
-    and in Database view, for the table list.
+    Sorts database, table names and foreign key constaint according to natural order (for
+    example, t1, t2, t10). Currently implemented in the navigation panel,
+    in Database view for the table list and Relation view while listing Foreign key constraints.
 
 .. config:option:: $cfg['InitialSlidersState']
 
diff --git a/src/Controllers/Table/RelationController.php b/src/Controllers/Table/RelationController.php
@@ -19,6 +19,7 @@
 use PhpMyAdmin\MessageType;
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Routing\Route;
+use PhpMyAdmin\SqlParser\Utils\ForeignKey as ForeignKeyObject;
 use PhpMyAdmin\Table\Table;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\UrlParams;
@@ -28,6 +29,7 @@
 use function array_keys;
 use function md5;
 use function strnatcasecmp;
+use function strnatcmp;
 use function uksort;
 use function usort;
 
@@ -179,6 +181,13 @@ public function __invoke(ServerRequest $request): Response
 
         if ($this->config->settings['NaturalOrder']) {
             uksort($columnArray, strnatcasecmp(...));
+            usort(
+                $relationsForeign,
+                static fn (ForeignKeyObject $before, ForeignKeyObject $after) => strnatcmp(
+                    $before->constraint ?? '',
+                    $after->constraint ?? '',
+                ),
+            );
         }
 
         $foreignKeyRow = '';
