[shardingsphere] branch master updated: Remove useless ExpectedCommonTableExpressColumnsClause (#22287)

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunnianjun 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 a3408201f24 Remove useless ExpectedCommonTableExpressColumnsClause (#22287)
a3408201f24 is described below

commit a3408201f2480dcd91dc5ae3874dd95ff54f7a66
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Nov 20 13:43:10 2022 +0800

    Remove useless ExpectedCommonTableExpressColumnsClause (#22287)
    
    * Remove useless ExpectedColumns
    
    * Remove useless ExpectedCommonTableExpressColumnsClause
---
 .../parser/internal/asserts/segment/with/WithClauseAssert.java   | 6 +++---
 .../segment/impl/with/ExpectedCommonTableExpressionClause.java   | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/with/WithClauseAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/with/WithClauseAssert.java
index e376d45eb94..60c6103cdfc 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/with/WithClauseAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/with/WithClauseAssert.java
@@ -59,13 +59,13 @@ public final class WithClauseAssert {
     }
     
     private static void assertCommonTableExpressionSegment(final SQLCaseAssertContext assertContext, final CommonTableExpressionSegment actual, final ExpectedCommonTableExpressionClause expected) {
-        if (null != expected.getCommonTableExpressColumns()) {
-            assertThat(assertContext.getText("Common table expression column size assertion error: "), actual.getColumns().size(), is(expected.getCommonTableExpressColumns().getColumns().size()));
+        if (!expected.getColumns().isEmpty()) {
+            assertThat(assertContext.getText("Common table expression column size assertion error: "), actual.getColumns().size(), is(expected.getColumns().size()));
         }
         assertThat(assertContext.getText("Common table expression name assertion error: "), actual.getIdentifier().getValue(), is(expected.getName()));
         int count = 0;
         for (ColumnSegment each : actual.getColumns()) {
-            ColumnAssert.assertIs(assertContext, each, expected.getCommonTableExpressColumns().getColumns().get(count));
+            ColumnAssert.assertIs(assertContext, each, expected.getColumns().get(count));
             count++;
         }
         if (null != expected.getSubquery()) {
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/with/ExpectedCommonTableExpressionClause.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/with/ExpectedCommonTableExpressionClause.java
index f6adc6190ee..49655c18928 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/with/ExpectedCommonTableExpressionClause.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/with/ExpectedCommonTableExpressionClause.java
@@ -20,10 +20,14 @@ 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.AbstractExpectedSQLSegment;
+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.expr.simple.ExpectedSubquery;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * Expected common table expression clause.
@@ -35,8 +39,9 @@ public final class ExpectedCommonTableExpressionClause extends AbstractExpectedS
     @XmlAttribute
     private String name;
     
-    @XmlElement(name = "columns")
-    private ExpectedCommonTableExpressColumnsClause commonTableExpressColumns;
+    @XmlElementWrapper
+    @XmlElement(name = "column")
+    private final List<ExpectedColumn> columns = new LinkedList<>();
     
     @XmlElement(name = "subquery-expression")
     private ExpectedSubquery subquery;