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 c4f79e52118 Remove testcontainers database module and related
references from documentation and code (#35287)
c4f79e52118 is described below
commit c4f79e52118c038f370ded75c539c3d2b64ad3d4
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Apr 28 23:32:16 2025 +0800
Remove testcontainers database module and related references from
documentation and code (#35287)
---
.../optional-plugins/_index.cn.md | 1 -
.../optional-plugins/_index.en.md | 1 -
.../optional-plugins/testcontainers/_index.cn.md | 117 ---------------------
.../optional-plugins/testcontainers/_index.en.md | 115 --------------------
.../optional-plugins/_index.cn.md | 1 -
.../optional-plugins/_index.en.md | 1 -
.../connector/url/StandardJdbcUrlParserTest.java | 19 ----
infra/database/type/pom.xml | 1 -
.../SQLServerConnectionPropertiesParserTest.java | 3 +-
infra/database/type/testcontainers/pom.xml | 43 --------
.../type/TcClickHouseDatabaseType.java | 46 --------
.../type/TcFirebirdDatabaseType.java | 46 --------
.../testcontainers/type/TcMariaDBDatabaseType.java | 46 --------
.../testcontainers/type/TcMySQLDatabaseType.java | 46 --------
.../testcontainers/type/TcOracleDatabaseType.java | 46 --------
.../testcontainers/type/TcTiDBDatabaseType.java | 46 --------
.../type/TestcontainersDatabaseTypeTest.java | 42 --------
test/native/pom.xml | 6 --
.../testcontainers}/TcPostgreSQLDatabaseType.java | 4 +-
.../testcontainers}/TcSQLServerDatabaseType.java | 4 +-
.../TestcontainersDatabaseType.java | 4 +-
...ingsphere.infra.database.core.type.DatabaseType | 10 +-
22 files changed, 9 insertions(+), 639 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md
index 782d0853a24..e88a1fb5c95 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md
@@ -50,7 +50,6 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现，在 Git Source 存
- 行表达式
- `org.apache.shardingsphere:shardingsphere-infra-expr-espresso`，基于 GraalVM
Truffle 的 Espresso 实现的使用 Groovy 语法的行表达式
- 数据库类型识别
- - `org.apache.shardingsphere:shardingsphere-infra-database-testcontainers`，
对 `testcontainers-java` 的 `JDBC support` 的 jdbcURL 的识别适配
- `org.apache.shardingsphere:shardingsphere-infra-database-hive`， 对 Hive 的
jdbcURL 的识别适配，元数据加载实现
- `org.apache.shardingsphere:shardingsphere-infra-database-presto`， 对 Presto
的 jdbcURL 的识别适配，元数据加载实现
- SQL 解析
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md
index a157d2edf37..2b1733b8514 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md
@@ -50,7 +50,6 @@ All optional plugins are listed below in the form of
`groupId:artifactId`.
- Row Value Expressions definition
- `org.apache.shardingsphere:shardingsphere-infra-expr-espresso`，Row Value
Expressions that uses the Groovy syntax based on GraalVM Truffle's Espresso
implementation
- Database type identification
- - `org.apache.shardingsphere:shardingsphere-infra-database-testcontainers`,
Adaptation of jdbcURL for `JDBC support` of `testcontainers-java`
- `org.apache.shardingsphere:shardingsphere-infra-database-hive`, Adaptation
of jdbcURL for `JDBC support` of Hive, and metadata loading implementation
- `org.apache.shardingsphere:shardingsphere-infra-database-presto`,
Adaptation of jdbcURL for `JDBC support` of Presto, and metadata loading
implementation
- SQL parsing
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.cn.md
deleted file mode 100644
index d8e24da9a15..00000000000
---
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.cn.md
+++ /dev/null
@@ -1,117 +0,0 @@
-+++
-title = "Testcontainers"
-weight = 6
-+++
-
-## 背景信息
-
-ShardingSphere 默认情况下不提供对 `org.testcontainers.jdbc.ContainerDatabaseDriver` 的
`driverClassName` 的支持。
-
-## 前提条件
-
-要在 ShardingSphere 的配置文件为数据节点使用类似
`jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` 的 `jdbcUrl`，
-可能的 Maven 依赖关系如下，
-
-```xml
-<dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-jdbc</artifactId>
- <version>${shardingsphere.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-database-testcontainers</artifactId>
- <version>${shardingsphere.version}</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>42.7.5</version>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
- <version>1.20.3</version>
- <scope>test</scope>
- </dependency>
-</dependencies>
-```
-
-## 配置示例
-
-要使用 `org.apache.shardingsphere:shardingsphere-infra-database-testcontainers`
模块，
-用户设备总是需要安装 Docker Engine 或符合
https://java.testcontainers.org/supported_docker_environment/ 要求的 alternative
container runtimes。
-此时可在 ShardingSphere 的 YAML 配置文件正常使用 `jdbc:tc:postgresql:` 前缀的 jdbcURL。
-
-```yaml
-dataSources:
- ds_0:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0
- ds_1:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_1
- ds_2:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_2
-```
-
-`org.apache.shardingsphere:shardingsphere-infra-database-testcontainers` 为
testcontainers-java 风格的 jdbcURL 提供支持，
-包括但不限于，
-
-1. 为 `jdbc:tc:clickhouse:` 的 jdbcURL 前缀提供支持的 Maven 模块
`org.testcontainers:clickhouse:1.20.3`
-2. 为 `jdbc:tc:postgresql:` 的 jdbcURL 前缀提供支持的 Maven 模块
`org.testcontainers:postgresql:1.20.3`
-3. 为 `jdbc:tc:sqlserver:` 的 jdbcURL 前缀提供支持的 Maven 模块
`org.testcontainers:mssqlserver:1.20.3`
-4. 为 `jdbc:tc:mariadb:` 的 jdbcURL 前缀提供支持的 Maven 模块
`org.testcontainers:mariadb:1.20.3`
-5. 为 `jdbc:tc:mysql:` 的 jdbcURL 前缀提供支持的 Maven 模块
`org.testcontainers:mysql:1.20.3`
-6. 为 `jdbc:tc:oracle:` 的 jdbcURL 前缀提供支持的 Maven 模块
`org.testcontainers:oracle-xe:1.20.3` 和 `org.testcontainers:oracle-free:1.20.3`
-7. 为 `jdbc:tc:tidb:` 的 jdbcURL 前缀提供支持的 Maven 模块
`org.testcontainers:tidb:1.20.3`
-8. 为 `jdbc:tc:firebird:` 的 jdbcURL 前缀提供支持的 Maven 模块
`org.firebirdsql:firebird-testcontainers-java:1.4.0`
-
-## 使用限制
-
-### 生命周期限制
-
-如果像如下所示在 ShardingSphere 配置文件内定义通过 testcontainers-java 创建 Docker Container 的逻辑，
-
-```yaml
-dataSources:
- ds_0:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0
-```
-
-testcontainers 默认情况下仅在对 `jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0`
的最后一个 `java.sql.Connection` 关闭后，
-停止`jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0`创建的 Docker Container。
-但 ShardingSphere 的内部类会缓存 `java.sql.Connection`。这导致直到 JVM 关闭，
-`jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` 创建的 Docker Container 才会被关闭。
-若有避免 Container 被长期开启的必要，
-`org.testcontainers.jdbc.ContainerDatabaseDriver` 存在可用方法来在单元测试中快速关闭相关
Container，
-示例如下，
-
-```java
-import org.testcontainers.jdbc.ContainerDatabaseDriver;
-public class ExampleUtils {
- void test() {
- ContainerDatabaseDriver.killContainers();
- }
-}
-```
-
-`org.testcontainers.jdbc.ContainerDatabaseDriver#killContainers()`
-将立刻销毁所有由 `org.testcontainers.jdbc.ContainerDatabaseDriver` 创建的 Docker
Container。
-默认情况下，通过 Junit 5 创建的单元测试是串行执行的，因此这一般不会造成问题。
-
-
-### host-less URIs 限制
-
-对于大多数 testcontainers-java 模块，
-ShardingSphere 配置文件的 `jdbcUrl` 可以使用类似
`jdbc:tc:postgresql:17.2-bookworm:///databasename` 的 host-less URIs。
-
-但对于特定 Maven 模块 `org.testcontainers:mssqlserver`，无法使用类似
`jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04:///databasename` 的 host-less URIs，
-仅可使用类似
`jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04://test;databaseName=databasename` 的
JDBC Url。
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.en.md
deleted file mode 100644
index ffd24e3e6fb..00000000000
---
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/testcontainers/_index.en.md
+++ /dev/null
@@ -1,115 +0,0 @@
-+++
-title = "Testcontainers"
-weight = 6
-+++
-
-## Background Information
-
-ShardingSphere does not provide support for `driverClassName` of
`org.testcontainers.jdbc.ContainerDatabaseDriver` by default.
-
-## Prerequisites
-
-To use `jdbcUrl` like `jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` for
data nodes in ShardingSphere's configuration file,
-the possible Maven dependencies are as follows,
-
-```xml
-<dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-jdbc</artifactId>
- <version>${shardingsphere.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-database-testcontainers</artifactId>
- <version>${shardingsphere.version}</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>42.7.5</version>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
- <version>1.20.3</version>
- <scope>test</scope>
- </dependency>
-</dependencies>
-```
-
-At this time, you can use the jdbcURL with the prefix `jdbc:tc:postgresql:`
normally in the YAML configuration file of ShardingSphere.
-
-## Configuration Example
-
-To use the
`org.apache.shardingsphere:shardingsphere-infra-database-testcontainers` module,
-the user machine always needs to have Docker Engine or alternative container
runtimes that comply with
https://java.testcontainers.org/supported_docker_environment/ installed.
-`org.apache.shardingsphere:shardingsphere-infra-database-testcontainers`
provides support for testcontainers-java style jdbcURL,
-including but not limited to,
-
-```yaml
-dataSources:
- ds_0:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0
- ds_1:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_1
- ds_2:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_2
-```
-
-1. Maven module `org.testcontainers:clickhouse:1.20.3` that provides support
for jdbcURL prefixes for `jdbc:tc:clickhouse:`
-2. Maven module `org.testcontainers:postgresql:1.20.3` that provides support
for jdbcURL prefixes for `jdbc:tc:postgresql:`
-3. Maven module `org.testcontainers:mssqlserver:1.20.3` that provides support
for jdbcURL prefixes for `jdbc:tc:sqlserver:`
-4. Maven module `org.testcontainers:mariadb:1.20.3` that provides support for
jdbcURL prefixes for `jdbc:tc:mariadb:`
-5. Maven module `org.testcontainers:mysql:1.20.3` that provides support for
jdbcURL prefixes of `jdbc:tc:mysql:`
-6. Maven modules `org.testcontainers:oracle-xe:1.20.3` and
`org.testcontainers:oracle-free:1.20.3` that provide support for jdbcURL
prefixes of `jdbc:tc:oracle:`
-7. Maven module `org.testcontainers:tidb:1.20.3` that provides support for
jdbcURL prefixes of `jdbc:tc:tidb:`
-8. Maven module `org.firebirdsql:firebird-testcontainers-java:1.4.0` that
provides support for jdbcURL prefixes of `jdbc:tc:firebird:`
-
-## Usage restrictions
-
-### Lifecycle restrictions
-
-If the logic of creating a Docker Container through testcontainers-java is
defined in the ShardingSphere configuration file as shown below,
-
-```yaml
-dataSources:
- ds_0:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
- jdbcUrl: jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0
-```
-
-testcontainers, by default,
-stops the Docker Container created by
`jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` only after the last
`java.sql.Connection` of `jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` is
closed.
-But ShardingSphere's internal class will cache `java.sql.Connection`.
-As a result, the Docker Container created by
`jdbc:tc:postgresql:17.2-bookworm://test/demo_ds_0` will not be closed until
the JVM is closed.
-If it is necessary to prevent the Container from being opened for a long time,
`org.testcontainers.jdbc.ContainerDatabaseDriver` has a method available to
quickly close the relevant Container in the unit test.
-The example is as follows,
-
-```java
-import org.testcontainers.jdbc.ContainerDatabaseDriver;
-public class ExampleUtils {
- void test() {
- ContainerDatabaseDriver.killContainers();
- }
-}
-```
-
-`org.testcontainers.jdbc.ContainerDatabaseDriver#killContainers()`
-will immediately destroy all Docker Containers created by
`org.testcontainers.jdbc.ContainerDatabaseDriver`.
-By default, unit tests created by JUnit 5 are executed serially, so this is
generally not a problem.
-
-### host-less URIs restrictions
-
-For most testcontainers-java modules,
-the `jdbcUrl` of ShardingSphere configuration file can use host-less URIs like
`jdbc:tc:postgresql:17.2-bookworm:///databasename`.
-
-But for the specific Maven module `org.testcontainers:mssqlserver`, host-less
URIs like `jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04:///databasename` cannot be
used,
-only JDBC Url like
`jdbc:tc:sqlserver:2022-CU16-ubuntu-22.04://test;databaseName=databasename` can
be used.
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
index 049cebaa28d..2c5880910ce 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
@@ -37,7 +37,6 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现，在 Git Source 存
- 行表达式
- `org.apache.shardingsphere:shardingsphere-infra-expr-espresso`，基于 GraalVM
Truffle 的 Espresso 实现的使用 Groovy 语法的行表达式
- 数据库类型识别
- - `org.apache.shardingsphere:shardingsphere-infra-database-testcontainers`，
对 `testcontainers-java` 的 `JDBC support` 的 jdbcURL 的识别适配
- `org.apache.shardingsphere:shardingsphere-infra-database-hive`， 对 Hive 的
jdbcURL 的识别适配，元数据加载实现
- `org.apache.shardingsphere:shardingsphere-infra-database-presto`， 对 Presto
的 jdbcURL 的识别适配，元数据加载实现
- SQL 解析
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
index 1d9b4038f28..19c0e3576a1 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
@@ -37,7 +37,6 @@ All optional plugins are listed below in the form of
`groupId:artifactId`.
- Row Value Expressions definition
- `org.apache.shardingsphere:shardingsphere-infra-expr-espresso`，Row Value
Expressions that uses the Groovy syntax based on GraalVM Truffle's Espresso
implementation
- Database type identification
- - `org.apache.shardingsphere:shardingsphere-infra-database-testcontainers`,
Adaptation of jdbcURL for `JDBC support` of `testcontainers-java`
- `org.apache.shardingsphere:shardingsphere-infra-database-hive`, Adaptation
of jdbcURL for `JDBC support` of Hive, and metadata loading implementation
- `org.apache.shardingsphere:shardingsphere-infra-database-presto`,
Adaptation of jdbcURL for `JDBC support` of Presto, and metadata loading
implementation
- SQL parsing
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/connector/url/StandardJdbcUrlParserTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/connector/url/StandardJdbcUrlParserTest.java
index 9afdafafa09..9abd9d02747 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/connector/url/StandardJdbcUrlParserTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/connector/url/StandardJdbcUrlParserTest.java
@@ -81,23 +81,4 @@ class StandardJdbcUrlParserTest {
void assertParseIncorrectURL() {
assertThrows(UnrecognizedDatabaseURLException.class, () -> new
StandardJdbcUrlParser().parse("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
}
-
- @Test
- void assertParseTestContainersJDBCUrl() {
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:mysql:5.7.34:///demo_ds").getDatabase(),
is("demo_ds"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:postgresql:9.6.8:///demo_ds").getDatabase(),
is("demo_ds"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:postgis:9.6-2.5:///demo_ds").getDatabase(),
is("demo_ds"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:timescaledb:2.1.0-pg13:///demo_ds").getDatabase(),
is("demo_ds"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:trino:352://localhost/memory/default").getDatabase(),
is("memory/default"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:cockroach:v21.2.3:///demo_ds").getDatabase(),
is("demo_ds"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:tidb:v6.1.0:///demo_ds").getDatabase(),
is("demo_ds"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:mysql:5.7.34:///demo_ds?TC_INITSCRIPT=somepath/init_mysql.sql")
- .getQueryProperties().getProperty("TC_INITSCRIPT"),
is("somepath/init_mysql.sql"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:mysql:5.7.34:///demo_ds?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql")
- .getQueryProperties().getProperty("TC_INITSCRIPT"),
is("file:src/main/resources/init_mysql.sql"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:mysql:5.7.34:///demo_ds?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction")
- .getQueryProperties().getProperty("TC_INITFUNCTION"),
is("org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:mysql:5.7.34:///demo_ds?TC_DAEMON=true").getQueryProperties().getProperty("TC_DAEMON"),
is("true"));
- assertThat(new
StandardJdbcUrlParser().parse("jdbc:tc:postgresql:9.6.8:///demo_ds?TC_TMPFS=/testtmpfs:rw").getQueryProperties().getProperty("TC_TMPFS"),
is("/testtmpfs:rw"));
- }
}
diff --git a/infra/database/type/pom.xml b/infra/database/type/pom.xml
index 8b85aef0fa5..e1b9a0cf52d 100644
--- a/infra/database/type/pom.xml
+++ b/infra/database/type/pom.xml
@@ -41,6 +41,5 @@
<module>firebird</module>
<module>h2</module>
<module>sql92</module>
- <module>testcontainers</module>
</modules>
</project>
diff --git
a/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/connector/SQLServerConnectionPropertiesParserTest.java
b/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/connector/SQLServerConnectionPropertiesParserTest.java
index ada44413127..af18c947ec6 100644
---
a/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/connector/SQLServerConnectionPropertiesParserTest.java
+++
b/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/connector/SQLServerConnectionPropertiesParserTest.java
@@ -67,8 +67,7 @@ class SQLServerConnectionPropertiesParserTest {
Arguments.of("defaultPortAndMicrosoft",
"jdbc:microsoft:sqlserver://127.0.0.1;DatabaseName=foo_ds", "127.0.0.1", 1433,
"foo_ds", null),
Arguments.of("defaultPortWithoutMicrosoft",
"jdbc:sqlserver://127.0.0.1;DatabaseName=foo_ds", "127.0.0.1", 1433, "foo_ds",
null),
Arguments.of("databaseNameContainDotAndMicrosoft",
"jdbc:microsoft:sqlserver://127.0.0.1:9999;DatabaseName=foo_0.0.0",
"127.0.0.1", 9999, "foo_0.0.0", null),
- Arguments.of("databaseNameContainDotAndWithoutMicrosoft",
"jdbc:sqlserver://127.0.0.1:9999;DatabaseName=foo_0.0.0", "127.0.0.1", 9999,
"foo_0.0.0", null),
- Arguments.of("testcontainers",
"jdbc:tc:sqlserver:2022-CU10-ubuntu-22.04://test-hostname;databaseName=test_database",
"test-hostname", 1433, "test_database", null));
+ Arguments.of("databaseNameContainDotAndWithoutMicrosoft",
"jdbc:sqlserver://127.0.0.1:9999;DatabaseName=foo_0.0.0", "127.0.0.1", 9999,
"foo_0.0.0", null));
}
}
}
diff --git a/infra/database/type/testcontainers/pom.xml
b/infra/database/type/testcontainers/pom.xml
deleted file mode 100644
index af57e7737a7..00000000000
--- a/infra/database/type/testcontainers/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-database-type</artifactId>
- <version>5.5.3-SNAPSHOT</version>
- </parent>
- <artifactId>shardingsphere-infra-database-testcontainers</artifactId>
- <name>${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-database-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcClickHouseDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcClickHouseDatabaseType.java
deleted file mode 100644
index c213c7aa71c..00000000000
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcClickHouseDatabaseType.java
+++ /dev/null
@@ -1,46 +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.infra.database.testcontainers.type;
-
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-
-/**
- * Database type of ClickHouse in testcontainers-java.
- */
-public final class TcClickHouseDatabaseType implements
TestcontainersDatabaseType {
-
- @Override
- public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singletonList("jdbc:tc:clickhouse:");
- }
-
- @Override
- public Optional<DatabaseType> getTrunkDatabaseType() {
- return Optional.of(TypedSPILoader.getService(DatabaseType.class,
"ClickHouse"));
- }
-
- @Override
- public String getType() {
- return "TC-ClickHouse";
- }
-}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcFirebirdDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcFirebirdDatabaseType.java
deleted file mode 100644
index 458c444403e..00000000000
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcFirebirdDatabaseType.java
+++ /dev/null
@@ -1,46 +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.infra.database.testcontainers.type;
-
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-
-/**
- * Database type of Firebird in testcontainers-java.
- */
-public final class TcFirebirdDatabaseType implements
TestcontainersDatabaseType {
-
- @Override
- public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singleton("jdbc:tc:firebird:");
- }
-
- @Override
- public Optional<DatabaseType> getTrunkDatabaseType() {
- return Optional.of(TypedSPILoader.getService(DatabaseType.class,
"Firebird"));
- }
-
- @Override
- public String getType() {
- return "TC-Firebird";
- }
-}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMariaDBDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMariaDBDatabaseType.java
deleted file mode 100644
index 154efe7aac5..00000000000
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMariaDBDatabaseType.java
+++ /dev/null
@@ -1,46 +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.infra.database.testcontainers.type;
-
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-
-/**
- * Database type of MariaDB in testcontainers-java.
- */
-public final class TcMariaDBDatabaseType implements TestcontainersDatabaseType
{
-
- @Override
- public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singleton("jdbc:tc:mariadb:");
- }
-
- @Override
- public Optional<DatabaseType> getTrunkDatabaseType() {
- return Optional.of(TypedSPILoader.getService(DatabaseType.class,
"MariaDB"));
- }
-
- @Override
- public String getType() {
- return "TC-MariaDB";
- }
-}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMySQLDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMySQLDatabaseType.java
deleted file mode 100644
index 4e5b57cca17..00000000000
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcMySQLDatabaseType.java
+++ /dev/null
@@ -1,46 +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.infra.database.testcontainers.type;
-
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-
-/**
- * Database type of MySQL in testcontainers-java.
- */
-public final class TcMySQLDatabaseType implements TestcontainersDatabaseType {
-
- @Override
- public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singleton("jdbc:tc:mysql:");
- }
-
- @Override
- public Optional<DatabaseType> getTrunkDatabaseType() {
- return Optional.of(TypedSPILoader.getService(DatabaseType.class,
"MySQL"));
- }
-
- @Override
- public String getType() {
- return "TC-MySQL";
- }
-}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcOracleDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcOracleDatabaseType.java
deleted file mode 100644
index f558f4728b9..00000000000
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcOracleDatabaseType.java
+++ /dev/null
@@ -1,46 +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.infra.database.testcontainers.type;
-
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-
-/**
- * Database type of Oracle in testcontainers-java.
- */
-public final class TcOracleDatabaseType implements TestcontainersDatabaseType {
-
- @Override
- public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singleton("jdbc:tc:oracle:");
- }
-
- @Override
- public Optional<DatabaseType> getTrunkDatabaseType() {
- return Optional.of(TypedSPILoader.getService(DatabaseType.class,
"Oracle"));
- }
-
- @Override
- public String getType() {
- return "TC-Oracle";
- }
-}
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcTiDBDatabaseType.java
b/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcTiDBDatabaseType.java
deleted file mode 100644
index 85c8df52d92..00000000000
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcTiDBDatabaseType.java
+++ /dev/null
@@ -1,46 +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.infra.database.testcontainers.type;
-
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-
-/**
- * Database type of TiDB in testcontainers-java.
- */
-public final class TcTiDBDatabaseType implements TestcontainersDatabaseType {
-
- @Override
- public Collection<String> getJdbcUrlPrefixes() {
- return Collections.singleton("jdbc:tc:tidb:");
- }
-
- @Override
- public Optional<DatabaseType> getTrunkDatabaseType() {
- return Optional.of(TypedSPILoader.getService(DatabaseType.class,
"MySQL"));
- }
-
- @Override
- public String getType() {
- return "TC-TiDB";
- }
-}
diff --git
a/infra/database/type/testcontainers/src/test/java/org/apache/shardingsphere/infra/database/testcontainers/type/TestcontainersDatabaseTypeTest.java
b/infra/database/type/testcontainers/src/test/java/org/apache/shardingsphere/infra/database/testcontainers/type/TestcontainersDatabaseTypeTest.java
deleted file mode 100644
index 5ca0a738821..00000000000
---
a/infra/database/type/testcontainers/src/test/java/org/apache/shardingsphere/infra/database/testcontainers/type/TestcontainersDatabaseTypeTest.java
+++ /dev/null
@@ -1,42 +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.infra.database.testcontainers.type;
-
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-class TestcontainersDatabaseTypeTest {
-
- @Test
- void assertGetJdbcUrlPrefixes() {
- assertThat(TypedSPILoader.getService(DatabaseType.class,
"TC-ClickHouse").getJdbcUrlPrefixes(),
is(Collections.singletonList("jdbc:tc:clickhouse:")));
- assertThat(TypedSPILoader.getService(DatabaseType.class,
"TC-MariaDB").getJdbcUrlPrefixes(),
is(Collections.singleton("jdbc:tc:mariadb:")));
- assertThat(TypedSPILoader.getService(DatabaseType.class,
"TC-MySQL").getJdbcUrlPrefixes(), is(Collections.singleton("jdbc:tc:mysql:")));
- assertThat(TypedSPILoader.getService(DatabaseType.class,
"TC-Oracle").getJdbcUrlPrefixes(),
is(Collections.singleton("jdbc:tc:oracle:")));
- assertThat(TypedSPILoader.getService(DatabaseType.class,
"TC-PostgreSQL").getJdbcUrlPrefixes(),
is(Collections.singleton("jdbc:tc:postgresql:")));
- assertThat(TypedSPILoader.getService(DatabaseType.class,
"TC-SQLServer").getJdbcUrlPrefixes(),
is(Collections.singleton("jdbc:tc:sqlserver:")));
- assertThat(TypedSPILoader.getService(DatabaseType.class,
"TC-TiDB").getJdbcUrlPrefixes(), is(Collections.singleton("jdbc:tc:tidb:")));
- assertThat(TypedSPILoader.getService(DatabaseType.class,
"TC-Firebird").getJdbcUrlPrefixes(),
is(Collections.singleton("jdbc:tc:firebird:")));
- }
-}
diff --git a/test/native/pom.xml b/test/native/pom.xml
index 443d069f00d..e8784a8ab30 100644
--- a/test/native/pom.xml
+++ b/test/native/pom.xml
@@ -39,12 +39,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-infra-database-testcontainers</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcPostgreSQLDatabaseType.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/testcontainers/TcPostgreSQLDatabaseType.java
similarity index 92%
rename from
infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcPostgreSQLDatabaseType.java
rename to
test/native/src/test/java/org/apache/shardingsphere/test/natived/testcontainers/TcPostgreSQLDatabaseType.java
index 55e0da0fe62..2d189569e7f 100644
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcPostgreSQLDatabaseType.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/testcontainers/TcPostgreSQLDatabaseType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.testcontainers.type;
+package org.apache.shardingsphere.test.natived.testcontainers;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Database type of PostgreSQL in testcontainers-java.
+ * Database type of PostgreSQL in testcontainers.
*/
public final class TcPostgreSQLDatabaseType implements
TestcontainersDatabaseType {
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcSQLServerDatabaseType.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/testcontainers/TcSQLServerDatabaseType.java
similarity index 92%
rename from
infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcSQLServerDatabaseType.java
rename to
test/native/src/test/java/org/apache/shardingsphere/test/natived/testcontainers/TcSQLServerDatabaseType.java
index 966bb392c13..a84cecce789 100644
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TcSQLServerDatabaseType.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/testcontainers/TcSQLServerDatabaseType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.testcontainers.type;
+package org.apache.shardingsphere.test.natived.testcontainers;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Database type of MSSQL Server in testcontainers-java.
+ * Database type of MSSQL Server in testcontainers.
*/
public final class TcSQLServerDatabaseType implements
TestcontainersDatabaseType {
diff --git
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TestcontainersDatabaseType.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/testcontainers/TestcontainersDatabaseType.java
similarity index 86%
rename from
infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TestcontainersDatabaseType.java
rename to
test/native/src/test/java/org/apache/shardingsphere/test/natived/testcontainers/TestcontainersDatabaseType.java
index 241546a55c2..600baed4f0a 100644
---
a/infra/database/type/testcontainers/src/main/java/org/apache/shardingsphere/infra/database/testcontainers/type/TestcontainersDatabaseType.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/testcontainers/TestcontainersDatabaseType.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.testcontainers.type;
+package org.apache.shardingsphere.test.natived.testcontainers;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
/**
* Database type for Testcontainers.
- * All jdbcUrl prefixes supported by testcontainers-java should extend this
class.
+ * All jdbcUrl prefixes supported by testcontainers should extend this class.
*/
public interface TestcontainersDatabaseType extends DatabaseType {
}
diff --git
a/infra/database/type/testcontainers/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.type.DatabaseType
b/test/native/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.type.DatabaseType
similarity index 54%
rename from
infra/database/type/testcontainers/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.type.DatabaseType
rename to
test/native/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.type.DatabaseType
index 152c14c8490..40a36b6b1b2 100644
---
a/infra/database/type/testcontainers/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.type.DatabaseType
+++
b/test/native/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.type.DatabaseType
@@ -15,11 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.testcontainers.type.TcClickHouseDatabaseType
-org.apache.shardingsphere.infra.database.testcontainers.type.TcMariaDBDatabaseType
-org.apache.shardingsphere.infra.database.testcontainers.type.TcMySQLDatabaseType
-org.apache.shardingsphere.infra.database.testcontainers.type.TcOracleDatabaseType
-org.apache.shardingsphere.infra.database.testcontainers.type.TcPostgreSQLDatabaseType
-org.apache.shardingsphere.infra.database.testcontainers.type.TcSQLServerDatabaseType
-org.apache.shardingsphere.infra.database.testcontainers.type.TcTiDBDatabaseType
-org.apache.shardingsphere.infra.database.testcontainers.type.TcFirebirdDatabaseType
+org.apache.shardingsphere.test.natived.testcontainers.TcPostgreSQLDatabaseType
+org.apache.shardingsphere.test.natived.testcontainers.TcSQLServerDatabaseType
