Recognize BINARY as function

Fixes https://github.com/phpmyadmin/phpmyadmin/issues/12762

Signed-off-by: Michal Čihař <michal@cihar.com>

13 files changed, 26 insertions, 10 deletions

diff --git a/src/Contexts/ContextMySql50000.php b/src/Contexts/ContextMySql50000.php
index 82ec3bd..f05cacc 100644
--- a/src/Contexts/ContextMySql50000.php
+++ b/src/Contexts/ContextMySql50000.php
@@ -173,7 +173,7 @@ class ContextMySql50000 extends Context
         'INT' => 11, 'SET' => 11,
         'BLOB' => 11, 'REAL' => 11,
         'FLOAT' => 11,
-        'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
+        'BIGINT' => 11, 'DOUBLE' => 11,
         'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
         'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
         'TINYTEXT' => 11,
@@ -281,6 +281,7 @@ class ContextMySql50000 extends Context
         'GEOMETRYCOLLECTION' => 41,
 
         'CHAR' => 43,
+        'BINARY' => 43,
         'INTERVAL' => 43,
 
     );
diff --git a/src/Contexts/ContextMySql50100.php b/src/Contexts/ContextMySql50100.php
index f63d174..d529b8f 100644
--- a/src/Contexts/ContextMySql50100.php
+++ b/src/Contexts/ContextMySql50100.php
@@ -187,7 +187,7 @@ class ContextMySql50100 extends Context
         'INT' => 11, 'SET' => 11,
         'BLOB' => 11, 'REAL' => 11,
         'FLOAT' => 11,
-        'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
+        'BIGINT' => 11, 'DOUBLE' => 11,
         'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
         'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
         'TINYTEXT' => 11,
@@ -306,6 +306,7 @@ class ContextMySql50100 extends Context
         'GEOMETRYCOLLECTION' => 41,
 
         'CHAR' => 43,
+        'BINARY' => 43,
         'INTERVAL' => 43,
 
     );
diff --git a/src/Contexts/ContextMySql50500.php b/src/Contexts/ContextMySql50500.php
index a015dd8..a76f8fe 100644
--- a/src/Contexts/ContextMySql50500.php
+++ b/src/Contexts/ContextMySql50500.php
@@ -191,7 +191,7 @@ class ContextMySql50500 extends Context
         'INT' => 11, 'SET' => 11,
         'BLOB' => 11, 'REAL' => 11,
         'FLOAT' => 11,
-        'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
+        'BIGINT' => 11, 'DOUBLE' => 11,
         'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
         'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
         'TINYTEXT' => 11,
@@ -311,6 +311,7 @@ class ContextMySql50500 extends Context
         'GEOMETRYCOLLECTION' => 41,
 
         'CHAR' => 43,
+        'BINARY' => 43,
         'INTERVAL' => 43,
 
     );
diff --git a/src/Contexts/ContextMySql50600.php b/src/Contexts/ContextMySql50600.php
index 94655ae..f6723d5 100644
--- a/src/Contexts/ContextMySql50600.php
+++ b/src/Contexts/ContextMySql50600.php
@@ -197,7 +197,7 @@ class ContextMySql50600 extends Context
         'INT' => 11, 'SET' => 11,
         'BLOB' => 11, 'REAL' => 11,
         'FLOAT' => 11,
-        'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
+        'BIGINT' => 11, 'DOUBLE' => 11,
         'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
         'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
         'TINYTEXT' => 11,
@@ -340,6 +340,7 @@ class ContextMySql50600 extends Context
         'GEOMETRYCOLLECTION' => 41,
 
         'CHAR' => 43,
+        'BINARY' => 43,
         'INTERVAL' => 43,
 
     );
diff --git a/src/Contexts/ContextMySql50700.php b/src/Contexts/ContextMySql50700.php
index 9f83e0f..1cac664 100644
--- a/src/Contexts/ContextMySql50700.php
+++ b/src/Contexts/ContextMySql50700.php
@@ -203,7 +203,7 @@ class ContextMySql50700 extends Context
         'INT' => 11, 'SET' => 11,
         'BLOB' => 11, 'REAL' => 11,
         'FLOAT' => 11,
-        'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
+        'BIGINT' => 11, 'DOUBLE' => 11,
         'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
         'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
         'TINYTEXT' => 11,
