Merge pull request #19346 from kamil-tekiela/getReservedColumnNames

MauricioFauth · web-flow · commit d8f0c402adb4 · 2024-10-31T17:28:44.000-03:00
Drop getReservedColumnNames()
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -13524,11 +13524,6 @@ parameters:
 			count: 2
 			path: src/Table/Table.php
 
-		-
-			message: "#^Only booleans are allowed in a negated boolean, int\\|null given\\.$#"
-			count: 1
-			path: src/Table/Table.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, PhpMyAdmin\\\\Dbal\\\\ResultInterface\\|false given\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -10765,7 +10765,6 @@
       <code><![CDATA[true|Message]]></code>
     </PossiblyUnusedReturnValue>
     <RiskyTruthyFalsyComparison>
-      <code><![CDATA[! Context::isKeyword($columnName, true)]]></code>
       <code><![CDATA[empty($existrelForeign[$masterFieldMd5]->onDelete)]]></code>
       <code><![CDATA[empty($existrelForeign[$masterFieldMd5]->onUpdate)]]></code>
     </RiskyTruthyFalsyComparison>
diff --git a/src/Table/Table.php b/src/Table/Table.php
@@ -19,7 +19,6 @@
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Query\Compatibility;
 use PhpMyAdmin\Query\Generator as QueryGenerator;
-use PhpMyAdmin\SqlParser\Context;
 use PhpMyAdmin\SqlParser\Parser;
 use PhpMyAdmin\SqlParser\Statements\CreateStatement;
 use PhpMyAdmin\SqlParser\Utils\ForeignKey;
@@ -1291,28 +1290,6 @@ public function removeUiProp(UiProperty $property): true|Message
         return true;
     }
 
-    /**
-     * Get all column names which are MySQL reserved words
-     *
-     * @return string[]
-     */
-    public function getReservedColumnNames(): array
-    {
-        $columns = $this->getColumns(false);
-        $return = [];
-        foreach ($columns as $column) {
-            $temp = explode('.', $column);
-            $columnName = $temp[2];
-            if (! Context::isKeyword($columnName, true)) {
-                continue;
-            }
-
-            $return[] = $columnName;
-        }
-
-        return $return;
-    }
-
     /**
      * Function to get the name and type of the columns of a table
      *
diff --git a/tests/unit/Table/TableTest.php b/tests/unit/Table/TableTest.php
@@ -1228,10 +1228,6 @@ public function testGetColumns(): void
             '`PMA`.`PMA_BookMark`.`ALL`',
         ];
         self::assertSame($expect, $return);
-
-        $return = $table->getReservedColumnNames();
-        $expect = ['ACCESSIBLE', 'ADD', 'ALL'];
-        self::assertSame($expect, $return);
     }
 
     /**
