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

Support Oracle select collect bulk into clause #6344

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

Support Oracle select collect bulk into clause #6344

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
9 changes: 9 additions & 0 deletions core/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectQueryBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class OracleSelectQueryBlock extends SQLSelectQueryBlock implements Oracl
private ModelClause modelClause;

private boolean skipLocked;
private boolean isBulkCollect;

public OracleSelectQueryBlock clone() {
OracleSelectQueryBlock x = new OracleSelectQueryBlock();
Expand Down Expand Up @@ -75,6 +76,14 @@ public void setSkipLocked(boolean skipLocked) {
this.skipLocked = skipLocked;
}

public boolean isBulkCollect() {
return isBulkCollect;
}

public void setBulkCollect(boolean bulkCollect) {
this.isBulkCollect = bulkCollect;
}

@Override
protected void accept0(SQLASTVisitor visitor) {
if (visitor instanceof OracleASTVisitor) {
Expand Down
49 changes: 33 additions & 16 deletions core/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,26 +937,43 @@ protected SQLTableSource parseTableSourceRest(OracleSelectTableSource tableSourc
}

protected void parseInto(OracleSelectQueryBlock x) {
if (lexer.token() == Token.INTO) {
if (lexer.identifierEquals("BULK")) {
Lexer.SavePoint mark = lexer.mark();
lexer.nextToken();

if (lexer.token() == Token.FROM) {
return;
}

SQLExpr expr = expr();
if (lexer.token() != Token.COMMA) {
x.setInto(expr);
return;
}
SQLListExpr list = new SQLListExpr();
list.addItem(expr);
while (lexer.token() == Token.COMMA) {
if (lexer.identifierEquals("COLLECT")) {
lexer.nextToken();
list.addItem(expr());
if (lexer.token() == Token.INTO) {
x.setBulkCollect(true);
parseIntoInternal(x);
} else {
// If it's not a "INTO" token, then it's not a "BULK COLLECT" clause
lexer.reset(mark);
}
}
x.setInto(list);
} else if (lexer.token() == Token.INTO) {
parseIntoInternal(x);
}
}

private void parseIntoInternal(OracleSelectQueryBlock x) {
lexer.nextToken();

if (lexer.token() == Token.FROM) {
return;
}

SQLExpr expr = expr();
if (lexer.token() != Token.COMMA) {
x.setInto(expr);
return;
}
SQLListExpr list = new SQLListExpr();
list.addItem(expr);
while (lexer.token() == Token.COMMA) {
lexer.nextToken();
list.addItem(expr());
}
x.setInto(list);
}

private void parseHints(OracleSelectQueryBlock queryBlock) {
Expand Down
6 changes: 5 additions & 1 deletion core/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,11 @@ private void printInto(OracleSelectQueryBlock x) {
return;
}
println();
print0(ucase ? "INTO " : "into ");
if (x.isBulkCollect()) {
print0(ucase ? "BULK COLLECT INTO " : "bulk collect into ");
} else {
print0(ucase ? "INTO " : "into ");
}
into.accept(this);
}

Expand Down
21 changes: 17 additions & 4 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 @@ -5916,10 +5916,23 @@ public SQLSelectItem parseSelectItem() {

if (token == Token.IDENTIFIER
&& hash_lower != FnvHash.Constants.CURRENT) {
Pair<String, SQLExpr> pair = parseSelectItemIdentifier(expr);
String as = pair.getKey();
expr = pair.getValue();
return new SQLSelectItem(expr, as, connectByRoot);
// Do not set "bulk" as alias for bulk collect into clause
if (lexer.identifierEquals("BULK")) {
Lexer.SavePoint mark = lexer.mark();
lexer.nextToken();
if (lexer.identifierEquals("COLLECT")) {
lexer.nextToken();
if (lexer.token == Token.INTO) {
lexer.reset(mark);
return new SQLSelectItem(expr, (String) null, connectByRoot);
}
}
} else {
Pair<String, SQLExpr> pair = parseSelectItemIdentifier(expr);
String as = pair.getKey();
expr = pair.getValue();
return new SQLSelectItem(expr, as, connectByRoot);
}
}

if (token == Token.LPAREN) {
Expand Down
43 changes: 43 additions & 0 deletions core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_select_bulk_collect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.alibaba.druid.bvt.sql.oracle.pl;

import java.util.List;

import com.alibaba.druid.sql.OracleTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.util.JdbcConstants;

public class Oracle_pl_select_bulk_collect extends OracleTest {

public void test_0() throws Exception {
String sql = "DECLARE\n" +
"\tTYPE NumList IS TABLE OF NUMBER;\n" +
"\tTYPE NameList IS TABLE OF VARCHAR2(20);\n" +
"\temp_id NumList;\n" +
"\temp_name NameList;\n" +
"BEGIN\n" +
"\tSELECT employee_id, last_name\n" +
"\tBULK COLLECT INTO (emp_id, emp_name)\n" +
"\tFROM employees\n" +
"\tWHERE department_id = 90;\n" +
"END;";

List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE);
SQLStatement stmt = statementList.get(0);

assertEquals(1, statementList.size());

String output = SQLUtils.toOracleString(stmt);
assertEquals("DECLARE\n" +
"\tTYPE NumList IS TABLE OF NUMBER;\n" +
"\tTYPE NameList IS TABLE OF VARCHAR2(20);\n" +
"\temp_id NumList;\n" +
"\temp_name NameList;\n" +
"BEGIN\n" +
"\tSELECT employee_id, last_name\n" +
"\tBULK COLLECT INTO (emp_id, emp_name)\n" +
"\tFROM employees\n" +
"\tWHERE department_id = 90;\n" +
"END;", output);
}
}