You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2026/08/15 11:05:41 UTC
(shardingsphere) branch master updated: Refactor Oracle create view column parsing (#39464)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao95 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 47d76ca5070 Refactor Oracle create view column parsing (#39464)
47d76ca5070 is described below
commit 47d76ca5070bd036b4c09200a79c30e2c13125b1
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Sat Aug 15 19:05:34 2026 +0800
Refactor Oracle create view column parsing (#39464)
* Refactor Oracle create view column parsing
* Refactor create view parser formatting
* Fix create view column binding
* Refactor create view column binding tests
* Remove Oracle create view visitor test
---
.../statement/ddl/CreateViewStatementBinder.java | 50 ++++++++
.../ddl/CreateViewStatementBinderTest.java | 128 +++++++++++++++++++++
.../statement/type/OracleDDLStatementVisitor.java | 13 +++
.../type/ddl/view/CreateViewStatement.java | 6 +
.../standard/type/CreateViewStatementAssert.java | 16 +++
.../standard/view/CreateViewStatementTestCase.java | 6 +
.../src/main/resources/case/ddl/create-view.xml | 6 +
7 files changed, 225 insertions(+)
diff --git a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinder.java b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinder.java
index 6d89f489fb7..75546a1a64f 100644
--- a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinder.java
+++ b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinder.java
@@ -18,15 +18,30 @@
package org.apache.shardingsphere.infra.binder.engine.statement.ddl;
import com.google.common.collect.LinkedHashMultimap;
+import org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.ColumnSegmentBinder;
import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.type.SimpleTableSegmentBinder;
import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinder;
import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementCopyUtils;
import org.apache.shardingsphere.infra.binder.engine.statement.dml.SelectStatementBinder;
+import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
+import org.apache.shardingsphere.infra.exception.kernel.syntax.DifferenceInColumnCountOfSelectListAndColumnNameListException;
+import org.apache.shardingsphere.sql.parser.statement.core.enums.TableSourceType;
+import org.apache.shardingsphere.sql.parser.statement.core.extractor.ColumnExtractor;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.view.ViewColumnSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item.ColumnProjectionSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item.ExpressionProjectionSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item.ProjectionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.view.CreateViewStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.SelectStatement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
/**
* Create view statement binder.
*/
@@ -45,7 +60,42 @@ public final class CreateViewStatementBinder implements SQLStatementBinder<Creat
result.setSelect(boundSelect);
result.setReplaceView(sqlStatement.isReplaceView());
result.setViewDefinition(sqlStatement.getViewDefinition());
+ result.getColumns().addAll(bindColumns(sqlStatement.getColumns(), boundSelect));
SQLStatementCopyUtils.copyAttributes(sqlStatement, result);
return result;
}
+
+ private Collection<ViewColumnSegment> bindColumns(final List<ViewColumnSegment> columns, final SelectStatement boundSelect) {
+ List<ProjectionSegment> projections = boundSelect.getProjections().getProjections();
+ ShardingSpherePreconditions.checkState(columns.isEmpty() || columns.size() == projections.size(), DifferenceInColumnCountOfSelectListAndColumnNameListException::new);
+ Collection<ViewColumnSegment> result = new ArrayList<>(columns.size());
+ int index = 0;
+ for (ViewColumnSegment each : columns) {
+ result.add(new ViewColumnSegment(each.getStartIndex(), each.getStopIndex(), bindColumn(each.getColumn(), projections.get(index)), each.getComment().orElse(null)));
+ index++;
+ }
+ return result;
+ }
+
+ private ColumnSegment bindColumn(final ColumnSegment column, final ProjectionSegment projection) {
+ ColumnSegment result = new ColumnSegment(column.getStartIndex(), column.getStopIndex(), column.getIdentifier());
+ result.setNestedObjectAttributes(column.getNestedObjectAttributes());
+ column.getOwner().ifPresent(result::setOwner);
+ result.setVariable(column.isVariable());
+ column.getLeftParentheses().ifPresent(result::setLeftParentheses);
+ column.getRightParentheses().ifPresent(result::setRightParentheses);
+ result.setColumnBoundInfo(ColumnSegmentBinder.createColumnSegmentBoundInfo(column, findInputColumn(projection).orElse(null), TableSourceType.TEMPORARY_TABLE));
+ return result;
+ }
+
+ private Optional<ColumnSegment> findInputColumn(final ProjectionSegment projection) {
+ if (projection instanceof ColumnProjectionSegment) {
+ return Optional.of(((ColumnProjectionSegment) projection).getColumn());
+ }
+ if (projection instanceof ExpressionProjectionSegment && null != ((ExpressionProjectionSegment) projection).getExpr()) {
+ Collection<ColumnSegment> columns = ColumnExtractor.extract(((ExpressionProjectionSegment) projection).getExpr());
+ return 1 == columns.size() ? Optional.of(columns.iterator().next()) : Optional.empty();
+ }
+ return Optional.empty();
+ }
}
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinderTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinderTest.java
new file mode 100644
index 00000000000..acd29853822
--- /dev/null
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinderTest.java
@@ -0,0 +1,128 @@
+/*
+ * 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.infra.binder.engine.statement.ddl;
+
+import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
+import org.apache.shardingsphere.infra.hint.HintValueContext;
+import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
+import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
+import org.apache.shardingsphere.sql.parser.statement.core.enums.TableSourceType;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.view.ViewColumnSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item.ColumnProjectionSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item.ExpressionProjectionSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item.ProjectionsSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.view.CreateViewStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.SelectStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Types;
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class CreateViewStatementBinderTest {
+
+ private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
+
+ @Test
+ void assertBindCreateViewWithExpressionColumn() {
+ CreateViewStatement createViewStatement = createCreateViewStatement(createExpressionSelectStatement());
+ CreateViewStatement actual = new CreateViewStatementBinder().bind(createViewStatement, createBinderContext(createViewStatement));
+ assertThat(actual.getColumns().size(), is(1));
+ assertThat(actual.getColumns().get(0).getColumn().getIdentifier().getValue(), is("foo_id"));
+ assertThat(actual.getColumns().get(0).getComment().orElse(null), is("id comment"));
+ assertThat(actual.getColumns().get(0).getColumn().getColumnBoundInfo().getOriginalColumn().getValue(), is("foo_id"));
+ assertThat(actual.getColumns().get(0).getColumn().getColumnBoundInfo().getTableSourceType(), is(TableSourceType.TEMPORARY_TABLE));
+ }
+
+ @Test
+ void assertBindCreateViewWithProjectionColumnBoundInfo() {
+ CreateViewStatement createViewStatement = createCreateViewStatement(createColumnSelectStatement());
+ CreateViewStatement actual = new CreateViewStatementBinder().bind(createViewStatement, createBinderContext(createViewStatement));
+ assertThat(actual.getColumns().size(), is(1));
+ assertThat(actual.getColumns().get(0).getColumn().getIdentifier().getValue(), is("foo_id"));
+ assertThat(actual.getColumns().get(0).getColumn().getColumnBoundInfo().getOriginalDatabase().getValue(), is("foo_db"));
+ assertThat(actual.getColumns().get(0).getColumn().getColumnBoundInfo().getOriginalSchema().getValue(), is("foo_db"));
+ assertThat(actual.getColumns().get(0).getColumn().getColumnBoundInfo().getOriginalTable().getValue(), is("t_order"));
+ assertThat(actual.getColumns().get(0).getColumn().getColumnBoundInfo().getOriginalColumn().getValue(), is("order_id"));
+ assertThat(actual.getColumns().get(0).getColumn().getColumnBoundInfo().getTableSourceType(), is(TableSourceType.TEMPORARY_TABLE));
+ }
+
+ private SQLStatementBinderContext createBinderContext(final CreateViewStatement createViewStatement) {
+ HintValueContext hintValueContext = new HintValueContext();
+ hintValueContext.setSkipMetadataValidate(true);
+ return new SQLStatementBinderContext(createMetaData(), "foo_db", hintValueContext, createViewStatement, Collections.emptyList());
+ }
+
+ private CreateViewStatement createCreateViewStatement(final SelectStatement selectStatement) {
+ CreateViewStatement result = new CreateViewStatement(databaseType);
+ result.setView(new SimpleTableSegment(new TableNameSegment(0, 8, new IdentifierValue("foo_view"))));
+ result.setSelect(selectStatement);
+ result.getColumns().add(new ViewColumnSegment(9, 14, new ColumnSegment(9, 14, new IdentifierValue("foo_id")), "id comment"));
+ return result;
+ }
+
+ private SelectStatement createExpressionSelectStatement() {
+ ProjectionsSegment projections = new ProjectionsSegment(35, 35);
+ projections.getProjections().add(new ExpressionProjectionSegment(35, 35, "1", new LiteralExpressionSegment(35, 35, 1)));
+ return SelectStatement.builder().databaseType(databaseType).projections(projections).build();
+ }
+
+ private SelectStatement createColumnSelectStatement() {
+ ProjectionsSegment projections = new ProjectionsSegment(35, 35);
+ projections.getProjections().add(new ColumnProjectionSegment(new ColumnSegment(35, 42, new IdentifierValue("order_id"))));
+ return SelectStatement.builder().databaseType(databaseType).projections(projections)
+ .from(new SimpleTableSegment(new TableNameSegment(48, 54, new IdentifierValue("t_order")))).build();
+ }
+
+ private ShardingSphereMetaData createMetaData() {
+ IdentifierValue databaseName = new IdentifierValue("foo_db");
+ IdentifierValue tableName = new IdentifierValue("t_order");
+ ShardingSphereSchema schema = mock(ShardingSphereSchema.class, RETURNS_DEEP_STUBS);
+ when(schema.getName()).thenReturn("foo_db");
+ when(schema.getTable("t_order").getAllColumns()).thenReturn(Arrays.asList(new ShardingSphereColumn("order_id", Types.INTEGER, true, false, false, true, false, false),
+ new ShardingSphereColumn("user_id", Types.INTEGER, false, false, false, true, false, false)));
+ when(schema.getTable(tableName).getAllColumns()).thenReturn(Arrays.asList(new ShardingSphereColumn("order_id", Types.INTEGER, true, false, false, true, false, false),
+ new ShardingSphereColumn("user_id", Types.INTEGER, false, false, false, true, false, false)));
+ ShardingSphereMetaData result = mock(ShardingSphereMetaData.class, RETURNS_DEEP_STUBS);
+ when(result.containsDatabase("foo_db")).thenReturn(true);
+ when(result.containsDatabase(databaseName)).thenReturn(true);
+ when(result.getDatabase("foo_db").getDefaultSchemaName()).thenReturn("foo_db");
+ when(result.getDatabase(databaseName).getDefaultSchemaName()).thenReturn("foo_db");
+ when(result.getDatabase("foo_db").containsSchema("foo_db")).thenReturn(true);
+ when(result.getDatabase(databaseName).containsSchema(databaseName)).thenReturn(true);
+ when(result.getDatabase("foo_db").getSchema("foo_db")).thenReturn(schema);
+ when(result.getDatabase(databaseName).getSchema(databaseName)).thenReturn(schema);
+ when(result.getDatabase("foo_db").getSchema("foo_db").containsTable("t_order")).thenReturn(true);
+ when(result.getDatabase(databaseName).getSchema(databaseName).containsTable(tableName)).thenReturn(true);
+ return result;
+ }
+}
diff --git a/parser/sql/engine/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/engine/oracle/visitor/statement/type/OracleDDLStatementVisitor.java b/parser/sql/engine/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/engine/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
index 38fd9ee18cf..b2e1a27bde4 100644
--- a/parser/sql/engine/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/engine/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
+++ b/parser/sql/engine/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/engine/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
@@ -65,6 +65,7 @@ import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterT
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterTriggerContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterTypeContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterViewContext;
+import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AliasContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AnalyzeContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AssociateStatisticsContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AuditContext;
@@ -249,6 +250,7 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.routine.V
import org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.tablespace.TablespaceSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.type.TypeDefinitionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.type.TypeSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.view.ViewColumnSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.FunctionSegment;
@@ -417,12 +419,23 @@ public final class OracleDDLStatementVisitor extends OracleStatementVisitor impl
getGlobalParameterMarkerSegments().addAll(visitor.getGlobalParameterMarkerSegments());
getStatementParameterMarkerSegments().addAll(visitor.getStatementParameterMarkerSegments());
result.setView((SimpleTableSegment) visit(ctx.viewName()));
+ result.getColumns().addAll(createViewColumns(ctx.alias()));
result.setSelect((SelectStatement) visitor.visit(ctx.select()));
result.setViewDefinition(getOriginalText(ctx.select()));
result.addParameterMarkers(getGlobalParameterMarkerSegments());
return result;
}
+ private Collection<ViewColumnSegment> createViewColumns(final Collection<AliasContext> aliases) {
+ Collection<ViewColumnSegment> result = new LinkedList<>();
+ for (AliasContext each : aliases) {
+ IdentifierValue identifier = null == each.identifier() ? new IdentifierValue(each.STRING_().getText()) : (IdentifierValue) visit(each.identifier());
+ ColumnSegment column = new ColumnSegment(each.getStart().getStartIndex(), each.getStop().getStopIndex(), identifier);
+ result.add(new ViewColumnSegment(each.getStart().getStartIndex(), each.getStop().getStopIndex(), column, null));
+ }
+ return result;
+ }
+
@SuppressWarnings("unchecked")
@Override
public ASTNode visitCreateTable(final CreateTableContext ctx) {
diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/ddl/view/CreateViewStatement.java b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/ddl/view/CreateViewStatement.java
index d34cd359e49..544e1c81fcf 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/ddl/view/CreateViewStatement.java
+++ b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/ddl/view/CreateViewStatement.java
@@ -20,10 +20,14 @@ package org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.v
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.view.ViewColumnSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.DDLStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.SelectStatement;
+import java.util.LinkedList;
+import java.util.List;
+
/**
* Create view statement.
*/
@@ -39,6 +43,8 @@ public final class CreateViewStatement extends DDLStatement {
private SelectStatement select;
+ private List<ViewColumnSegment> columns = new LinkedList<>();
+
public CreateViewStatement(final DatabaseType databaseType) {
super(databaseType);
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/type/CreateViewStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/type/CreateViewStatementAssert.java
index 8fa364c083f..acaef7d2b7d 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/type/CreateViewStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/type/CreateViewStatementAssert.java
@@ -19,10 +19,14 @@ package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.view.ViewColumnSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.view.CreateViewStatement;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
+import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.SQLSegmentAssert;
+import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.table.TableAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.dml.standard.type.SelectStatementAssert;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.column.ExpectedViewColumn;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.view.CreateViewStatementTestCase;
import static org.hamcrest.Matchers.is;
@@ -45,6 +49,7 @@ public final class CreateViewStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final CreateViewStatement actual, final CreateViewStatementTestCase expected) {
assertView(assertContext, actual, expected);
+ assertColumns(assertContext, actual, expected);
assertViewDefinition(assertContext, actual, expected);
assertSelect(assertContext, actual, expected);
}
@@ -53,6 +58,17 @@ public final class CreateViewStatementAssert {
TableAssert.assertIs(assertContext, actual.getView(), expected.getView());
}
+ private static void assertColumns(final SQLCaseAssertContext assertContext, final CreateViewStatement actual, final CreateViewStatementTestCase expected) {
+ assertThat(assertContext.getText("View columns size assertion error: "), actual.getColumns().size(), is(expected.getColumns().size()));
+ int count = 0;
+ for (ViewColumnSegment each : actual.getColumns()) {
+ ExpectedViewColumn expectedColumn = expected.getColumns().get(count);
+ IdentifierValueAssert.assertIs(assertContext, each.getColumn().getIdentifier(), expectedColumn, "View column");
+ SQLSegmentAssert.assertIs(assertContext, each, expectedColumn);
+ count++;
+ }
+ }
+
private static void assertViewDefinition(final SQLCaseAssertContext assertContext, final CreateViewStatement actual, final CreateViewStatementTestCase expected) {
if (null == expected.getViewDefinition()) {
assertNull(actual.getViewDefinition(), "actual view definition should not exist");
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ddl/standard/view/CreateViewStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ddl/standard/view/CreateViewStatementTestCase.java
index eb5e284be7a..69a971f176b 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ddl/standard/view/CreateViewStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ddl/standard/view/CreateViewStatementTestCase.java
@@ -20,11 +20,14 @@ package org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.column.ExpectedViewColumn;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.table.ExpectedSimpleTable;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.standard.SelectStatementTestCase;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import java.util.LinkedList;
+import java.util.List;
/**
* Create view statement test case.
@@ -41,4 +44,7 @@ public final class CreateViewStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "select")
private SelectStatementTestCase selectStatement;
+
+ @XmlElement(name = "column")
+ private List<ExpectedViewColumn> columns = new LinkedList<>();
}
diff --git a/test/it/parser/src/main/resources/case/ddl/create-view.xml b/test/it/parser/src/main/resources/case/ddl/create-view.xml
index 38a6fc44b9a..e6158724a11 100644
--- a/test/it/parser/src/main/resources/case/ddl/create-view.xml
+++ b/test/it/parser/src/main/resources/case/ddl/create-view.xml
@@ -1336,6 +1336,9 @@
<create-view sql-case-id="create_view_select_with_read_only" view-definition="SELECT cust_last_name, nls_language, credit_limit FROM customers">
<view name="customer_ro" start-index="12" stop-index="22" />
+ <column name="name" start-index="25" stop-index="28" />
+ <column name="language" start-index="31" stop-index="38" />
+ <column name="credit" start-index="41" stop-index="46" />
<select>
<projections start-index="59" stop-index="100">
<column-projection name="cust_last_name" start-index="59" stop-index="72" />
@@ -1427,6 +1430,9 @@
<create-view sql-case-id="create_view_define_column_with_select" view-definition="SELECT employee_id, last_name, email FROM employees">
<view name="emp_sal" start-index="12" stop-index="18" />
+ <column name="emp_id" start-index="21" stop-index="26" />
+ <column name="last_name" start-index="29" stop-index="37" />
+ <column name="email" start-index="40" stop-index="44" />
<select>
<projections start-index="151" stop-index="179">
<column-projection name="employee_id" start-index="151" stop-index="161" />