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 oracle select union sql parse #29001

Merged
merged 3 commits into from
Nov 11, 2023
Merged

Fix oracle select union sql parse #29001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
427a4cd
Fix oracle select union sql parse
zihaoAK47 Nov 10, 2023
7574ca5
Format code
zihaoAK47 Nov 10, 2023
cfdee08
Remove combineClause loop visit
zihaoAK47 Nov 10, 2023
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
2 changes: 1 addition & 1 deletion parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DMLStatement.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ select
;

selectSubquery
: (queryBlock | selectCombineClause | parenthesisSelectSubquery) pivotClause? orderByClause? rowLimitingClause
: (selectCombineClause | queryBlock | parenthesisSelectSubquery) pivotClause? orderByClause? rowLimitingClause
;

selectCombineClause
Expand Down
30 changes: 22 additions & 8 deletions ...he/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.WhereClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.WithClauseContext;
import org.apache.shardingsphere.sql.parser.oracle.visitor.statement.OracleStatementVisitor;
import org.apache.shardingsphere.sql.parser.sql.common.enums.CombineType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.JoinType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.OrderDirection;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dal.VariableSegment;
Expand All @@ -117,6 +118,7 @@
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.assignment.SetAssignmentSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.InsertColumnsSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.combine.CombineSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BetweenExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.CaseWhenExpression;
Expand Down Expand Up @@ -649,18 +651,16 @@ public ASTNode visitReferenceModel(final ReferenceModelContext ctx) {

@Override
public ASTNode visitSelectCombineClause(final SelectCombineClauseContext ctx) {
OracleSelectStatement result;
if (null != ctx.queryBlock()) {
result = (OracleSelectStatement) visit(ctx.queryBlock());
} else {
result = (OracleSelectStatement) visit(ctx.parenthesisSelectSubquery());
OracleSelectStatement result = new OracleSelectStatement();
OracleSelectStatement left = null != ctx.queryBlock() ? (OracleSelectStatement) visit(ctx.queryBlock()) : (OracleSelectStatement) visit(ctx.parenthesisSelectSubquery());
if (null != ctx.selectSubquery()) {
result.setProjections(left.getProjections());
result.setFrom(left.getFrom());
setSelectCombineClause(ctx, result, left);
}
if (null != ctx.orderByClause()) {
result.setOrderBy((OrderBySegment) visit(ctx.orderByClause()));
}
for (SelectSubqueryContext each : ctx.selectSubquery()) {
visit(each);
}
return result;
}

Expand All @@ -669,6 +669,20 @@ public ASTNode visitParenthesisSelectSubquery(final ParenthesisSelectSubqueryCon
return visit(ctx.selectSubquery());
}

private void setSelectCombineClause(final SelectCombineClauseContext ctx, final OracleSelectStatement result, final OracleSelectStatement left) {
CombineType combineType;
if (null != ctx.UNION(0) && null != ctx.ALL(0)) {
combineType = CombineType.UNION_ALL;
} else if (null != ctx.UNION(0)) {
combineType = CombineType.UNION;
} else if (null != ctx.INTERSECT(0)) {
combineType = CombineType.INTERSECT;
} else {
combineType = CombineType.MINUS;
}
result.setCombine(new CombineSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), left, combineType, (OracleSelectStatement) visit(ctx.selectSubquery(0))));
}

