Manage COALESCE PARTITION in ALTER TABLE, rather than COALESCE

phpmyadmin · Apr 12, 2023 · 26eb1f2 · 26eb1f2
1 parent c1cf0ba
commit 26eb1f2
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 14 deletions.
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
@@ -78,6 +78,10 @@ class AlterOperation extends Component
             1,
             'var',
         ],
+        'COALESCE PARTITION' => [
+            1,
+            'var',
+        ],
         'MAX_ROWS' => [
             1,
             'var',
@@ -96,7 +100,6 @@ class AlterOperation extends 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/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)