Skip to content

fix: support BigQuery UNNEST WITH OFFSET without AS alias (#6547) #6596

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

Open
Zjianru wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: support BigQuery UNNEST WITH OFFSET without AS alias (#6547) #6596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions core/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnnestTableSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class SQLUnnestTableSource extends SQLTableSourceImpl
private final List<SQLExpr> items = new ArrayList<SQLExpr>();
protected List<SQLName> columns = new ArrayList<SQLName>();
private boolean ordinality;
private boolean withOffset;
private SQLExpr offset;

public SQLUnnestTableSource() {
Expand Down Expand Up @@ -70,6 +71,14 @@ public void setOffset(SQLExpr x) {
this.offset = x;
}

public boolean isWithOffset() {
return withOffset;
}

public void setWithOffset(boolean withOffset) {
this.withOffset = withOffset;
}

public SQLUnnestTableSource clone() {
SQLUnnestTableSource x = new SQLUnnestTableSource();

Expand All @@ -91,6 +100,8 @@ public SQLUnnestTableSource clone() {
x.setOffset(offset);
}

x.withOffset = withOffset;

return x;
}

Expand Down
17 changes: 13 additions & 4 deletions core/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,10 +1400,19 @@ protected SQLTableSource parseUnnestTableSource() {

if (lexer.nextIf(Token.WITH)) {
acceptIdentifier("OFFSET");
lexer.nextIf(Token.AS);
unnest.setOffset(
this.exprParser.expr()
);
unnest.setWithOffset(true);
if (lexer.nextIf(Token.AS)) {
unnest.setOffset(
this.exprParser.expr()
);
} else {
String offsetAlias = this.tableAlias(false);
if (offsetAlias != null) {
unnest.setOffset(
new com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr(offsetAlias)
);
}
}
}
return unnest;
} else {
Expand Down
2 changes: 2 additions & 0 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 @@ -5152,6 +5152,8 @@ public boolean visit(SQLUnnestTableSource x) {
if (x.getOffset() != null) {
print0(ucase ? " WITH OFFSET AS " : " with offset as ");
x.getOffset().accept(this);
} else if (x.isWithOffset()) {
print0(ucase ? " WITH OFFSET" : " with offset");
}
printPivot(x.getPivot());
printUnpivot(x.getUnpivot());
Expand Down
49 changes: 48 additions & 1 deletion core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/UnnestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.alibaba.druid.sql.ast.statement.SQLUnnestTableSource;
import org.junit.Test;

import static org.junit.Assert.assertTrue;
import static org.junit.Assert.*;

public class UnnestTest {
@Test
Expand All @@ -29,4 +29,51 @@ public void test_0() throws Exception {
SQLJoinTableSource left = (SQLJoinTableSource) join.getLeft();
assertTrue(left.getRight() instanceof SQLUnnestTableSource);
}

// https://github.com/alibaba/druid/issues/6547
@Test
public void test_unnest_with_offset_no_alias() throws Exception {
String sql = "SELECT * FROM UNNEST ([10,20,30]) as numbers WITH OFFSET";
SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.bigquery);
SQLTableSource from = stmt.getSelect().getQueryBlock().getFrom();
assertTrue(from instanceof SQLUnnestTableSource);
SQLUnnestTableSource unnest = (SQLUnnestTableSource) from;
assertEquals("numbers", unnest.getAlias());
assertTrue(unnest.isWithOffset());
assertNull(unnest.getOffset());

String output = SQLUtils.toSQLString(stmt, DbType.bigquery);
assertTrue(output.toUpperCase().contains("WITH OFFSET"));
assertFalse(output.toUpperCase().contains("WITH OFFSET AS"));
}

// https://github.com/alibaba/druid/issues/6547
@Test
public void test_unnest_with_offset_as_alias() throws Exception {
String sql = "SELECT * FROM UNNEST ([10,20,30]) as numbers WITH OFFSET AS off";
SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.bigquery);
SQLTableSource from = stmt.getSelect().getQueryBlock().getFrom();
assertTrue(from instanceof SQLUnnestTableSource);
SQLUnnestTableSource unnest = (SQLUnnestTableSource) from;
assertEquals("numbers", unnest.getAlias());
assertTrue(unnest.isWithOffset());
assertNotNull(unnest.getOffset());

String output = SQLUtils.toSQLString(stmt, DbType.bigquery);
assertTrue(output.toUpperCase().contains("WITH OFFSET AS"));
}

// https://github.com/alibaba/druid/issues/6547
@Test
public void test_unnest_with_offset_implicit_alias() throws Exception {
// BigQuery allows: WITH OFFSET offset_alias (without AS keyword)
String sql = "SELECT * FROM UNNEST ([10,20,30]) as numbers WITH OFFSET off";
SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.bigquery);
SQLTableSource from = stmt.getSelect().getQueryBlock().getFrom();
assertTrue(from instanceof SQLUnnestTableSource);
SQLUnnestTableSource unnest = (SQLUnnestTableSource) from;
assertEquals("numbers", unnest.getAlias());
assertTrue(unnest.isWithOffset());
assertNotNull(unnest.getOffset());
}
}
Loading