Skip to content

Commit 35dd70b

Browse files
JackWang032JackWang032
committed
feat: support query result and derived table entity collecting
1 parent 7f3e4d8 commit 35dd70b

39 files changed

+39702
-35944
lines changed

‎src/grammar/flink/FlinkSqlParser.g4‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,34 @@ selectStatement
479479
;
480480

481481
selectClause
482-
: KW_SELECT setQuantifier? (
483-
ASTERISK_SIGN
484-
| projectItemDefinition (COMMA projectItemDefinition)*
485-
)
482+
: KW_SELECT setQuantifier? selectList
483+
;
484+
485+
selectList
486+
: columnProjectItem (COMMA columnProjectItem)*
487+
;
488+
489+
columnProjectItem
490+
: selectWindowItemColumnName
491+
| selectLiteralColumnName (columnAlias | KW_AS? expression)?
492+
| selectExpressionColumnName (columnAlias | KW_AS? columnName)?
493+
| tableAllColumns columnAlias?
494+
;
495+
496+
selectWindowItemColumnName
497+
: overWindowItem
498+
;
499+
500+
selectExpressionColumnName
501+
: expression
502+
;
503+
504+
selectLiteralColumnName
505+
: columnName
506+
;
507+
508+
columnAlias
509+
: KW_AS? alias=identifier
486510
;
487511

488512
projectItemDefinition
@@ -491,9 +515,13 @@ projectItemDefinition
491515
| expression (KW_AS? columnName)?
492516
;
493517

518+
tableAllColumns
519+
: (identifier (DOT identifier)* DOT)? ASTERISK_SIGN
520+
;
521+
494522
overWindowItem
495-
: primaryExpression KW_OVER windowSpec KW_AS identifier
496-
| primaryExpression KW_OVER errorCapturingIdentifier KW_AS identifier
523+
: primaryExpression KW_OVER windowSpec KW_AS alias=identifier
524+
| primaryExpression KW_OVER errorCapturingIdentifier KW_AS alias=identifier
497525
;
498526

499527
fromClause
@@ -515,8 +543,16 @@ tableReference
515543
tablePrimary
516544
: KW_TABLE? tablePath systemTimePeriod?
517545
| viewPath systemTimePeriod?
518-
| KW_LATERAL KW_TABLE LR_BRACKET functionName LR_BRACKET functionParam (COMMA functionParam)* RR_BRACKET RR_BRACKET
519-
| KW_LATERAL? LR_BRACKET queryStatement RR_BRACKET
546+
| atomFunctionTable
547+
| atomExpressionTable
548+
;
549+
550+
atomFunctionTable
551+
: KW_LATERAL KW_TABLE LR_BRACKET functionName LR_BRACKET functionParam (COMMA functionParam)* RR_BRACKET RR_BRACKET
552+
;
553+
554+
atomExpressionTable
555+
: KW_LATERAL? LR_BRACKET queryStatement RR_BRACKET
520556
| KW_UNNEST LR_BRACKET expression RR_BRACKET
521557
;
522558

@@ -910,7 +946,7 @@ viewPathCreate
910946
;
911947

912948
uid
913-
: identifier (DOT identifier)*?
949+
: identifier (DOT identifier)*
914950
;
915951

916952
withOption

‎src/grammar/impala/ImpalaSqlParser.g4‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -767,11 +767,13 @@ sortItem
767767
;
768768

769769
querySpecification
770-
: KW_SELECT setQuantifier? (KW_STRAIGHT_JOIN)? selectItem (COMMA selectItem)* (
771-
KW_FROM relation (COMMA relation)*
772-
)? (KW_WHERE where=booleanExpression)? (KW_GROUP KW_BY groupBy)? (
773-
KW_HAVING having=booleanExpression
774-
)?
770+
: KW_SELECT setQuantifier? (KW_STRAIGHT_JOIN)? selectList (KW_FROM relation (COMMA relation)*)? (
771+
KW_WHERE where=booleanExpression
772+
)? (KW_GROUP KW_BY groupBy)? (KW_HAVING having=booleanExpression)?
773+
;
774+
775+
selectList
776+
: selectItem (COMMA selectItem)*
775777
;
776778

