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/08/28 14:02:03 UTC
[shardingsphere] branch master updated: Fix nestedTableColProperties and physicalProperties definition (#28275)
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 4563afd14d2 Fix nestedTableColProperties and physicalProperties definition (#28275)
4563afd14d2 is described below
commit 4563afd14d23d494f75f680c47a351cdd19893db
Author: niu niu <zi...@aliyun.com>
AuthorDate: Mon Aug 28 22:01:55 2023 +0800
Fix nestedTableColProperties and physicalProperties definition (#28275)
---
.../src/main/antlr4/imports/oracle/DDLStatement.g4 | 10 +++-------
.../parser/src/main/resources/case/ddl/alter-table.xml | 18 ++++++++++++++++++
.../main/resources/sql/supported/ddl/alter-table.xml | 3 +++
3 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4 b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
index 40679348970..1440c88fff7 100644
--- a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
+++ b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
@@ -720,9 +720,7 @@ commitClause
;
physicalProperties
- : deferredSegmentCreation? segmentAttributesClause? tableCompression? inmemoryTableClause? ilmClause?
- | deferredSegmentCreation? (organizationClause?|externalPartitionClause?)
- | clusterClause
+ : (deferredSegmentCreation? segmentAttributesClause tableCompression? inmemoryTableClause? ilmClause? | deferredSegmentCreation? (organizationClause | externalPartitionClause) | clusterClause)
;
deferredSegmentCreation
@@ -954,10 +952,8 @@ varrayColProperties
;
nestedTableColProperties
- : NESTED TABLE
- (nestedItem | COLUMN_VALUE) substitutableColumnClause? (LOCAL | GLOBAL)? STORE AS storageTable
- LP_ (LP_ objectProperties RP_ | physicalProperties | columnProperties) RP_
- (RETURN AS? (LOCATOR | VALUE))?
+ : NESTED TABLE (nestedItem | COLUMN_VALUE) substitutableColumnClause? (LOCAL | GLOBAL)? STORE AS storageTable
+ ( LP_ (LP_ objectProperties RP_ | physicalProperties | columnProperties)+ RP_)? (RETURN AS? (LOCATOR | VALUE))?
;
lobStorageClause
diff --git a/test/it/parser/src/main/resources/case/ddl/alter-table.xml b/test/it/parser/src/main/resources/case/ddl/alter-table.xml
index e7771cfc696..162405bc1b4 100644
--- a/test/it/parser/src/main/resources/case/ddl/alter-table.xml
+++ b/test/it/parser/src/main/resources/case/ddl/alter-table.xml
@@ -17,6 +17,20 @@
-->
<sql-parser-test-cases>
+ <alter-table sql-case-id="alter_table_add_constraint_foreign_key_references_enable_novalidate">
+ <table name="sales" start-index="12" stop-index="16" />
+ <add-constraint constraint-name="sales_time_fk" start-index="22" stop-index="112">
+ <referenced-table name="times" start-index="80" stop-index="84" />
+ </add-constraint>
+ </alter-table>
+
+ <alter-table sql-case-id="alter_table_add_constraint_foreign_key_references_enable_validate">
+ <table name="sales" start-index="12" stop-index="16" />
+ <add-constraint constraint-name="sales_time_fk" start-index="22" stop-index="110">
+ <referenced-table name="times" start-index="80" stop-index="84" />
+ </add-constraint>
+ </alter-table>
+
<alter-table sql-case-id="alter_table_modify_lob_shrink_space">
<table name="employees" start-index="12" stop-index="20" />
<modify-column>
@@ -851,6 +865,10 @@
<table name="t1" start-index="12" stop-index="13" />
</alter-table>
+ <alter-table sql-case-id="alter_table_add_partition_nested_table_col_properties">
+ <table name="print_media_part" start-index="12" stop-index="27" />
+ </alter-table>
+
<alter-table sql-case-id="alter_table_partition">
<table name="t1" start-index="12" stop-index="13" />
</alter-table>
diff --git a/test/it/parser/src/main/resources/sql/supported/ddl/alter-table.xml b/test/it/parser/src/main/resources/sql/supported/ddl/alter-table.xml
index b69b51977aa..d399d45c2ac 100644
--- a/test/it/parser/src/main/resources/sql/supported/ddl/alter-table.xml
+++ b/test/it/parser/src/main/resources/sql/supported/ddl/alter-table.xml
@@ -17,6 +17,8 @@
-->
<sql-cases>
+ <sql-case id="alter_table_add_constraint_foreign_key_references_enable_novalidate" value="ALTER TABLE sales ADD CONSTRAINT sales_time_fk FOREIGN KEY (time_id) REFERENCES times (time_id) ENABLE NOVALIDATE" db-types="Oracle" />
+ <sql-case id="alter_table_add_constraint_foreign_key_references_enable_validate" value="ALTER TABLE sales ADD CONSTRAINT sales_time_fk FOREIGN KEY (time_id) REFERENCES times (time_id) ENABLE VALIDATE" db-types="Oracle" />
<sql-case id="alter_table_modify_lob_shrink_space" value="ALTER TABLE employees MODIFY LOB (perf_review) (SHRINK SPACE)" db-types="Oracle" />
<sql-case id="alter_table_set_unused" value="ALTER TABLE hr.admin_emp SET UNUSED (hiredate, mgr)" db-types="Oracle" />
<sql-case id="alter_table_modify_lob_cache" value="ALTER TABLE employees MODIFY LOB (resume) (CACHE)" db-types="Oracle" />
@@ -50,6 +52,7 @@
<sql-case id="alter_table_modify_unsigned_zerofill_not_null" value="alter table t1 modify c1 real unsigned zerofill not null" db-types="MySQL" />
<sql-case id="alter_table_change_unsigned_zerofill_not_null" value="alter table t1 change c1 c2 real unsigned zerofill not null" db-types="MySQL" />
<sql-case id="alter_table_add_partition" value="alter table t1 add partition partitions 10" db-types="MySQL" />
+ <sql-case id="alter_table_add_partition_nested_table_col_properties" value="ALTER TABLE print_media_part ADD PARTITION p4 VALUES LESS THAN (400) LOB(ad_photo, ad_composite) STORE AS (TABLESPACE omf_ts1) LOB(ad_sourcetext, ad_finaltext) STORE AS (TABLESPACE omf_ts1) NESTED TABLE ad_textdocs_ntab STORE AS nt_p3" db-types="Oracle" />
<sql-case id="alter_table_partition" value="alter table t1 partition by key(c1) partitions 5" db-types="MySQL" />
<sql-case id="alter_table_if_exists_only" value="ALTER TABLE IF EXISTS ONLY t_log ADD name varchar" db-types="PostgreSQL,openGauss" />
<sql-case id="alter_table_with_force" value="ALTER TABLE t_order FORCE" db-types="MySQL" />