You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/11/27 06:15:49 UTC
[shardingsphere] branch master updated: Update openGauss SQL statement visitor (#22450)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 33003ebf632 Update openGauss SQL statement visitor (#22450)
33003ebf632 is described below
commit 33003ebf632605f386b6740e0ab95886820c23ae
Author: Zichao <57...@users.noreply.github.com>
AuthorDate: Sun Nov 27 19:15:42 2022 +1300
Update openGauss SQL statement visitor (#22450)
* Update openGauss SQL visitor
* Update openGauss SQL visitor
* Update openGauss SQL visitor
---
.../impl/OpenGaussStatementSQLVisitor.java | 23 +++++++++++++++++-
.../main/antlr4/imports/postgresql/DMLStatement.g4 | 1 +
.../impl/PostgreSQLStatementSQLVisitor.java | 28 +++++++++++++++++++++-
test/parser/src/main/resources/case/dml/select.xml | 12 ++++++++++
.../main/resources/sql/supported/dml/select.xml | 1 +
5 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java
index e64d9a84389..9c755dd5023 100644
--- a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java
+++ b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java
@@ -83,6 +83,7 @@ import org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.Rel
import org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.SchemaNameContext;
import org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.SelectClauseNContext;
import org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.SelectContext;
+import org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.SelectFetchFirstValueContext;
import org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.SelectLimitContext;
import org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.SelectLimitValueContext;
import org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.SelectNoParensContext;
@@ -1274,6 +1275,18 @@ public abstract class OpenGaussStatementSQLVisitor extends OpenGaussStatementBas
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.parseLong(((LiteralExpressionSegment) astNode).getLiterals().toString()));
}
+ @Override
+ public ASTNode visitSelectFetchFirstValue(final SelectFetchFirstValueContext ctx) {
+ ASTNode astNode = visit(ctx.cExpr());
+ if (null != astNode) {
+ if (astNode instanceof ParameterMarkerLimitValueSegment) {
+ return new ParameterMarkerLimitValueSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ((ParameterMarkerExpressionSegment) astNode).getParameterMarkerIndex());
+ }
+ return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.parseLong(((LiteralExpressionSegment) astNode).getLiterals().toString()));
+ }
+ return visit(ctx.NUMBER_());
+ }
+
private LimitSegment createLimitSegmentWhenLimitAndOffset(final SelectLimitContext ctx) {
ParseTree astNode0 = ctx.getChild(0);
LimitValueSegment rowCount = null;
@@ -1299,10 +1312,18 @@ public abstract class OpenGaussStatementSQLVisitor extends OpenGaussStatementBas
LimitValueSegment offset = (LimitValueSegment) visit(ctx.limitClause().selectOffsetValue());
return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), offset, limit);
}
+ if (null != ctx.limitClause().selectFetchFirstValue()) {
+ LimitValueSegment offset = (LimitValueSegment) visit(ctx.limitClause().selectFetchFirstValue());
+ return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), offset, null);
+ }
LimitValueSegment limit = (LimitValueSegment) visit(ctx.limitClause().selectLimitValue());
return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), null, limit);
}
- LimitValueSegment offset = (LimitValueSegment) visit(ctx.offsetClause().selectOffsetValue());
+ if (null != ctx.offsetClause().selectOffsetValue()) {
+ LimitValueSegment offset = (LimitValueSegment) visit(ctx.offsetClause().selectOffsetValue());
+ return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), offset, null);
+ }
+ LimitValueSegment offset = (LimitValueSegment) visit(ctx.offsetClause().selectFetchFirstValue());
return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), offset, null);
}
diff --git a/sql-parser/dialect/postgresql/src/main/antlr4/imports/postgresql/DMLStatement.g4 b/sql-parser/dialect/postgresql/src/main/antlr4/imports/postgresql/DMLStatement.g4
index 60fbc78726f..1bd430d41f8 100644
--- a/sql-parser/dialect/postgresql/src/main/antlr4/imports/postgresql/DMLStatement.g4
+++ b/sql-parser/dialect/postgresql/src/main/antlr4/imports/postgresql/DMLStatement.g4
@@ -229,6 +229,7 @@ valuesClause
limitClause
: LIMIT selectLimitValue
+ | LIMIT selectOffsetValue COMMA_ selectLimitValue
| FETCH firstOrNext selectFetchFirstValue rowOrRows ONLY
| FETCH firstOrNext selectFetchFirstValue rowOrRows WITH TIES
| FETCH firstOrNext rowOrRows ONLY
diff --git a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
index a23fd578311..2d346ffa0e2 100644
--- a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
+++ b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
@@ -106,6 +106,7 @@ import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.Wh
import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.WhereClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.WhereOrCurrentClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.WindowClauseContext;
+import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.SelectFetchFirstValueContext;
import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParserBaseVisitor;
import org.apache.shardingsphere.sql.parser.sql.common.enums.AggregationType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.CombineType;
@@ -1241,6 +1242,18 @@ public abstract class PostgreSQLStatementSQLVisitor extends PostgreSQLStatementP
return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.parseLong(((LiteralExpressionSegment) astNode).getLiterals().toString()));
}
+ @Override
+ public ASTNode visitSelectFetchFirstValue(final SelectFetchFirstValueContext ctx) {
+ ASTNode astNode = visit(ctx.cExpr());
+ if (null != astNode) {
+ if (astNode instanceof ParameterMarkerLimitValueSegment) {
+ return new ParameterMarkerLimitValueSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ((ParameterMarkerExpressionSegment) astNode).getParameterMarkerIndex());
+ }
+ return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.parseLong(((LiteralExpressionSegment) astNode).getLiterals().toString()));
+ }
+ return visit(ctx.NUMBER_());
+ }
+
private LimitSegment createLimitSegmentWhenLimitAndOffset(final SelectLimitContext ctx) {
ParseTree astNode0 = ctx.getChild(0);
LimitValueSegment rowCount = null;
@@ -1261,10 +1274,23 @@ public abstract class PostgreSQLStatementSQLVisitor extends PostgreSQLStatementP
private LimitSegment createLimitSegmentWhenRowCountOrOffsetAbsent(final SelectLimitContext ctx) {
if (null != ctx.limitClause()) {
+ if (null != ctx.limitClause().selectOffsetValue()) {
+ LimitValueSegment limit = (LimitValueSegment) visit(ctx.limitClause().selectLimitValue());
+ LimitValueSegment offset = (LimitValueSegment) visit(ctx.limitClause().selectOffsetValue());
+ return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), offset, limit);
+ }
+ if (null != ctx.limitClause().selectFetchFirstValue()) {
+ LimitValueSegment offset = (LimitValueSegment) visit(ctx.limitClause().selectFetchFirstValue());
+ return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), offset, null);
+ }
LimitValueSegment limit = (LimitValueSegment) visit(ctx.limitClause().selectLimitValue());
return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), null, limit);
}
- LimitValueSegment offset = (LimitValueSegment) visit(ctx.offsetClause().selectOffsetValue());
+ if (null != ctx.offsetClause().selectOffsetValue()) {
+ LimitValueSegment offset = (LimitValueSegment) visit(ctx.offsetClause().selectOffsetValue());
+ return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), offset, null);
+ }
+ LimitValueSegment offset = (LimitValueSegment) visit(ctx.offsetClause().selectFetchFirstValue());
return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), offset, null);
}
diff --git a/test/parser/src/main/resources/case/dml/select.xml b/test/parser/src/main/resources/case/dml/select.xml
index d050f6622d8..990cdcbbb4d 100644
--- a/test/parser/src/main/resources/case/dml/select.xml
+++ b/test/parser/src/main/resources/case/dml/select.xml
@@ -4795,4 +4795,16 @@
</xml-table>
</from>
</select>
+
+ <select sql-case-id="select_with_offset">
+ <projections start-index="7" stop-index="7">
+ <shorthand-projection start-index="7" stop-index="7" />
+ </projections>
+ <from>
+ <simple-table name="t_new_order" start-index="14" stop-index="24" />
+ </from>
+ <limit start-index="26" stop-index="46">
+ <offset value="3" start-index="37" stop-index="37" />
+ </limit>
+ </select>
</sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/sql/supported/dml/select.xml b/test/parser/src/main/resources/sql/supported/dml/select.xml
index d8c25246558..83ba13d76b3 100644
--- a/test/parser/src/main/resources/sql/supported/dml/select.xml
+++ b/test/parser/src/main/resources/sql/supported/dml/select.xml
@@ -155,4 +155,5 @@
<sql-case id="select_xmlroot_function" value="SELECT XMLROOT(XMLType('143598'), VERSION '1.0', STANDALONE YES) AS 'XMLROOT' FROM DUAL;" db-types="Oracle" />
<sql-case id="select_xmlserialize_function" value="SELECT XMLSERIALIZE(DOCUMENT c2 AS BLOB ENCODING 'UTF-8' VERSION 'a' IDENT SIZE = 0 SHOW DEFAULT) FROM b;" db-types="Oracle" />
<sql-case id="select_from_xmltable_function" value="SELECT warehouse_name warehouse, warehouse2.Water, warehouse2.Rail FROM warehouses, XMLTABLE('/Warehouse' PASSING warehouses.warehouse_spec COLUMNS "Water" varchar2(6) PATH 'WaterAccess',"Rail" varchar2(6) PATH 'RailAccess') warehouse2;" db-types="Oracle" />
+ <sql-case id="select_with_offset" value="select * from t_new_order fetch next 3 row only;" db-types="openGauss,PostgreSQL" />
</sql-cases>