777779
groupBy
@@ -797,9 +799,25 @@ setQuantifier
797799
;
798800

799801
selectItem
800-
: columnItem (KW_AS? identifier)? # selectSingle
801-
| qualifiedName DOT ASTERISK # selectAll
802-
| ASTERISK # selectAll
802+
: selectLiteralColumnName columnAlias?
803+
| selectExpressionColumnName columnAlias?
804+
| tableAllColumns columnAlias?
805+
;
806+
807+
columnAlias
808+
: KW_AS alias=identifier
809+
;
810+
811+
selectLiteralColumnName
812+
: columnNamePath columnAlias?
813+
;
814+
815+
selectExpressionColumnName
816+
: expression
817+
;
818+
819+
tableAllColumns
820+
: (qualifiedName DOT)? ASTERISK
803821
;
804822

805823
relation
@@ -851,11 +869,15 @@ columnAliases
851869

852870
relationPrimary
853871
: tableOrViewPath
854-
| KW_LATERAL? subQueryRelation
872+
| atomSubQueryTableSource
855873
| unnest
856874
| parenthesizedRelation
857875
;
858876

877+
atomSubQueryTableSource
878+
: KW_LATERAL? subQueryRelation
879+
;
880+
859881
subQueryRelation
860882
: LPAREN queryStatement RPAREN
861883
;

‎src/grammar/mysql/MySqlParser.g4‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,9 +1087,14 @@ tableSource
10871087
tableSourceItem
10881088
: tableName (KW_PARTITION '(' partitionNames ')')? (KW_AS? alias=uid)? (
10891089
indexHint (',' indexHint)*
1090-
)? # atomTableItem
1091-
| KW_LATERAL? (selectStatement | '(' parenthesisSubquery=selectStatement ')') KW_AS? alias=uid fullColumnNames? # subqueryTableItem
1092-
| '(' tableSources ')' # tableSourcesItem
1090+
)? # atomTableItem
1091+
| KW_LATERAL? atomSubQueryTableSource KW_AS? alias=uid fullColumnNames? # subqueryTableItem
1092+
| '(' tableSources ')' # tableSourcesItem
1093+
;
1094+
1095+
atomSubQueryTableSource
1096+
: selectStatement
1097+
| '(' parenthesisSubquery=selectStatement ')'
10931098
;
10941099

10951100
// (col_list) | (col_alias [, col_alias] ...)
@@ -1196,14 +1201,30 @@ selectSpec
11961201
;
11971202

11981203
selectElements
1199-
: (star='*' | selectElement) (',' selectElement)*
1204+
: (pureAllColumns | selectElement) (',' selectElement)*
12001205
;
12011206

12021207
selectElement
1203-
: (LOCAL_ID VAR_ASSIGN)? expression (KW_AS? alias=uid)? # selectExpressionElement
1204-
| functionCall (KW_AS? alias=uid)? # selectFunctionElement
1205-
| select_element=fullId '.' '*' # selectStarElement
1206-
| columnName (KW_AS? alias=uid)? # selectColumnElement
1208+
: tableAllColumns
1209+
| selectLiteralColumnName (KW_AS? alias=uid)?
1210+
| selectExpressionColumnName (KW_AS? alias=uid)?
1211+
;
1212+
1213+
tableAllColumns
1214+
: fullId DOT STAR
1215+
;
1216+
1217+
pureAllColumns
1218+
: STAR
1219+
;
1220+
1221+
selectLiteralColumnName
1222+
: columnName
1223+
;
1224+
1225+
selectExpressionColumnName
1226+
: (LOCAL_ID VAR_ASSIGN)? expression # selectExpressionElement
1227+
| functionCall # selectFunctionElement
12071228
;
12081229

