Skip to content

Commit 4c187d5

Browse files
manticore-projectsmanticore-projects
committed
feat: BigQuery STRUCT data types and literal
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
1 parent 159c28e commit 4c187d5

8 files changed

Lines changed: 301 additions & 3 deletions

File tree

‎src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,4 +246,5 @@ public interface ExpressionVisitor {
246246

247247
void visit(TSQLRightJoin tsqlRightJoin);
248248

249+
void visit(StructType structType);
249250
}

‎src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,4 +692,14 @@ public void visit(TSQLRightJoin tsqlRightJoin) {
692692
visitBinaryExpression(tsqlRightJoin);
693693
}
694694

695+
@Override
696+
public void visit(StructType structType) {
697+
// @todo: visit the ColType also
698+
if (structType.getArguments() != null) {
699+
for (SelectItem<?> selectItem : structType.getArguments()) {
700+
visit(selectItem);
701+
}
702+
}
703+
}
704+
695705
}

‎src/main/java/net/sf/jsqlparser/expression/StructType.java‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
package net.sf.jsqlparser.expression;
2+
3+
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
4+
import net.sf.jsqlparser.statement.create.table.ColDataType;
5+
import net.sf.jsqlparser.statement.select.SelectItem;
6+
7+
import java.util.List;
8+
import java.util.Map;
9+
10+
/*
11+
* STRUCT<T>
12+
*
13+
* Type Declaration Meaning STRUCT<INT64> Simple struct with a single unnamed 64-bit integer field.
14+
* STRUCT<x STRING(10)> Simple struct with a single parameterized string field named x. STRUCT<x
15+
* STRUCT<y INT64, z INT64>> A struct with a nested struct named x inside it. The struct x has two
16+
* fields, y and z, both of which are 64-bit integers. STRUCT<inner_array ARRAY<INT64>> A struct
17+
* containing an array named inner_array that holds 64-bit integer elements.
18+
*
19+
* STRUCT( expr1 [AS field_name] [, ... ])
20+
*
21+
* Syntax Output Type STRUCT(1,2,3) STRUCT<int64,int64,int64> STRUCT() STRUCT<> STRUCT('abc')
22+
* STRUCT<string> STRUCT(1, t.str_col) STRUCT<int64, str_col string> STRUCT(1 AS a, 'abc' AS b)
23+
* STRUCT<a int64, b string> STRUCT(str_col AS abc) STRUCT<abc string>
24+
*
25+
*
26+
* Struct Literals
27+
*
28+
* Example Output Type (1, 2, 3) STRUCT<INT64, INT64, INT64> (1, 'abc') STRUCT<INT64, STRING>
29+
* STRUCT(1 AS foo, 'abc' AS bar) STRUCT<foo INT64, bar STRING> STRUCT<INT64, STRING>(1, 'abc')
30+
* STRUCT<INT64, STRING> STRUCT(1) STRUCT<INT64> STRUCT<INT64>(1) STRUCT<INT64>
31+
*
32+
*/
33+
public class StructType extends ASTNodeAccessImpl implements Expression {
34+
private String keyword;
35+
private List<Map.Entry<String, ColDataType>> parameters;
36+
private List<SelectItem<?>> arguments;
37+
38+
public StructType(String keyword, List<Map.Entry<String, ColDataType>> parameters,
39+
List<SelectItem<?>> arguments) {
40+
this.keyword = keyword;
41+
this.parameters = parameters;
42+
this.arguments = arguments;
43+
}
44+
45+
public StructType(List<Map.Entry<String, ColDataType>> parameters,
46+
List<SelectItem<?>> arguments) {
47+
this.keyword = "STRUCT";
48+
this.parameters = parameters;
49+
this.arguments = arguments;
50+
}
51+
52+
public String getKeyword() {
53+
return keyword;
54+
}
55+
56+
public StructType setKeyword(String keyword) {
57+
this.keyword = keyword;
58+
return this;
59+
}
60+
61+
public List<Map.Entry<String, ColDataType>> getParameters() {
62+
return parameters;
63+
}
64+
65+
public StructType setParameters(List<Map.Entry<String, ColDataType>> parameters) {
66+
this.parameters = parameters;
67+
return this;
68+
}
69+
70+
public List<SelectItem<?>> getArguments() {
71+
return arguments;
72+
}
73+
74+
public StructType setArguments(List<SelectItem<?>> arguments) {
75+
this.arguments = arguments;
76+
return this;
77+
}
78+
79+
public StringBuilder appendTo(StringBuilder builder) {
80+
if (keyword != null) {
81+
builder.append(keyword);
82+
}
83+
84+
if (parameters != null && !parameters.isEmpty()) {
85+
builder.append("<");
86+
int i = 0;
87+
88+
for (Map.Entry<String, ColDataType> e : parameters) {
89+
if (0 < i++) {
90+
builder.append(",");
91+
}
92+
// optional name
93+
if (e.getKey() != null && !e.getKey().isEmpty()) {
94+
builder.append(e.getKey()).append(" ");
95+
}
96+
97+
// mandatory type
98+
builder.append(e.getValue());
99+
}
100+
101+
builder.append(">");
102+
}
103+
104+
if (arguments != null && !arguments.isEmpty()) {
105+
builder.append("(");
106+
int i = 0;
107+
108+
for (SelectItem<?> e : arguments) {
109+
if (0 < i++) {
110+
builder.append(",");
111+
}
112+
e.appendTo(builder);
113+
}
114+
115+
builder.append(")");
116+
}
117+
118+
return builder;
119+
}
120+
121+
@Override
122+
public String toString() {
123+
return appendTo(new StringBuilder()).toString();
124+
}
125+
126+
@Override
127+
public void accept(ExpressionVisitor expressionVisitor) {
128+
expressionVisitor.visit(this);
129+
}
130+
}

