Repository navigation
Commit bfafeaa
authored
Match MySQL operator precedence for XOR and bitwise operators (#2838)
XOR sat on the same level as OR, and |, &, <<, >> shared one
left-associative level, in every dialect. MySQL puts XOR between AND
and OR, and tiers the bitwise operators as <<, >> above & above |.
Gate the tiers on Dialect.MYSQL so the default dialect keeps the
shared levels established in #2833. SimpleExpression now enters the
arithmetic loop at floor 2 under MySQL so | is admitted.
Fixes #2834, fixes #28351 parent 28ad7d2 commit bfafeaa
2 files changed
Lines changed: 58 additions & 6 deletions
File tree
- src
- main/jjtree/net/sf/jsqlparser/parser
- test/java/net/sf/jsqlparser/expression
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
903 | 903 | | |
904 | 904 | | |
905 | 905 | | |
906 | | - | |
| 906 | + | |
907 | 907 | | |
908 | 908 | | |
909 | 909 | | |
| |||
913 | 913 | | |
914 | 914 | | |
915 | 915 | | |
916 | | - | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
| 920 | + | |
917 | 921 | | |
918 | 922 | | |
919 | 923 | | |
| |||
989 | 993 | | |
990 | 994 | | |
991 | 995 | | |
992 | | - | |
993 | | - | |
| 996 | + | |
| 997 | + | |
| 998 | + | |
| 999 | + | |
| 1000 | + | |
| 1001 | + | |
| 1002 | + | |
994 | 1003 | | |
995 | 1004 | | |
996 | 1005 | | |
997 | 1006 | | |
998 | 1007 | | |
999 | 1008 | | |
1000 | 1009 | | |
1001 | | - | |
| 1010 | + | |
| 1011 | + | |
| 1012 | + | |
1002 | 1013 | | |
1003 | 1014 | | |
1004 | 1015 | | |
| |||
12659 | 12670 | | |
12660 | 12671 | | |
12661 | 12672 | | |
12662 | | - | |
| 12673 | + | |
| 12674 | + | |
| 12675 | + | |
| 12676 | + | |
| 12677 | + | |
| 12678 | + | |
12663 | 12679 | | |
12664 | 12680 | | |
12665 | 12681 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
25 | 27 | | |
26 | 28 | | |
27 | 29 | | |
| |||
309 | 311 | | |
310 | 312 | | |
311 | 313 | | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
312 | 348 | | |
0 commit comments