Merge pull request #554 from MoonE/support-alter-table-with-column-ch…

…eck-constraint Allow parsing ALTER TABLE statement with column check constraint
phpmyadmin · May 23, 2024 · f136374 · f136374
2 parents 29f982a + 692cecf
commit f136374
Show file tree

Hide file tree

Showing 4 changed files with 435 additions and 1 deletion.
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
@@ -422,7 +422,11 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                     } elseif (($token->value === ',') && ($brackets === 0)) {
                         break;
                     }
-                } elseif (! self::checkIfTokenQuotedSymbol($token) && $token->type !== Token::TYPE_STRING) {
+                } elseif (
+                    ! self::checkIfTokenQuotedSymbol($token) &&
+                    $token->type !== Token::TYPE_STRING &&
+                    $token->value !== 'CHECK'
+                ) {
                     if (isset(Parser::$STATEMENT_PARSERS[$arrayKey]) && Parser::$STATEMENT_PARSERS[$arrayKey] !== '') {
                         $list->idx++; // Ignore the current token
                         $nextToken = $list->getNext();

diff --git a/tests/Parser/AlterStatementTest.php b/tests/Parser/AlterStatementTest.php
@@ -45,6 +45,7 @@ public function alterProvider(): array
             ['parser/parseAlterTablePartitionByRange1'],
             ['parser/parseAlterTablePartitionByRange2'],
             ['parser/parseAlterTableCoalescePartition'],
+            ['parser/parseAlterTableAddColumnWithCheck'],
             ['parser/parseAlterTableAddSpatialIndex1'],
             ['parser/parseAlterTableDropAddIndex1'],
             ['parser/parseAlterTableDropColumn1'],

diff --git a/tests/data/parser/parseAlterTableAddColumnWithCheck.in b/tests/data/parser/parseAlterTableAddColumnWithCheck.in
@@ -0,0 +1 @@
+ALTER TABLE `xx` ADD `json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`json`));
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE `xx` ADD `json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`json`));