‎src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import net.sf.jsqlparser.expression.RowGetExpression;
5858
import net.sf.jsqlparser.expression.SignedExpression;
5959
import net.sf.jsqlparser.expression.StringValue;
60+
import net.sf.jsqlparser.expression.StructType;
6061
import net.sf.jsqlparser.expression.TimeKeyExpression;
6162
import net.sf.jsqlparser.expression.TimeValue;
6263
import net.sf.jsqlparser.expression.TimestampValue;
@@ -1177,6 +1178,15 @@ public void visit(TSQLRightJoin tsqlRightJoin) {
11771178
visitBinaryExpression(tsqlRightJoin);
11781179
}
11791180

1181+
@Override
1182+
public void visit(StructType structType) {
1183+
if (structType.getArguments() != null) {
1184+
for (SelectItem<?> selectItem : structType.getArguments()) {
1185+
selectItem.getExpression().accept(this);
1186+
}
1187+
}
1188+
}
1189+
11801190
@Override
11811191
public void visit(VariableAssignment var) {
11821192
var.getVariable().accept(this);

‎src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import net.sf.jsqlparser.expression.RowGetExpression;
5252
import net.sf.jsqlparser.expression.SignedExpression;
5353
import net.sf.jsqlparser.expression.StringValue;
54+
import net.sf.jsqlparser.expression.StructType;
5455
import net.sf.jsqlparser.expression.TimeKeyExpression;
5556
import net.sf.jsqlparser.expression.TimeValue;
5657
import net.sf.jsqlparser.expression.TimestampValue;
@@ -107,16 +108,19 @@
107108
import net.sf.jsqlparser.expression.operators.relational.TSQLRightJoin;
108109
import net.sf.jsqlparser.schema.Column;
109110
import net.sf.jsqlparser.schema.Table;
111+
import net.sf.jsqlparser.statement.create.table.ColDataType;
110112
import net.sf.jsqlparser.statement.select.AllColumns;
111113
import net.sf.jsqlparser.statement.select.AllTableColumns;
112114
import net.sf.jsqlparser.statement.select.OrderByElement;
113115
import net.sf.jsqlparser.statement.select.ParenthesedSelect;
114116
import net.sf.jsqlparser.statement.select.Select;
117+
import net.sf.jsqlparser.statement.select.SelectItem;
115118
import net.sf.jsqlparser.statement.select.SelectVisitor;
116119
import net.sf.jsqlparser.statement.select.WithItem;
117120

118121
import java.util.Iterator;
119122
import java.util.List;
123+
import java.util.Map;
120124

121125
import static java.util.stream.Collectors.joining;
122126

@@ -1106,4 +1110,44 @@ public void visit(TSQLRightJoin tsqlRightJoin) {
11061110
visitBinaryExpression(tsqlRightJoin, " =* ");
11071111
}
11081112

1113+
@Override
1114+
public void visit(StructType structType) {
1115+
if (structType.getKeyword() != null) {
1116+
buffer.append(structType.getKeyword());
1117+
}
1118+
1119+
if (structType.getParameters() != null && !structType.getParameters().isEmpty()) {
1120+
buffer.append("<");
1121+
int i = 0;
1122+
for (Map.Entry<String, ColDataType> e : structType.getParameters()) {
1123+
if (0 < i++) {
1124+
buffer.append(",");
1125+
}
1126+
// optional name
1127+
if (e.getKey() != null && !e.getKey().isEmpty()) {
1128+
buffer.append(e.getKey()).append(" ");
1129+
}
1130+
1131+
// mandatory type
1132+
buffer.append(e.getValue());
1133+
}
1134+
1135+
buffer.append(">");
1136+
}
1137+
1138+
if (structType.getArguments() != null && !structType.getArguments().isEmpty()) {
1139+
buffer.append("(");
1140+
int i = 0;
1141+
1142+
for (SelectItem<?> e : structType.getArguments()) {
1143+
if (0 < i++) {
1144+
buffer.append(",");
1145+
}
1146+
e.appendTo(buffer);
1147+
}
1148+
1149+
buffer.append(")");
1150+
}
1151+
}
1152+
11091153
}

