Merge #360 - Fix #197 - Adding over keyword to the contexts and modify the Expression allowed keywords

Fixes: phpmyadmin/phpmyadmin#17126
Fixes: #197

Signed-off-by: William Desportes <williamdes@wdes.fr>

Author: williamdes

src/Components/Expression.php

@@ -43,6 +43,8 @@ class Expression extends Component
         'XOR' => 1,
         'NOT' => 1,
         'MOD' => 1,
+
+        'OVER' => 2,
     ];
 
     /**

src/Contexts/ContextMariaDb100200.php

@@ -122,8 +122,8 @@ class ContextMariaDb100200 extends Context
         'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
         'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
         'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'ROWS' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3,
-        'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
+        'NULL' => 3, 'OVER' => 3, 'READ' => 3, 'ROWS' => 3, 'SHOW' => 3, 'THEN' => 3,
+        'TRUE' => 3, 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
         'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
         'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
         'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,

src/Contexts/ContextMariaDb100300.php

@@ -122,8 +122,8 @@ class ContextMariaDb100300 extends Context
         'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
         'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
         'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'ROWS' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3,
-        'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
+        'NULL' => 3, 'OVER' => 3, 'READ' => 3, 'ROWS' => 3, 'SHOW' => 3, 'THEN' => 3,
+        'TRUE' => 3, 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
         'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
         'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
         'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,

src/Contexts/ContextMariaDb100400.php

@@ -122,8 +122,8 @@ class ContextMariaDb100400 extends Context
         'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
         'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
         'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'ROWS' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3,
-        'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
+        'NULL' => 3, 'OVER' => 3, 'READ' => 3, 'ROWS' => 3, 'SHOW' => 3, 'THEN' => 3,
+        'TRUE' => 3, 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
         'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
         'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
         'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,

src/Contexts/ContextMariaDb100500.php

@@ -122,8 +122,8 @@ class ContextMariaDb100500 extends Context
         'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
         'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
         'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'ROWS' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3,
-        'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
+        'NULL' => 3, 'OVER' => 3, 'READ' => 3, 'ROWS' => 3, 'SHOW' => 3, 'THEN' => 3,
+        'TRUE' => 3, 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
         'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
         'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
         'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,

src/Contexts/ContextMariaDb100600.php

@@ -122,8 +122,8 @@ class ContextMariaDb100600 extends Context
         'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
         'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
         'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'ROWS' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3,
-        'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
+        'NULL' => 3, 'OVER' => 3, 'READ' => 3, 'ROWS' => 3, 'SHOW' => 3, 'THEN' => 3,
+        'TRUE' => 3, 'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
         'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
         'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
         'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,

src/Contexts/ContextMySql80000.php

@@ -123,8 +123,8 @@ class ContextMySql80000 extends Context
         'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
         'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
         'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3,
-        'WHEN' => 3, 'WITH' => 3,
+        'NULL' => 3, 'OVER' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3,
+        'UNDO' => 3, 'WHEN' => 3, 'WITH' => 3,
         'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
         'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
         'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,

tests/data/parser/parseSelectOverAlias.in

@@ -0,0 +1 @@
+select `products`.`pid` AS `pid`, `products`.`pname` as `name`, rank() over( partition by `products`.`pvalue` order by `products`.`pid` desc) AS `myrank` from `products` 

tools/contexts/MariaDb100200.txt

@@ -369,6 +369,7 @@ OUT (R)
 OUTER (R)
 OUTFILE (R)
 OWNER
+OVER (R)
 PACK_KEYS
 PAGE
 PARSE_GCOL_EXPR

tools/contexts/MariaDb100300.txt

@@ -372,6 +372,7 @@ OUT (R)
 OUTER (R)
 OUTFILE (R)
 OWNER
+OVER (R)
 PACK_KEYS
 PAGE
 PARSE_GCOL_EXPR