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/07/12 07:51:11 UTC
[shardingsphere] branch master updated: Rename indextype with camelcase (#19053)
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 1dfb10f8663 Rename indextype with camelcase (#19053)
1dfb10f8663 is described below
commit 1dfb10f8663a98955b38e711641fd0008a43bbfc
Author: Jiaqi Yan <13...@qq.com>
AuthorDate: Tue Jul 12 15:51:03 2022 +0800
Rename indextype with camelcase (#19053)
* rename indextype
* update indexType
---
.../src/main/antlr4/imports/oracle/BaseRule.g4 | 2 +-
.../src/main/antlr4/imports/oracle/DDLStatement.g4 | 6 +++---
.../statement/impl/OracleDDLStatementSQLVisitor.java | 18 +++++++++---------
.../statement/impl/OracleStatementSQLVisitor.java | 8 ++++----
.../{IndextypeSegment.java => IndexTypeSegment.java} | 4 ++--
.../dialect/handler/ddl/CommentStatementHandler.java | 6 +++---
.../ddl/OracleAssociateStatisticsStatement.java | 4 ++--
.../statement/oracle/ddl/OracleCommentStatement.java | 4 ++--
.../ddl/OracleDisassociateStatisticsStatement.java | 4 ++--
.../{IndextypeAssert.java => IndexTypeAssert.java} | 20 ++++++++++----------
.../ddl/impl/AssociateStatisticsStatementAssert.java | 14 +++++++-------
.../statement/ddl/impl/CommentStatementAssert.java | 18 +++++++++---------
.../impl/DisassociateStatisticsStatementAssert.java | 14 +++++++-------
...ExpectedIndextype.java => ExpectedIndexType.java} | 4 ++--
.../ddl/AssociateStatisticsStatementTestCase.java | 6 +++---
.../statement/ddl/CommentStatementTestCase.java | 6 +++---
.../ddl/DisassociateStatisticsStatementTestCase.java | 6 +++---
.../main/resources/case/ddl/associate-statistics.xml | 4 ++--
.../src/main/resources/case/ddl/comment.xml | 4 ++--
.../resources/case/ddl/disassociate-statistics.xml | 4 ++--
.../sql/supported/ddl/associate-statistics.xml | 2 +-
.../src/main/resources/sql/supported/ddl/comment.xml | 2 +-
.../sql/supported/ddl/disassociate-statistics.xml | 2 +-
23 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4
index f317558ca86..d0b96917d6f 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4
@@ -152,7 +152,7 @@ typeName
: (owner DOT_)? name
;
-indextypeName
+indexTypeName
: (owner DOT_)? name
;
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/DDLStatement.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
index 1fb4940b894..c9819ca215f 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
@@ -1915,7 +1915,7 @@ functionAssociation
| PACKAGES packageName (COMMA_ packageName)*
| TYPES typeName (COMMA_ typeName)*
| INDEXES indexName (COMMA_ indexName)*
- | INDEXTYPES indextypeName (COMMA_ indextypeName)*)
+ | INDEXTYPES indexTypeName (COMMA_ indexTypeName)*)
(usingStatisticsType | defaultCostClause (COMMA_ defaultSelectivityClause)? | defaultSelectivityClause (COMMA_ defaultCostClause)?)
;
@@ -1942,7 +1942,7 @@ disassociateStatistics
| PACKAGES packageName (COMMA_ packageName)*
| TYPES typeName (COMMA_ typeName)*
| INDEXES indexName (COMMA_ indexName)*
- | INDEXTYPES indextypeName (COMMA_ indextypeName)*) FORCE?
+ | INDEXTYPES indexTypeName (COMMA_ indexTypeName)*) FORCE?
;
audit
@@ -1978,7 +1978,7 @@ comment
| AUDIT POLICY policyName
| COLUMN (tableName | viewName | materializedViewName) DOT_ columnName
| EDITION editionName
- | INDEXTYPE indextypeName
+ | INDEXTYPE indexTypeName
| MATERIALIZED VIEW materializedViewName
| MINING MODEL modelName
| OPERATOR operatorName
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java
index 50bc8726531..855d899f96c 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java
@@ -103,7 +103,7 @@ import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.Functi
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.IndexExpressionContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.IndexExpressionsContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.IndexNameContext;
-import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.IndextypeNameContext;
+import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.IndexTypeNameContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.InlineConstraintContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.ModifyColPropertiesContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.ModifyColumnSpecificationContext;
@@ -131,7 +131,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.constraint.al
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.constraint.alter.DropConstraintDefinitionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.constraint.alter.ModifyConstraintDefinitionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndextypeSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.packages.PackageSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.type.TypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
@@ -620,8 +620,8 @@ public final class OracleDDLStatementSQLVisitor extends OracleStatementSQLVisito
for (TypeNameContext each : ctx.functionAssociation().typeName()) {
result.getTypes().add((TypeSegment) visit(each));
}
- for (IndextypeNameContext each : ctx.functionAssociation().indextypeName()) {
- result.getIndextypes().add((IndextypeSegment) visit(each));
+ for (IndexTypeNameContext each : ctx.functionAssociation().indexTypeName()) {
+ result.getIndexTypes().add((IndexTypeSegment) visit(each));
}
}
return result;
@@ -658,9 +658,9 @@ public final class OracleDDLStatementSQLVisitor extends OracleStatementSQLVisito
result.getTypes().add((TypeSegment) visit(each));
}
}
- if (null != ctx.indextypeName()) {
- for (IndextypeNameContext each : ctx.indextypeName()) {
- result.getIndextypes().add((IndextypeSegment) visit(each));
+ if (null != ctx.indexTypeName()) {
+ for (IndexTypeNameContext each : ctx.indexTypeName()) {
+ result.getIndexTypes().add((IndexTypeSegment) visit(each));
}
}
return result;
@@ -685,8 +685,8 @@ public final class OracleDDLStatementSQLVisitor extends OracleStatementSQLVisito
if (null != ctx.columnName()) {
result.setColumn((ColumnSegment) visit(ctx.columnName()));
}
- if (null != ctx.indextypeName()) {
- result.setIndextype((IndextypeSegment) visit(ctx.indextypeName()));
+ if (null != ctx.indexTypeName()) {
+ result.setIndexType((IndexTypeSegment) visit(ctx.indexTypeName()));
}
return result;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java
index 806c65e2bb4..3250cbca3be 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java
@@ -45,7 +45,7 @@ import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.Functi
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.HexadecimalLiteralsContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.IdentifierContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.IndexNameContext;
-import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.IndextypeNameContext;
+import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.IndexTypeNameContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.LiteralsContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.NullValueLiteralsContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.NumberLiteralsContext;
@@ -72,7 +72,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.constant.ParameterMarkerT
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.constraint.ConstraintSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexNameSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndextypeSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.packages.PackageSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.type.TypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
@@ -270,8 +270,8 @@ public abstract class OracleStatementSQLVisitor extends OracleStatementBaseVisit
}
@Override
- public final ASTNode visitIndextypeName(final IndextypeNameContext ctx) {
- return new IndextypeSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), (IdentifierValue) visit(ctx.name()));
+ public final ASTNode visitIndexTypeName(final IndexTypeNameContext ctx) {
+ return new IndexTypeSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), (IdentifierValue) visit(ctx.name()));
}
@Override
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/index/IndextypeSegment.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/index/IndexTypeSegment.java
similarity index 95%
rename from shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/index/IndextypeSegment.java
rename to shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/index/IndexTypeSegment.java
index 39cf3717743..d39fa63c93d 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/index/IndextypeSegment.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/index/IndexTypeSegment.java
@@ -28,12 +28,12 @@ import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.Identifi
import java.util.Optional;
/**
- * Indextype segment.
+ * Index type segment.
*/
@RequiredArgsConstructor
@Getter
@Setter
-public final class IndextypeSegment implements SQLSegment, OwnerAvailable {
+public final class IndexTypeSegment implements SQLSegment, OwnerAvailable {
private final int startIndex;
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CommentStatementHandler.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CommentStatementHandler.java
index e2b76966f83..6e37f4c4f4b 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CommentStatementHandler.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CommentStatementHandler.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sql.parser.sql.dialect.handler.ddl;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndextypeSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CommentStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.handler.SQLStatementHandler;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleStatement;
@@ -39,9 +39,9 @@ public final class CommentStatementHandler implements SQLStatementHandler {
* @param commentStatement comment statement
* @return index type segment
*/
- public static Optional<IndextypeSegment> getIndextype(final CommentStatement commentStatement) {
+ public static Optional<IndexTypeSegment> getIndexType(final CommentStatement commentStatement) {
if (commentStatement instanceof OracleStatement) {
- return Optional.ofNullable(((OracleCommentStatement) commentStatement).getIndextype());
+ return Optional.ofNullable(((OracleCommentStatement) commentStatement).getIndexType());
}
return Optional.empty();
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleAssociateStatisticsStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleAssociateStatisticsStatement.java
index 121319837b5..5c187e780d0 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleAssociateStatisticsStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleAssociateStatisticsStatement.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndextypeSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.packages.PackageSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.type.TypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
@@ -54,5 +54,5 @@ public final class OracleAssociateStatisticsStatement extends AbstractSQLStateme
private List<TypeSegment> types = new LinkedList<>();
- private List<IndextypeSegment> indextypes = new LinkedList<>();
+ private List<IndexTypeSegment> indexTypes = new LinkedList<>();
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleCommentStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleCommentStatement.java
index a4a4e82803c..9cdf3479f61 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleCommentStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleCommentStatement.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndextypeSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CommentStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleStatement;
@@ -32,5 +32,5 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleS
@ToString
public final class OracleCommentStatement extends CommentStatement implements OracleStatement {
- private IndextypeSegment indextype;
+ private IndexTypeSegment indexType;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDisassociateStatisticsStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDisassociateStatisticsStatement.java
index de3191c3df0..f734a2069b2 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDisassociateStatisticsStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDisassociateStatisticsStatement.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndextypeSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.packages.PackageSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.type.TypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
@@ -54,5 +54,5 @@ public final class OracleDisassociateStatisticsStatement extends AbstractSQLStat
private List<TypeSegment> types = new LinkedList<>();
- private List<IndextypeSegment> indextypes = new LinkedList<>();
+ private List<IndexTypeSegment> indexTypes = new LinkedList<>();
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/index/IndextypeAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/index/IndexTypeAssert.java
similarity index 83%
rename from shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/index/IndextypeAssert.java
rename to shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/index/IndexTypeAssert.java
index 423fd520ff7..6c19a2e4a07 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/index/IndextypeAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/index/IndexTypeAssert.java
@@ -19,33 +19,33 @@ package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndextypeSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTypeSegment;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.owner.OwnerAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.value.IdentifierValueAssert;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.index.ExpectedIndextype;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.index.ExpectedIndexType;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
- * Indextype assert.
+ * Index type assert.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class IndextypeAssert {
+public final class IndexTypeAssert {
/**
- * Assert actual indextype segment is correct with expected indextype.
+ * Assert actual index type segment is correct with expected index type.
*
* @param assertContext assert context
- * @param actual actual indextype segment
- * @param expected expected indextype
+ * @param actual actual index type segment
+ * @param expected expected index type
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final IndextypeSegment actual, final ExpectedIndextype expected) {
- assertNotNull(assertContext.getText("Indextype should exist."), expected);
- IdentifierValueAssert.assertIs(assertContext, actual.getIdentifier(), expected, "Indextype");
+ public static void assertIs(final SQLCaseAssertContext assertContext, final IndexTypeSegment actual, final ExpectedIndexType expected) {
+ assertNotNull(assertContext.getText("IndexType should exist."), expected);
+ IdentifierValueAssert.assertIs(assertContext, actual.getIdentifier(), expected, "IndexType");
if (null != expected.getOwner()) {
assertTrue(assertContext.getText("Actual owner should exist."), actual.getOwner().isPresent());
OwnerAssert.assertIs(assertContext, actual.getOwner().get(), expected.getOwner());
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/AssociateStatisticsStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/AssociateStatisticsStatementAssert.java
index 45fec1d89f3..39d333e6040 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/AssociateStatisticsStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/AssociateStatisticsStatementAssert.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statemen
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndextypeSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.packages.PackageSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.type.TypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAs
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.column.ColumnAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.expression.ExpressionAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.index.IndexAssert;
-import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.index.IndextypeAssert;
+import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.index.IndexTypeAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.packages.PackageAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.table.TableAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.type.TypeAssert;
@@ -56,7 +56,7 @@ public final class AssociateStatisticsStatementAssert {
assertFunctions(assertContext, actual, expected);
assertPackages(assertContext, actual, expected);
assertTypes(assertContext, actual, expected);
- assertIndextypes(assertContext, actual, expected);
+ assertIndexTypes(assertContext, actual, expected);
}
private static void assertTables(final SQLCaseAssertContext assertContext, final OracleAssociateStatisticsStatement actual, final AssociateStatisticsStatementTestCase expected) {
@@ -115,11 +115,11 @@ public final class AssociateStatisticsStatementAssert {
}
}
- private static void assertIndextypes(final SQLCaseAssertContext assertContext, final OracleAssociateStatisticsStatement actual, final AssociateStatisticsStatementTestCase expected) {
- if (null != expected.getIndextypes()) {
+ private static void assertIndexTypes(final SQLCaseAssertContext assertContext, final OracleAssociateStatisticsStatement actual, final AssociateStatisticsStatementTestCase expected) {
+ if (null != expected.getIndexTypes()) {
int count = 0;
- for (IndextypeSegment each : actual.getIndextypes()) {
- IndextypeAssert.assertIs(assertContext, each, expected.getIndextypes().get(count));
+ for (IndexTypeSegment each : actual.getIndexTypes()) {
+ IndexTypeAssert.assertIs(assertContext, each, expected.getIndexTypes().get(count));
count++;
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/CommentStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/CommentStatementAssert.java
index 6dfc909fd2f..e0a1b577cb1 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/CommentStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/CommentStatementAssert.java
@@ -19,12 +19,12 @@ package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statemen
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndextypeSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CommentStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.handler.ddl.CommentStatementHandler;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.column.ColumnAssert;
-import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.index.IndextypeAssert;
+import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.index.IndexTypeAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.table.TableAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.ddl.CommentStatementTestCase;
@@ -50,7 +50,7 @@ public final class CommentStatementAssert {
public static void assertIs(final SQLCaseAssertContext assertContext, final CommentStatement actual, final CommentStatementTestCase expected) {
assertTable(assertContext, actual, expected);
assertColumn(assertContext, actual, expected);
- assertIndextype(assertContext, actual, expected);
+ assertIndexType(assertContext, actual, expected);
}
private static void assertTable(final SQLCaseAssertContext assertContext, final CommentStatement actual, final CommentStatementTestCase expected) {
@@ -69,13 +69,13 @@ public final class CommentStatementAssert {
}
}
- private static void assertIndextype(final SQLCaseAssertContext assertContext, final CommentStatement actual, final CommentStatementTestCase expected) {
- Optional<IndextypeSegment> indextypeSegment = CommentStatementHandler.getIndextype(actual);
- if (null != expected.getIndextype()) {
- assertTrue(assertContext.getText("Actual index type should exist"), indextypeSegment.isPresent());
- IndextypeAssert.assertIs(assertContext, indextypeSegment.get(), expected.getIndextype());
+ private static void assertIndexType(final SQLCaseAssertContext assertContext, final CommentStatement actual, final CommentStatementTestCase expected) {
+ Optional<IndexTypeSegment> indexTypeSegment = CommentStatementHandler.getIndexType(actual);
+ if (null != expected.getIndexType()) {
+ assertTrue(assertContext.getText("Actual index type should exist"), indexTypeSegment.isPresent());
+ IndexTypeAssert.assertIs(assertContext, indexTypeSegment.get(), expected.getIndexType());
} else {
- assertFalse(assertContext.getText("Actual index type should not exist."), indextypeSegment.isPresent());
+ assertFalse(assertContext.getText("Actual index type should not exist."), indexTypeSegment.isPresent());
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/DisassociateStatisticsStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/DisassociateStatisticsStatementAssert.java
index 0b02c0da61d..29a75afaad7 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/DisassociateStatisticsStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/ddl/impl/DisassociateStatisticsStatementAssert.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statemen
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndextypeSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.packages.PackageSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.type.TypeSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAs
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.column.ColumnAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.expression.ExpressionAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.index.IndexAssert;
-import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.index.IndextypeAssert;
+import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.index.IndexTypeAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.packages.PackageAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.table.TableAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.type.TypeAssert;
@@ -56,7 +56,7 @@ public final class DisassociateStatisticsStatementAssert {
assertFunctions(assertContext, actual, expected);
assertPackages(assertContext, actual, expected);
assertTypes(assertContext, actual, expected);
- assertIndextypes(assertContext, actual, expected);
+ assertIndexTypes(assertContext, actual, expected);
}
private static void assertTables(final SQLCaseAssertContext assertContext, final OracleDisassociateStatisticsStatement actual, final DisassociateStatisticsStatementTestCase expected) {
@@ -115,11 +115,11 @@ public final class DisassociateStatisticsStatementAssert {
}
}
- private static void assertIndextypes(final SQLCaseAssertContext assertContext, final OracleDisassociateStatisticsStatement actual, final DisassociateStatisticsStatementTestCase expected) {
- if (null != expected.getIndextypes()) {
+ private static void assertIndexTypes(final SQLCaseAssertContext assertContext, final OracleDisassociateStatisticsStatement actual, final DisassociateStatisticsStatementTestCase expected) {
+ if (null != expected.getIndexTypes()) {
int count = 0;
- for (IndextypeSegment each : actual.getIndextypes()) {
- IndextypeAssert.assertIs(assertContext, each, expected.getIndextypes().get(count));
+ for (IndexTypeSegment each : actual.getIndexTypes()) {
+ IndexTypeAssert.assertIs(assertContext, each, expected.getIndexTypes().get(count));
count++;
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/index/ExpectedIndextype.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/index/ExpectedIndexType.java
similarity index 93%
rename from shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/index/ExpectedIndextype.java
rename to shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/index/ExpectedIndexType.java
index 02415c0f04d..0e69a2be9bc 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/index/ExpectedIndextype.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/index/ExpectedIndexType.java
@@ -25,11 +25,11 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
import javax.xml.bind.annotation.XmlElement;
/**
- * Expected indextype.
+ * Expected index type.
*/
@Getter
@Setter
-public final class ExpectedIndextype extends AbstractExpectedIdentifierSQLSegment {
+public final class ExpectedIndexType extends AbstractExpectedIdentifierSQLSegment {
@XmlElement
private ExpectedOwner owner;
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/AssociateStatisticsStatementTestCase.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/AssociateStatisticsStatementTestCase.java
index f0bbbe5e032..d2e4574c5da 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/AssociateStatisticsStatementTestCase.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/AssociateStatisticsStatementTestCase.java
@@ -22,7 +22,7 @@ import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.column.ExpectedColumn;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.function.ExpectedFunction;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.index.ExpectedIndex;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.index.ExpectedIndextype;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.index.ExpectedIndexType;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.packages.ExpectedPackage;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.table.ExpectedSimpleTable;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.type.ExpectedType;
@@ -57,6 +57,6 @@ public final class AssociateStatisticsStatementTestCase extends SQLParserTestCas
@XmlElement(name = "type")
private final List<ExpectedType> types = new LinkedList<>();
- @XmlElement(name = "indextype")
- private final List<ExpectedIndextype> indextypes = new LinkedList<>();
+ @XmlElement(name = "index-type")
+ private final List<ExpectedIndexType> indexTypes = new LinkedList<>();
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/CommentStatementTestCase.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/CommentStatementTestCase.java
index 65cefd95d42..3bfd7749132 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/CommentStatementTestCase.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/CommentStatementTestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domai
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.column.ExpectedColumn;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.index.ExpectedIndextype;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.index.ExpectedIndexType;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.table.ExpectedSimpleTable;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
@@ -39,6 +39,6 @@ public final class CommentStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "column")
private ExpectedColumn column;
- @XmlElement(name = "indextype")
- private ExpectedIndextype indextype;
+ @XmlElement(name = "index-type")
+ private ExpectedIndexType indexType;
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/DisassociateStatisticsStatementTestCase.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/DisassociateStatisticsStatementTestCase.java
index 3071718de68..e310d1237ce 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/DisassociateStatisticsStatementTestCase.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/ddl/DisassociateStatisticsStatementTestCase.java
@@ -22,7 +22,7 @@ import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.column.ExpectedColumn;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.function.ExpectedFunction;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.index.ExpectedIndex;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.index.ExpectedIndextype;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.index.ExpectedIndexType;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.packages.ExpectedPackage;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.table.ExpectedSimpleTable;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.type.ExpectedType;
@@ -57,6 +57,6 @@ public final class DisassociateStatisticsStatementTestCase extends SQLParserTest
@XmlElement(name = "type")
private final List<ExpectedType> types = new LinkedList<>();
- @XmlElement(name = "indextype")
- private final List<ExpectedIndextype> indextypes = new LinkedList<>();
+ @XmlElement(name = "index-type")
+ private final List<ExpectedIndexType> indexTypes = new LinkedList<>();
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/associate-statistics.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/associate-statistics.xml
index 071406181b2..eb109b685b8 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/associate-statistics.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/associate-statistics.xml
@@ -45,7 +45,7 @@
<type name="Example_typ" start-index="32" stop-index="42" />
</associate-statistics>
- <associate-statistics sql-case-id="associate_statistics_with_indextype">
- <indextype name="indtype" start-index="37" stop-index="43" />
+ <associate-statistics sql-case-id="associate_statistics_with_index_type">
+ <index-type name="indtype" start-index="37" stop-index="43" />
</associate-statistics>
</sql-parser-test-cases>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/comment.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/comment.xml
index c023e249945..907ed98cfd7 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/comment.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/comment.xml
@@ -23,8 +23,8 @@
<column name="job_id" start-index="28" stop-index="33" />
</comment>
<comment sql-case-id="comment_on_edition" />
- <comment sql-case-id="comment_on_indextype">
- <indextype name="indtype" start-index="21" stop-index="27" />
+ <comment sql-case-id="comment_on_index_type">
+ <index-type name="indtype" start-index="21" stop-index="27" />
</comment>
<comment sql-case-id="comment_on_view" />
<comment sql-case-id="comment_on_model" />
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/disassociate-statistics.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/disassociate-statistics.xml
index 70c02a44373..b323dc0428c 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/disassociate-statistics.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/disassociate-statistics.xml
@@ -45,7 +45,7 @@
<type name="example_typ" start-index="35" stop-index="45" />
</disassociate-statistics>
- <disassociate-statistics sql-case-id="disassociate_statistics_from_indextype">
- <indextype name="indtype" start-index="40" stop-index="46" />
+ <disassociate-statistics sql-case-id="disassociate_statistics_from_index_type">
+ <index-type name="indtype" start-index="40" stop-index="46" />
</disassociate-statistics>
</sql-parser-test-cases>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/associate-statistics.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/associate-statistics.xml
index 0e1665f9337..a752036da15 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/associate-statistics.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/associate-statistics.xml
@@ -23,5 +23,5 @@
<sql-case id="associate_statistics_with_function" value="ASSOCIATE STATISTICS WITH FUNCTIONS myFunction USING stat_MyFunction" db-types="Oracle" />
<sql-case id="associate_statistics_with_package" value="ASSOCIATE STATISTICS WITH PACKAGES emp_mgmt DEFAULT SELECTIVITY 10" db-types="Oracle" />
<sql-case id="associate_statistics_with_type" value="ASSOCIATE STATISTICS WITH TYPES Example_typ DEFAULT SELECTIVITY 30, DEFAULT COST (100,5,0)" db-types="Oracle" />
- <sql-case id="associate_statistics_with_indextype" value="ASSOCIATE STATISTICS WITH INDEXTYPES indtype USING stat_indtype WITH SYSTEM MANAGED STORAGE TABLES" db-types="Oracle" />
+ <sql-case id="associate_statistics_with_index_type" value="ASSOCIATE STATISTICS WITH INDEXTYPES indtype USING stat_indtype WITH SYSTEM MANAGED STORAGE TABLES" db-types="Oracle" />
</sql-cases>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/comment.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/comment.xml
index 2f71946c521..48dcf248e39 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/comment.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/comment.xml
@@ -20,7 +20,7 @@
<sql-case id="comment_on_policy" value="COMMENT ON AUDIT POLICY read_dir_pol IS 'this is a default policy'" db-types="Oracle" />
<sql-case id="comment_on_column" value="COMMENT ON COLUMN employees.job_id IS 'abbreviated job title'" db-types="Oracle, PostgreSQL" />
<sql-case id="comment_on_edition" value="COMMENT ON EDITION editionName IS 'some comments'" db-types="Oracle" />
- <sql-case id="comment_on_indextype" value="COMMENT ON INDEXTYPE indtype IS 'some comments'" db-types="Oracle" />
+ <sql-case id="comment_on_index_type" value="COMMENT ON INDEXTYPE indtype IS 'some comments'" db-types="Oracle" />
<sql-case id="comment_on_view" value="COMMENT ON MATERIALIZED VIEW viewName IS 'some comments'" db-types="Oracle" />
<sql-case id="comment_on_model" value="COMMENT ON MINING MODEL modelName IS 'some comments'" db-types="Oracle" />
<sql-case id="comment_on_operator" value="COMMENT ON OPERATOR op IS 'some comments'" db-types="Oracle" />
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/disassociate-statistics.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/disassociate-statistics.xml
index 30949b4b36b..b6aee460150 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/disassociate-statistics.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/disassociate-statistics.xml
@@ -23,5 +23,5 @@
<sql-case id="disassociate_statistics_from_function" value="DISASSOCIATE STATISTICS FROM FUNCTIONS myFunction FORCE" db-types="Oracle" />
<sql-case id="disassociate_statistics_from_package" value="DISASSOCIATE STATISTICS FROM PACKAGES emp_mgmt" db-types="Oracle" />
<sql-case id="disassociate_statistics_from_type" value="DISASSOCIATE STATISTICS FROM TYPES example_typ" db-types="Oracle" />
- <sql-case id="disassociate_statistics_from_indextype" value="DISASSOCIATE STATISTICS FROM INDEXTYPES indtype" db-types="Oracle" />
+ <sql-case id="disassociate_statistics_from_index_type" value="DISASSOCIATE STATISTICS FROM INDEXTYPES indtype" db-types="Oracle" />
</sql-cases>