@Override
public ASTNode visitWithClause(final WithClauseContext ctx) {
Collection<CommonTableExpressionSegment> commonTableExpressions = new LinkedList<>();
Expand Down
125 changes: 125 additions & 0 deletions test/it/parser/src/main/resources/case/dml/select-combine.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,4 +893,129 @@
</right>
</combine>
</select>

<select sql-case-id="select_union_all_where">
<projections start-index="7" stop-index="7">
<shorthand-projection start-index="7" stop-index="7" />
</projections>
<from>
<simple-table name="TEST_TABLE_1" start-index="14" stop-index="25" />
</from>
<combine combine-type="UNION_ALL" start-index="0" stop-index="88">
<left>
<projections start-index="7" stop-index="7">
<shorthand-projection start-index="7" stop-index="7" />
</projections>
<from>
<simple-table name="TEST_TABLE_1" start-index="14" stop-index="25" />
</from>
<where start-index="27" stop-index="38">
<expr>
<binary-operation-expression start-index="33" stop-index="38">
<left>
<column name="ID" start-index="33" stop-index="34" />
</left>
<right>
<literal-expression value="1" start-index="38" stop-index="38" />
</right>
<operator>=</operator>
</binary-operation-expression>
</expr>
</where>
</left>
<right>
<projections start-index="57" stop-index="57">
<shorthand-projection start-index="57" stop-index="57" />
</projections>
<from>
<simple-table name="TEST_TABLE_2" start-index="64" stop-index="75" />
</from>
<where start-index="77" stop-index="88">
<expr>
<binary-operation-expression start-index="83" stop-index="88">
<left>
<column name="ID" start-index="83" stop-index="84" />
</left>
<right>
<literal-expression value="2" start-index="88" stop-index="88" />
</right>
<operator>=</operator>
</binary-operation-expression>
</expr>
</where>
</right>
</combine>
</select>

<select sql-case-id="select_union_all_minus">
<projections start-index="7" stop-index="7">
<shorthand-projection start-index="7" stop-index="7" />
</projections>
<from>
<simple-table name="TEST_TABLE_1" start-index="14" stop-index="25" />
</from>
<combine combine-type="UNION_ALL" start-index="0" stop-index="95">
<left>
<projections start-index="7" stop-index="7">
<shorthand-projection start-index="7" stop-index="7" />
</projections>
<from>
<simple-table name="TEST_TABLE_1" start-index="14" stop-index="25" />
</from>
</left>
<right>
<projections start-index="44" stop-index="44">
<shorthand-projection start-index="44" stop-index="44" />
</projections>
<from>
<simple-table name="TEST_TABLE_2" start-index="51" stop-index="62" />
</from>
<combine combine-type="MINUS" start-index="37" stop-index="95">
<left>
<projections start-index="44" stop-index="44">
<shorthand-projection start-index="44" stop-index="44" />
</projections>
<from>
<simple-table name="TEST_TABLE_2" start-index="51" stop-index="62" />
</from>
</left>
<right>
<projections start-index="77" stop-index="77">
<shorthand-projection start-index="77" stop-index="77" />
</projections>
<from>
<simple-table name="TEST_TABLE_3" start-index="84" stop-index="95" />
</from>
</right>
</combine>
</right>
</combine>
</select>

<select sql-case-id="select_union_subquery">
<projections start-index="8" stop-index="14">
<column-projection name="TEST_ID" start-index="8" stop-index="14" />
</projections>
<from>
<simple-table name="TEST_TABLE" start-index="22" stop-index="31" />
</from>
<combine combine-type="UNION" start-index="0" stop-index="71">
<left>
<projections start-index="8" stop-index="14">
<column-projection name="TEST_ID" start-index="8" stop-index="14" />
</projections>
<from>
<simple-table name="TEST_TABLE" start-index="22" stop-index="31" />
</from>
</left>
<right>
<projections start-index="48" stop-index="54">
<column-projection name="TEST_ID" start-index="48" stop-index="54" />
</projections>
<from>
<simple-table name="TEST_TABLE" start-index="61" stop-index="70" />
</from>
</right>
</combine>
</select>
</sql-parser-test-cases>
3 changes: 3 additions & 0 deletions test/it/parser/src/main/resources/sql/supported/dml/select-combine.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,7 @@
<sql-case id="select_except_intersect" value="SELECT * FROM table1 EXCEPT SELECT * FROM table2 INTERSECT SELECT * FROM table3" db-types="PostgreSQL,openGauss" />
<sql-case id="select_except_intersect_union" value="SELECT * FROM table1 EXCEPT SELECT * FROM table2 INTERSECT SELECT * FROM table3 UNION SELECT * FROM table4" db-types="PostgreSQL,openGauss" />
<sql-case id="select_sub_union" value="SELECT * FROM table1 UNION (SELECT * FROM table2 UNION SELECT * FROM table3)" db-types="MySQL,PostgreSQL,openGauss" />
<sql-case id="select_union_all_where" value="SELECT * FROM TEST_TABLE_1 WHERE ID = 1 UNION ALL SELECT * FROM TEST_TABLE_2 WHERE ID = 2" db-types="Oracle" />
<sql-case id="select_union_all_minus" value="SELECT * FROM TEST_TABLE_1 UNION ALL SELECT * FROM TEST_TABLE_2 MINUS SELECT * FROM TEST_TABLE_3" db-types="Oracle" />
<sql-case id="select_union_subquery" value="(SELECT TEST_ID FROM TEST_TABLE) UNION (SELECT TEST_ID FROM TEST_TABLE)" db-types="Oracle" />
</sql-cases>