Merge pull request #19342 from liviuconcioiu/primary-key

MauricioFauth · web-flow · commit 48c6e9f7ed5e · 2024-10-29T22:30:11.000-03:00
Fix add PRIMARY key from More drop-down
diff --git a/src/Controllers/Table/Structure/AbstractIndexController.php b/src/Controllers/Table/Structure/AbstractIndexController.php
@@ -39,7 +39,7 @@ public function handleIndexCreation(ServerRequest $request, string $indexType):
         Assert::allString($selected);
 
         if ($indexType === 'PRIMARY') {
-            $hasPrimaryKey = $this->indexes->hasPrimaryKey(Current::$table);
+            $hasPrimaryKey = $this->indexes->hasPrimaryKey(Current::$database, Current::$table);
             $statement = Generator::getAddPrimaryKeyStatement(Current::$table, $selected[0], $hasPrimaryKey);
         } else {
             $statement = Generator::getAddIndexSql($indexType, Current::$table, $selected);
diff --git a/src/Table/Indexes.php b/src/Table/Indexes.php
@@ -189,9 +189,11 @@ public function executeAddIndexSql(string|DatabaseName $db, string $sql): Messag
         return Message::success();
     }
 
-    public function hasPrimaryKey(string|TableName $table): bool
+    public function hasPrimaryKey(string|DatabaseName $db, string|TableName $table): bool
     {
+        $this->dbi->selectDb($db);
         $result = $this->dbi->query('SHOW KEYS FROM ' . Util::backquote($table));
+
         foreach ($result as $row) {
             if ($row['Key_name'] === 'PRIMARY') {
                 return true;

Original file line number	Diff line number	Diff line change
`@@ -189,9 +189,11 @@ public function executeAddIndexSql(string\|DatabaseName $db, string $sql): Messag`
`189`	`189`	`return Message::success();`
`190`	`190`	`}`
`191`	`191`
`192`		`- public function hasPrimaryKey(string\|TableName $table): bool`
	`192`	`+ public function hasPrimaryKey(string\|DatabaseName $db, string\|TableName $table): bool`
`193`	`193`	`{`
	`194`	`+ $this->dbi->selectDb($db);`
`194`	`195`	`$result = $this->dbi->query('SHOW KEYS FROM ' . Util::backquote($table));`
	`196`	`+`
`195`	`197`	`foreach ($result as $row) {`
`196`	`198`	`if ($row['Key_name'] === 'PRIMARY') {`
`197`	`199`	`return true;`