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 a9c25680bae Support Parsing ALTER RULE in PostgreSQL (#18784)
a9c25680bae is described below
commit a9c25680bae1177032ad9d19beaf47de32f07e55
Author: Everly Precia Suresh <[email protected]>
AuthorDate: Sat Jul 2 18:11:49 2022 +0530
Support Parsing ALTER RULE in PostgreSQL (#18784)
---
.../main/antlr4/imports/postgresql/DDLStatement.g4 | 2 +-
.../parser/autogen/PostgreSQLStatementParser.g4 | 1 +
.../impl/PostgreSQLDDLStatementSQLVisitor.java | 7 ++++++
.../ddl/PostgreSQLAlterRuleStatement.java | 29 ++++++++++++++++++++++
.../resources/sql/supported/ddl/alter-rule.xml | 2 +-
.../main/resources/sql/unsupported/unsupported.xml | 5 ----
6 files changed, 39 insertions(+), 7 deletions(-)
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/DDLStatement.g4
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/DDLStatement.g4
index 5e34c0f1128..f7e45cd71f6 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/DDLStatement.g4
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/DDLStatement.g4
@@ -1030,7 +1030,7 @@ alterRoutine
;
alterRule
- : ALTER RULE ON qualifiedName RENAME TO name
+ : ALTER RULE name ON qualifiedName RENAME TO name
;
alterSequence
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/PostgreSQLStatementParser.g4
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/PostgreSQLStatementParser.g4
index ad6a69011fa..f9b44d728db 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/PostgreSQLStatementParser.g4
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/PostgreSQLStatementParser.g4
@@ -159,5 +159,6 @@ execute
| createAggregate
| createCast
| alterRoutine
+ | alterRule
) SEMI_? EOF
;
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDDLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDDLStatementSQLVisitor.java
index 8297bded548..1c37fbdf164 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDDLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDDLStatementSQLVisitor.java
@@ -45,6 +45,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.Al
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AlterPublicationContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AlterRenameViewContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AlterRoutineContext;
+import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AlterRuleContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AlterSchemaContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AlterSequenceContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AlterTableActionContext;
@@ -206,6 +207,7 @@ import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl.PostgreSQLAlterProcedureStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl.PostgreSQLAlterPublicationStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl.PostgreSQLAlterRoutineStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl.PostgreSQLAlterRuleStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl.PostgreSQLAlterSchemaStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl.PostgreSQLAlterSequenceStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl.PostgreSQLAlterTableStatement;
@@ -753,6 +755,11 @@ public final class PostgreSQLDDLStatementSQLVisitor
extends PostgreSQLStatementS
return new PostgreSQLAlterRoutineStatement();
}
+ @Override
+ public ASTNode visitAlterRule(final AlterRuleContext ctx) {
+ return new PostgreSQLAlterRuleStatement();
+ }
+
@Override
public ASTNode visitDropProcedure(final DropProcedureContext ctx) {
return new PostgreSQLDropProcedureStatement();
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLAlterRuleStatement.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLAlterRuleStatement.java
new file mode 100644
index 00000000000..49ad4e47c2b
--- /dev/null
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLAlterRuleStatement.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl;
+
+import lombok.ToString;
+import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.AlterRuleStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.PostgreSQLStatement;
+
+/**
+ * PostgreSQL alter rule statement.
+ */
+@ToString
+public final class PostgreSQLAlterRuleStatement extends AlterRuleStatement
implements PostgreSQLStatement {
+}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/alter-rule.xml
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/alter-rule.xml
index 84dae61b15d..97cbcdd0439 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/alter-rule.xml
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/alter-rule.xml
@@ -17,5 +17,5 @@
-->
<sql-cases>
- <sql-case id="alter_rule" value="ALTER RULE notify_all ON emp RENAME TO
notify_me;" db-types="openGauss" />
+ <sql-case id="alter_rule" value="ALTER RULE notify_all ON emp RENAME TO
notify_me;" db-types="openGauss,PostgreSQL" />
</sql-cases>
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/unsupported/unsupported.xml
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/unsupported/unsupported.xml
index d87e44d220a..319f583f2a7 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/unsupported/unsupported.xml
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/unsupported/unsupported.xml
@@ -3353,11 +3353,6 @@
<sql-case id="alter_by_postgresql_source_test_case214" value="ALTER
OPERATOR FAMILY alt_opf7 USING btree DROP OPERATOR 1 (int4, int2, int8);"
db-types="PostgreSQL" />
<sql-case id="alter_by_postgresql_source_test_case215" value="ALTER
OPERATOR FAMILY alt_opf8 USING btree ADD OPERATOR 1 < (int4, int4);"
db-types="PostgreSQL" />
<sql-case id="alter_by_postgresql_source_test_case216" value="ALTER
OPERATOR FAMILY alt_opf9 USING gist ADD OPERATOR 1 < (int4, int4) FOR ORDER
BY float_ops;" db-types="PostgreSQL" />
- <sql-case id="alter_by_postgresql_source_test_case286" value="ALTER RULE
"_RETURN" ON rule_v1 RENAME TO abc;" db-types="PostgreSQL" />
- <sql-case id="alter_by_postgresql_source_test_case287" value="ALTER RULE
InsertRule ON rule_v1 RENAME TO NewInsertRule;" db-types="PostgreSQL" />
- <sql-case id="alter_by_postgresql_source_test_case288" value="ALTER RULE
InsertRule ON rule_v1 RENAME to NewInsertRule;" db-types="PostgreSQL" />
- <sql-case id="alter_by_postgresql_source_test_case289" value="ALTER RULE
NewInsertRule ON rule_v1 RENAME TO "_RETURN";" db-types="PostgreSQL"
/>
- <sql-case id="alter_by_postgresql_source_test_case290" value="ALTER RULE
rules_parted_table_insert ON rules_parted_table RENAME TO
rules_parted_table_insert_redirect;" db-types="PostgreSQL" />
<sql-case id="alter_by_postgresql_source_test_case295" value="ALTER
SEQUENCE itest6_a_seq OWNED BY NONE;" db-types="PostgreSQL" />
<sql-case id="alter_by_postgresql_source_test_case296" value="ALTER SERVER
alt_fserv1 RENAME TO alt_fserv2;" db-types="PostgreSQL" />
<sql-case id="alter_by_postgresql_source_test_case297" value="ALTER SERVER
alt_fserv1 RENAME TO alt_fserv3;" db-types="PostgreSQL" />