‎src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import net.sf.jsqlparser.expression.RowGetExpression;
5151
import net.sf.jsqlparser.expression.SignedExpression;
5252
import net.sf.jsqlparser.expression.StringValue;
53+
import net.sf.jsqlparser.expression.StructType;
5354
import net.sf.jsqlparser.expression.TimeKeyExpression;
5455
import net.sf.jsqlparser.expression.TimeValue;
5556
import net.sf.jsqlparser.expression.TimestampValue;
@@ -112,6 +113,7 @@
112113
import net.sf.jsqlparser.statement.select.AllTableColumns;
113114
import net.sf.jsqlparser.statement.select.ParenthesedSelect;
114115
import net.sf.jsqlparser.statement.select.Select;
116+
import net.sf.jsqlparser.statement.select.SelectItem;
115117
import net.sf.jsqlparser.util.validation.ValidationCapability;
116118
import net.sf.jsqlparser.util.validation.metadata.NamedObject;
117119

@@ -708,4 +710,13 @@ public void visit(TSQLRightJoin tsqlRightJoin) {
708710
tsqlRightJoin.getLeftExpression().accept(this);
709711
tsqlRightJoin.getRightExpression().accept(this);
710712
}
713+
714+
@Override
715+
public void visit(StructType structType) {
716+
if (structType.getArguments() != null) {
717+
for (SelectItem<?> selectItem : structType.getArguments()) {
718+
selectItem.getExpression().accept(this);
719+
}
720+
}
721+
}
711722
}

‎src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ import net.sf.jsqlparser.statement.upsert.*;
6767
import net.sf.jsqlparser.statement.merge.*;
6868
import net.sf.jsqlparser.statement.grant.*;
6969
import java.util.*;
70+
import java.util.AbstractMap.SimpleEntry;
7071

