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/12/02 11:34:18 UTC
[shardingsphere] branch master updated: Add ParameterizedArray.getDatabaseType() (#22597)
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 38adc13d4cc Add ParameterizedArray.getDatabaseType() (#22597)
38adc13d4cc is described below
commit 38adc13d4cc0b3dc4c5deabfd2f0673e1fb0e9b8
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Dec 2 19:34:11 2022 +0800
Add ParameterizedArray.getDatabaseType() (#22597)
---
.../sharding/datetime/IntervalShardingAlgorithmTest.java | 2 +-
.../integration/framework/param/model/ITParameterizedArray.java | 8 --------
.../test/sql/parser/SQLParserParameterizedArray.java | 8 --------
test/runner/pom.xml | 6 ++++++
.../shardingsphere/test/runner/param/ParameterizedArray.java | 9 +++++++++
5 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithmTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithmTest.java
index bfdc8d4272c..0bd0bc1d5e5 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithmTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithmTest.java
@@ -449,7 +449,7 @@ public final class IntervalShardingAlgorithmTest {
new RangeShardingValue<>("t_order", "create_time", DATA_NODE_INFO, Range.closed("04", "10")));
assertThat(actualAsMonthString.size(), is(4));
}
-
+
@Test
public void assertDateInSqlDate() {
Collection<String> actualAsLocalDate = shardingAlgorithmByJDBCDate.doSharding(availableTablesForJDBCDateDataSources,
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ITParameterizedArray.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ITParameterizedArray.java
index c69c97db992..e7171e35ad0 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ITParameterizedArray.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ITParameterizedArray.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.test.integration.framework.param.model;
-import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
import org.apache.shardingsphere.test.runner.param.ParameterizedArray;
@@ -47,13 +46,6 @@ public interface ITParameterizedArray extends ParameterizedArray {
*/
String getAdapter();
- /**
- * Get database type.
- *
- * @return database type
- */
- DatabaseType getDatabaseType();
-
/**
* Get mode.
*
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/SQLParserParameterizedArray.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/SQLParserParameterizedArray.java
index 7732a698a89..4123006b0a1 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/SQLParserParameterizedArray.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/SQLParserParameterizedArray.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.test.sql.parser;
-import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.runner.param.ParameterizedArray;
/**
@@ -31,11 +30,4 @@ public interface SQLParserParameterizedArray extends ParameterizedArray {
* @return SQL case ID
*/
String getSqlCaseId();
-
- /**
- * Get database type.
- *
- * @return database type
- */
- DatabaseType getDatabaseType();
}
diff --git a/test/runner/pom.xml b/test/runner/pom.xml
index 8eb14aaead3..9ba833f916a 100644
--- a/test/runner/pom.xml
+++ b/test/runner/pom.xml
@@ -32,6 +32,12 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/param/ParameterizedArray.java b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/param/ParameterizedArray.java
index d35049e71c7..5ddb75cc685 100644
--- a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/param/ParameterizedArray.java
+++ b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/param/ParameterizedArray.java
@@ -17,8 +17,17 @@
package org.apache.shardingsphere.test.runner.param;
+import org.apache.shardingsphere.infra.database.type.DatabaseType;
+
/**
* Parameterized array.
*/
public interface ParameterizedArray {
+
+ /**
+ * Get database type.
+ *
+ * @return database type
+ */
+ DatabaseType getDatabaseType();
}