Fix #17538 Index Rename Button generated incorrect sql

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
phpmyadmin · Dec 27, 2023 · 7652f01 · 7652f01
1 parent 98ff89e
commit 7652f01
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/libraries/classes/Controllers/Table/IndexRenameController.php b/libraries/classes/Controllers/Table/IndexRenameController.php
@@ -53,7 +53,9 @@ public function __invoke(): void
         if (isset($_POST['index'])) {
             if (is_array($_POST['index'])) {
                 // coming already from form
-                $index = new Index($_POST['index']);
+                $oldIndex = is_array($_POST['old_index']) ? $_POST['old_index']['Key_name'] : $_POST['old_index'];
+                $index = clone $this->dbi->getTable($this->db, $this->table)->getIndex($oldIndex);
+                $index->setName($_POST['index']['Key_name']);
             } else {
                 $index = $this->dbi->getTable($this->db, $this->table)->getIndex($_POST['index']);
             }

diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php
@@ -2127,7 +2127,7 @@ public function getSqlQueryForIndexCreateOrEdit($index, &$error)
                     ' ADD %s ',
                     $index->getChoice()
                 );
-                if ($index->getName()) {
+                if ($index->getName() !== '') {
                     $sqlQuery .= Util::backquote($index->getName());
                 }
 

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -3363,6 +3363,14 @@
     <MixedArgumentTypeCoercion occurrences="1">
       <code>$urlParams</code>
     </MixedArgumentTypeCoercion>
+    <PossiblyInvalidArgument occurrences="2">
+      <code>$_POST['index']['Key_name']</code>
+      <code>$oldIndex</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidCast occurrences="2">
+      <code>$_POST['index']['Key_name']</code>
+      <code>$oldIndex</code>
+    </PossiblyInvalidCast>
   </file>
   <file src="libraries/classes/Controllers/Table/IndexesController.php">
     <MixedArgument occurrences="2">