@@ -352,6 +352,7 @@ class ContextMySql50700 extends Context
         'GEOMETRYCOLLECTION' => 41,
 
         'CHAR' => 43,
+        'BINARY' => 43,
         'INTERVAL' => 43,
 
     );
diff --git a/tests/Parser/SelectStatementTest.php b/tests/Parser/SelectStatementTest.php
index 597f063..2fae302 100644
--- a/tests/Parser/SelectStatementTest.php
+++ b/tests/Parser/SelectStatementTest.php
@@ -36,6 +36,7 @@ class SelectStatementTest extends TestCase
             array('parser/parseSelect7'),
             array('parser/parseSelect8'),
             array('parser/parseSelect9'),
+            array('parser/parseSelect10'),
             array('parser/parseSelectErr1'),
             array('parser/parseSelectNested'),
             array('parser/parseSelectCase1'),
diff --git a/tests/data/parser/parseSelect10.in b/tests/data/parser/parseSelect10.in
new file mode 100644
index 0000000..61d8635
--- /dev/null
+++ b/tests/data/parser/parseSelect10.in
@@ -0,0 +1 @@
+SELECT my_column FROM my_table WHERE BINARY(my_column) != BINARY(UPPER(my_column))
diff --git a/tests/data/parser/parseSelect10.out b/tests/data/parser/parseSelect10.out
new file mode 100644
index 0000000..8486960
--- /dev/null
+++ b/tests/data/parser/parseSelect10.out
@@ -0,0 +1,4 @@
+a:4:{s:5:"query";s:83:"SELECT my_column FROM my_table WHERE BINARY(my_column) != BINARY(UPPER(my_column))
+";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:83:"SELECT my_column FROM my_table WHERE BINARY(my_column) != BINARY(UPPER(my_column))
+";s:3:"len";i:83;s:4:"last";i:83;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:26:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"SELECT";s:5:"value";s:6:"SELECT";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:0;}i:1;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:6;}i:2;O:15:"SqlParser\Token":5:{s:5:"token";s:9:"my_column";s:5:"value";s:9:"my_column";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:7;}i:3;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:16;}i:4;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"FROM";s:5:"value";s:4:"FROM";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:17;}i:5;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:21;}i:6;O:15:"SqlParser\Token":5:{s:5:"token";s:8:"my_table";s:5:"value";s:8:"my_table";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:22;}i:7;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:30;}i:8;O:15:"SqlParser\Token":5:{s:5:"token";s:5:"WHERE";s:5:"value";s:5:"WHERE";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:31;}i:9;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:36;}i:10;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"BINARY";s:5:"value";s:6:"BINARY";s:4:"type";i:1;s:5:"flags";i:43;s:8:"position";i:37;}i:11;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:43;}i:12;O:15:"SqlParser\Token":5:{s:5:"token";s:9:"my_column";s:5:"value";s:9:"my_column";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:44;}i:13;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:53;}i:14;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:54;}i:15;O:15:"SqlParser\Token":5:{s:5:"token";s:2:"!=";s:5:"value";s:2:"!=";s:4:"type";i:2;s:5:"flags";i:2;s:8:"position";i:55;}i:16;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:57;}i:17;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"BINARY";s:5:"value";s:6:"BINARY";s:4:"type";i:1;s:5:"flags";i:43;s:8:"position";i:58;}i:18;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:64;}i:19;O:15:"SqlParser\Token":5:{s:5:"token";s:5:"UPPER";s:5:"value";s:5:"UPPER";s:4:"type";i:1;s:5:"flags";i:33;s:8:"position";i:65;}i:20;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:70;}i:21;O:15:"SqlParser\Token":5:{s:5:"token";s:9:"my_column";s:5:"value";s:9:"my_column";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:71;}i:22;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:80;}i:23;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:81;}i:24;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"
+";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:82;}i:25;O:15:"SqlParser\Token":5:{s:5:"token";N;s:5:"value";N;s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";N;}}s:5:"count";i:26;s:3:"idx";i:26;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";O:16:"SqlParser\Parser":5:{s:4:"list";r:8;s:6:"strict";b:0;s:6:"errors";a:0:{}s:10:"statements";a:1:{i:0;O:36:"SqlParser\Statements\SelectStatement":16:{s:4:"expr";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";s:9:"my_column";s:4:"expr";s:9:"my_column";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:4:"from";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:8:"my_table";s:6:"column";N;s:4:"expr";s:8:"my_table";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:9:"partition";N;s:5:"where";a:1:{i:0;O:30:"SqlParser\Components\Condition":3:{s:11:"identifiers";a:2:{i:0;s:9:"my_column";i:1;s:5:"UPPER";}s:10:"isOperator";b:0;s:4:"expr";s:45:"BINARY(my_column) != BINARY(UPPER(my_column))";}}s:5:"group";N;s:6:"having";N;s:5:"order";N;s:5:"limit";N;s:9:"procedure";N;s:4:"into";N;s:4:"join";N;s:5:"union";a:0:{}s:11:"end_options";N;s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:0;s:4:"last";i:24;}}s:8:"brackets";i:0;}s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:0:{}}}
\ No newline at end of file
diff --git a/tools/contexts/_functionsMySql50000.txt b/tools/contexts/_functionsMySql50000.txt
index d197ca1..d66b8c0 100644
--- a/tools/contexts/_functionsMySql50000.txt
+++ b/tools/contexts/_functionsMySql50000.txt
@@ -14,6 +14,7 @@ ATAN (F)
 AVG (F)
 BENCHMARK (F)
 BIN (F)
