Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix parse array with data type. #6279

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Fix parse array with data type. #6279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7d7720
Fix parse array with data type.
lingo-xp Dec 9, 2024
6fecd03
Revert test.
lingo-xp Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions core/src/main/java/com/alibaba/druid/sql/ast/expr/SQLArrayExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package com.alibaba.druid.sql.ast.expr;

import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.SQLObject;
Expand All @@ -26,16 +27,28 @@

public class SQLArrayExpr extends SQLExprImpl implements SQLReplaceable {
private SQLExpr expr;
private SQLDataType dataType;
private List<SQLExpr> values = new ArrayList<SQLExpr>();

public SQLArrayExpr() {
}

public SQLDataType getDataType() {
return dataType;
}

public void setDataType(SQLDataType dataType) {
this.dataType = dataType;
}

public SQLArrayExpr clone() {
SQLArrayExpr x = new SQLArrayExpr();
if (expr != null) {
x.setExpr(expr.clone());
}
if (dataType != null) {
x.setDataType(dataType.clone());
}
for (SQLExpr value : values) {
SQLExpr value2 = value.clone();
value2.setParent(x);
Expand Down Expand Up @@ -76,17 +89,9 @@ public void setValues(List<SQLExpr> values) {
@Override
protected void accept0(SQLASTVisitor visitor) {
if (visitor.visit(this)) {
if (expr != null) {
this.expr.accept(visitor);
}

if (values != null) {
for (SQLExpr value : values) {
if (value != null) {
value.accept(visitor);
}
}
}
acceptChild(visitor, expr);
acceptChild(visitor, dataType);
acceptChild(visitor, values);
}
visitor.endVisit(this);
}
Expand Down
37 changes: 29 additions & 8 deletions core/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,12 +586,21 @@ && dialectFeatureEnabled(SQLTimestampExpr)) {
} else if (hash_lower == FnvHash.Constants.TIMESTAMP && lexer.token == Token.LITERAL_ALIAS) {
sqlExpr = new SQLTimestampExpr(lexer.stringVal());
lexer.nextToken();
} else if (hash_lower == FnvHash.Constants.ARRAY && lexer.token == Token.LBRACKET) {
} else if (hash_lower == FnvHash.Constants.ARRAY && (lexer.token == Token.LBRACKET || lexer.token == Token.LT)) {
SQLArrayExpr array = new SQLArrayExpr();
array.setExpr(new SQLIdentifierExpr(ident));
accept(Token.LBRACKET);
this.exprList(array.getValues(), array);
accept(Token.RBRACKET);
if (lexer.nextIf(Token.LT)) {
SQLDataType sqlDataType = this.parseDataType();
array.setDataType(sqlDataType);
accept(Token.GT);
}

if (lexer.nextIf(Token.LBRACKET)) {
this.exprList(array.getValues(), array);
accept(Token.RBRACKET);
} else {
throw new ParserException("Syntax error. " + lexer.info());
}
sqlExpr = array;
} else {
sqlExpr = primaryIdentifierRest(hash_lower, ident);
Expand Down Expand Up @@ -1241,10 +1250,18 @@ && dialectFeatureEnabled(SQLTimestampExpr)) {
SQLArrayExpr array = new SQLArrayExpr();
array.setExpr(new SQLIdentifierExpr("ARRAY"));
lexer.nextToken();
if (lexer.nextIf(Token.LT)) {
SQLDataType sqlDataType = this.parseDataType();
array.setDataType(sqlDataType);
accept(Token.GT);
}
if (lexer.nextIf(Token.LBRACKET)) {
this.exprList(array.getValues(), array);
accept(Token.RBRACKET);
} else {
throw new ParserException("Syntax error. " + lexer.info());
}

accept(Token.LBRACKET);
this.exprList(array.getValues(), array);
accept(Token.RBRACKET);
sqlExpr = array;
break;
}
Expand Down Expand Up @@ -6404,7 +6421,11 @@ protected SQLStructExpr struct() {
SQLStructExpr structExpr = new SQLStructExpr();
accept(Token.LPAREN);
aliasedItems(structExpr.getItems(), structExpr);
accept(Token.RPAREN);
if (lexer.token == Token.GTGT) {
lexer.token = Token.RPAREN;
} else {
accept(Token.RPAREN);
}
return structExpr;
}
}
12 changes: 7 additions & 5 deletions core/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4893,11 +4893,7 @@ public boolean visit(SQLUnnestTableSource x) {
final List<SQLName> columns = x.getColumns();
final String alias = x.getAlias();
if (alias != null) {
if (columns.size() > 0) {
print0(ucase ? " AS " : " as ");
} else {
print(' ');
}
print0(ucase ? " AS " : " as ");
print0(alias);
}

Expand Down Expand Up @@ -7511,6 +7507,12 @@ public boolean visit(SQLArrayExpr x) {
}
}

if (x.getDataType() != null) {
print('<');
x.getDataType().accept(this);
print('>');
}

boolean brace = arrayValue && (dbType == DbType.hive || dbType == DbType.spark || dbType == DbType.odps);

print(brace ? '(' : '[');
Expand Down
7 changes: 2 additions & 5 deletions core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryDirTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@

import com.alibaba.druid.DbType;
import com.alibaba.druid.bvt.sql.SQLResourceTest;
import com.alibaba.druid.sql.SQLUtils;
import org.apache.commons.io.FileUtils;
import org.junit.Ignore;
import org.junit.Test;

import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Comparator;

public class BigQueryDirTest extends SQLResourceTest {
public BigQueryDirTest() {
Expand All @@ -20,6 +16,7 @@ protected File dir(String path) {
return new File(path);
}

@Ignore
@Test
public void dirTest() throws Exception {
// File dir = new File("/Users/wenshao/Downloads/goto_1894_sql");
Expand Down
29 changes: 25 additions & 4 deletions core/src/test/resources/bvt/parser/bigquery/0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
SELECT
campaign.key AS campaign_key,
campaign.start_date AS campaign_start_date,
campaign.end_date AS campaign_end_date,
FROM
UNNEST([
STRUCT(
'trial_campaign' AS key,
'2024-11-17T17:00:00+00:00' AS start_date,
'2024-12-01T16:59:59+00:00' AS end_date,
ARRAY<STRUCT<key STRING, start_date STRING, end_date STRING>>[
STRUCT('mission_1', '2024-11-17T17:00:00+00:00', '2024-11-24T16:59:59+00:00'),
STRUCT('mission_2', '2024-11-24T17:00:00+00:00', '2024-12-01T16:59:59+00:00')
] AS missions
)
]) AS campaign
--------------------
SELECT campaign.key AS campaign_key, campaign.start_date AS campaign_start_date, campaign.end_date AS campaign_end_date
FROM UNNEST([STRUCT('trial_campaign' AS key, '2024-11-17T17:00:00+00:00' AS start_date, '2024-12-01T16:59:59+00:00' AS end_date, ARRAY<STRUCT<key STRING, start_date STRING, end_date STRING>>[STRUCT('mission_1', '2024-11-17T17:00:00+00:00', '2024-11-24T16:59:59+00:00'),
STRUCT('mission_2', '2024-11-24T17:00:00+00:00', '2024-12-01T16:59:59+00:00')] AS missions)]) AS campaign
------------------------------------------------------------------------------------------------------------------------
CREATE TEMP FUNCTION invalidRoute(polyline1 STRING)
RETURNS BOOL
LANGUAGE js AS
Expand Down Expand Up @@ -216,7 +237,7 @@ WITH Races AS (
STRUCT('Lewandowski' AS name, [25.0, 25.7, 26.3, 27.2] AS laps),
STRUCT('Kipketer' AS name, [23.2, 26.1, 27.3, 29.4] AS laps),
STRUCT('Berian' AS name, [23.7, 26.1, 27.0, 29.3] AS laps),
STRUCT('Nathan' AS name, ARRAY < FLOAT64 > [] AS laps),
STRUCT('Nathan' AS name, ARRAY<FLOAT64>[] AS laps),
STRUCT('David' AS name, NULL AS laps)] AS participants
)
SELECT name, sum(duration) AS finish_time
Expand Down Expand Up @@ -564,7 +585,7 @@ FROM UNNEST([2, 1, -2, 3, -2, 1, 2]) AS x;
--------------------
SELECT ARRAY_AGG(x LIMIT 5) AS array_agg
FROM UNNEST([2, 1, -2, 3, -2,
1, 2]) x;
1, 2]) AS x;
------------------------------------------------------------------------------------------------------------------------
ASSERT (
(SELECT COUNT(*) > 5 FROM UNNEST([1, 2, 3, 4, 5, 6]))
Expand Down Expand Up @@ -687,6 +708,6 @@ SELECT
FROM professors
GROUP BY item;
------------------------------------------------------------------------------------------------------------------------
select cast(json_parse(tickets_fields_value) as array(varchar)) as tickets_fields_value
select cast(json_parse(tickets_fields_value) as array<varchar>) as tickets_fields_value
--------------------
SELECT CAST(json_parse(tickets_fields_value) AS ARRAY(varchar)) AS tickets_fields_value
SELECT CAST(json_parse(tickets_fields_value) AS ARRAY<varchar>) AS tickets_fields_value
Loading