This is an automated email from the ASF dual-hosted git repository.
totalo 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 47dfb0becc0 Remove useless ExpectedColumns (#22286)
47dfb0becc0 is described below
commit 47dfb0becc0c23fbd29eb31b6238f84d30e88546
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Nov 20 13:15:08 2022 +0800
Remove useless ExpectedColumns (#22286)
---
.../ddl/impl/CreateIndexStatementAssert.java | 4 +--
.../statement/dml/impl/CopyStatementAssert.java | 4 +--
.../segment/impl/column/ExpectedColumns.java | 37 ----------------------
.../ddl/CreateIndexStatementTestCase.java | 10 ++++--
.../statement/dml/CopyStatementTestCase.java | 10 ++++--
test/parser/src/main/resources/case/dml/copy.xml | 19 ++++++-----
6 files changed, 27 insertions(+), 57 deletions(-)
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CreateIndexStatementAssert.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CreateIndexStatementAssert.java
index a42d3bd4e12..30f37678148 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CreateIndexStatementAssert.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CreateIndexStatementAssert.java
@@ -67,10 +67,10 @@ public final class CreateIndexStatementAssert {
}
private static void assertColumns(final SQLCaseAssertContext
assertContext, final CreateIndexStatement actual, final
CreateIndexStatementTestCase expected) {
- if (null == expected.getIndexColumns() ||
expected.getIndexColumns().getColumns().isEmpty()) {
+ if (null == expected.getColumns()) {
assertTrue(assertContext.getText("Actual columns segments should
not exist."), actual.getColumns().isEmpty());
} else {
- ColumnAssert.assertIs(assertContext, actual.getColumns(),
expected.getIndexColumns().getColumns());
+ ColumnAssert.assertIs(assertContext, actual.getColumns(),
expected.getColumns());
}
}
}
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/CopyStatementAssert.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/CopyStatementAssert.java
index 5389a0b0f6a..46f5fb726d6 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/CopyStatementAssert.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/CopyStatementAssert.java
@@ -65,11 +65,11 @@ public final class CopyStatementAssert {
private static void assertColumns(final SQLCaseAssertContext
assertContext, final CopyStatement actual, final CopyStatementTestCase
expected) {
Collection<ColumnSegment> columnSegments =
CopyStatementHandler.getColumns(actual);
- if (null == expected.getColumns() ||
expected.getColumns().getColumns().isEmpty()) {
+ if (expected.getColumns().isEmpty()) {
assertTrue(assertContext.getText("Actual column segments should
not exist."), columnSegments.isEmpty());
} else {
assertFalse(assertContext.getText("Actual column segments should
exist."), columnSegments.isEmpty());
- ColumnAssert.assertIs(assertContext, columnSegments,
expected.getColumns().getColumns());
+ ColumnAssert.assertIs(assertContext, columnSegments,
expected.getColumns());
}
}
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/column/ExpectedColumns.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/column/ExpectedColumns.java
deleted file mode 100644
index 62f60141c5b..00000000000
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/column/ExpectedColumns.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.test.sql.parser.internal.cases.parser.domain.segment.impl.column;
-
-import lombok.Getter;
-import lombok.Setter;
-import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.AbstractExpectedSQLSegment;
-
-import javax.xml.bind.annotation.XmlElement;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Expected columns.
- */
-@Getter
-@Setter
-public final class ExpectedColumns extends AbstractExpectedSQLSegment {
-
- @XmlElement(name = "column")
- private List<ExpectedColumn> columns = new LinkedList<>();
-}
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/ddl/CreateIndexStatementTestCase.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/ddl/CreateIndexStatementTestCase.java
index 7109b11db3f..e5e94fd8853 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/ddl/CreateIndexStatementTestCase.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/ddl/CreateIndexStatementTestCase.java
@@ -19,12 +19,15 @@ package
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.s
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.column.ExpectedColumns;
+import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.column.ExpectedColumn;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.index.ExpectedIndex;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.table.ExpectedTable;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.statement.SQLParserTestCase;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import java.util.LinkedList;
+import java.util.List;
/**
* Create index statement test case.
@@ -39,6 +42,7 @@ public final class CreateIndexStatementTestCase extends
SQLParserTestCase {
@XmlElement
private ExpectedTable table;
- @XmlElement(name = "columns")
- private ExpectedColumns indexColumns;
+ @XmlElementWrapper
+ @XmlElement(name = "column")
+ private List<ExpectedColumn> columns = new LinkedList<>();
}
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/CopyStatementTestCase.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/CopyStatementTestCase.java
index a1a35e09347..6b4c4157980 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/CopyStatementTestCase.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/CopyStatementTestCase.java
@@ -19,12 +19,15 @@ package
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.s
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.column.ExpectedColumns;
+import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.column.ExpectedColumn;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.query.ExpectedPrepareStatementQuery;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.table.ExpectedSimpleTable;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.statement.SQLParserTestCase;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import java.util.LinkedList;
+import java.util.List;
/**
* Copy statement test case.
@@ -36,8 +39,9 @@ public final class CopyStatementTestCase extends
SQLParserTestCase {
@XmlElement
private ExpectedSimpleTable table;
- @XmlElement
- private ExpectedColumns columns;
+ @XmlElementWrapper
+ @XmlElement(name = "column")
+ private List<ExpectedColumn> columns = new LinkedList<>();
@XmlElement
private ExpectedPrepareStatementQuery query;
diff --git a/test/parser/src/main/resources/case/dml/copy.xml
b/test/parser/src/main/resources/case/dml/copy.xml
index d60a3d6decd..12c2285377e 100644
--- a/test/parser/src/main/resources/case/dml/copy.xml
+++ b/test/parser/src/main/resources/case/dml/copy.xml
@@ -16,32 +16,31 @@
~ limitations under the License.
-->
-
<sql-parser-test-cases>
<copy sql-case-id="copy_table_from_stdin">
<table name="t_order" start-index="5" stop-index="11" />
</copy>
-
+
<copy sql-case-id="copy_table_from_stdin_with_null_as">
<table name="t_order" start-index="5" stop-index="11" />
</copy>
-
+
<copy sql-case-id="copy_table_to_stdout_with_null_as">
<table name="t_order" start-index="5" stop-index="11" />
</copy>
-
+
<copy sql-case-id="copy_table_from_stdin_with_delimiter_null_as">
<table name="t_order" start-index="5" stop-index="11" />
</copy>
-
+
<copy sql-case-id="copy_table_to_stdout_format_csv">
<table name="t_order" start-index="5" stop-index="11" />
</copy>
-
+
<copy sql-case-id="copy_table_to_stdout_with_csv_force_quote">
<table name="t_order" start-index="5" stop-index="11" />
</copy>
-
+
<copy sql-case-id="copy_query_results_to_stdout">
<query start-index="6" stop-index="26">
<select>
@@ -54,7 +53,7 @@
</select>
</query>
</copy>
-
+
<copy sql-case-id="copy_query_results_from_stdin">
<query start-index="6" stop-index="26">
<select>
@@ -67,11 +66,11 @@
</select>
</query>
</copy>
-
+
<copy sql-case-id="copy_table_to_file">
<table name="t_order" start-index="5" stop-index="11" />
</copy>
-
+
<copy sql-case-id="copy_table_with_columns_to_file">
<table name="t_order" start-index="5" stop-index="11" />
<columns start-index="13" stop-index="20">
