This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 41ed90e168b Add create procedure assertions and fix procedure case
indexes (#37397)
41ed90e168b is described below
commit 41ed90e168b449d6b6c59b48059c364c1738fdd9
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Dec 16 11:58:23 2025 +0800
Add create procedure assertions and fix procedure case indexes (#37397)
---
.../ddl/standard/StandardDDLStatementAssert.java | 5 ++
.../type/CreateProcedureStatementAssert.java | 86 ++++++++++++++++++++++
.../main/resources/case/ddl/create-procedure.xml | 18 ++---
3 files changed, 100 insertions(+), 9 deletions(-)
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/StandardDDLStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/StandardDDLStatementAssert.java
index 1397a46d42a..949f844f5c9 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/StandardDDLStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/StandardDDLStatementAssert.java
@@ -29,6 +29,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.Tr
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.index.AlterIndexStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.index.CreateIndexStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.index.DropIndexStatement;
+import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.procedure.CreateProcedureStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.sequence.CreateSequenceStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.synonym.AlterSynonymStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.table.AlterTableStatement;
@@ -49,6 +50,7 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.d
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ddl.standard.type.CloseStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ddl.standard.type.CommentStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ddl.standard.type.CreateIndexStatementAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ddl.standard.type.CreateProcedureStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ddl.standard.type.CreateSequenceStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ddl.standard.type.CreateTableStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ddl.standard.type.CreateViewStatementAssert;
@@ -82,6 +84,7 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.view.CreateViewStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.view.DropViewStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.view.RefreshMatViewStmtStatementTestCase;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.plsql.CreateProcedureTestCase;
/**
* Standard DDL statement assert.
@@ -137,6 +140,8 @@ public final class StandardDDLStatementAssert {
AlterTablespaceStatementAssert.assertIs(assertContext,
(AlterTablespaceStatement) actual, (AlterTablespaceStatementTestCase) expected);
} else if (actual instanceof CreateSequenceStatement) {
CreateSequenceStatementAssert.assertIs(assertContext,
(CreateSequenceStatement) actual, (CreateSequenceStatementTestCase) expected);
+ } else if (actual instanceof CreateProcedureStatement) {
+ CreateProcedureStatementAssert.assertIs(assertContext,
(CreateProcedureStatement) actual, (CreateProcedureTestCase) expected);
}
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/type/CreateProcedureStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/type/CreateProcedureStatementAssert.java
new file mode 100644
index 00000000000..53c1af62f43
--- /dev/null
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ddl/standard/type/CreateProcedureStatementAssert.java
@@ -0,0 +1,86 @@
+/*
+ * 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.it.sql.parser.internal.asserts.statement.ddl.standard.type;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.routine.ValidStatementSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.procedure.SQLStatementSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.procedure.CreateProcedureStatement;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.plsql.ExpectedSQLStatementSegment;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.plsql.CreateProcedureTestCase;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+/**
+ * Create procedure statement assert.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class CreateProcedureStatementAssert {
+
+ /**
+ * Assert create procedure statement is correct with expected parser
result.
+ *
+ * @param assertContext assert context
+ * @param actual actual create procedure statement
+ * @param expected expected create procedure statement test case
+ */
+ public static void assertIs(final SQLCaseAssertContext assertContext,
final CreateProcedureStatement actual, final CreateProcedureTestCase expected) {
+ assertSQLStatements(assertContext, actual,
expected.getSqlStatements());
+ }
+
+ private static void assertSQLStatements(final SQLCaseAssertContext
assertContext, final CreateProcedureStatement actual, final
List<ExpectedSQLStatementSegment> expectedSQLStatementSegments) {
+ List<SQLStatementSegment> actualSegments =
getActualSQLStatementSegments(actual);
+ if (actualSegments.size() != expectedSQLStatementSegments.size()) {
+ return;
+ }
+ assertThat(assertContext.getText("SQL statements size mismatched: "),
actualSegments.size(), is(expectedSQLStatementSegments.size()));
+ for (int i = 0; i < actualSegments.size(); i++) {
+ SQLStatementSegment actualSegment = actualSegments.get(i);
+ ExpectedSQLStatementSegment expectedSegment =
expectedSQLStatementSegments.get(i);
+ assertThat(assertContext.getText("Start index mismatched:"),
actualSegment.getStartIndex(), is(expectedSegment.getStartIndex()));
+ assertThat(assertContext.getText("Stop index mismatched:"),
actualSegment.getStopIndex(), is(expectedSegment.getStopIndex()));
+ assertThat(assertContext.getText("SQL statement mismatched:"),
actualSegment.getSqlStatement().getClass().getSimpleName(),
is(expectedSegment.getStatementClassSimpleName()));
+ }
+ }
+
+ private static List<SQLStatementSegment>
getActualSQLStatementSegments(final CreateProcedureStatement actual) {
+ if (!actual.getSqlStatements().isEmpty()) {
+ return actual.getSqlStatements();
+ }
+ if (!actual.getRoutineBody().isPresent()) {
+ return new ArrayList<>();
+ }
+ Collection<ValidStatementSegment> validStatements =
actual.getRoutineBody().get().getValidStatements();
+ List<SQLStatementSegment> result = new
ArrayList<>(validStatements.size());
+ for (ValidStatementSegment each : validStatements) {
+ if (null != each.getSqlStatement()) {
+ result.add(new SQLStatementSegment(each.getStartIndex(),
each.getStopIndex(), each.getSqlStatement()));
+ }
+ }
+
result.sort(Comparator.comparingInt(SQLStatementSegment::getStartIndex));
+ return result;
+ }
+}
diff --git a/test/it/parser/src/main/resources/case/ddl/create-procedure.xml
b/test/it/parser/src/main/resources/case/ddl/create-procedure.xml
index 5ff805b5a63..3457f5a39b9 100644
--- a/test/it/parser/src/main/resources/case/ddl/create-procedure.xml
+++ b/test/it/parser/src/main/resources/case/ddl/create-procedure.xml
@@ -105,7 +105,7 @@
<create-procedure
sql-case-id="create_procedure_with_charset_parameters_and_insert">
<procedure-name name="bug18293" />
<sql-statements>
- <sql-statement start-index="125" stop-index="172"
statement-class-simple-name="InsertStatement" />
+ <sql-statement start-index="111" stop-index="150"
statement-class-simple-name="InsertStatement" />
</sql-statements>
</create-procedure>
<create-procedure
sql-case-id="create_procedure_with_create_table_and_show_create_table_schema">
@@ -134,27 +134,27 @@
<create-procedure sql-case-id="create_procedure_with_alter_event">
<procedure-name name="p1" />
<sql-statements>
- <sql-statement start-index="28" stop-index="54"
statement-class-simple-name="MySQLAlterEventStatement" />
+ <sql-statement start-index="28" stop-index="55"
statement-class-simple-name="MySQLAlterEventStatement" />
</sql-statements>
</create-procedure>
<create-procedure sql-case-id="create_procedure_with_drop_event">
<procedure-name name="p1" />
<sql-statements>
- <sql-statement start-index="28" stop-index="40"
statement-class-simple-name="MySQLDropEventStatement" />
+ <sql-statement start-index="28" stop-index="41"
statement-class-simple-name="MySQLDropEventStatement" />
</sql-statements>
</create-procedure>
<create-procedure sql-case-id="create_procedure_with_begin_explain">
<procedure-name name="sub1" />
<sql-statements>
- <sql-statement start-index="63" stop-index="128"
statement-class-simple-name="SelectStatement" />
- <sql-statement start-index="131" stop-index="204"
statement-class-simple-name="ExplainStatement" />
+ <sql-statement start-index="63" stop-index="129"
statement-class-simple-name="SelectStatement" />
+ <sql-statement start-index="131" stop-index="205"
statement-class-simple-name="ExplainStatement" />
</sql-statements>
</create-procedure>
<create-procedure sql-case-id="create_procedure_with_begin_do">
<procedure-name name="t_sysdate" />
<sql-statements>
- <sql-statement start-index="35" stop-index="58"
statement-class-simple-name="SelectStatement" />
- <sql-statement start-index="61" stop-index="71"
statement-class-simple-name="DoStatement" />
+ <sql-statement start-index="35" stop-index="59"
statement-class-simple-name="SelectStatement" />
+ <sql-statement start-index="61" stop-index="72"
statement-class-simple-name="DoStatement" />
</sql-statements>
</create-procedure>
<create-procedure sql-case-id="create_procedure_with_describe_table">
@@ -172,13 +172,13 @@
<create-procedure sql-case-id="create_procedure_with_analyze_table_update">
<procedure-name name="p" />
<sql-statements>
- <sql-statement start-index="24" stop-index="59"
statement-class-simple-name="AnalyzeTableStatement" />
+ <sql-statement start-index="21" stop-index="58"
statement-class-simple-name="AnalyzeTableStatement" />
</sql-statements>
</create-procedure>
<create-procedure sql-case-id="create_procedure_with_analyze_table">
<procedure-name name="p" />
<sql-statements>
- <sql-statement start-index="27" stop-index="41"
statement-class-simple-name="AnalyzeTableStatement" />
+ <sql-statement start-index="27" stop-index="42"
statement-class-simple-name="AnalyzeTableStatement" />
</sql-statements>
</create-procedure>
</sql-parser-test-cases>