12091230
intoClause

‎src/grammar/postgresql/PostgreSqlParser.g4‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
11
/*
2-
* [The "MIT license"]
3-
* Copyright (C) 2014 Sam Harwell, Tunnel Vision Laboratories, LLC
4-
*
5-
* Permission is hereby granted, free of charge, to any person obtaining a copy
6-
* of this software and associated documentation files (the "Software"), to deal
7-
* in the Software without restriction, including without limitation the rights
8-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
* copies of the Software, and to permit persons to whom the Software is
2+
* [The "MIT license"] Copyright (C) 2014 Sam Harwell, Tunnel Vision Laboratories, LLC
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
5+
* associated documentation files (the "Software"), to deal in the Software without restriction,
6+
* including without limitation the rights to use, copy, modify, merge, publish, distribute,
7+
* sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
108
* furnished to do so, subject to the following conditions:
11-
*
12-
* 1. The above copyright notice and this permission notice shall be included in
13-
* all copies or substantial portions of the Software.
14-
* 2. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17-
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20-
* DEALINGS IN THE SOFTWARE.
21-
* 3. Except as contained in this notice, the name of Tunnel Vision
22-
* Laboratories, LLC. shall not be used in advertising or otherwise to
23-
* promote the sale, use or other dealings in this Software without prior
24-
* written authorization from Tunnel Vision Laboratories, LLC.
9+
*
10+
* 1. The above copyright notice and this permission notice shall be included in all copies or
11+
* substantial portions of the Software. 2. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
12+
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
13+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
14+
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
15+
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
16+
* DEALINGS IN THE SOFTWARE. 3. Except as contained in this notice, the name of Tunnel Vision
17+
* Laboratories, LLC. shall not be used in advertising or otherwise to promote the sale, use or
18+
* other dealings in this Software without prior written authorization from Tunnel Vision
19+
* Laboratories, LLC.
2520
*/
2621

2722
/**
28-
* This file is an adaptation of antlr's sql/postgresql/PostgreSQLParser.g4 grammar.
29-
* Reference: https://github.com/antlr/grammars-v4/blob/master/sql/postgresql/PostgreSQLParser.g4
23+
* This file is an adaptation of antlr's sql/postgresql/PostgreSQLParser.g4 grammar. Reference:
24+
* https://github.com/antlr/grammars-v4/blob/master/sql/postgresql/PostgreSQLParser.g4
3025
*/
3126

