You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/11/23 13:38:15 UTC
[shardingsphere] branch master updated: Remove ExpectedProcedureParameters (#22370)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 cef569f5d72 Remove ExpectedProcedureParameters (#22370)
cef569f5d72 is described below
commit cef569f5d72a25c5cb735116b2df7b959da1fb7d
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Nov 23 21:38:07 2022 +0800
Remove ExpectedProcedureParameters (#22370)
---
.../statement/dml/impl/CallStatementAssert.java | 8 +-
.../impl/call/ExpectedProcedureParameters.java | 35 ----
.../statement/dml/CallStatementTestCase.java | 8 +-
test/parser/src/main/resources/case/dml/call.xml | 200 +++++++++------------
4 files changed, 98 insertions(+), 153 deletions(-)
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/CallStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/CallStatementAssert.java
index 936653c2869..496172018b0 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/CallStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dml/impl/CallStatementAssert.java
@@ -56,20 +56,20 @@ public final class CallStatementAssert {
if (actual instanceof MySQLCallStatement) {
MySQLCallStatement actualStatement = (MySQLCallStatement) actual;
if (null != actualStatement.getParameters() && null != expected.getProcedureParameters()) {
- assertThat(assertContext.getText("Procedure parameters assertion error: "), actualStatement.getParameters().size(), is(expected.getProcedureParameters().getParameters().size()));
+ assertThat(assertContext.getText("Procedure parameters assertion error: "), actualStatement.getParameters().size(), is(expected.getProcedureParameters().size()));
int count = 0;
for (ExpressionSegment each : actualStatement.getParameters()) {
- assertParameter(assertContext, each, expected.getProcedureParameters().getParameters().get(count));
+ assertParameter(assertContext, each, expected.getProcedureParameters().get(count));
count++;
}
}
} else if (actual instanceof PostgreSQLCallStatement) {
PostgreSQLCallStatement actualStatement = (PostgreSQLCallStatement) actual;
if (null != expected.getProcedureParameters()) {
- assertThat(assertContext.getText("Procedure parameters assertion error: "), actualStatement.getParameters().size(), is(expected.getProcedureParameters().getParameters().size()));
+ assertThat(assertContext.getText("Procedure parameters assertion error: "), actualStatement.getParameters().size(), is(expected.getProcedureParameters().size()));
int count = 0;
for (ExpressionSegment each : actualStatement.getParameters()) {
- assertParameter(assertContext, each, expected.getProcedureParameters().getParameters().get(count));
+ assertParameter(assertContext, each, expected.getProcedureParameters().get(count));
count++;
}
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureParameters.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureParameters.java
deleted file mode 100644
index cb221cd177b..00000000000
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/segment/impl/call/ExpectedProcedureParameters.java
+++ /dev/null
@@ -1,35 +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.call;
-
-import lombok.Getter;
-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 procedure parameters.
- */
-@Getter
-public final class ExpectedProcedureParameters extends AbstractExpectedSQLSegment {
-
- @XmlElement(name = "parameter")
- private final List<ExpectedCallParameter> parameters = new LinkedList<>();
-}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/CallStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/CallStatementTestCase.java
index c9fdf061e3a..68f71aca702 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/CallStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/domain/statement/dml/CallStatementTestCase.java
@@ -19,11 +19,13 @@ 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.call.ExpectedCallParameter;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.call.ExpectedProcedureName;
-import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.segment.impl.call.ExpectedProcedureParameters;
import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.domain.statement.SQLParserTestCase;
import javax.xml.bind.annotation.XmlElement;
+import java.util.LinkedList;
+import java.util.List;
/**
* Call statement test case.
@@ -35,6 +37,6 @@ public final class CallStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "procedure-name")
private ExpectedProcedureName procedureName;
- @XmlElement(name = "parameters")
- private ExpectedProcedureParameters procedureParameters;
+ @XmlElement(name = "procedure-parameter")
+ private final List<ExpectedCallParameter> procedureParameters = new LinkedList<>();
}
diff --git a/test/parser/src/main/resources/case/dml/call.xml b/test/parser/src/main/resources/case/dml/call.xml
index 135b7e66733..f019004b9f6 100644
--- a/test/parser/src/main/resources/case/dml/call.xml
+++ b/test/parser/src/main/resources/case/dml/call.xml
@@ -21,148 +21,126 @@
<call sql-case-id="call_without_parameters">
<procedure-name name="p" start-index="5" stop-index="6"/>
</call>
-
+
<call sql-case-id="call_with_parameters_all_variable">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <common-expression literal-text="@order_id" start-index="7" stop-index="15"/>
- </parameter>
- <parameter>
- <common-expression literal-text="@user_id" start-index="18" stop-index="25"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <common-expression literal-text="@order_id" start-index="7" stop-index="15"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <common-expression literal-text="@user_id" start-index="18" stop-index="25"/>
+ </procedure-parameter>
</call>
-
+
<call sql-case-id="call_with_parameters_all_placeholder">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <parameter-marker-expression parameter-index="0" start-index="7" stop-index="7"/>
- </parameter>
- <parameter>
- <parameter-marker-expression parameter-index="1" start-index="10" stop-index="10"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <parameter-marker-expression parameter-index="0" start-index="7" stop-index="7"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <parameter-marker-expression parameter-index="1" start-index="10" stop-index="10"/>
+ </procedure-parameter>
</call>
-
+
<call sql-case-id="call_with_parameters_all_expression">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <literal-expression value="user" start-index="7" stop-index="12"/>
- </parameter>
- <parameter>
- <literal-expression value="order" start-index="15" stop-index="21"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <literal-expression value="user" start-index="7" stop-index="12"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <literal-expression value="order" start-index="15" stop-index="21"/>
+ </procedure-parameter>
</call>
-
+
<call sql-case-id="call_with_parameters_mix">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <common-expression literal-text="@order_id" start-index="7" stop-index="15"/>
- </parameter>
- <parameter>
- <literal-expression value="user" start-index="18" stop-index="23"/>
- </parameter>
- <parameter>
- <parameter-marker-expression parameter-index="0" start-index="26" stop-index="26"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <common-expression literal-text="@order_id" start-index="7" stop-index="15"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <literal-expression value="user" start-index="18" stop-index="23"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <parameter-marker-expression parameter-index="0" start-index="26" stop-index="26"/>
+ </procedure-parameter>
</call>
-
+
<call sql-case-id="call_with_named_notation_with_null">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <common-expression literal-text="a => null" start-index="7" stop-index="15"/>
- </parameter>
- <parameter>
- <common-expression literal-text="b => 8" start-index="18" stop-index="23"/>
- </parameter>
- <parameter>
- <common-expression literal-text="c => 2" start-index="26" stop-index="31"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <common-expression literal-text="a => null" start-index="7" stop-index="15"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <common-expression literal-text="b => 8" start-index="18" stop-index="23"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <common-expression literal-text="c => 2" start-index="26" stop-index="31"/>
+ </procedure-parameter>
</call>
-
+
<call sql-case-id="call_with_named_notation">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <common-expression literal-text="b => 8" start-index="7" stop-index="12"/>
- </parameter>
- <parameter>
- <common-expression literal-text="c => 2" start-index="15" stop-index="20"/>
- </parameter>
- <parameter>
- <common-expression literal-text="a => 0" start-index="23" stop-index="28"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <common-expression literal-text="b => 8" start-index="7" stop-index="12"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <common-expression literal-text="c => 2" start-index="15" stop-index="20"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <common-expression literal-text="a => 0" start-index="23" stop-index="28"/>
+ </procedure-parameter>
</call>
-
+
<call sql-case-id="call_with_mixed_notation">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <common-expression literal-text="null" start-index="7" stop-index="10"/>
- </parameter>
- <parameter>
- <literal-expression value="7" start-index="13" stop-index="13"/>
- </parameter>
- <parameter>
- <common-expression literal-text="c => 2" start-index="16" stop-index="21"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <common-expression literal-text="null" start-index="7" stop-index="10"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <literal-expression value="7" start-index="13" stop-index="13"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <common-expression literal-text="c => 2" start-index="16" stop-index="21"/>
+ </procedure-parameter>
</call>
-
+
<call sql-case-id="call_with_mixed_notation_with_null">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <common-expression literal-text="null" start-index="7" stop-index="10"/>
- </parameter>
- <parameter>
- <common-expression literal-text="c => 4" start-index="13" stop-index="18"/>
- </parameter>
- <parameter>
- <common-expression literal-text="b => 11" start-index="21" stop-index="27"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <common-expression literal-text="null" start-index="7" stop-index="10"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <common-expression literal-text="c => 4" start-index="13" stop-index="18"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <common-expression literal-text="b => 11" start-index="21" stop-index="27"/>
+ </procedure-parameter>
</call>
-
+
<call sql-case-id="call_with_mixed_notation_with_apos">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <literal-expression value="10" start-index="7" stop-index="8"/>
- </parameter>
- <parameter>
- <common-expression literal-text="b => 'Hello'" start-index="11" stop-index="22"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <literal-expression value="10" start-index="7" stop-index="8"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <common-expression literal-text="b => 'Hello'" start-index="11" stop-index="22"/>
+ </procedure-parameter>
</call>
-
+
<call sql-case-id="call_with_named_notation_with_apos">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <common-expression literal-text="b => 'Hello'" start-index="7" stop-index="18"/>
- </parameter>
- <parameter>
- <common-expression literal-text="a => 10" start-index="21" stop-index="27"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <common-expression literal-text="b => 'Hello'" start-index="7" stop-index="18"/>
+ </procedure-parameter>
+ <procedure-parameter>
+ <common-expression literal-text="a => 10" start-index="21" stop-index="27"/>
+ </procedure-parameter>
</call>
-
+
<call sql-case-id="call_with_positional_notation_with_expression">
<procedure-name name="p" start-index="5" stop-index="6"/>
- <parameters>
- <parameter>
- <common-expression literal-text="1.0/0.1" start-index="7" stop-index="13"/>
- </parameter>
- </parameters>
+ <procedure-parameter>
+ <common-expression literal-text="1.0/0.1" start-index="7" stop-index="13"/>
+ </procedure-parameter>
</call>
</sql-parser-test-cases>