+BINARY (F)
 BIT_AND (F)
 BIT_COUNT (F)
 BIT_LENGTH (F)
@@ -263,4 +264,4 @@ Within (F)
 X (F)
 Y (F)
 YEAR (F)
-YEARWEEK (F)
\ No newline at end of file
+YEARWEEK (F)
diff --git a/tools/contexts/_functionsMySql50100.txt b/tools/contexts/_functionsMySql50100.txt
index 188bfd4..2b62271 100644
--- a/tools/contexts/_functionsMySql50100.txt
+++ b/tools/contexts/_functionsMySql50100.txt
@@ -16,6 +16,7 @@ ATAN2 (F)
 AVG (F)
 BENCHMARK (F)
 BIN (F)
+BINARY (F)
 BIT_AND (F)
 BIT_COUNT (F)
 BIT_LENGTH (F)
@@ -281,4 +282,4 @@ Within (F)
 X (F)
 Y (F)
 YEAR (F)
-YEARWEEK (F)
\ No newline at end of file
+YEARWEEK (F)
diff --git a/tools/contexts/_functionsMySql50500.txt b/tools/contexts/_functionsMySql50500.txt
index 75d30c9..f391c8e 100644
--- a/tools/contexts/_functionsMySql50500.txt
+++ b/tools/contexts/_functionsMySql50500.txt
@@ -16,6 +16,7 @@ ATAN2 (F)
 AVG (F)
 BENCHMARK (F)
 BIN (F)
+BINARY (F)
 BIT_AND (F)
 BIT_COUNT (F)
 BIT_LENGTH (F)
@@ -288,4 +289,4 @@ Within (F)
 X (F)
 Y (F)
 YEAR (F)
-YEARWEEK (F)
\ No newline at end of file
+YEARWEEK (F)
diff --git a/tools/contexts/_functionsMySql50600.txt b/tools/contexts/_functionsMySql50600.txt
index 601b7b7..89f8b56 100644
--- a/tools/contexts/_functionsMySql50600.txt
+++ b/tools/contexts/_functionsMySql50600.txt
@@ -21,6 +21,7 @@ ATAN2 (F)
 AVG (F)
 BENCHMARK (F)
 BIN (F)
+BINARY (F)
 BIT_AND (F)
 BIT_COUNT (F)
 BIT_LENGTH (F)
@@ -363,4 +364,4 @@ Within (F)
 X (F)
 Y (F)
 YEAR (F)
-YEARWEEK (F)
\ No newline at end of file
+YEARWEEK (F)
diff --git a/tools/contexts/_functionsMySql50700.txt b/tools/contexts/_functionsMySql50700.txt
index f533e90..d7867b4 100644
--- a/tools/contexts/_functionsMySql50700.txt
+++ b/tools/contexts/_functionsMySql50700.txt
@@ -17,6 +17,7 @@ ATAN2 (F)
 AVG (F)
 BENCHMARK (F)
 BIN (F)
+BINARY (F)
 BIT_AND (F)
 BIT_COUNT (F)
 BIT_LENGTH (F)
@@ -387,4 +388,4 @@ Within (F)
 X (F)
 Y (F)
 YEAR (F)
-YEARWEEK (F)
\ No newline at end of file
+YEARWEEK (F)