Merge branch '5.8.x'

williamdes · williamdes · commit 2a997ce6c6e7 · 2023-04-14T13:27:54.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Fix `ALTER TABLE … RENAME COLUMN … TO …` is not understood by the parser/linter (#430)
 - Fix `PARTITION` syntax errors (#377)
 - Fix `ALTER USER` when used with `IDENTIFIED WITH/VIA/BY` option (#431)
+- Fix `COALESCE PARTITION` in `ALTER TABLE`, rather than `COALESCE` (#323)
 
 ## [5.7.0] - 2023-01-25
 
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
@@ -76,6 +76,10 @@ final class AlterOperation implements Component
             1,
             'var',
         ],
+        'COALESCE PARTITION' => [
+            1,
+            'var',
+        ],
         'MAX_ROWS' => [
             1,
             'var',
@@ -94,7 +98,6 @@ final class AlterOperation implements Component
         'CHANGE' => 1,
         'CHARSET' => 1,
         'CHECK' => 1,
-        'COALESCE' => 1,
         'CONVERT' => 1,
         'DEFAULT CHARSET' => 1,
         'DISABLE' => 1,
diff --git a/src/Contexts/ContextMariaDb100000.php b/src/Contexts/ContextMariaDb100000.php
@@ -166,7 +166,8 @@ class ContextMariaDb100000 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMariaDb100100.php b/src/Contexts/ContextMariaDb100100.php
@@ -177,7 +177,8 @@ class ContextMariaDb100100 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMariaDb100200.php b/src/Contexts/ContextMariaDb100200.php
@@ -177,7 +177,8 @@ class ContextMariaDb100200 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMariaDb100300.php b/src/Contexts/ContextMariaDb100300.php
@@ -177,7 +177,8 @@ class ContextMariaDb100300 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMariaDb100400.php b/src/Contexts/ContextMariaDb100400.php
@@ -177,7 +177,8 @@ class ContextMariaDb100400 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMariaDb100500.php b/src/Contexts/ContextMariaDb100500.php
@@ -177,7 +177,8 @@ class ContextMariaDb100500 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMariaDb100600.php b/src/Contexts/ContextMariaDb100600.php
@@ -177,7 +177,8 @@ class ContextMariaDb100600 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMySql50000.php b/src/Contexts/ContextMySql50000.php
@@ -148,7 +148,8 @@ class ContextMySql50000 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
         'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
diff --git a/src/Contexts/ContextMySql50100.php b/src/Contexts/ContextMySql50100.php
@@ -161,7 +161,8 @@ class ContextMySql50100 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMySql50500.php b/src/Contexts/ContextMySql50500.php
@@ -166,7 +166,8 @@ class ContextMySql50500 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMySql50600.php b/src/Contexts/ContextMySql50600.php
@@ -171,7 +171,8 @@ class ContextMySql50600 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMySql50700.php b/src/Contexts/ContextMySql50700.php
@@ -177,7 +177,8 @@ class ContextMySql50700 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/src/Contexts/ContextMySql80000.php b/src/Contexts/ContextMySql80000.php
@@ -178,7 +178,8 @@ class ContextMySql80000 extends Context
         'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
         'DISABLE ON SLAVE' => 7, 'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'MODIFIES SQL DATA' => 7, 'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
+        'COALESCE PARTITION' => 7, 'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7,
+        'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,
         'ON COMPLETION PRESERVE' => 7,
         'NATURAL LEFT OUTER JOIN' => 7,
diff --git a/tests/Parser/AlterStatementTest.php b/tests/Parser/AlterStatementTest.php
@@ -43,6 +43,7 @@ public static function alterProvider(): array
             ['parser/parseAlterTableRenameIndex'],
             ['parser/parseAlterTablePartitionByRange1'],
             ['parser/parseAlterTablePartitionByRange2'],
+            ['parser/parseAlterTableCoalescePartition'],
             ['parser/parseAlterWithInvisible'],
             ['parser/parseAlterTableCharacterSet1'],
             ['parser/parseAlterTableCharacterSet2'],
diff --git a/tests/data/parser/parseAlterTableCoalescePartition.in b/tests/data/parser/parseAlterTableCoalescePartition.in
@@ -0,0 +1 @@
+ALTER TABLE `MY_TABLE` COALESCE PARTITION 2;
diff --git a/tests/data/parser/parseAlterTableCoalescePartition.out b/tests/data/parser/parseAlterTableCoalescePartition.out
@@ -0,0 +1,174 @@
+{
+    "query": "ALTER TABLE `MY_TABLE` COALESCE PARTITION 2;",
+    "lexer": {
+        "@type": "PhpMyAdmin\\SqlParser\\Lexer",
+        "str": "ALTER TABLE `MY_TABLE` COALESCE PARTITION 2;",
+        "len": 44,
+        "last": 44,
+        "list": {
+            "@type": "PhpMyAdmin\\SqlParser\\TokensList",
+            "tokens": [
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": "ALTER",
+                    "value": "ALTER",
+                    "keyword": "ALTER",
+                    "type": 1,
+                    "flags": 3,
+                    "position": 0
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": " ",
+                    "value": " ",
+                    "keyword": null,
+                    "type": 3,
+                    "flags": 0,
+                    "position": 5
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": "TABLE",
+                    "value": "TABLE",
+                    "keyword": "TABLE",
+                    "type": 1,
+                    "flags": 3,
+                    "position": 6
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": " ",
+                    "value": " ",
+                    "keyword": null,
+                    "type": 3,
+                    "flags": 0,
+                    "position": 11
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": "`MY_TABLE`",
+                    "value": "MY_TABLE",
+                    "keyword": null,
+                    "type": 8,
+                    "flags": 2,
+                    "position": 12
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": " ",
+                    "value": " ",
+                    "keyword": null,
+                    "type": 3,
+                    "flags": 0,
+                    "position": 22
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": "COALESCE PARTITION",
+                    "value": "COALESCE PARTITION",
+                    "keyword": "COALESCE PARTITION",
+                    "type": 1,
+                    "flags": 7,
+                    "position": 23
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": " ",
+                    "value": " ",
+                    "keyword": null,
+                    "type": 3,
+                    "flags": 0,
+                    "position": 41
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": "2",
+                    "value": 2,
+                    "keyword": null,
+                    "type": 6,
+                    "flags": 0,
+                    "position": 42
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": ";",
+                    "value": ";",
+                    "keyword": null,
+                    "type": 9,
+                    "flags": 0,
+                    "position": 43
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": null,
+                    "value": null,
+                    "keyword": null,
+                    "type": 9,
+                    "flags": 0,
+                    "position": null
+                }
+            ],
+            "count": 11,
+            "idx": 11
+        },
+        "delimiter": ";",
+        "delimiterLen": 1,
+        "strict": false,
+        "errors": []
+    },
+    "parser": {
+        "@type": "PhpMyAdmin\\SqlParser\\Parser",
+        "list": {
+            "@type": "@1"
+        },
+        "statements": [
+            {
+                "@type": "PhpMyAdmin\\SqlParser\\Statements\\AlterStatement",
+                "table": {
+                    "@type": "PhpMyAdmin\\SqlParser\\Components\\Expression",
+                    "database": null,
+                    "table": "MY_TABLE",
+                    "column": null,
+                    "expr": "`MY_TABLE`",
+                    "alias": null,
+                    "function": null,
+                    "subquery": null
+                },
+                "altered": [
+                    {
+                        "@type": "PhpMyAdmin\\SqlParser\\Components\\AlterOperation",
+                        "options": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
+                            "options": {
+                                "1": {
+                                    "name": "COALESCE PARTITION",
+                                    "equals": false,
+                                    "expr": "2",
+                                    "value": "2"
+                                }
+                            }
+                        },
+                        "field": null,
+                        "partitions": null,
+                        "unknown": []
+                    }
+                ],
+                "options": {
+                    "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
+                    "options": {
+                        "3": "TABLE"
+                    }
+                },
+                "first": 0,
+                "last": 9
+            }
+        ],
+        "brackets": 0,
+        "strict": false,
+        "errors": []
+    },
+    "errors": {
+        "lexer": [],
+        "parser": []
+    }
+}
diff --git a/tools/contexts/_common.txt b/tools/contexts/_common.txt
@@ -12,6 +12,7 @@ CHAR (D)
 CHARACTER (D)
 CHARACTER SET
 CHARSET
+COALESCE PARTITION
 CROSS JOIN
 DATA DIRECTORY
 DATE (D)
