Skip to content

Commit 81253ae

Browse files
[sql-parsing] Remove MIN/MAX token names from mysql grammar (#1447)
Summary: The mysql grammar created an enum with `MIN` and `MAX` as names, which conflicted with some macros. This changes their names to `MIN_TOKEN` and `MAX_TOKEN`. Type of change: /kind cleanup Test Plan: Relying on existing tests. Signed-off-by: James Bartlett <jamesbartlett@pixielabs.ai>
1 parent 1dbe6ac commit 81253ae

File tree

1 file changed

+35
-2
lines changed

1 file changed

+35
-2
lines changed

bazel/external/antlr_grammars.patch

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ diff --git a/sql/mysql/Positive-Technologies/MySqlLexer.g4 b/sql/mysql/Positive-
22
similarity index 99%
33
rename from sql/mysql/Positive-Technologies/MySqlLexer.g4
44
rename to sql/mysql/Positive-Technologies/MySQLLexer.g4
5-
index 98dd6d8d..10dd0d1a 100644
5+
index 98dd6d8d..4ecdb4c5 100644
66
--- a/sql/mysql/Positive-Technologies/MySqlLexer.g4
77
+++ b/sql/mysql/Positive-Technologies/MySQLLexer.g4
88
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -23,6 +23,17 @@ index 98dd6d8d..10dd0d1a 100644
2323
COLLATE: 'COLLATE';
2424
COLUMN: 'COLUMN';
2525
CONDITION: 'CONDITION';
26+
@@ -290,8 +290,8 @@ BIT_OR: 'BIT_OR';
27+
BIT_XOR: 'BIT_XOR';
28+
COUNT: 'COUNT';
29+
GROUP_CONCAT: 'GROUP_CONCAT';
30+
-MAX: 'MAX';
31+
-MIN: 'MIN';
32+
+MAX_TOKEN: 'MAX';
33+
+MIN_TOKEN: 'MIN';
34+
STD: 'STD';
35+
STDDEV: 'STDDEV';
36+
STDDEV_POP: 'STDDEV_POP';
2637
@@ -811,7 +811,7 @@ ASYMMETRIC_SIGN: 'ASYMMETRIC_SIGN';
2738
ASYMMETRIC_VERIFY: 'ASYMMETRIC_VERIFY';
2839
ATAN: 'ATAN';
@@ -54,7 +65,7 @@ diff --git a/sql/mysql/Positive-Technologies/MySqlParser.g4 b/sql/mysql/Positive
5465
similarity index 93%
5566
rename from sql/mysql/Positive-Technologies/MySqlParser.g4
5667
rename to sql/mysql/Positive-Technologies/MySQLParser.g4
57-
index 6110ba86..9ac133f7 100644
68+
index 6110ba86..b992c407 100644
5869
--- a/sql/mysql/Positive-Technologies/MySqlParser.g4
5970
+++ b/sql/mysql/Positive-Technologies/MySQLParser.g4
6071
@@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -152,6 +163,15 @@ index 6110ba86..9ac133f7 100644
152163
| (LOCAL_ID VAR_ASSIGN)? expression (AS? uid)? #selectExpressionElement
153164
;
154165

166+
@@ -1356,7 +1352,7 @@ blockStatement
167+
(declareCursor SEMI)*
168+
(declareHandler SEMI)*
169+
procedureSqlStatement*
170+
- )?
171+
+ )
172+
END uid?
173+
;
174+
155175
@@ -1622,7 +1618,7 @@ analyzeTable
156176
;
157177

@@ -318,6 +338,19 @@ index 6110ba86..9ac133f7 100644
318338
)*
319339
;
320340

341+
@@ -2479,10 +2363,10 @@ keywordsCanBeId
342+
| MASTER_SSL_CRL | MASTER_SSL_CRLPATH | MASTER_SSL_KEY
343+
| MASTER_TLS_VERSION | MASTER_USER
344+
| MAX_CONNECTIONS_PER_HOUR | MAX_QUERIES_PER_HOUR
345+
- | MAX | MAX_ROWS | MAX_SIZE | MAX_UPDATES_PER_HOUR
346+
+ | MAX_TOKEN | MAX_ROWS | MAX_SIZE | MAX_UPDATES_PER_HOUR
347+
| MAX_USER_CONNECTIONS | MEDIUM | MEMBER | MEMORY | MERGE | MESSAGE_TEXT
348+
| MID | MIGRATE
349+
- | MIN | MIN_ROWS | MODE | MODIFY | MUTEX | MYSQL | MYSQL_ERRNO | NAME | NAMES
350+
+ | MIN_TOKEN | MIN_ROWS | MODE | MODIFY | MUTEX | MYSQL | MYSQL_ERRNO | NAME | NAMES
351+
| NCHAR | NDB_STORED_USER | NEVER | NEXT | NO | NODEGROUP | NONE | NUMBER | OFFLINE | OFFSET
352+
| OF | OJ | OLD_PASSWORD | ONE | ONLINE | ONLY | OPEN | OPTIMIZER_COSTS
353+
| OPTIONS | ORDER | OWNER | PACK_KEYS | PAGE | PARSER | PARTIAL
321354
@@ -2518,7 +2402,7 @@ functionNameBase
322355
| AREA | ASBINARY | ASIN | ASTEXT | ASWKB | ASWKT
323356
| ASYMMETRIC_DECRYPT | ASYMMETRIC_DERIVE

0 commit comments

Comments
 (0)