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 2023/09/09 12:05:46 UTC
[shardingsphere] branch master updated: Support OpenGauss Network Address Functions parse (#28379)
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 11f6f0e7855 Support OpenGauss Network Address Functions parse (#28379)
11f6f0e7855 is described below
commit 11f6f0e785548c96a2c5b74207fc356f56e533b4
Author: Zichao <57...@users.noreply.github.com>
AuthorDate: Sun Sep 10 00:05:39 2023 +1200
Support OpenGauss Network Address Functions parse (#28379)
---
.../src/main/antlr4/imports/opengauss/BaseRule.g4 | 4 +++
.../antlr4/imports/opengauss/OpenGaussKeyword.g4 | 12 ++++++++
.../main/resources/case/dml/select-expression.xml | 32 ++++++++++++++++++++++
.../sql/supported/dml/select-expression.xml | 4 +++
4 files changed, 52 insertions(+)
diff --git a/parser/sql/dialect/opengauss/src/main/antlr4/imports/opengauss/BaseRule.g4 b/parser/sql/dialect/opengauss/src/main/antlr4/imports/opengauss/BaseRule.g4
index aa7744bb630..e852aa49f8f 100644
--- a/parser/sql/dialect/opengauss/src/main/antlr4/imports/opengauss/BaseRule.g4
+++ b/parser/sql/dialect/opengauss/src/main/antlr4/imports/opengauss/BaseRule.g4
@@ -1104,6 +1104,10 @@ functionExprCommonSubexpr
| TS_REWRITE LP_ aExpr (TYPE_CAST_ TSQUERY)? (COMMA_ aExpr (TYPE_CAST_ TSQUERY)?)* RP_
| ELEM_CONTAINED_BY_RANGE LP_ aExpr COMMA_ dataType RP_
| (LOWER_INF | UPPER_INF) LP_ aExpr TYPE_CAST_ identifier RP_
+ | ABBREV LP_ (INET | CIDR) STRING_ RP_
+ | SET_MASKLEN LP_ STRING_ (TYPE_CAST_ CIDR)? COMMA_ numberLiterals RP_
+ | TEXT LP_ INET STRING_ RP_
+ | TRUNC LP_ MACADDR STRING_ RP_
;
typeName
diff --git a/parser/sql/dialect/opengauss/src/main/antlr4/imports/opengauss/OpenGaussKeyword.g4 b/parser/sql/dialect/opengauss/src/main/antlr4/imports/opengauss/OpenGaussKeyword.g4
index 2a177f4d661..6668fcef344 100644
--- a/parser/sql/dialect/opengauss/src/main/antlr4/imports/opengauss/OpenGaussKeyword.g4
+++ b/parser/sql/dialect/opengauss/src/main/antlr4/imports/opengauss/OpenGaussKeyword.g4
@@ -1428,3 +1428,15 @@ LOWER_INF
UPPER_INF
: U P P E R UL_ I N F
;
+
+ABBREV
+ : A B B R E V
+ ;
+
+SET_MASKLEN
+ : S E T UL_ M A S K L E N
+ ;
+
+TRUNC
+ : T R U N C
+ ;
diff --git a/test/it/parser/src/main/resources/case/dml/select-expression.xml b/test/it/parser/src/main/resources/case/dml/select-expression.xml
index 22842474aa4..9a9166a2123 100644
--- a/test/it/parser/src/main/resources/case/dml/select-expression.xml
+++ b/test/it/parser/src/main/resources/case/dml/select-expression.xml
@@ -3093,4 +3093,36 @@
</expression-projection>
</projections>
</select>
+
+ <select sql-case-id="select_abbrev_function">
+ <projections start-index="7" stop-index="42">
+ <expression-projection start-index="7" stop-index="42" text="abbrev(cidr '10.1.0.0/16')" alias="RESULT">
+ <function start-index="7" stop-index="42" function-name="abbrev" text="abbrev(cidr '10.1.0.0/16')" alias="RESULT" />
+ </expression-projection>
+ </projections>
+ </select>
+
+ <select sql-case-id="select_set_masklen_function">
+ <projections start-index="7" stop-index="55">
+ <expression-projection start-index="7" stop-index="55" text="set_masklen('192.168.1.0/24'::cidr, 16)" alias="RESULT">
+ <function start-index="7" stop-index="55" function-name="set_masklen" text="set_masklen('192.168.1.0/24'::cidr, 16)" alias="RESULT" />
+ </expression-projection>
+ </projections>
+ </select>
+
+ <select sql-case-id="select_text_inet_function">
+ <projections start-index="7" stop-index="40">
+ <expression-projection start-index="7" stop-index="40" text="text(inet '192.168.1.5')" alias="RESULT">
+ <function start-index="7" stop-index="40" function-name="text" text="text(inet '192.168.1.5')" alias="RESULT" />
+ </expression-projection>
+ </projections>
+ </select>
+
+ <select sql-case-id="select_trunc_function">
+ <projections start-index="7" stop-index="50">
+ <expression-projection start-index="7" stop-index="50" text="trunc(macaddr '12:34:56:78:90:ab')" alias="RESULT">
+ <function start-index="7" stop-index="50" function-name="trunc" text="trunc(macaddr '12:34:56:78:90:ab')" alias="RESULT" />
+ </expression-projection>
+ </projections>
+ </select>
</sql-parser-test-cases>
diff --git a/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml b/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
index 46c8cbb7acb..96e30ebb469 100644
--- a/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
+++ b/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
@@ -132,4 +132,8 @@
<sql-case id="select_int4range" value="SELECT int4range(2,4) <@ int4range(1,7) AS RESULT;" db-types="openGauss" />
<sql-case id="select_lower_inf_function" value="SELECT lower_inf('(,)'::daterange) AS RESULT;" db-types="openGauss" />
<sql-case id="select_tsquery" value="SELECT 'super:*'::tsquery;" db-types="openGauss" />
+ <sql-case id="select_abbrev_function" value="SELECT abbrev(cidr '10.1.0.0/16') AS RESULT;" db-types="openGauss" />
+ <sql-case id="select_set_masklen_function" value="SELECT set_masklen('192.168.1.0/24'::cidr, 16) AS RESULT;" db-types="openGauss" />
+ <sql-case id="select_text_inet_function" value="SELECT text(inet '192.168.1.5') AS RESULT;" db-types="openGauss" />
+ <sql-case id="select_trunc_function" value="SELECT trunc(macaddr '12:34:56:78:90:ab') AS RESULT;" db-types="openGauss" />
</sql-cases>