Skip to content

Commit 19efddd

Browse files
nijelnijel
committed
Recognize BINARY as function
Fixes phpmyadmin/phpmyadmin#12762 Signed-off-by: Michal Čihař <[email protected]>
1 parent 3d206ed commit 19efddd

13 files changed

+26
-10
lines changed

‎src/Contexts/ContextMySql50000.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class ContextMySql50000 extends Context
173173
'INT' => 11, 'SET' => 11,
174174
'BLOB' => 11, 'REAL' => 11,
175175
'FLOAT' => 11,
176-
'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
176+
'BIGINT' => 11, 'DOUBLE' => 11,
177177
'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
178178
'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
179179
'TINYTEXT' => 11,
@@ -281,6 +281,7 @@ class ContextMySql50000 extends Context
281281
'GEOMETRYCOLLECTION' => 41,
282282

283283
'CHAR' => 43,
284+
'BINARY' => 43,
284285
'INTERVAL' => 43,
285286

286287
);

‎src/Contexts/ContextMySql50100.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class ContextMySql50100 extends Context
187187
'INT' => 11, 'SET' => 11,
188188
'BLOB' => 11, 'REAL' => 11,
189189
'FLOAT' => 11,
190-
'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
190+
'BIGINT' => 11, 'DOUBLE' => 11,
191191
'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
192192
'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
193193
'TINYTEXT' => 11,
@@ -306,6 +306,7 @@ class ContextMySql50100 extends Context
306306
'GEOMETRYCOLLECTION' => 41,
307307

308308
'CHAR' => 43,
309+
'BINARY' => 43,
309310
'INTERVAL' => 43,
310311

311312
);

‎src/Contexts/ContextMySql50500.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ class ContextMySql50500 extends Context
191191
'INT' => 11, 'SET' => 11,
192192
'BLOB' => 11, 'REAL' => 11,
193193
'FLOAT' => 11,
194-
'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
194+
'BIGINT' => 11, 'DOUBLE' => 11,
195195
'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
196196
'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
197197
'TINYTEXT' => 11,
@@ -311,6 +311,7 @@ class ContextMySql50500 extends Context
311311
'GEOMETRYCOLLECTION' => 41,
312312

313313
'CHAR' => 43,
314+
'BINARY' => 43,
314315
'INTERVAL' => 43,
315316

316317
);

‎src/Contexts/ContextMySql50600.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ class ContextMySql50600 extends Context
197197
'INT' => 11, 'SET' => 11,
198198
'BLOB' => 11, 'REAL' => 11,
199199
'FLOAT' => 11,
200-
'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
200+
'BIGINT' => 11, 'DOUBLE' => 11,
201201
'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
202202
'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
203203
'TINYTEXT' => 11,
@@ -340,6 +340,7 @@ class ContextMySql50600 extends Context
340340
'GEOMETRYCOLLECTION' => 41,
341341

342342
'CHAR' => 43,
343+
'BINARY' => 43,
343344
'INTERVAL' => 43,
344345

345346
);

‎src/Contexts/ContextMySql50700.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class ContextMySql50700 extends Context
203203
'INT' => 11, 'SET' => 11,
204204
'BLOB' => 11, 'REAL' => 11,
205205
'FLOAT' => 11,
206-
'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
206+
'BIGINT' => 11, 'DOUBLE' => 11,
207207
'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
208208
'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
209209
'TINYTEXT' => 11,
@@ -352,6 +352,7 @@ class ContextMySql50700 extends Context
352352
'GEOMETRYCOLLECTION' => 41,
353353

354354
'CHAR' => 43,
355+
'BINARY' => 43,
355356
'INTERVAL' => 43,
356357

357358
);

‎tests/Parser/SelectStatementTest.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public function testSelectProvider()
3636
array('parser/parseSelect7'),
3737
array('parser/parseSelect8'),
3838
array('parser/parseSelect9'),
39+
array('parser/parseSelect10'),
3940
array('parser/parseSelectErr1'),
4041
array('parser/parseSelectNested'),
4142
array('parser/parseSelectCase1'),

‎tests/data/parser/parseSelect10.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SELECT my_column FROM my_table WHERE BINARY(my_column) != BINARY(UPPER(my_column))

‎tests/data/parser/parseSelect10.out‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
a:4:{s:5:"query";s:83:"SELECT my_column FROM my_table WHERE BINARY(my_column) != BINARY(UPPER(my_column))
2+
";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))
3+
";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:"
4+
";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:{}}}

‎tools/contexts/_functionsMySql50000.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ATAN (F)
1414
AVG (F)
1515
BENCHMARK (F)
1616
BIN (F)
17+
BINARY (F)
1718
BIT_AND (F)
1819
BIT_COUNT (F)
1920
BIT_LENGTH (F)
@@ -263,4 +264,4 @@ Within (F)
263264
X (F)
264265
Y (F)
265266
YEAR (F)
266-
YEARWEEK (F)
267+
YEARWEEK (F)

‎tools/contexts/_functionsMySql50100.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ATAN2 (F)
1616
AVG (F)
1717
BENCHMARK (F)
1818
BIN (F)
19+
BINARY (F)
1920
BIT_AND (F)
2021
BIT_COUNT (F)
2122
BIT_LENGTH (F)
@@ -281,4 +282,4 @@ Within (F)
281282
X (F)
282283
Y (F)
283284
YEAR (F)
284-
YEARWEEK (F)
285+
YEARWEEK (F)

0 commit comments

Comments
 (0)