3227
/**
@@ -2142,12 +2137,8 @@ from_list
21422137

21432138
table_ref
21442139
: (
2145-
(relation_expr | (KW_ONLY? view_name STAR? column_list? where_clause?)) alias_clause? tablesample_clause?
2146-
| KW_LATERAL? (
2147-
xmltable alias_clause?
2148-
| func_table func_alias_clause?
2149-
| select_with_parens alias_clause?
2150-
)
2140+
(relation_expr | ( KW_ONLY? view_name STAR? column_list? where_clause?)) alias_clause? tablesample_clause?
2141+
| KW_LATERAL? expressionTable
21512142
| OPEN_PAREN table_ref (
21522143
KW_CROSS KW_JOIN table_ref
21532144
| KW_NATURAL join_type? KW_JOIN table_ref
@@ -2160,6 +2151,12 @@ table_ref
21602151
)*
21612152
;
21622153

2154+
expressionTable
2155+
: xmltable alias_clause?
2156+
| func_table func_alias_clause?
2157+
| select_with_parens alias_clause?
2158+
;
2159+
21632160
alias_clause
21642161
: KW_AS? alias=colid (OPEN_PAREN name_list CLOSE_PAREN)?
21652162
;
@@ -2585,8 +2582,8 @@ column_expr
25852582
;
25862583

25872584
column_expr_noparen
2588-
: expression
2589-
| column_name
2585+
: expression # selectExpressionColumnName
2586+
| column_name # selectLiteralColumnName
25902587
;
25912588

25922589
func_arg_list
@@ -2650,8 +2647,12 @@ target_list
26502647
;
26512648

26522649
target_el
2653-
: column_expr_noparen (KW_AS collabel | identifier |) # target_label
2654-
| STAR # target_star
2650+
: tableAllColumns # target_star
2651+
| column_expr_noparen (KW_AS? alias=identifier |) # target_label
2652+
;
2653+
2654+
tableAllColumns
2655+
: (colid DOT)* STAR
26552656
;
26562657

26572658
qualified_name_list

‎src/grammar/spark/SparkSqlParser.g4‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ queryPrimary
491491
: querySpecification
492492
| fromStatement
493493
| KW_TABLE tableName
494-
| inlineTable
494+
| KW_VALUES expression (COMMA expression)* tableAlias
495495
| LEFT_PAREN query RIGHT_PAREN
496496
;
497497

@@ -530,7 +530,7 @@ transformClause
530530
;
531531

532532
selectClause
533-
: KW_SELECT (hints+=hint)* setQuantifier? namedExpressionSeq
533+
: KW_SELECT (hints+=hint)* setQuantifier? selectList
534534
;
535535

536536
setClause
@@ -799,15 +799,19 @@ identifierComment
799799
;
800800

801801
relationPrimary
802-
: (tableName | viewName | identifierReference) temporalClause? sample? tableAlias
803-
| LEFT_PAREN query RIGHT_PAREN sample? tableAlias
804-
| LEFT_PAREN relation RIGHT_PAREN sample? tableAlias
805-
| inlineTable
806-
| functionTable
802+
: (tableName | viewName | identifierReference) temporalClause? sample? tableAlias # tableSource
803+
| atomSubQueryTableSource sample? tableAlias # subQueryTableSource
804+
| LEFT_PAREN relation RIGHT_PAREN sample? tableAlias # joinTableSource
805+
| inlineTable tableAlias # inlineTableSource
806+
| functionTable # functionTableSource
807+
;
808+
809+
atomSubQueryTableSource
810+
: LEFT_PAREN query RIGHT_PAREN
807811
;
808812

809813
inlineTable
810-
: KW_VALUES expression (COMMA expression)* tableAlias
814+
: KW_VALUES expression (COMMA expression)*
811815
;
812816

813817
functionTableSubqueryArgument
@@ -847,7 +851,11 @@ functionTableArgument
847851
;
848852

849853
functionTable
850-
: functionName LEFT_PAREN (functionTableArgument (COMMA functionTableArgument)*)? RIGHT_PAREN tableAlias
854+
: atomFunctionTable tableAlias
855+
;
856+
857+
atomFunctionTable
858+
: functionName LEFT_PAREN (functionTableArgument (COMMA functionTableArgument)*)? RIGHT_PAREN
851859
;
852860

853861
tableAlias
@@ -891,14 +899,32 @@ viewIdentifier
891899
: (db=errorCapturingIdentifier DOT)? view=errorCapturingIdentifier
892900
;
893901

902+
selectLiteralColumnName
903+
: columnName
904+
;
905+
906+
selectExpressionColumnName
907+
: expression
908+
;
909+
910+
tableAllColumns
911+
: (qualifiedName DOT)* ASTERISK
912+
;
913+
894914
namedExpression
895-
: (columnName | expression) (KW_AS? (name=errorCapturingIdentifier | identifierList))?
915+
: (tableAllColumns | selectLiteralColumnName | selectExpressionColumnName) (
916+
KW_AS? (name=errorCapturingIdentifier | identifierList)
917+
)?
896918
;
897919

898920
namedExpressionSeq
899921
: namedExpression (COMMA namedExpression)*
900922
;
901923

924+
selectList
925+
: namedExpressionSeq
926+
;
927+
902928
partitionFieldList
903929
: LEFT_PAREN fields+=partitionField (COMMA fields+=partitionField)* RIGHT_PAREN
904930
;

0 commit comments

Comments
 (0)