Actually fix the ALTER TABLE … ENUM type column operation.

Author: niconoe-

src/Components/AlterOperation.php

@@ -425,33 +425,32 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                         break;
                     }
                 } elseif (! self::checkIfTokenQuotedSymbol($token)) {
-                    if (! empty(Parser::$statementParsers[$token->value])) {
+                    // If the current token is "SET" or "ENUM", we want to avoid the token between their parenthesis in
+                    // the unknown tokens.
+                    if (in_array($token->value, ['SET', 'ENUM'], true)) {
                         $list->idx++; // Ignore the current token
                         $nextToken = $list->getNext();
 
-                        if (
-                            in_array($token->value, ['SET', 'ENUM'], true)
-                            && $nextToken !== null
-                            && $nextToken->value === '('
-                        ) {
-                            // To avoid adding the tokens between the SET() or ENUM() parentheses to the unknown tokens
+                        if ($nextToken !== null && $nextToken->value === '(') {
                             $list->getNextOfTypeAndValue(Token::TYPE_OPERATOR, ')');
-                        } elseif (
-                            in_array($token->value, ['SET', 'ENUM'], true)
-                            && $nextToken !== null
-                            && $nextToken->value === 'DEFAULT'
-                        ) {
+                        } elseif ($nextToken !== null && $nextToken->value === 'DEFAULT') {
                             // to avoid adding the `DEFAULT` token to the unknown tokens.
                             ++$list->idx;
                         } else {
-                            // We have reached the end of ALTER operation and suddenly found
-                            // a start to new statement, but have not find a delimiter between them
                             $parser->error(
                                 'A new statement was found, but no delimiter between it and the previous one.',
                                 $token
                             );
                             break;
                         }
+                    } elseif (! empty(Parser::$statementParsers[$token->value])) {
+                        // We have reached the end of ALTER operation and suddenly found
+                        // a start to new statement, but have not found a delimiter between them
+                        $parser->error(
+                            'A new statement was found, but no delimiter between it and the previous one.',
+                            $token
+                        );
+                        break;
                     } elseif (
                         (array_key_exists($arrayKey, self::$databaseOptions)
                         || array_key_exists($arrayKey, self::$tableOptions))

tests/Parser/AlterStatementTest.php

@@ -49,6 +49,9 @@ public static function alterProvider(): array
             ['parser/parseAlterTableDropAddIndex1'],
             ['parser/parseAlterTableDropColumn1'],
             ['parser/parseAlterTableModifyColumn'],
+            ['parser/parseAlterTableModifyColumnEnum1'],
+            ['parser/parseAlterTableModifyColumnEnum2'],
+            ['parser/parseAlterTableModifyColumnEnum3'],
             ['parser/parseAlterWithInvisible'],
             ['parser/parseAlterTableCharacterSet1'],
             ['parser/parseAlterTableCharacterSet2'],

tests/data/parser/parseAlter9.out

@@ -336,18 +336,6 @@
                             {
                                 "@type": "@16"
                             },
-                            {
-                                "@type": "@17"
-                            },
-                            {
-                                "@type": "@18"
-                            },
-                            {
-                                "@type": "@19"
-                            },
-                            {
-                                "@type": "@20"
-                            },
                             {
                                 "@type": "@21"
                             },

tests/data/parser/parseAlterTableModifyColumnEnum1.out

@@ -248,18 +248,6 @@
                             {
                                 "@type": "@14"
                             },
-                            {
-                                "@type": "@15"
-                            },
-                            {
-                                "@type": "@16"
-                            },
-                            {
-                                "@type": "@17"
-                            },
-                            {
-                                "@type": "@18"
-                            },
                             {
                                 "@type": "@19"
                             }

tests/data/parser/parseAlterTableModifyColumnEnum2.out

@@ -248,12 +248,6 @@
                             {
                                 "@type": "@14"
                             },
-                            {
-                                "@type": "@15"
-                            },
-                            {
-                                "@type": "@16"
-                            },
                             {
                                 "@type": "@19"
                             }

tests/data/parser/parseAlterTableModifyColumnEnum3.out

@@ -248,12 +248,6 @@
                             {
                                 "@type": "@14"
                             },
-                            {
-                                "@type": "@15"
-                            },
-                            {
-                                "@type": "@16"
-                            },
                             {
                                 "@type": "@19"
                             }