7172
/**
7273
* The parser generated by JavaCC
@@ -411,6 +412,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
411412
| <K_START:"START">
412413
| <K_STORED: "STORED">
413414
| <K_STRING: "STRING">
415+
| <K_STRUCT: "STRUCT">
414416
| <K_SUSPEND:"SUSPEND">
415417
| <K_SWITCH: "SWITCH">
416418
| <K_SYNONYM:"SYNONYM">
@@ -1842,7 +1844,7 @@ String RelObjectNameWithoutValue() :
18421844
{ Token tk = null; }
18431845
{
18441846
( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR>
1845-
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GUARD" | tk="HASH" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="LOOP" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MEMBER" | tk="MERGE" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TO" | tk="TRIGGER" | tk="TRUE" | tk="TRUNCATE" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
1847+
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GUARD" | tk="HASH" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="LOOP" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MEMBER" | tk="MERGE" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="STRUCT" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TO" | tk="TRIGGER" | tk="TRUE" | tk="TRUNCATE" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
18461848
{ return tk.image; }
18471849
}
18481850

@@ -2447,11 +2449,11 @@ WithItem WithItem() #WithItem:
24472449

24482450
List<SelectItem<?>> SelectItemsList():
24492451
{
2450-
List<SelectItem<?>> selectItemsList = new ArrayList<SelectItem<?>>();
2452+
List<SelectItem<?>> selectItemsList = null;
24512453
SelectItem selectItem = null;
24522454
}
24532455
{
2454-
selectItem=SelectItem() { selectItemsList.add(selectItem); }
2456+
selectItem=SelectItem() { selectItemsList = new ArrayList<SelectItem<?>>(); selectItemsList.add(selectItem); }
24552457
(
24562458
LOOKAHEAD(2) "," selectItem=SelectItem()
24572459
{
@@ -4267,6 +4269,8 @@ Expression PrimaryExpression() #PrimaryExpression:
42674269

42684270
| LOOKAHEAD(2, {!interrupted}) retval=DateTimeLiteralExpression()
42694271

4272+
| LOOKAHEAD( 3 , {!interrupted}) retval=StructType()
4273+
42704274
| LOOKAHEAD(3, {!interrupted}) <K_ARRAY_LITERAL> retval=ArrayConstructor(true)
42714275

42724276
| LOOKAHEAD(3, {!interrupted}) retval=ArrayConstructor(false)
@@ -4481,6 +4485,68 @@ ArrayConstructor ArrayConstructor(boolean arrayKeyword) : {
44814485
{ return array; }
44824486
}
44834487

4488+
List<Map.Entry<String, ColDataType>> StructParameters():
4489+
{
4490+
String parameterName = "";
4491+
ColDataType parameterType = null;
4492+
AbstractMap.SimpleEntry<String, ColDataType> parameter = null;
4493+
List<Map.Entry<String, ColDataType>> parameters = new ArrayList<Map.Entry<String, ColDataType>>();
4494+
}
4495+
{
4496+
[ LOOKAHEAD(2) parameterName = RelObjectName() ]
4497+
parameterType = ColDataType()
4498+
{
4499+
parameters.add( new AbstractMap.SimpleEntry<String, ColDataType>(parameterName, parameterType) );
4500+
}
4501+
4502+
(
4503+
"," { parameterName=""; }
4504+
4505+
[ LOOKAHEAD(2) parameterName = RelObjectName() ]
4506+
parameterType = ColDataType()
4507+
{
4508+
parameters.add( new AbstractMap.SimpleEntry<String, ColDataType>(parameterName, parameterType) );
4509+
}
4510+
)*
4511+
4512+
{
4513+
return parameters;
4514+
}
4515+
}
4516+
4517+
StructType StructType() #StruckType:
4518+
{
4519+
Token tk1;
4520+
String keyword = "";
4521+
List<Map.Entry<String, ColDataType>> parameters = null;
4522+
List<SelectItem<?>> arguments = null;
4523+
4524+
StructType type;
4525+
}
4526+
{
4527+
(
4528+
LOOKAHEAD(4) (
4529+
tk1=<K_STRUCT> { keyword = tk1.image; }
4530+
"<" parameters = StructParameters() ">"
4531+
"(" { System.out.println("found arguments!"); } arguments = SelectItemsList() ")"
4532+
)
4533+
|
4534+
(
4535+
tk1=<K_STRUCT> { keyword = tk1.image; }
4536+
"(" arguments = SelectItemsList() ")"
4537+
)
4538+
4539+
// don't parse this as an Struct, but rather use an Expressionlist
4540+
// |
4541+
// arguments = StructArguments()
4542+
)
4543+
{
4544+
type = new StructType(keyword, parameters, arguments);
4545+
linkAST(type,jjtThis);
4546+
return type;
4547+
}
4548+
}
4549+
44844550
Expression ParenthesedExpression():
44854551
{
44864552
Expression expression;

0 commit comments

Comments
 (0)