This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 317eee16b4a Add Format SQL statement test case. (#19534)
317eee16b4a is described below
commit 317eee16b4a98f2c2fff0837f509578378c5482c
Author: Pace2Car <[email protected]>
AuthorDate: Wed Jul 27 01:03:19 2022 +0800
Add Format SQL statement test case. (#19534)
* Add Format SQL statement test case.
* Add Format SQL statement test case.
* Refactor import *.
---
.../text/database/DropDatabaseBackendHandler.java | 2 +-
.../distsql/rul/impl/SQLRULStatementAssert.java | 5 +++
.../rul/impl/sql/FormatSQLStatementAssert.java | 49 ++++++++++++++++++++++
.../jaxb/cases/domain/SQLParserTestCases.java | 8 +++-
.../distsql/rul/FormatSQLStatementTestCase.java | 18 ++++----
.../src/main/resources/case/rul/sql.xml | 1 +
.../src/main/resources/sql/supported/rul/sql.xml | 1 +
7 files changed, 73 insertions(+), 11 deletions(-)
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java
index ac41538a2da..3e831db1905 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java
@@ -69,7 +69,7 @@ public final class DropDatabaseBackendHandler implements
TextProtocolBackendHand
return !Strings.isNullOrEmpty(connectionSession.getDatabaseName()) &&
connectionSession.getDatabaseName().equals(databaseName);
}
- private static Collection<ShardingSphereRule> getRules(final String
databaseName) {
+ private Collection<ShardingSphereRule> getRules(final String databaseName)
{
Collection<ShardingSphereRule> result = new LinkedList<>();
ShardingSphereDatabase database =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName);
if (null != database && null != database.getRuleMetaData()) {
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rul/impl/SQLRULStatementAssert.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rul/impl/SQLRULStatementAssert.java
index c833560dbb3..91cf40fd1b3 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rul/impl/SQLRULStatementAssert.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rul/impl/SQLRULStatementAssert.java
@@ -20,12 +20,15 @@ package
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statemen
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rul.SQLRULStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement;
import
org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement;
import
org.apache.shardingsphere.distsql.parser.statement.rul.sql.PreviewStatement;
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rul.impl.sql.FormatSQLStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rul.impl.sql.ParseStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rul.impl.sql.PreviewStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rul.FormatSQLStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rul.ParseStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rul.PreviewStatementTestCase;
@@ -47,6 +50,8 @@ public final class SQLRULStatementAssert {
PreviewStatementAssert.assertIs(assertContext, (PreviewStatement)
actual, (PreviewStatementTestCase) expected);
} else if (actual instanceof ParseStatement) {
ParseStatementAssert.assertIs(assertContext, (ParseStatement)
actual, (ParseStatementTestCase) expected);
+ } else if (actual instanceof FormatStatement) {
+ FormatSQLStatementAssert.assertIs(assertContext, (FormatStatement)
actual, (FormatSQLStatementTestCase) expected);
}
}
}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rul/impl/sql/FormatSQLStatementAssert.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rul/impl/sql/FormatSQLStatementAssert.java
new file mode 100644
index 00000000000..ff947466e57
--- /dev/null
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rul/impl/sql/FormatSQLStatementAssert.java
@@ -0,0 +1,49 @@
+/*
+ * 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.parameterized.asserts.statement.distsql.rul.impl.sql;
+
+import
org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rul.FormatSQLStatementTestCase;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Format SQL statement assert.
+ */
+public final class FormatSQLStatementAssert {
+
+ /**
+ * Assert format sql statement is correct with expected parser result.
+ *
+ * @param assertContext assert context
+ * @param actual actual format sql statement
+ * @param expected expected format sql statement test case
+ */
+ public static void assertIs(final SQLCaseAssertContext assertContext,
final FormatStatement actual, final FormatSQLStatementTestCase expected) {
+ if (null == expected) {
+ assertNull(assertContext.getText("Actual statement should not
exist."), actual);
+ } else {
+ assertNotNull(assertContext.getText("Actual statement should
exist."), actual);
+ assertThat(assertContext.getText("SQL assertion error"),
actual.getSql(), is(expected.getSql()));
+ }
+ }
+}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
index 8d6de2c0309..236950fa140 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
@@ -276,9 +276,7 @@ import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ExportDatabaseConfigurationStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ImportDatabaseConfigurationStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.LabelInstanceStatementTestCase;
-import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rul.ParseStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.PrepareDistSQLStatementTestCase;
-import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rul.PreviewStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.RefreshTableMetadataStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.SetReadwriteSplittingHintStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.SetShardingHintDatabaseValueStatementTestCase;
@@ -392,6 +390,9 @@ import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.ShowSingleTableStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.ShowUnusedShardingAlgorithmsStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rql.ShowUnusedShardingKeyGeneratorsStatementTestCase;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rul.FormatSQLStatementTestCase;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rul.ParseStatementTestCase;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rul.PreviewStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.dml.CallStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.dml.CheckpointStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.dml.CopyStatementTestCase;
@@ -1028,6 +1029,9 @@ public final class SQLParserTestCases {
@XmlElement(name = "parse-sql")
private final List<ParseStatementTestCase> parseStatementAsserts = new
LinkedList<>();
+
+ @XmlElement(name = "format-sql")
+ private final List<FormatSQLStatementTestCase> formatSQLStatementAsserts =
new LinkedList<>();
@XmlElement(name = "show-variable")
private final List<ShowVariableStatementTestCase> showVariableTestCases =
new LinkedList<>();
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropDatabaseStatementContext.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rul/FormatSQLStatementTestCase.java
similarity index 63%
rename from
shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropDatabaseStatementContext.java
rename to
shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rul/FormatSQLStatementTestCase.java
index 186105a05b7..5bc21081174 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropDatabaseStatementContext.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rul/FormatSQLStatementTestCase.java
@@ -15,19 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.binder.statement.ddl;
+package
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rul;
import lombok.Getter;
-import
org.apache.shardingsphere.infra.binder.statement.CommonSQLStatementContext;
-import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropDatabaseStatement;
+import lombok.Setter;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
+
+import javax.xml.bind.annotation.XmlAttribute;
/**
- * Drop database statement context.
+ * Format SQL statement test case.
*/
@Getter
-public final class DropDatabaseStatementContext extends
CommonSQLStatementContext<DropDatabaseStatement> {
+@Setter
+public final class FormatSQLStatementTestCase extends SQLParserTestCase {
- public DropDatabaseStatementContext(final DropDatabaseStatement
sqlStatement) {
- super(sqlStatement);
- }
+ @XmlAttribute(name = "sql")
+ private String sql;
}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rul/sql.xml
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rul/sql.xml
index 48e269fe133..aac4ec6e999 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rul/sql.xml
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rul/sql.xml
@@ -19,4 +19,5 @@
<sql-parser-test-cases>
<preview-sql sql-case-id="preview-sql" sql="SELECT * FROM t_order;"/>
<parse-sql sql-case-id="parse-sql" sql="SELECT * FROM t_order;" />
+ <format-sql sql-case-id="format-sql" sql="SELECT * FROM t_order WHERE
order_id=1;" />
</sql-parser-test-cases>
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rul/sql.xml
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rul/sql.xml
index 457ef895f92..4527e3165dd 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rul/sql.xml
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rul/sql.xml
@@ -19,4 +19,5 @@
<sql-cases>
<distsql-case id="preview-sql" value="PREVIEW SELECT * FROM t_order;" />
<distsql-case id="parse-sql" value="PARSE SELECT * FROM t_order;" />
+ <distsql-case id="format-sql" value="FORMAT SELECT * FROM t_order WHERE
order_id=1;" />
</sql-cases>
