Skip to content

Commit 3386fb7

Browse files
paco-valdezpaco-valdez
authored
fix(schema-compiler): Fix sql parser for "?" (#9945)
* Fix sql parser for ? * Fix lint * Fix select alias * pr review comments
1 parent 180c292 commit 3386fb7

File tree

11 files changed

+562
-299
lines changed

11 files changed

+562
-299
lines changed

‎packages/cubejs-schema-compiler/src/parser/GenericSql.g4‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ selectFields:
1515
(field (',' field)*);
1616

1717
field:
18-
aliasField | ASTERISK;
18+
selectField | ASTERISK;
19+
20+
selectField:
21+
exp (AS? identifier)?;
1922

2023
aliasField:
2124
idPath (AS? identifier)?;
@@ -33,10 +36,12 @@ exp:
3336
idPath |
3437
identifier '(' (exp (',' exp)*) ')' |
3538
CAST '(' exp AS identifier ')' |
39+
REGEXP STRING |
3640
STRING |
3741
numeric |
3842
identifier |
3943
INDEXED_PARAM |
44+
PARAM_PLACEHOLDER |
4045
'(' exp ')'
4146
;
4247

@@ -74,12 +79,16 @@ NOT_EQUALS: '<>' | '!=';
7479
IS: 'IS';
7580
NULL: 'NULL';
7681
CAST: 'CAST';
82+
REGEXP: 'REGEXP';
7783

7884
INDEXED_PARAM: '$' [0-9]+ '$';
85+
PARAM_PLACEHOLDER: '?';
7986
ID: [A-Z_@] [A-Z_@0-9]*;
8087
DIGIT: [0-9];
8188
QUOTED_ID: ('"' (~'"')* '"') | ('`' (~'`')* '`');
8289
STRING: ('\'' (~ '\'' | '\'\'')* '\'');
8390

8491

8592
WHITESPACE: [ \t\r\n] -> channel(HIDDEN);
93+
COMMENT: ('--' (~[\r\n])* ('\r'? '\n' | EOF)) -> channel(HIDDEN);
94+
MULTILINE_COMMENT: ('/*' .*? '*/') -> channel(HIDDEN);

‎packages/cubejs-schema-compiler/src/parser/GenericSql.interp‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ null
2121
'IS'
2222
'NULL'
2323
'CAST'
24+
'REGEXP'
25+
null
26+
'?'
27+
null
2428
null
2529
null
2630
null
@@ -51,19 +55,24 @@ NOT_EQUALS
5155
IS
5256
NULL
5357
CAST
58+
REGEXP
5459
INDEXED_PARAM
60+
PARAM_PLACEHOLDER
5561
ID
5662
DIGIT
5763
QUOTED_ID
5864
STRING
5965
WHITESPACE
66+
COMMENT
67+
MULTILINE_COMMENT
6068

6169
rule names:
6270
statement
6371
query
6472
fromTables
6573
selectFields
6674
field
75+
selectField
6776
aliasField
6877
boolExp
6978
exp
@@ -75,4 +84,4 @@ identifier
7584

7685

7786
atn:
78-
[4, 1, 27, 165, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 35, 8, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 43, 8, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 5, 3, 50, 8, 3, 10, 3, 12, 3, 53, 9, 3, 1, 4, 1, 4, 3, 4, 57, 8, 4, 1, 5, 1, 5, 3, 5, 61, 8, 5, 1, 5, 3, 5, 64, 8, 5, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 70, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 5, 6, 78, 8, 6, 10, 6, 12, 6, 81, 9, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7, 90, 8, 7, 10, 7, 12, 7, 93, 9, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 112, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7, 120, 8, 7, 10, 7, 12, 7, 123, 9, 7, 1, 8, 4, 8, 126, 8, 8, 11, 8, 12, 8, 127, 1, 8, 1, 8, 4, 8, 132, 8, 8, 11, 8, 12, 8, 133, 3, 8, 136, 8, 8, 1, 8, 1, 8, 4, 8, 140, 8, 8, 11, 8, 12, 8, 141, 3, 8, 144, 8, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 3, 10, 153, 8, 10, 1, 11, 1, 11, 1, 11, 5, 11, 158, 8, 11, 10, 11, 12, 11, 161, 9, 11, 1, 12, 1, 12, 1, 12, 0, 2, 12, 14, 13, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 0, 2, 1, 0, 13, 18, 2, 0, 23, 23, 25, 25, 177, 0, 34, 1, 0, 0, 0, 2, 36, 1, 0, 0, 0, 4, 44, 1, 0, 0, 0, 6, 46, 1, 0, 0, 0, 8, 56, 1, 0, 0, 0, 10, 58, 1, 0, 0, 0, 12, 69, 1, 0, 0, 0, 14, 111, 1, 0, 0, 0, 16, 143, 1, 0, 0, 0, 18, 145, 1, 0, 0, 0, 20, 152, 1, 0, 0, 0, 22, 154, 1, 0, 0, 0, 24, 162, 1, 0, 0, 0, 26, 27, 3, 2, 1, 0, 27, 28, 5, 0, 0, 1, 28, 35, 1, 0, 0, 0, 29, 30, 5, 1, 0, 0, 30, 31, 3, 2, 1, 0, 31, 32, 5, 2, 0, 0, 32, 33, 5, 0, 0, 1, 33, 35, 1, 0, 0, 0, 34, 26, 1, 0, 0, 0, 34, 29, 1, 0, 0, 0, 35, 1, 1, 0, 0, 0, 36, 37, 5, 5, 0, 0, 37, 38, 3, 6, 3, 0, 38, 39, 5, 7, 0, 0, 39, 42, 3, 4, 2, 0, 40, 41, 5, 8, 0, 0, 41, 43, 3, 12, 6, 0, 42, 40, 1, 0, 0, 0, 42, 43, 1, 0, 0, 0, 43, 3, 1, 0, 0, 0, 44, 45, 3, 10, 5, 0, 45, 5, 1, 0, 0, 0, 46, 51, 3, 8, 4, 0, 47, 48, 5, 3, 0, 0, 48, 50, 3, 8, 4, 0, 49, 47, 1, 0, 0, 0, 50, 53, 1, 0, 0, 0, 51, 49, 1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 52, 7, 1, 0, 0, 0, 53, 51, 1, 0, 0, 0, 54, 57, 3, 10, 5, 0, 55, 57, 5, 6, 0, 0, 56, 54, 1, 0, 0, 0, 56, 55, 1, 0, 0, 0, 57, 9, 1, 0, 0, 0, 58, 63, 3, 22, 11, 0, 59, 61, 5, 12, 0, 0, 60, 59, 1, 0, 0, 0, 60, 61, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 64, 3, 24, 12, 0, 63, 60, 1, 0, 0, 0, 63, 64, 1, 0, 0, 0, 64, 11, 1, 0, 0, 0, 65, 66, 6, 6, -1, 0, 66, 70, 3, 14, 7, 0, 67, 68, 5, 11, 0, 0, 68, 70, 3, 12, 6, 1, 69, 65, 1, 0, 0, 0, 69, 67, 1, 0, 0, 0, 70, 79, 1, 0, 0, 0, 71, 72, 10, 3, 0, 0, 72, 73, 5, 9, 0, 0, 73, 78, 3, 12, 6, 4, 74, 75, 10, 2, 0, 0, 75, 76, 5, 10, 0, 0, 76, 78, 3, 12, 6, 3, 77, 71, 1, 0, 0, 0, 77, 74, 1, 0, 0, 0, 78, 81, 1, 0, 0, 0, 79, 77, 1, 0, 0, 0, 79, 80, 1, 0, 0, 0, 80, 13, 1, 0, 0, 0, 81, 79, 1, 0, 0, 0, 82, 83, 6, 7, -1, 0, 83, 112, 3, 22, 11, 0, 84, 85, 3, 24, 12, 0, 85, 86, 5, 1, 0, 0, 86, 91, 3, 14, 7, 0, 87, 88, 5, 3, 0, 0, 88, 90, 3, 14, 7, 0, 89, 87, 1, 0, 0, 0, 90, 93, 1, 0, 0, 0, 91, 89, 1, 0, 0, 0, 91, 92, 1, 0, 0, 0, 92, 94, 1, 0, 0, 0, 93, 91, 1, 0, 0, 0, 94, 95, 5, 2, 0, 0, 95, 112, 1, 0, 0, 0, 96, 97, 5, 21, 0, 0, 97, 98, 5, 1, 0, 0, 98, 99, 3, 14, 7, 0, 99, 100, 5, 12, 0, 0, 100, 101, 3, 24, 12, 0, 101, 102, 5, 2, 0, 0, 102, 112, 1, 0, 0, 0, 103, 112, 5, 26, 0, 0, 104, 112, 3, 16, 8, 0, 105, 112, 3, 24, 12, 0, 106, 112, 5, 22, 0, 0, 107, 108, 5, 1, 0, 0, 108, 109, 3, 14, 7, 0, 109, 110, 5, 2, 0, 0, 110, 112, 1, 0, 0, 0, 111, 82, 1, 0, 0, 0, 111, 84, 1, 0, 0, 0, 111, 96, 1, 0, 0, 0, 111, 103, 1, 0, 0, 0, 111, 104, 1, 0, 0, 0, 111, 105, 1, 0, 0, 0, 111, 106, 1, 0, 0, 0, 111, 107, 1, 0, 0, 0, 112, 121, 1, 0, 0, 0, 113, 114, 10, 10, 0, 0, 114, 115, 3, 18, 9, 0, 115, 116, 3, 14, 7, 11, 116, 120, 1, 0, 0, 0, 117, 118, 10, 9, 0, 0, 118, 120, 3, 20, 10, 0, 119, 113, 1, 0, 0, 0, 119, 117, 1, 0, 0, 0, 120, 123, 1, 0, 0, 0, 121, 119, 1, 0, 0, 0, 121, 122, 1, 0, 0, 0, 122, 15, 1, 0, 0, 0, 123, 121, 1, 0, 0, 0, 124, 126, 5, 24, 0, 0, 125, 124, 1, 0, 0, 0, 126, 127, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 127, 128, 1, 0, 0, 0, 128, 135, 1, 0, 0, 0, 129, 131, 5, 4, 0, 0, 130, 132, 5, 24, 0, 0, 131, 130, 1, 0, 0, 0, 132, 133, 1, 0, 0, 0, 133, 131, 1, 0, 0, 0, 133, 134, 1, 0, 0, 0, 134, 136, 1, 0, 0, 0, 135, 129, 1, 0, 0, 0, 135, 136, 1, 0, 0, 0, 136, 144, 1, 0, 0, 0, 137, 139, 5, 4, 0, 0, 138, 140, 5, 24, 0, 0, 139, 138, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 139, 1, 0, 0, 0, 141, 142, 1, 0, 0, 0, 142, 144, 1, 0, 0, 0, 143, 125, 1, 0, 0, 0, 143, 137, 1, 0, 0, 0, 144, 17, 1, 0, 0, 0, 145, 146, 7, 0, 0, 0, 146, 19, 1, 0, 0, 0, 147, 148, 5, 19, 0, 0, 148, 153, 5, 20, 0, 0, 149, 150, 5, 19, 0, 0, 150, 151, 5, 11, 0, 0, 151, 153, 5, 20, 0, 0, 152, 147, 1, 0, 0, 0, 152, 149, 1, 0, 0, 0, 153, 21, 1, 0, 0, 0, 154, 159, 3, 24, 12, 0, 155, 156, 5, 4, 0, 0, 156, 158, 3, 24, 12, 0, 157, 155, 1, 0, 0, 0, 158, 161, 1, 0, 0, 0, 159, 157, 1, 0, 0, 0, 159, 160, 1, 0, 0, 0, 160, 23, 1, 0, 0, 0, 161, 159, 1, 0, 0, 0, 162, 163, 7, 1, 0, 0, 163, 25, 1, 0, 0, 0, 20, 34, 42, 51, 56, 60, 63, 69, 77, 79, 91, 111, 119, 121, 127, 133, 135, 141, 143, 152, 159]
87+
[4, 1, 31, 177, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 37, 8, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 45, 8, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 5, 3, 52, 8, 3, 10, 3, 12, 3, 55, 9, 3, 1, 4, 1, 4, 3, 4, 59, 8, 4, 1, 5, 1, 5, 3, 5, 63, 8, 5, 1, 5, 3, 5, 66, 8, 5, 1, 6, 1, 6, 3, 6, 70, 8, 6, 1, 6, 3, 6, 73, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 79, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7, 87, 8, 7, 10, 7, 12, 7, 90, 9, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 99, 8, 8, 10, 8, 12, 8, 102, 9, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 124, 8, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 132, 8, 8, 10, 8, 12, 8, 135, 9, 8, 1, 9, 4, 9, 138, 8, 9, 11, 9, 12, 9, 139, 1, 9, 1, 9, 4, 9, 144, 8, 9, 11, 9, 12, 9, 145, 3, 9, 148, 8, 9, 1, 9, 1, 9, 4, 9, 152, 8, 9, 11, 9, 12, 9, 153, 3, 9, 156, 8, 9, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 3, 11, 165, 8, 11, 1, 12, 1, 12, 1, 12, 5, 12, 170, 8, 12, 10, 12, 12, 12, 173, 9, 12, 1, 13, 1, 13, 1, 13, 0, 2, 14, 16, 14, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 0, 2, 1, 0, 13, 18, 2, 0, 25, 25, 27, 27, 192, 0, 36, 1, 0, 0, 0, 2, 38, 1, 0, 0, 0, 4, 46, 1, 0, 0, 0, 6, 48, 1, 0, 0, 0, 8, 58, 1, 0, 0, 0, 10, 60, 1, 0, 0, 0, 12, 67, 1, 0, 0, 0, 14, 78, 1, 0, 0, 0, 16, 123, 1, 0, 0, 0, 18, 155, 1, 0, 0, 0, 20, 157, 1, 0, 0, 0, 22, 164, 1, 0, 0, 0, 24, 166, 1, 0, 0, 0, 26, 174, 1, 0, 0, 0, 28, 29, 3, 2, 1, 0, 29, 30, 5, 0, 0, 1, 30, 37, 1, 0, 0, 0, 31, 32, 5, 1, 0, 0, 32, 33, 3, 2, 1, 0, 33, 34, 5, 2, 0, 0, 34, 35, 5, 0, 0, 1, 35, 37, 1, 0, 0, 0, 36, 28, 1, 0, 0, 0, 36, 31, 1, 0, 0, 0, 37, 1, 1, 0, 0, 0, 38, 39, 5, 5, 0, 0, 39, 40, 3, 6, 3, 0, 40, 41, 5, 7, 0, 0, 41, 44, 3, 4, 2, 0, 42, 43, 5, 8, 0, 0, 43, 45, 3, 14, 7, 0, 44, 42, 1, 0, 0, 0, 44, 45, 1, 0, 0, 0, 45, 3, 1, 0, 0, 0, 46, 47, 3, 12, 6, 0, 47, 5, 1, 0, 0, 0, 48, 53, 3, 8, 4, 0, 49, 50, 5, 3, 0, 0, 50, 52, 3, 8, 4, 0, 51, 49, 1, 0, 0, 0, 52, 55, 1, 0, 0, 0, 53, 51, 1, 0, 0, 0, 53, 54, 1, 0, 0, 0, 54, 7, 1, 0, 0, 0, 55, 53, 1, 0, 0, 0, 56, 59, 3, 10, 5, 0, 57, 59, 5, 6, 0, 0, 58, 56, 1, 0, 0, 0, 58, 57, 1, 0, 0, 0, 59, 9, 1, 0, 0, 0, 60, 65, 3, 16, 8, 0, 61, 63, 5, 12, 0, 0, 62, 61, 1, 0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 64, 1, 0, 0, 0, 64, 66, 3, 26, 13, 0, 65, 62, 1, 0, 0, 0, 65, 66, 1, 0, 0, 0, 66, 11, 1, 0, 0, 0, 67, 72, 3, 24, 12, 0, 68, 70, 5, 12, 0, 0, 69, 68, 1, 0, 0, 0, 69, 70, 1, 0, 0, 0, 70, 71, 1, 0, 0, 0, 71, 73, 3, 26, 13, 0, 72, 69, 1, 0, 0, 0, 72, 73, 1, 0, 0, 0, 73, 13, 1, 0, 0, 0, 74, 75, 6, 7, -1, 0, 75, 79, 3, 16, 8, 0, 76, 77, 5, 11, 0, 0, 77, 79, 3, 14, 7, 1, 78, 74, 1, 0, 0, 0, 78, 76, 1, 0, 0, 0, 79, 88, 1, 0, 0, 0, 80, 81, 10, 3, 0, 0, 81, 82, 5, 9, 0, 0, 82, 87, 3, 14, 7, 4, 83, 84, 10, 2, 0, 0, 84, 85, 5, 10, 0, 0, 85, 87, 3, 14, 7, 3, 86, 80, 1, 0, 0, 0, 86, 83, 1, 0, 0, 0, 87, 90, 1, 0, 0, 0, 88, 86, 1, 0, 0, 0, 88, 89, 1, 0, 0, 0, 89, 15, 1, 0, 0, 0, 90, 88, 1, 0, 0, 0, 91, 92, 6, 8, -1, 0, 92, 124, 3, 24, 12, 0, 93, 94, 3, 26, 13, 0, 94, 95, 5, 1, 0, 0, 95, 100, 3, 16, 8, 0, 96, 97, 5, 3, 0, 0, 97, 99, 3, 16, 8, 0, 98, 96, 1, 0, 0, 0, 99, 102, 1, 0, 0, 0, 100, 98, 1, 0, 0, 0, 100, 101, 1, 0, 0, 0, 101, 103, 1, 0, 0, 0, 102, 100, 1, 0, 0, 0, 103, 104, 5, 2, 0, 0, 104, 124, 1, 0, 0, 0, 105, 106, 5, 21, 0, 0, 106, 107, 5, 1, 0, 0, 107, 108, 3, 16, 8, 0, 108, 109, 5, 12, 0, 0, 109, 110, 3, 26, 13, 0, 110, 111, 5, 2, 0, 0, 111, 124, 1, 0, 0, 0, 112, 113, 5, 22, 0, 0, 113, 124, 5, 28, 0, 0, 114, 124, 5, 28, 0, 0, 115, 124, 3, 18, 9, 0, 116, 124, 3, 26, 13, 0, 117, 124, 5, 23, 0, 0, 118, 124, 5, 24, 0, 0, 119, 120, 5, 1, 0, 0, 120, 121, 3, 16, 8, 0, 121, 122, 5, 2, 0, 0, 122, 124, 1, 0, 0, 0, 123, 91, 1, 0, 0, 0, 123, 93, 1, 0, 0, 0, 123, 105, 1, 0, 0, 0, 123, 112, 1, 0, 0, 0, 123, 114, 1, 0, 0, 0, 123, 115, 1, 0, 0, 0, 123, 116, 1, 0, 0, 0, 123, 117, 1, 0, 0, 0, 123, 118, 1, 0, 0, 0, 123, 119, 1, 0, 0, 0, 124, 133, 1, 0, 0, 0, 125, 126, 10, 12, 0, 0, 126, 127, 3, 20, 10, 0, 127, 128, 3, 16, 8, 13, 128, 132, 1, 0, 0, 0, 129, 130, 10, 11, 0, 0, 130, 132, 3, 22, 11, 0, 131, 125, 1, 0, 0, 0, 131, 129, 1, 0, 0, 0, 132, 135, 1, 0, 0, 0, 133, 131, 1, 0, 0, 0, 133, 134, 1, 0, 0, 0, 134, 17, 1, 0, 0, 0, 135, 133, 1, 0, 0, 0, 136, 138, 5, 26, 0, 0, 137, 136, 1, 0, 0, 0, 138, 139, 1, 0, 0, 0, 139, 137, 1, 0, 0, 0, 139, 140, 1, 0, 0, 0, 140, 147, 1, 0, 0, 0, 141, 143, 5, 4, 0, 0, 142, 144, 5, 26, 0, 0, 143, 142, 1, 0, 0, 0, 144, 145, 1, 0, 0, 0, 145, 143, 1, 0, 0, 0, 145, 146, 1, 0, 0, 0, 146, 148, 1, 0, 0, 0, 147, 141, 1, 0, 0, 0, 147, 148, 1, 0, 0, 0, 148, 156, 1, 0, 0, 0, 149, 151, 5, 4, 0, 0, 150, 152, 5, 26, 0, 0, 151, 150, 1, 0, 0, 0, 152, 153, 1, 0, 0, 0, 153, 151, 1, 0, 0, 0, 153, 154, 1, 0, 0, 0, 154, 156, 1, 0, 0, 0, 155, 137, 1, 0, 0, 0, 155, 149, 1, 0, 0, 0, 156, 19, 1, 0, 0, 0, 157, 158, 7, 0, 0, 0, 158, 21, 1, 0, 0, 0, 159, 160, 5, 19, 0, 0, 160, 165, 5, 20, 0, 0, 161, 162, 5, 19, 0, 0, 162, 163, 5, 11, 0, 0, 163, 165, 5, 20, 0, 0, 164, 159, 1, 0, 0, 0, 164, 161, 1, 0, 0, 0, 165, 23, 1, 0, 0, 0, 166, 171, 3, 26, 13, 0, 167, 168, 5, 4, 0, 0, 168, 170, 3, 26, 13, 0, 169, 167, 1, 0, 0, 0, 170, 173, 1, 0, 0, 0, 171, 169, 1, 0, 0, 0, 171, 172, 1, 0, 0, 0, 172, 25, 1, 0, 0, 0, 173, 171, 1, 0, 0, 0, 174, 175, 7, 1, 0, 0, 175, 27, 1, 0, 0, 0, 22, 36, 44, 53, 58, 62, 65, 69, 72, 78, 86, 88, 100, 123, 131, 133, 139, 145, 147, 153, 155, 164, 171]

‎packages/cubejs-schema-compiler/src/parser/GenericSql.tokens‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@ NOT_EQUALS=18
1919
IS=19
2020
NULL=20
2121
CAST=21
22-
INDEXED_PARAM=22
23-
ID=23
24-
DIGIT=24
25-
QUOTED_ID=25
26-
STRING=26
27-
WHITESPACE=27
22+
REGEXP=22
23+
INDEXED_PARAM=23
24+
PARAM_PLACEHOLDER=24
25+
ID=25
26+
DIGIT=26
27+
QUOTED_ID=27
28+
STRING=28
29+
WHITESPACE=29
30+
COMMENT=30
31+
MULTILINE_COMMENT=31
2832
'('=1
2933
')'=2
3034
','=3
@@ -45,3 +49,5 @@ WHITESPACE=27
4549
'IS'=19
4650
'NULL'=20
4751
'CAST'=21
52+
'REGEXP'=22
53+
'?'=24

0 commit comments

Comments
 (0)