You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2023/07/18 10:23:14 UTC
[shardingsphere] branch master updated: Add shardingsphere-infra-database-type modules (#27270)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 87769382180 Add shardingsphere-infra-database-type modules (#27270)
87769382180 is described below
commit 877693821800be0b4cb3e590518152022deae7f7
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Jul 18 18:23:06 2023 +0800
Add shardingsphere-infra-database-type modules (#27270)
* Add shardingsphere-infra-database-mysql module
* Add shardingsphere-infra-database-mariadb module
* Add shardingsphere-infra-database-type modules
---
.../impl/proxy/ProxyMetaDataInfoExporterTest.java | 2 +-
...penTelemetryJDBCExecutorCallbackAdviceTest.java | 2 +-
...atedEncryptShowCreateTableMergedResultTest.java | 2 +-
...rgedEncryptShowCreateTableMergedResultTest.java | 2 +-
.../data/ShardingStatisticsTableCollector.java | 6 +-
.../generator/impl/ProjectionsTokenGenerator.java | 2 +-
.../decider/ShardingSQLFederationDeciderTest.java | 2 +-
.../merge/dal/ShardingDALResultMergerTest.java | 2 +-
.../rewrite/token/IndexTokenGeneratorTest.java | 2 +-
.../InsertClauseShardingConditionEngineTest.java | 2 +-
.../ShardingTableBroadcastRoutingEngineTest.java | 2 +-
.../standard/assertion/ShardingRouteAssert.java | 2 +-
.../sharding/rule/ShardingRuleTest.java | 2 +-
.../select/projection/engine/ProjectionEngine.java | 2 +-
.../select/projection/impl/SubqueryProjection.java | 2 +-
infra/common/pom.xml | 38 +++++-
.../database/schema/util/SystemSchemaUtils.java | 2 +-
.../PostgreSQLShardingSphereStatisticsBuilder.java | 2 +-
.../infra/database/DatabaseTypeEngineTest.java | 6 +-
.../infra/metadata/ShardingSphereMetaDataTest.java | 4 +-
.../builder/SystemSchemaBuilderRuleTest.java | 6 +-
.../schema/builder/SystemSchemaBuilderTest.java | 6 +-
.../loader/common/SchemaMetaDataLoaderTest.java | 6 +-
.../schema/util/IndexMetaDataUtilsTest.java | 2 +-
.../schema/util/SystemSchemaUtilsTest.java | 6 +-
.../builder/global/GlobalRulesBuilderTest.java | 2 +-
.../database/core/type/DatabaseTypeFactory.java | 2 +-
.../core/metadata/DataSourceMetaDataTest.java | 81 -----------
.../dialect/AbstractDataSourceMetaDataTest.java | 39 ------
.../core/metadata/url/JdbcUrlAppenderTest.java | 8 +-
.../core/type/DatabaseTypeFactoryTest.java | 2 +-
.../type/fixture/DataSourceMetaDataFixture.java} | 13 +-
.../fixture/InfraBranchDatabaseTypeFixture.java | 2 +-
.../fixture/InfraTrunkDatabaseTypeFixture.java | 7 +-
infra/database/pom.xml | 1 +
infra/database/{ => type/h2}/pom.xml | 28 +++-
.../infra/database/h2}/H2DataSourceMetaData.java | 2 +-
.../infra/database/h2}/H2DatabaseType.java | 3 +-
....shardingsphere.infra.database.spi.DatabaseType | 9 +-
.../database/h2}/H2DataSourceMetaDataTest.java | 19 +--
.../infra/database/h2}/H2DatabaseTypeTest.java | 3 +-
infra/database/{ => type/mariadb}/pom.xml | 28 +++-
.../mariadb}/MariaDBDataSourceMetaData.java | 2 +-
.../database/mariadb}/MariaDBDatabaseType.java | 3 +-
....shardingsphere.infra.database.spi.DatabaseType | 9 +-
.../mariadb}/MariaDBDataSourceMetaDataTest.java | 19 +--
.../database/mariadb}/MariaDBDatabaseTypeTest.java | 3 +-
infra/database/{ => type/mysql}/pom.xml | 23 +++-
.../database/mysql}/MySQLDataSourceMetaData.java | 2 +-
.../infra/database/mysql}/MySQLDatabaseType.java | 3 +-
....shardingsphere.infra.database.spi.DatabaseType | 9 +-
.../mysql}/MySQLDataSourceMetaDataTest.java | 19 +--
.../database/mysql}/MySQLDatabaseTypeTest.java | 7 +-
infra/database/{ => type/opengauss}/pom.xml | 23 +++-
.../opengauss}/OpenGaussDataSourceMetaData.java | 2 +-
.../database/opengauss}/OpenGaussDatabaseType.java | 3 +-
....shardingsphere.infra.database.spi.DatabaseType | 9 +-
.../OpenGaussDataSourceMetaDataTest.java | 21 +--
.../opengauss/OpenGaussDatabaseTypeTest.java} | 28 ++--
infra/database/{ => type/oracle}/pom.xml | 23 +++-
.../database/oracle}/OracleDataSourceMetaData.java | 2 +-
.../infra/database/oracle}/OracleDatabaseType.java | 3 +-
....shardingsphere.infra.database.spi.DatabaseType | 9 +-
.../oracle}/OracleDataSourceMetaDataTest.java | 21 +--
.../database/oracle}/OracleDatabaseTypeTest.java | 5 +-
infra/database/{ => type}/pom.xml | 14 +-
infra/database/{ => type/postgresql}/pom.xml | 23 +++-
.../postgresql}/PostgreSQLDataSourceMetaData.java | 2 +-
.../postgresql}/PostgreSQLDatabaseType.java | 3 +-
....shardingsphere.infra.database.spi.DatabaseType | 9 +-
.../PostgreSQLDataSourceMetaDataTest.java | 19 +--
.../postgresql}/PostgreSQLDatabaseTypeTest.java | 3 +-
infra/database/{ => type/sql92}/pom.xml | 23 +++-
.../database/sql92}/SQL92DataSourceMetaData.java | 2 +-
.../infra/database/sql92}/SQL92DatabaseType.java | 8 +-
....shardingsphere.infra.database.spi.DatabaseType | 9 +-
.../sql92}/SQL92DataSourceMetaDataTest.java | 21 +--
.../database/sql92}/SQL92DatabaseTypeTest.java | 3 +-
infra/database/{ => type/sqlserver}/pom.xml | 23 +++-
.../sqlserver}/SQLServerDataSourceMetaData.java | 2 +-
.../database/sqlserver}/SQLServerDatabaseType.java | 3 +-
....shardingsphere.infra.database.spi.DatabaseType | 9 +-
.../SQLServerDataSourceMetaDataTest.java | 22 +--
.../sqlserver}/SQLServerDatabaseTypeTest.java | 3 +-
.../type/memory/JDBCMemoryQueryResultTest.java | 2 +-
.../infra/rewrite/SQLRewriteEntryTest.java | 4 +-
.../generic/SubstitutableColumnNameTokenTest.java | 2 +-
.../statement/ShardingSpherePreparedStatement.java | 2 +-
.../core/statement/ShardingSphereStatement.java | 2 +-
.../jdbc/adapter/PreparedStatementAdapterTest.java | 2 +-
.../UnsupportedOperationPreparedStatementTest.java | 2 +-
.../driver/state/DriverStateContextTest.java | 2 +-
.../pipeline/common/util/JDBCStreamQueryUtils.java | 4 +-
...DataMatchDataConsistencyCalculateAlgorithm.java | 2 +-
.../data/pipeline/core/dumper/InventoryDumper.java | 2 +-
.../preparer/InventoryRecordsCountCalculator.java | 2 +-
.../datasource/PipelineDataSourceWrapperTest.java | 2 +-
.../StandardPipelineTableMetaDataLoaderTest.java | 2 +-
.../ingest/wal/OpenGaussLogicalReplication.java | 2 +-
.../pipeline/cdc/core/prepare/CDCJobPreparer.java | 2 +-
.../pipeline/cdc/handler/CDCBackendHandler.java | 2 +-
.../pipeline/cdc/util/CDCSchemaTableUtilsTest.java | 4 +-
.../decider/SingleSQLFederationDeciderTest.java | 2 +-
.../LoadSingleTableStatementUpdaterTest.java | 2 +-
.../metadata/util/SQLFederationDataTypeUtils.java | 2 +-
.../enumerable/EnumerableScanExecutor.java | 2 +-
.../compiler/it/SQLStatementCompilerIT.java | 2 +-
.../engine/SQLFederationEngineTest.java | 2 +-
.../sqltranslator/rule/SQLTranslatorRuleTest.java | 4 +-
.../transaction/ConnectionSavepointManager.java | 2 +-
.../transaction/rule/TransactionRuleTest.java | 4 +-
.../mode/manager/ContextManagerTest.java | 2 +-
.../cluster/ClusterModeContextManagerTest.java | 149 +++++++++------------
.../ProcessListChangedSubscriberTest.java | 2 +-
.../ConfigurationChangedSubscriberTest.java | 2 +-
.../ResourceMetaDataChangedSubscriberTest.java | 2 +-
.../subscriber/StateChangedSubscriberTest.java | 2 +-
.../converter/DataSourceSegmentsConverterTest.java | 2 +-
.../transaction/TransactionBackendHandler.java | 2 +-
.../connector/DatabaseConnectorFactoryTest.java | 2 +-
.../backend/connector/ProxySQLExecutorTest.java | 2 +-
.../jdbc/datasource/JDBCBackendDataSourceTest.java | 2 +-
.../proxy/backend/context/ProxyContextTest.java | 2 +-
.../DefaultDatabaseMetaDataExecutorTest.java | 2 +-
.../impl/UnicastDatabaseBackendHandlerTest.java | 2 +-
.../DatabaseOperateBackendHandlerFactoryTest.java | 2 +-
.../ConvertYamlConfigurationExecutorTest.java | 2 +-
...DistVariableUpdatableRALBackendHandlerTest.java | 2 +-
.../rdl/rule/RuleDefinitionBackendHandlerTest.java | 2 +-
.../unit/AlterStorageUnitBackendHandlerTest.java | 2 +-
.../RegisterStorageUnitBackendHandlerTest.java | 2 +-
.../distsql/rul/sql/FormatSQLExecutorTest.java | 2 +-
.../distsql/rul/sql/ParseDistSQLExecutorTest.java | 4 +-
.../backend/session/ConnectionSessionTest.java | 2 +-
.../executor/ShowCreateDatabaseExecutorTest.java | 2 +-
.../admin/executor/ShowDatabasesExecutorTest.java | 2 +-
.../executor/ShowFunctionStatusExecutorTest.java | 2 +-
.../executor/ShowProcedureStatusExecutorTest.java | 2 +-
.../executor/ShowProcessListExecutorTest.java | 2 +-
.../admin/executor/ShowTablesExecutorTest.java | 2 +-
.../admin/executor/UseDatabaseExecutorTest.java | 2 +-
.../SelectInformationSchemataExecutorTest.java | 2 +-
.../TransactionIsolationValueProviderTest.java | 2 +-
.../TransactionReadOnlyValueProviderTest.java | 2 +-
.../sysvar/provider/VersionValueProviderTest.java | 2 +-
...enGaussSystemCatalogAdminQueryExecutorTest.java | 2 +-
.../FrontDatabaseProtocolTypeFactoryTest.java | 2 +-
.../execute/MySQLComStmtExecuteExecutorTest.java | 2 +-
.../prepare/MySQLComStmtPrepareExecutorTest.java | 2 +-
.../query/MySQLComQueryPacketExecutorTest.java | 2 +-
.../query/MySQLMultiStatementsHandlerTest.java | 2 +-
.../bind/OpenGaussComBatchBindExecutorTest.java | 2 +-
.../command/query/extended/PortalTest.java | 2 +-
...egatedBatchedStatementsCommandExecutorTest.java | 2 +-
.../PostgreSQLBatchedStatementsExecutorTest.java | 2 +-
.../bind/PostgreSQLComBindExecutorTest.java | 2 +-
.../PostgreSQLComDescribeExecutorTest.java | 2 +-
.../parse/PostgreSQLComParseExecutorTest.java | 2 +-
.../pipeline/cases/PipelineContainerComposer.java | 6 +-
.../test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java | 6 +-
.../createtable/CreateTableSQLGeneratorIT.java | 6 +-
.../cases/migration/AbstractMigrationE2EIT.java | 4 +-
.../general/MySQLMigrationGeneralE2EIT.java | 2 +-
.../general/MySQLTimeTypesMigrationE2EIT.java | 2 +-
.../general/PostgreSQLMigrationGeneralE2EIT.java | 4 +-
.../migration/general/RulesMigrationE2EIT.java | 2 +-
.../primarykey/IndexesMigrationE2EIT.java | 4 +-
.../primarykey/MariaDBMigrationE2EIT.java | 2 +-
.../primarykey/TextPrimaryKeyMigrationE2EIT.java | 6 +-
.../pipeline/cases/task/E2EIncrementalTask.java | 6 +-
.../container/compose/DockerContainerComposer.java | 2 +-
...eProxyClusterContainerConfigurationFactory.java | 6 +-
.../framework/helper/PipelineCaseHelper.java | 6 +-
.../engine/ShowProcessListE2EIT.java | 4 +-
.../engine/base/TransactionBaseE2EIT.java | 6 +-
.../ProxyClusterContainerConfigurationFactory.java | 4 +-
.../test/e2e/env/DataSetEnvironmentManager.java | 4 +-
...MatchDataConsistencyCalculateAlgorithmTest.java | 2 +-
.../core/dump/ColumnValueReaderEngineTest.java | 2 +-
179 files changed, 572 insertions(+), 631 deletions(-)
diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/proxy/ProxyMetaDataInfoExporterTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/proxy/ProxyMetaDataInfoExporterTest.java
index 01e7f71e245..25f11f9614a 100644
--- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/proxy/ProxyMetaDataInfoExporterTest.java
+++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/proxy/ProxyMetaDataInfoExporterTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.agent.plugin.metrics.core.collector.type.GaugeM
import org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricCollectorType;
import org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfiguration;
import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.collector.MetricsCollectorFixture;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
diff --git a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
index a02b02e84b4..3e8578a169c 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
@@ -34,7 +34,7 @@ import org.apache.shardingsphere.agent.plugin.tracing.core.constant.AttributeCon
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.fixture.JDBCExecutorCallbackFixture;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.context.SQLUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowCreateTableMergedResultTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowCreateTableMergedResultTest.java
index 9231e005f5d..959b477f700 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowCreateTableMergedResultTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowCreateTableMergedResultTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfigu
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.encrypt.rule.EncryptTable;
import org.apache.shardingsphere.infra.binder.statement.dal.ShowCreateTableStatementContext;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment;
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowCreateTableMergedResultTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowCreateTableMergedResultTest.java
index 5f2b037c852..3c74d5928e2 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowCreateTableMergedResultTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowCreateTableMergedResultTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfigu
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.encrypt.rule.EncryptTable;
import org.apache.shardingsphere.infra.binder.statement.dal.ShowCreateTableStatementContext;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/data/ShardingStatisticsTableCollector.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/data/ShardingStatisticsTableCollector.java
index ee530147e4e..d29790c3025 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/data/ShardingStatisticsTableCollector.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/data/ShardingStatisticsTableCollector.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.sharding.metadata.data;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java
index a644e8d198c..c073cbc2af1 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.binder.segment.select.projection.impl.Der
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType;
+import org.apache.shardingsphere.infra.database.oracle.OracleDatabaseType;
import org.apache.shardingsphere.infra.rewrite.sql.token.generator.OptionalSQLTokenGenerator;
import org.apache.shardingsphere.infra.rewrite.sql.token.generator.aware.RouteContextAware;
import org.apache.shardingsphere.infra.route.context.RouteContext;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDeciderTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDeciderTest.java
index 56320808c6d..38a0443c1db 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDeciderTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDeciderTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.decider;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java
index 2722c318fbc..6746e953dd0 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.binder.segment.table.TablesContext;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataMergedResult;
import org.apache.shardingsphere.infra.merge.result.impl.transparent.TransparentMergedResult;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/IndexTokenGeneratorTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/IndexTokenGeneratorTest.java
index cf70decdec0..cb782fbea3d 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/IndexTokenGeneratorTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/IndexTokenGeneratorTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.rewrite.token;
import org.apache.shardingsphere.infra.binder.statement.ddl.AlterIndexStatementContext;
import org.apache.shardingsphere.infra.binder.statement.ddl.CreateDatabaseStatementContext;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
import org.apache.shardingsphere.sharding.rewrite.token.generator.impl.IndexTokenGenerator;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngineTest.java
index 62d362c1bf4..66e471b5d25 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngineTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.binder.segment.insert.values.InsertSelect
import org.apache.shardingsphere.infra.binder.segment.insert.values.InsertValueContext;
import org.apache.shardingsphere.infra.binder.statement.dml.InsertStatementContext;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.sharding.route.engine.condition.ShardingCondition;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java
index 3b4cec784b5..d0c7e532eb8 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.ddl.DropIndexStatementContext;
import org.apache.shardingsphere.infra.binder.type.IndexAvailable;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/assertion/ShardingRouteAssert.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/assertion/ShardingRouteAssert.java
index c8273faa6e8..488e3f1484b 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/assertion/ShardingRouteAssert.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/assertion/ShardingRouteAssert.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
index c388f6962e1..aeb0a6b6648 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.binder.statement.dml.UpdateStatementConte
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionEngine.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionEngine.java
index 91d7e37d0df..956a21dff07 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionEngine.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionEngine.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.binder.segment.select.projection.impl.Sho
import org.apache.shardingsphere.infra.binder.segment.select.projection.impl.SubqueryProjection;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.exception.SchemaNotFoundException;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/impl/SubqueryProjection.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/impl/SubqueryProjection.java
index 725a889eb4f..c21aac17c11 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/impl/SubqueryProjection.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/impl/SubqueryProjection.java
@@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.infra.binder.segment.select.projection.Projection;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType;
+import org.apache.shardingsphere.infra.database.oracle.OracleDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
import java.util.Optional;
diff --git a/infra/common/pom.xml b/infra/common/pom.xml
index 309291456e3..159df29e050 100644
--- a/infra/common/pom.xml
+++ b/infra/common/pom.xml
@@ -37,9 +37,45 @@
<artifactId>shardingsphere-infra-util</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-database-mysql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-database-mariadb</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-database-postgresql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-database-opengauss</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-database-oracle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-database-sqlserver</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-database-h2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-database-core</artifactId>
+ <artifactId>shardingsphere-infra-database-sql92</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java
index 77f55193566..e2f3e88a397 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.metadata.database.schema.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ExpressionProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ProjectionSegment;
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/builder/dialect/PostgreSQLShardingSphereStatisticsBuilder.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/builder/dialect/PostgreSQLShardingSphereStatisticsBuilder.java
index d55caba5449..13898d44f60 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/builder/dialect/PostgreSQLShardingSphereStatisticsBuilder.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/builder/dialect/PostgreSQLShardingSphereStatisticsBuilder.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.metadata.statistics.builder.dialect;
import org.apache.shardingsphere.infra.autogen.version.ShardingSphereVersion;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereDatabaseData;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/database/DatabaseTypeEngineTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/database/DatabaseTypeEngineTest.java
index 482026fad68..814c865b76d 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/database/DatabaseTypeEngineTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/database/DatabaseTypeEngineTest.java
@@ -21,10 +21,10 @@ import org.apache.shardingsphere.infra.config.database.DatabaseConfiguration;
import org.apache.shardingsphere.infra.config.database.impl.DataSourceProvidedDatabaseConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
+import org.apache.shardingsphere.infra.database.mariadb.MariaDBDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MariaDBDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.fixture.FixtureRuleConfiguration;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.wrapper.SQLWrapperException;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
index f159f91cfd4..7a15d291706 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.infra.metadata;
import org.apache.shardingsphere.infra.config.database.impl.DataSourceProvidedDatabaseConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRuleTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRuleTest.java
index 9f9584ecc4e..46085d77891 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRuleTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRuleTest.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.infra.metadata.database.schema.builder;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderTest.java
index e291e119063..8adaca48248 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderTest.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.infra.metadata.database.schema.builder;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.junit.jupiter.api.Test;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
index a17ca2f2058..ce341541804 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.infra.metadata.database.schema.loader.common;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java
index daa41fdae7f..71ca75ae4e2 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.metadata.database.schema.util;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java
index b76b235a029..b5ed9991004 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.infra.metadata.database.schema.util;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.junit.jupiter.api.Test;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilderTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilderTest.java
index a5800c6e6fd..f06e76edbbb 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilderTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.rule.builder.global;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.builder.fixture.FixtureGlobalRule;
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactory.java b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactory.java
index c9ab085ac91..9f1d5a33271 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactory.java
+++ b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactory.java
@@ -41,7 +41,7 @@ public final class DatabaseTypeFactory {
public static DatabaseType get(final String url) {
Collection<DatabaseType> databaseTypes = ShardingSphereServiceLoader.getServiceInstances(DatabaseType.class).stream().filter(each -> matchURLs(url, each)).collect(Collectors.toList());
if (databaseTypes.isEmpty()) {
- return TypedSPILoader.getService(DatabaseType.class, "SQL92");
+ return TypedSPILoader.getService(DatabaseType.class, null);
}
for (DatabaseType each : databaseTypes) {
if (each instanceof BranchDatabaseType) {
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/DataSourceMetaDataTest.java b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/DataSourceMetaDataTest.java
deleted file mode 100644
index 161caed87c3..00000000000
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/DataSourceMetaDataTest.java
+++ /dev/null
@@ -1,81 +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.core.metadata;
-
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.H2DataSourceMetaData;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.MariaDBDataSourceMetaData;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.MySQLDataSourceMetaData;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.OracleDataSourceMetaData;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.PostgreSQLDataSourceMetaData;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.SQL92DataSourceMetaData;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.SQLServerDataSourceMetaData;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class DataSourceMetaDataTest {
-
- @Test
- void assertIsInSameDatabaseInstanceWithH2() {
- H2DataSourceMetaData actual1 = new H2DataSourceMetaData("jdbc:h2:tcp://localhost:8082/~/test1/test2;DB_CLOSE_DELAY=-1");
- H2DataSourceMetaData actual2 = new H2DataSourceMetaData("jdbc:h2:tcp://localhost:8082/~/test1/test2;DB_CLOSE_DELAY=-1");
- assertTrue(actual1.isInSameDatabaseInstance(actual2));
- }
-
- @Test
- void assertIsInSameDatabaseInstanceWithMysql() {
- MySQLDataSourceMetaData actual1 = new MySQLDataSourceMetaData("jdbc:mysql://127.0.0.1:9999/ds_1?serverTimezone=UTC&useSSL=false");
- MySQLDataSourceMetaData actual2 = new MySQLDataSourceMetaData("jdbc:mysql://127.0.0.1:9999/ds_0?serverTimezone=UTC&useSSL=false");
- assertTrue(actual1.isInSameDatabaseInstance(actual2));
- }
-
- @Test
- void assertIsInSameDatabaseInstanceWithOracle() {
- OracleDataSourceMetaData actual1 = new OracleDataSourceMetaData("jdbc:oracle:thin:@//127.0.0.1:9999/ds_0", "test");
- OracleDataSourceMetaData actual2 = new OracleDataSourceMetaData("jdbc:oracle:thin:@//127.0.0.1:9999/ds_1", "test");
- assertTrue(actual1.isInSameDatabaseInstance(actual2));
- }
-
- @Test
- void assertIsInSameDatabaseInstanceWithMariaDB() {
- MariaDBDataSourceMetaData actual1 = new MariaDBDataSourceMetaData("jdbc:mariadb://127.0.0.1:9999/ds_0?serverTimezone=UTC&useSSL=false");
- MariaDBDataSourceMetaData actual2 = new MariaDBDataSourceMetaData("jdbc:mariadb://127.0.0.1:9999/ds_1?serverTimezone=UTC&useSSL=false");
- assertTrue(actual1.isInSameDatabaseInstance(actual2));
- }
-
- @Test
- void assertIsInSameDatabaseInstanceWithPostgreSQL() {
- PostgreSQLDataSourceMetaData actual1 = new PostgreSQLDataSourceMetaData("jdbc:postgresql://127.0.0.1/ds_0");
- PostgreSQLDataSourceMetaData actual2 = new PostgreSQLDataSourceMetaData("jdbc:postgresql://127.0.0.1/ds_1");
- assertTrue(actual1.isInSameDatabaseInstance(actual2));
- }
-
- @Test
- void assertIsInSameDatabaseInstanceWithSQL92() {
- SQL92DataSourceMetaData actual1 = new SQL92DataSourceMetaData("jdbc:sql92_db:ds_0");
- SQL92DataSourceMetaData actual2 = new SQL92DataSourceMetaData("jdbc:sql92_db:ds_1");
- assertTrue(actual1.isInSameDatabaseInstance(actual2));
- }
-
- @Test
- void assertIsInSameDatabaseInstanceWithSQLServer() {
- SQLServerDataSourceMetaData actual1 = new SQLServerDataSourceMetaData("jdbc:microsoft:sqlserver://127.0.0.1:9999;DatabaseName=ds_0");
- SQLServerDataSourceMetaData actual2 = new SQLServerDataSourceMetaData("jdbc:microsoft:sqlserver://127.0.0.1:9999;DatabaseName=ds_1");
- assertTrue(actual1.isInSameDatabaseInstance(actual2));
- }
-}
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/AbstractDataSourceMetaDataTest.java b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/AbstractDataSourceMetaDataTest.java
deleted file mode 100644
index 0b37516d0db..00000000000
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/AbstractDataSourceMetaDataTest.java
+++ /dev/null
@@ -1,39 +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.core.metadata.dialect;
-
-import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
-
-import java.util.Properties;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-abstract class AbstractDataSourceMetaDataTest {
-
- protected final void assertDataSourceMetaData(final String url, final String hostname, final int port, final String catalog, final String schema, final Properties queryProps) {
- DataSourceMetaData actual = createDataSourceMetaData(url);
- assertThat(actual.getHostname(), is(hostname));
- assertThat(actual.getPort(), is(port));
- assertThat(actual.getCatalog(), is(catalog));
- assertThat(actual.getSchema(), is(schema));
- assertThat(actual.getQueryProperties(), is(queryProps));
- }
-
- protected abstract DataSourceMetaData createDataSourceMetaData(String url);
-}
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/url/JdbcUrlAppenderTest.java b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/url/JdbcUrlAppenderTest.java
index b882cd58788..a0e8eb6063b 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/url/JdbcUrlAppenderTest.java
+++ b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/url/JdbcUrlAppenderTest.java
@@ -29,9 +29,9 @@ class JdbcUrlAppenderTest {
@Test
void assertAppendQueryPropertiesWithoutOriginalQueryProperties() {
- String actual = new JdbcUrlAppender().appendQueryProperties("jdbc:mysql://192.168.0.1:3306/foo_ds",
+ String actual = new JdbcUrlAppender().appendQueryProperties("jdbc:infra.fixture://192.168.0.1:3306/foo_ds",
PropertiesBuilder.build(new Property("useSSL", Boolean.FALSE.toString()), new Property("rewriteBatchedStatements", Boolean.TRUE.toString())));
- assertThat(actual, startsWith("jdbc:mysql://192.168.0.1:3306/foo_ds?"));
+ assertThat(actual, startsWith("jdbc:infra.fixture://192.168.0.1:3306/foo_ds?"));
assertThat(actual, containsString("rewriteBatchedStatements=true"));
assertThat(actual, containsString("useSSL=false"));
}
@@ -39,9 +39,9 @@ class JdbcUrlAppenderTest {
@Test
void assertAppendQueryPropertiesWithOriginalQueryProperties() {
String actual = new JdbcUrlAppender().appendQueryProperties(
- "jdbc:mysql://192.168.0.1:3306/foo_ds?serverTimezone=UTC&useSSL=false&rewriteBatchedStatements=true",
+ "jdbc:infra.fixture://192.168.0.1:3306/foo_ds?serverTimezone=UTC&useSSL=false&rewriteBatchedStatements=true",
PropertiesBuilder.build(new Property("useSSL", Boolean.FALSE.toString()), new Property("rewriteBatchedStatements", Boolean.TRUE.toString())));
- assertThat(actual, startsWith("jdbc:mysql://192.168.0.1:3306/foo_ds?"));
+ assertThat(actual, startsWith("jdbc:infra.fixture://192.168.0.1:3306/foo_ds?"));
assertThat(actual, containsString("serverTimezone=UTC"));
assertThat(actual, containsString("rewriteBatchedStatements=true"));
assertThat(actual, containsString("useSSL=false"));
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactoryTest.java b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactoryTest.java
index 89234bb0e03..70744844d37 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactoryTest.java
+++ b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactoryTest.java
@@ -36,6 +36,6 @@ class DatabaseTypeFactoryTest {
@Test
void assertGetDatabaseTypeWithUnrecognizedURL() {
- assertThat(DatabaseTypeFactory.get("jdbc:sqlite:test").getType(), is("SQL92"));
+ assertThat(DatabaseTypeFactory.get("jdbc:not-existed:test").getType(), is("INFRA.TRUNK.FIXTURE"));
}
}
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQL92DataSourceMetaData.java b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/DataSourceMetaDataFixture.java
similarity index 86%
copy from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQL92DataSourceMetaData.java
copy to infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/DataSourceMetaDataFixture.java
index 9f9f09eddb2..1096d4626e3 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQL92DataSourceMetaData.java
+++ b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/DataSourceMetaDataFixture.java
@@ -15,25 +15,22 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.core.type.fixture;
import lombok.Getter;
-import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.core.metadata.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-/**
- * Data source meta data for SQL92.
- */
@Getter
-public final class SQL92DataSourceMetaData implements DataSourceMetaData {
+public final class DataSourceMetaDataFixture implements DataSourceMetaData {
private static final int DEFAULT_PORT = -1;
- private static final Pattern URL_PATTERN = Pattern.compile("jdbc:.*", Pattern.CASE_INSENSITIVE);
+ private static final Pattern URL_PATTERN = Pattern.compile("jdbc:infra", Pattern.CASE_INSENSITIVE);
private final String hostname;
@@ -43,7 +40,7 @@ public final class SQL92DataSourceMetaData implements DataSourceMetaData {
private final String schema;
- public SQL92DataSourceMetaData(final String url) {
+ public DataSourceMetaDataFixture(final String url) {
Matcher matcher = URL_PATTERN.matcher(url);
if (!matcher.find()) {
throw new UnrecognizedDatabaseURLException(url, URL_PATTERN.pattern());
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraBranchDatabaseTypeFixture.java b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraBranchDatabaseTypeFixture.java
index 08c82b15628..985ec9369b2 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraBranchDatabaseTypeFixture.java
+++ b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraBranchDatabaseTypeFixture.java
@@ -42,7 +42,7 @@ public final class InfraBranchDatabaseTypeFixture implements BranchDatabaseType
@Override
public DataSourceMetaData getDataSourceMetaData(final String url, final String username) {
- return null;
+ return new DataSourceMetaDataFixture(url);
}
@Override
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraTrunkDatabaseTypeFixture.java b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraTrunkDatabaseTypeFixture.java
index 5f6f6732ea2..d6d84144648 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraTrunkDatabaseTypeFixture.java
+++ b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraTrunkDatabaseTypeFixture.java
@@ -45,7 +45,7 @@ public final class InfraTrunkDatabaseTypeFixture implements TrunkDatabaseType {
@Override
public DataSourceMetaData getDataSourceMetaData(final String url, final String username) {
- return null;
+ return new DataSourceMetaDataFixture(url);
}
@Override
@@ -62,4 +62,9 @@ public final class InfraTrunkDatabaseTypeFixture implements TrunkDatabaseType {
public String getType() {
return "INFRA.TRUNK.FIXTURE";
}
+
+ @Override
+ public boolean isDefault() {
+ return true;
+ }
}
diff --git a/infra/database/pom.xml b/infra/database/pom.xml
index 2ddb73773d4..ec618ace393 100644
--- a/infra/database/pom.xml
+++ b/infra/database/pom.xml
@@ -30,5 +30,6 @@
<modules>
<module>spi</module>
<module>core</module>
+ <module>type</module>
</modules>
</project>
diff --git a/infra/database/pom.xml b/infra/database/type/h2/pom.xml
similarity index 59%
copy from infra/database/pom.xml
copy to infra/database/type/h2/pom.xml
index 2ddb73773d4..2f4b33c54c0 100644
--- a/infra/database/pom.xml
+++ b/infra/database/type/h2/pom.xml
@@ -20,15 +20,29 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere-infra-database-type</artifactId>
<version>5.4.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-database</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-infra-database-h2</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>spi</module>
- <module>core</module>
- </modules>
+ <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-infra-database-mysql</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/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/H2DataSourceMetaData.java b/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2DataSourceMetaData.java
similarity index 98%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/H2DataSourceMetaData.java
rename to infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2DataSourceMetaData.java
index cfb9513a40e..d25e2e2d981 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/H2DataSourceMetaData.java
+++ b/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2DataSourceMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.h2;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/H2DatabaseType.java b/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2DatabaseType.java
similarity index 93%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/H2DatabaseType.java
rename to infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2DatabaseType.java
index 762cd5fb4d8..830fa92f6b7 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/H2DatabaseType.java
+++ b/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2DatabaseType.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.h2;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.H2DataSourceMetaData;
import org.apache.shardingsphere.infra.database.core.type.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType b/infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
similarity index 55%
copy from infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
copy to infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
index ada6eaaef53..6d1291c802c 100644
--- a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
+++ b/infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
@@ -15,11 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.core.type.dialect.SQL92DatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MariaDBDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.SQLServerDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType
+org.apache.shardingsphere.infra.database.h2.H2DatabaseType
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/H2DataSourceMetaDataTest.java b/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/H2DataSourceMetaDataTest.java
similarity index 89%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/H2DataSourceMetaDataTest.java
rename to infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/H2DataSourceMetaDataTest.java
index a8e19418cc5..2a835d8b737 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/H2DataSourceMetaDataTest.java
+++ b/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/H2DataSourceMetaDataTest.java
@@ -15,26 +15,32 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.h2;
+import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import java.util.Properties;
import java.util.stream.Stream;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-class H2DataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
+class H2DataSourceMetaDataTest {
@ParameterizedTest(name = "{0}")
@ArgumentsSource(NewConstructorTestCaseArgumentsProvider.class)
void assertNewConstructor(final String name, final String url, final String hostname, final int port, final String catalog, final String schema) {
- assertDataSourceMetaData(url, hostname, port, catalog, schema, new Properties());
+ DataSourceMetaData actual = new H2DataSourceMetaData(url);
+ assertThat(actual.getHostname(), is(hostname));
+ assertThat(actual.getPort(), is(port));
+ assertThat(actual.getCatalog(), is(catalog));
+ assertThat(actual.getSchema(), is(schema));
+ assertTrue(actual.getQueryProperties().isEmpty());
}
@ParameterizedTest(name = "{0}")
@@ -45,11 +51,6 @@ class H2DataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
assertThat(actual1.isInSameDatabaseInstance(actual2), is(isSame));
}
- @Override
- protected H2DataSourceMetaData createDataSourceMetaData(final String url) {
- return new H2DataSourceMetaData(url);
- }
-
private static class NewConstructorTestCaseArgumentsProvider implements ArgumentsProvider {
@Override
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/H2DatabaseTypeTest.java b/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/H2DatabaseTypeTest.java
similarity index 93%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/H2DatabaseTypeTest.java
rename to infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/H2DatabaseTypeTest.java
index ed5cfa541a1..8ecc9ce595b 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/H2DatabaseTypeTest.java
+++ b/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/H2DatabaseTypeTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.h2;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.H2DataSourceMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import org.junit.jupiter.api.Test;
diff --git a/infra/database/pom.xml b/infra/database/type/mariadb/pom.xml
similarity index 59%
copy from infra/database/pom.xml
copy to infra/database/type/mariadb/pom.xml
index 2ddb73773d4..e0bfdf806d3 100644
--- a/infra/database/pom.xml
+++ b/infra/database/type/mariadb/pom.xml
@@ -20,15 +20,29 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere-infra-database-type</artifactId>
<version>5.4.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-database</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-infra-database-mariadb</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>spi</module>
- <module>core</module>
- </modules>
+ <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-infra-database-mysql</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/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MariaDBDataSourceMetaData.java b/infra/database/type/mariadb/src/main/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDataSourceMetaData.java
similarity index 97%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MariaDBDataSourceMetaData.java
rename to infra/database/type/mariadb/src/main/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDataSourceMetaData.java
index 4dfe7fcd39b..8d5570cdb9b 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MariaDBDataSourceMetaData.java
+++ b/infra/database/type/mariadb/src/main/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDataSourceMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.mariadb;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MariaDBDatabaseType.java b/infra/database/type/mariadb/src/main/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDatabaseType.java
similarity index 93%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MariaDBDatabaseType.java
rename to infra/database/type/mariadb/src/main/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDatabaseType.java
index 2f5db435a24..655d86ac95f 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MariaDBDatabaseType.java
+++ b/infra/database/type/mariadb/src/main/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDatabaseType.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.mariadb;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.MariaDBDataSourceMetaData;
import org.apache.shardingsphere.infra.database.core.type.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType b/infra/database/type/mariadb/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
similarity index 55%
copy from infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
copy to infra/database/type/mariadb/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
index ada6eaaef53..22e1f6627f6 100644
--- a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
+++ b/infra/database/type/mariadb/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
@@ -15,11 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.core.type.dialect.SQL92DatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MariaDBDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.SQLServerDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType
+org.apache.shardingsphere.infra.database.mariadb.MariaDBDatabaseType
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MariaDBDataSourceMetaDataTest.java b/infra/database/type/mariadb/src/test/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDataSourceMetaDataTest.java
similarity index 81%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MariaDBDataSourceMetaDataTest.java
rename to infra/database/type/mariadb/src/test/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDataSourceMetaDataTest.java
index b702df06625..4a50e66da66 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MariaDBDataSourceMetaDataTest.java
+++ b/infra/database/type/mariadb/src/test/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDataSourceMetaDataTest.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.mariadb;
import org.apache.shardingsphere.infra.database.core.metadata.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
@@ -30,14 +31,21 @@ import org.junit.jupiter.params.provider.ArgumentsSource;
import java.util.Properties;
import java.util.stream.Stream;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-class MariaDBDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
+class MariaDBDataSourceMetaDataTest {
@ParameterizedTest(name = "{0}")
@ArgumentsSource(NewConstructorTestCaseArgumentsProvider.class)
void assertNewConstructorWithSimpleJdbcUrl(final String name, final String url, final String hostname, final int port, final String catalog, final String schema, final Properties queryProps) {
- assertDataSourceMetaData(url, hostname, port, catalog, schema, queryProps);
+ DataSourceMetaData actual = new MariaDBDataSourceMetaData(url);
+ assertThat(actual.getHostname(), is(hostname));
+ assertThat(actual.getPort(), is(port));
+ assertThat(actual.getCatalog(), is(catalog));
+ assertThat(actual.getSchema(), is(schema));
+ assertThat(actual.getQueryProperties(), is(queryProps));
}
@Test
@@ -45,11 +53,6 @@ class MariaDBDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
assertThrows(UnrecognizedDatabaseURLException.class, () -> new MariaDBDataSourceMetaData("jdbc:mariadb:xxxxxxxx"));
}
- @Override
- protected MariaDBDataSourceMetaData createDataSourceMetaData(final String url) {
- return new MariaDBDataSourceMetaData(url);
- }
-
private static class NewConstructorTestCaseArgumentsProvider implements ArgumentsProvider {
@Override
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/MariaDBDatabaseTypeTest.java b/infra/database/type/mariadb/src/test/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDatabaseTypeTest.java
similarity index 92%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/MariaDBDatabaseTypeTest.java
rename to infra/database/type/mariadb/src/test/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDatabaseTypeTest.java
index a11fc8fa42c..90483bfba35 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/MariaDBDatabaseTypeTest.java
+++ b/infra/database/type/mariadb/src/test/java/org/apache/shardingsphere/infra/database/mariadb/MariaDBDatabaseTypeTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.mariadb;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.MariaDBDataSourceMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import org.junit.jupiter.api.Test;
diff --git a/infra/database/pom.xml b/infra/database/type/mysql/pom.xml
similarity index 66%
copy from infra/database/pom.xml
copy to infra/database/type/mysql/pom.xml
index 2ddb73773d4..ee2f2f8e541 100644
--- a/infra/database/pom.xml
+++ b/infra/database/type/mysql/pom.xml
@@ -20,15 +20,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere-infra-database-type</artifactId>
<version>5.4.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-database</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-infra-database-mysql</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>spi</module>
- <module>core</module>
- </modules>
+ <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/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MySQLDataSourceMetaData.java b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataSourceMetaData.java
similarity index 97%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MySQLDataSourceMetaData.java
rename to infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataSourceMetaData.java
index 025ec294ef0..880bfe16256 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MySQLDataSourceMetaData.java
+++ b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataSourceMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.mysql;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MySQLDatabaseType.java b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDatabaseType.java
similarity index 97%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MySQLDatabaseType.java
rename to infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDatabaseType.java
index 08121a8a8ba..6a3f73c122f 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MySQLDatabaseType.java
+++ b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDatabaseType.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.mysql;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.MySQLDataSourceMetaData;
import org.apache.shardingsphere.infra.database.core.type.DataSourceAggregatableDatabaseType;
import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
diff --git a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType b/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
similarity index 55%
copy from infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
copy to infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
index ada6eaaef53..b0446704993 100644
--- a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
+++ b/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
@@ -15,11 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.core.type.dialect.SQL92DatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MariaDBDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.SQLServerDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType
+org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MySQLDataSourceMetaDataTest.java b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataSourceMetaDataTest.java
similarity index 81%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MySQLDataSourceMetaDataTest.java
rename to infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataSourceMetaDataTest.java
index def71ae9519..4ce0d3fab53 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/MySQLDataSourceMetaDataTest.java
+++ b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataSourceMetaDataTest.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.mysql;
import org.apache.shardingsphere.infra.database.core.metadata.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
@@ -30,14 +31,21 @@ import org.junit.jupiter.params.provider.ArgumentsSource;
import java.util.Properties;
import java.util.stream.Stream;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-class MySQLDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
+class MySQLDataSourceMetaDataTest {
@ParameterizedTest(name = "{0}")
@ArgumentsSource(NewConstructorTestCaseArgumentsProvider.class)
void assertNewConstructor(final String name, final String url, final String hostname, final int port, final String catalog, final String schema, final Properties queryProps) {
- assertDataSourceMetaData(url, hostname, port, catalog, schema, queryProps);
+ DataSourceMetaData actual = new MySQLDataSourceMetaData(url);
+ assertThat(actual.getHostname(), is(hostname));
+ assertThat(actual.getPort(), is(port));
+ assertThat(actual.getCatalog(), is(catalog));
+ assertThat(actual.getSchema(), is(schema));
+ assertThat(actual.getQueryProperties(), is(queryProps));
}
@Test
@@ -45,11 +53,6 @@ class MySQLDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
assertThrows(UnrecognizedDatabaseURLException.class, () -> new MySQLDataSourceMetaData("jdbc:mysql:xxxxxxxx"));
}
- @Override
- protected MySQLDataSourceMetaData createDataSourceMetaData(final String url) {
- return new MySQLDataSourceMetaData(url);
- }
-
private static class NewConstructorTestCaseArgumentsProvider implements ArgumentsProvider {
@Override
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/MySQLDatabaseTypeTest.java b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLDatabaseTypeTest.java
similarity index 88%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/MySQLDatabaseTypeTest.java
rename to infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLDatabaseTypeTest.java
index 2cf3482b75a..3f0e5806504 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/MySQLDatabaseTypeTest.java
+++ b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLDatabaseTypeTest.java
@@ -15,16 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.mysql;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.MySQLDataSourceMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
+import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
import java.util.HashSet;
-import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -43,7 +42,7 @@ class MySQLDatabaseTypeTest {
@Test
void assertGetDataSourceMetaData() {
- assertThat(new MySQLDatabaseType().getDataSourceMetaData("jdbc:mysql://127.0.0.1/foo_ds", "root"), instanceOf(MySQLDataSourceMetaData.class));
+ assertThat(new MySQLDatabaseType().getDataSourceMetaData("jdbc:mysql://127.0.0.1/foo_ds", "root"), CoreMatchers.instanceOf(MySQLDataSourceMetaData.class));
}
@Test
diff --git a/infra/database/pom.xml b/infra/database/type/opengauss/pom.xml
similarity index 66%
copy from infra/database/pom.xml
copy to infra/database/type/opengauss/pom.xml
index 2ddb73773d4..441e6506009 100644
--- a/infra/database/pom.xml
+++ b/infra/database/type/opengauss/pom.xml
@@ -20,15 +20,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere-infra-database-type</artifactId>
<version>5.4.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-database</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-infra-database-opengauss</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>spi</module>
- <module>core</module>
- </modules>
+ <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/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OpenGaussDataSourceMetaData.java b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDataSourceMetaData.java
similarity index 96%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OpenGaussDataSourceMetaData.java
rename to infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDataSourceMetaData.java
index dbb2a5efb1d..554bf4973f5 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OpenGaussDataSourceMetaData.java
+++ b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDataSourceMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.opengauss;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OpenGaussDatabaseType.java b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDatabaseType.java
similarity index 97%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OpenGaussDatabaseType.java
rename to infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDatabaseType.java
index 4bca5ed380d..8b4a465f5e7 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OpenGaussDatabaseType.java
+++ b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDatabaseType.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.opengauss;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.OpenGaussDataSourceMetaData;
import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
diff --git a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType b/infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
similarity index 55%
copy from infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
copy to infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
index ada6eaaef53..03e3b0ac023 100644
--- a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
+++ b/infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
@@ -15,11 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.core.type.dialect.SQL92DatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MariaDBDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.SQLServerDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType
+org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OpenGaussDataSourceMetaDataTest.java b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDataSourceMetaDataTest.java
similarity index 79%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OpenGaussDataSourceMetaDataTest.java
rename to infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDataSourceMetaDataTest.java
index 95ec4f1ebbf..49f516da63c 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OpenGaussDataSourceMetaDataTest.java
+++ b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDataSourceMetaDataTest.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.opengauss;
import org.apache.shardingsphere.infra.database.core.metadata.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
@@ -30,24 +31,26 @@ import org.junit.jupiter.params.provider.ArgumentsSource;
import java.util.Properties;
import java.util.stream.Stream;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-class OpenGaussDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
+class OpenGaussDataSourceMetaDataTest {
@ParameterizedTest(name = "{0}")
@ArgumentsSource(NewConstructorTestCaseArgumentsProvider.class)
void assertNewConstructor(final String name, final String url, final String hostname, final int port, final String catalog, final String schema, final Properties queryProps) {
- assertDataSourceMetaData(url, hostname, port, catalog, schema, queryProps);
+ DataSourceMetaData actual = new OpenGaussDataSourceMetaData(url);
+ assertThat(actual.getHostname(), is(hostname));
+ assertThat(actual.getPort(), is(port));
+ assertThat(actual.getCatalog(), is(catalog));
+ assertThat(actual.getSchema(), is(schema));
+ assertThat(actual.getQueryProperties(), is(queryProps));
}
@Test
void assertNewConstructorFailure() {
- assertThrows(UnrecognizedDatabaseURLException.class, () -> new PostgreSQLDataSourceMetaData("jdbc:opengauss:xxxxxxxx"));
- }
-
- @Override
- protected OpenGaussDataSourceMetaData createDataSourceMetaData(final String url) {
- return new OpenGaussDataSourceMetaData(url);
+ assertThrows(UnrecognizedDatabaseURLException.class, () -> new OpenGaussDataSourceMetaData("jdbc:opengauss:xxxxxxxx"));
}
private static class NewConstructorTestCaseArgumentsProvider implements ArgumentsProvider {
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseTypeTest.java b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDatabaseTypeTest.java
similarity index 62%
copy from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseTypeTest.java
copy to infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDatabaseTypeTest.java
index 5fe9b846761..013ca275bf8 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseTypeTest.java
+++ b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDatabaseTypeTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.opengauss;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.PostgreSQLDataSourceMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.CommitStatement;
@@ -38,60 +37,61 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
-class PostgreSQLDatabaseTypeTest {
+class OpenGaussDatabaseTypeTest {
@Test
void assertGetQuoteCharacter() {
- assertThat(new PostgreSQLDatabaseType().getQuoteCharacter(), is(QuoteCharacter.QUOTE));
+ assertThat(new OpenGaussDatabaseType().getQuoteCharacter(), is(QuoteCharacter.QUOTE));
}
@Test
void assertGetJdbcUrlPrefixes() {
- assertThat(new PostgreSQLDatabaseType().getJdbcUrlPrefixes(), is(Collections.singleton("jdbc:postgresql:")));
+ assertThat(new OpenGaussDatabaseType().getJdbcUrlPrefixes(), is(Collections.singleton("jdbc:opengauss:")));
}
@Test
void assertGetDataSourceMetaData() {
- assertThat(new PostgreSQLDatabaseType().getDataSourceMetaData("jdbc:postgresql://localhost:5432/demo_ds_0", "postgres"), instanceOf(PostgreSQLDataSourceMetaData.class));
+ assertThat(new OpenGaussDatabaseType().getDataSourceMetaData("jdbc:opengauss://localhost:5432/demo_ds_0", "postgres"), instanceOf(OpenGaussDataSourceMetaData.class));
}
@Test
void assertHandleRollbackOnlyForNotRollbackOnly() {
- assertDoesNotThrow(() -> new PostgreSQLDatabaseType().handleRollbackOnly(false, mock(CommitStatement.class)));
+ assertDoesNotThrow(() -> new OpenGaussDatabaseType().handleRollbackOnly(false, mock(CommitStatement.class)));
}
@Test
void assertHandleRollbackOnlyForRollbackOnlyAndCommitStatement() {
- assertDoesNotThrow(() -> new PostgreSQLDatabaseType().handleRollbackOnly(true, mock(CommitStatement.class)));
+ assertDoesNotThrow(() -> new OpenGaussDatabaseType().handleRollbackOnly(true, mock(CommitStatement.class)));
}
@Test
void assertHandleRollbackOnlyForRollbackOnlyAndRollbackStatement() {
- assertDoesNotThrow(() -> new PostgreSQLDatabaseType().handleRollbackOnly(true, mock(RollbackStatement.class)));
+ assertDoesNotThrow(() -> new OpenGaussDatabaseType().handleRollbackOnly(true, mock(RollbackStatement.class)));
}
@Test
void assertHandleRollbackOnlyForRollbackOnlyAndNotTCLStatement() {
- assertThrows(SQLFeatureNotSupportedException.class, () -> new PostgreSQLDatabaseType().handleRollbackOnly(true, mock(SelectStatement.class)));
+ assertThrows(SQLFeatureNotSupportedException.class, () -> new OpenGaussDatabaseType().handleRollbackOnly(true, mock(SelectStatement.class)));
}
@Test
void assertGetSystemDatabases() {
- assertTrue(new PostgreSQLDatabaseType().getSystemDatabaseSchemaMap().containsKey("postgres"));
+ assertTrue(new OpenGaussDatabaseType().getSystemDatabaseSchemaMap().containsKey("postgres"));
}
@Test
void assertGetSystemSchemas() {
- assertThat(new PostgreSQLDatabaseType().getSystemSchemas(), is(new HashSet<>(Arrays.asList("information_schema", "pg_catalog", "shardingsphere"))));
+ assertThat(new OpenGaussDatabaseType().getSystemSchemas(), is(new HashSet<>(Arrays.asList("information_schema", "pg_catalog", "blockchain",
+ "cstore", "db4ai", "dbe_perf", "dbe_pldebugger", "gaussdb", "oracle", "pkg_service", "snapshot", "sqladvisor", "dbe_pldeveloper", "pg_toast", "pkg_util", "shardingsphere"))));
}
@Test
void assertIsSchemaAvailable() {
- assertTrue(new PostgreSQLDatabaseType().isSchemaAvailable());
+ assertTrue(new OpenGaussDatabaseType().isSchemaAvailable());
}
@Test
void assertGetDefaultSchema() {
- assertThat(new PostgreSQLDatabaseType().getDefaultSchema(), is(Optional.of("public")));
+ assertThat(new OpenGaussDatabaseType().getDefaultSchema(), is(Optional.of("public")));
}
}
diff --git a/infra/database/pom.xml b/infra/database/type/oracle/pom.xml
similarity index 66%
copy from infra/database/pom.xml
copy to infra/database/type/oracle/pom.xml
index 2ddb73773d4..319d383a508 100644
--- a/infra/database/pom.xml
+++ b/infra/database/type/oracle/pom.xml
@@ -20,15 +20,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere-infra-database-type</artifactId>
<version>5.4.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-database</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-infra-database-oracle</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>spi</module>
- <module>core</module>
- </modules>
+ <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/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OracleDataSourceMetaData.java b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDataSourceMetaData.java
similarity index 97%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OracleDataSourceMetaData.java
rename to infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDataSourceMetaData.java
index a45969075c6..562bd187856 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OracleDataSourceMetaData.java
+++ b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDataSourceMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.oracle;
import com.google.common.base.Strings;
import lombok.Getter;
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OracleDatabaseType.java b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDatabaseType.java
similarity index 96%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OracleDatabaseType.java
rename to infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDatabaseType.java
index ef86d8eba02..f6783006e40 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OracleDatabaseType.java
+++ b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDatabaseType.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.oracle;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.OracleDataSourceMetaData;
import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
diff --git a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType b/infra/database/type/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
similarity index 55%
copy from infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
copy to infra/database/type/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
index ada6eaaef53..de7eb34dfd9 100644
--- a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
+++ b/infra/database/type/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
@@ -15,11 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.core.type.dialect.SQL92DatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MariaDBDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.SQLServerDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType
+org.apache.shardingsphere.infra.database.oracle.OracleDatabaseType
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OracleDataSourceMetaDataTest.java b/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/OracleDataSourceMetaDataTest.java
similarity index 86%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OracleDataSourceMetaDataTest.java
rename to infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/OracleDataSourceMetaDataTest.java
index e42adf6f1a6..0daf24055be 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/OracleDataSourceMetaDataTest.java
+++ b/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/OracleDataSourceMetaDataTest.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.oracle;
import org.apache.shardingsphere.infra.database.core.metadata.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
@@ -25,17 +26,24 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import java.util.Properties;
import java.util.stream.Stream;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-class OracleDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
+class OracleDataSourceMetaDataTest {
@ParameterizedTest(name = "{0}")
@ArgumentsSource(NewConstructorTestCaseArgumentsProvider.class)
void assertNewConstructor(final String name, final String url, final String hostname, final int port, final String catalog, final String schema) {
- assertDataSourceMetaData(url, hostname, port, catalog, schema, new Properties());
+ DataSourceMetaData actual = new OracleDataSourceMetaData(url, "test");
+ assertThat(actual.getHostname(), is(hostname));
+ assertThat(actual.getPort(), is(port));
+ assertThat(actual.getCatalog(), is(catalog));
+ assertThat(actual.getSchema(), is(schema));
+ assertTrue(actual.getQueryProperties().isEmpty());
}
@Test
@@ -43,11 +51,6 @@ class OracleDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
assertThrows(UnrecognizedDatabaseURLException.class, () -> new OracleDataSourceMetaData("jdbc:oracle:xxxxxxxx", "test"));
}
- @Override
- protected OracleDataSourceMetaData createDataSourceMetaData(final String url) {
- return new OracleDataSourceMetaData(url, "test");
- }
-
private static class NewConstructorTestCaseArgumentsProvider implements ArgumentsProvider {
@Override
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/OracleDatabaseTypeTest.java b/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/OracleDatabaseTypeTest.java
similarity index 94%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/OracleDatabaseTypeTest.java
rename to infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/OracleDatabaseTypeTest.java
index 298af909d68..20adce4ea4a 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/OracleDatabaseTypeTest.java
+++ b/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/OracleDatabaseTypeTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.oracle;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.OracleDataSourceMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import org.junit.jupiter.api.Test;
@@ -27,8 +26,8 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.jupiter.api.Assertions.assertNull;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
diff --git a/infra/database/pom.xml b/infra/database/type/pom.xml
similarity index 77%
copy from infra/database/pom.xml
copy to infra/database/type/pom.xml
index 2ddb73773d4..6306cbc04cd 100644
--- a/infra/database/pom.xml
+++ b/infra/database/type/pom.xml
@@ -20,15 +20,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere-infra-database</artifactId>
<version>5.4.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-database</artifactId>
+ <artifactId>shardingsphere-infra-database-type</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<modules>
- <module>spi</module>
- <module>core</module>
+ <module>mysql</module>
+ <module>mariadb</module>
+ <module>postgresql</module>
+ <module>opengauss</module>
+ <module>oracle</module>
+ <module>sqlserver</module>
+ <module>h2</module>
+ <module>sql92</module>
</modules>
</project>
diff --git a/infra/database/pom.xml b/infra/database/type/postgresql/pom.xml
similarity index 66%
copy from infra/database/pom.xml
copy to infra/database/type/postgresql/pom.xml
index 2ddb73773d4..f68ea9ef8a9 100644
--- a/infra/database/pom.xml
+++ b/infra/database/type/postgresql/pom.xml
@@ -20,15 +20,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere-infra-database-type</artifactId>
<version>5.4.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-database</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-infra-database-postgresql</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>spi</module>
- <module>core</module>
- </modules>
+ <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/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/PostgreSQLDataSourceMetaData.java b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDataSourceMetaData.java
similarity index 96%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/PostgreSQLDataSourceMetaData.java
rename to infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDataSourceMetaData.java
index 9763f6c89bc..11d1abd905d 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/PostgreSQLDataSourceMetaData.java
+++ b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDataSourceMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.postgresql;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseType.java b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDatabaseType.java
similarity index 96%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseType.java
rename to infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDatabaseType.java
index 1360ffbe700..7f1a3353f33 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseType.java
+++ b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDatabaseType.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.postgresql;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.PostgreSQLDataSourceMetaData;
import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
diff --git a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType b/infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
similarity index 55%
copy from infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
copy to infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
index ada6eaaef53..152fd5be632 100644
--- a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
+++ b/infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
@@ -15,11 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.core.type.dialect.SQL92DatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MariaDBDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.SQLServerDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType
+org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/PostgreSQLDataSourceMetaDataTest.java b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDataSourceMetaDataTest.java
similarity index 81%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/PostgreSQLDataSourceMetaDataTest.java
rename to infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDataSourceMetaDataTest.java
index f6309d72b53..defaea230d9 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/PostgreSQLDataSourceMetaDataTest.java
+++ b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDataSourceMetaDataTest.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.postgresql;
import org.apache.shardingsphere.infra.database.core.metadata.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
@@ -30,14 +31,21 @@ import org.junit.jupiter.params.provider.ArgumentsSource;
import java.util.Properties;
import java.util.stream.Stream;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-class PostgreSQLDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
+class PostgreSQLDataSourceMetaDataTest {
@ParameterizedTest(name = "{0}")
@ArgumentsSource(NewConstructorTestCaseArgumentsProvider.class)
void assertNewConstructor(final String name, final String url, final String hostname, final int port, final String catalog, final String schema, final Properties queryProps) {
- assertDataSourceMetaData(url, hostname, port, catalog, schema, queryProps);
+ DataSourceMetaData actual = new PostgreSQLDataSourceMetaData(url);
+ assertThat(actual.getHostname(), is(hostname));
+ assertThat(actual.getPort(), is(port));
+ assertThat(actual.getCatalog(), is(catalog));
+ assertThat(actual.getSchema(), is(schema));
+ assertThat(actual.getQueryProperties(), is(queryProps));
}
@Test
@@ -45,11 +53,6 @@ class PostgreSQLDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
assertThrows(UnrecognizedDatabaseURLException.class, () -> new PostgreSQLDataSourceMetaData("jdbc:postgresql:xxxxxxxx"));
}
- @Override
- protected PostgreSQLDataSourceMetaData createDataSourceMetaData(final String url) {
- return new PostgreSQLDataSourceMetaData(url);
- }
-
private static class NewConstructorTestCaseArgumentsProvider implements ArgumentsProvider {
@Override
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseTypeTest.java b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDatabaseTypeTest.java
similarity index 95%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseTypeTest.java
rename to infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDatabaseTypeTest.java
index 5fe9b846761..44b4758bbea 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseTypeTest.java
+++ b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLDatabaseTypeTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.postgresql;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.PostgreSQLDataSourceMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.CommitStatement;
diff --git a/infra/database/pom.xml b/infra/database/type/sql92/pom.xml
similarity index 66%
copy from infra/database/pom.xml
copy to infra/database/type/sql92/pom.xml
index 2ddb73773d4..fc737de2ddf 100644
--- a/infra/database/pom.xml
+++ b/infra/database/type/sql92/pom.xml
@@ -20,15 +20,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere-infra-database-type</artifactId>
<version>5.4.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-database</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-infra-database-sql92</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>spi</module>
- <module>core</module>
- </modules>
+ <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/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQL92DataSourceMetaData.java b/infra/database/type/sql92/src/main/java/org/apache/shardingsphere/infra/database/sql92/SQL92DataSourceMetaData.java
similarity index 96%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQL92DataSourceMetaData.java
rename to infra/database/type/sql92/src/main/java/org/apache/shardingsphere/infra/database/sql92/SQL92DataSourceMetaData.java
index 9f9f09eddb2..81a73c26d49 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQL92DataSourceMetaData.java
+++ b/infra/database/type/sql92/src/main/java/org/apache/shardingsphere/infra/database/sql92/SQL92DataSourceMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.sql92;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQL92DatabaseType.java b/infra/database/type/sql92/src/main/java/org/apache/shardingsphere/infra/database/sql92/SQL92DatabaseType.java
similarity index 92%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQL92DatabaseType.java
rename to infra/database/type/sql92/src/main/java/org/apache/shardingsphere/infra/database/sql92/SQL92DatabaseType.java
index 93282d0efe9..2b996af3dbe 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQL92DatabaseType.java
+++ b/infra/database/type/sql92/src/main/java/org/apache/shardingsphere/infra/database/sql92/SQL92DatabaseType.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.sql92;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.SQL92DataSourceMetaData;
import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
@@ -59,4 +58,9 @@ public final class SQL92DatabaseType implements TrunkDatabaseType {
public String getType() {
return "SQL92";
}
+
+ @Override
+ public boolean isDefault() {
+ return true;
+ }
}
diff --git a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType b/infra/database/type/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
similarity index 55%
copy from infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
copy to infra/database/type/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
index ada6eaaef53..caf4100a778 100644
--- a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
+++ b/infra/database/type/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
@@ -15,11 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.core.type.dialect.SQL92DatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MariaDBDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.SQLServerDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType
+org.apache.shardingsphere.infra.database.sql92.SQL92DatabaseType
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQL92DataSourceMetaDataTest.java b/infra/database/type/sql92/src/test/java/org/apache/shardingsphere/infra/database/sql92/SQL92DataSourceMetaDataTest.java
similarity index 76%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQL92DataSourceMetaDataTest.java
rename to infra/database/type/sql92/src/test/java/org/apache/shardingsphere/infra/database/sql92/SQL92DataSourceMetaDataTest.java
index a40a7015a8d..1bd114c0dd7 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQL92DataSourceMetaDataTest.java
+++ b/infra/database/type/sql92/src/test/java/org/apache/shardingsphere/infra/database/sql92/SQL92DataSourceMetaDataTest.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.sql92;
import org.apache.shardingsphere.infra.database.core.metadata.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
@@ -25,17 +26,24 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import java.util.Properties;
import java.util.stream.Stream;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-class SQL92DataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
+class SQL92DataSourceMetaDataTest {
@ParameterizedTest(name = "{0}")
@ArgumentsSource(NewConstructorTestCaseArgumentsProvider.class)
void assertNewConstructor(final String name, final String url, final String hostname, final int port, final String catalog, final String schema) {
- assertDataSourceMetaData(url, hostname, port, catalog, schema, new Properties());
+ DataSourceMetaData actual = new SQL92DataSourceMetaData(url);
+ assertThat(actual.getHostname(), is(hostname));
+ assertThat(actual.getPort(), is(port));
+ assertThat(actual.getCatalog(), is(catalog));
+ assertThat(actual.getSchema(), is(schema));
+ assertTrue(actual.getQueryProperties().isEmpty());
}
@Test
@@ -43,11 +51,6 @@ class SQL92DataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
assertThrows(UnrecognizedDatabaseURLException.class, () -> new SQL92DataSourceMetaData("xxx:xxxx:xxxxxxxx"));
}
- @Override
- protected SQL92DataSourceMetaData createDataSourceMetaData(final String url) {
- return new SQL92DataSourceMetaData(url);
- }
-
private static class NewConstructorTestCaseArgumentsProvider implements ArgumentsProvider {
@Override
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQL92DatabaseTypeTest.java b/infra/database/type/sql92/src/test/java/org/apache/shardingsphere/infra/database/sql92/SQL92DatabaseTypeTest.java
similarity index 92%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQL92DatabaseTypeTest.java
rename to infra/database/type/sql92/src/test/java/org/apache/shardingsphere/infra/database/sql92/SQL92DatabaseTypeTest.java
index 969d7441e8a..e2d72ea3900 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQL92DatabaseTypeTest.java
+++ b/infra/database/type/sql92/src/test/java/org/apache/shardingsphere/infra/database/sql92/SQL92DatabaseTypeTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.sql92;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.SQL92DataSourceMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import org.junit.jupiter.api.Test;
diff --git a/infra/database/pom.xml b/infra/database/type/sqlserver/pom.xml
similarity index 66%
copy from infra/database/pom.xml
copy to infra/database/type/sqlserver/pom.xml
index 2ddb73773d4..859ebbf4845 100644
--- a/infra/database/pom.xml
+++ b/infra/database/type/sqlserver/pom.xml
@@ -20,15 +20,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere-infra-database-type</artifactId>
<version>5.4.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-database</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-infra-database-sqlserver</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>spi</module>
- <module>core</module>
- </modules>
+ <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/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQLServerDataSourceMetaData.java b/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDataSourceMetaData.java
similarity index 97%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQLServerDataSourceMetaData.java
rename to infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDataSourceMetaData.java
index d35ecb5f801..d93f2aa3cd6 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQLServerDataSourceMetaData.java
+++ b/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDataSourceMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.sqlserver;
import com.google.common.base.Strings;
import lombok.Getter;
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQLServerDatabaseType.java b/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDatabaseType.java
similarity index 92%
rename from infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQLServerDatabaseType.java
rename to infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDatabaseType.java
index c62bfc46cd7..a95d5cad623 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQLServerDatabaseType.java
+++ b/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDatabaseType.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.sqlserver;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.SQLServerDataSourceMetaData;
import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
diff --git a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType b/infra/database/type/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
similarity index 55%
rename from infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
rename to infra/database/type/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
index ada6eaaef53..a77b97b2858 100644
--- a/infra/database/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
+++ b/infra/database/type/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.spi.DatabaseType
@@ -15,11 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.core.type.dialect.SQL92DatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.MariaDBDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.SQLServerDatabaseType
-org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType
+org.apache.shardingsphere.infra.database.sqlserver.SQLServerDatabaseType
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQLServerDataSourceMetaDataTest.java b/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDataSourceMetaDataTest.java
similarity index 83%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQLServerDataSourceMetaDataTest.java
rename to infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDataSourceMetaDataTest.java
index 26242129743..1d015f42e16 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/dialect/SQLServerDataSourceMetaDataTest.java
+++ b/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDataSourceMetaDataTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.dialect;
+package org.apache.shardingsphere.infra.database.sqlserver;
-import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.core.metadata.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
@@ -26,17 +26,24 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import java.util.Properties;
import java.util.stream.Stream;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-class SQLServerDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
+class SQLServerDataSourceMetaDataTest {
@ParameterizedTest(name = "{0}")
@ArgumentsSource(NewConstructorTestCaseArgumentsProvider.class)
void assertNewConstructor(final String name, final String url, final String hostname, final int port, final String catalog, final String schema) {
- assertDataSourceMetaData(url, hostname, port, catalog, schema, new Properties());
+ DataSourceMetaData actual = new SQLServerDataSourceMetaData(url);
+ assertThat(actual.getHostname(), is(hostname));
+ assertThat(actual.getPort(), is(port));
+ assertThat(actual.getCatalog(), is(catalog));
+ assertThat(actual.getSchema(), is(schema));
+ assertTrue(actual.getQueryProperties().isEmpty());
}
@Test
@@ -44,11 +51,6 @@ class SQLServerDataSourceMetaDataTest extends AbstractDataSourceMetaDataTest {
assertThrows(UnrecognizedDatabaseURLException.class, () -> new SQLServerDataSourceMetaData("jdbc:sqlserver:xxxxxxxx"));
}
- @Override
- protected DataSourceMetaData createDataSourceMetaData(final String url) {
- return new SQLServerDataSourceMetaData(url);
- }
-
private static class NewConstructorTestCaseArgumentsProvider implements ArgumentsProvider {
@Override
diff --git a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQLServerDatabaseTypeTest.java b/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDatabaseTypeTest.java
similarity index 93%
rename from infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQLServerDatabaseTypeTest.java
rename to infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDatabaseTypeTest.java
index ae54b4da183..c2868381b5e 100644
--- a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQLServerDatabaseTypeTest.java
+++ b/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerDatabaseTypeTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.type.dialect;
+package org.apache.shardingsphere.infra.database.sqlserver;
-import org.apache.shardingsphere.infra.database.core.metadata.dialect.SQLServerDataSourceMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import org.junit.jupiter.api.Test;
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/memory/JDBCMemoryQueryResultTest.java b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/memory/JDBCMemoryQueryResultTest.java
index 2ebafffa797..235dfb106a5 100644
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/memory/JDBCMemoryQueryResultTest.java
+++ b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/memory/JDBCMemoryQueryResultTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.memory;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.hamcrest.core.Is;
import org.junit.jupiter.api.Test;
diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntryTest.java b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntryTest.java
index eb0ebc1b399..7795159db09 100644
--- a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntryTest.java
+++ b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntryTest.java
@@ -21,8 +21,8 @@ import org.apache.shardingsphere.infra.binder.statement.CommonSQLStatementContex
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumnNameTokenTest.java b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumnNameTokenTest.java
index ed737360c99..549a84d6491 100644
--- a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumnNameTokenTest.java
+++ b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumnNameTokenTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic;
import org.apache.shardingsphere.infra.binder.segment.select.projection.Projection;
import org.apache.shardingsphere.infra.binder.segment.select.projection.impl.ColumnProjection;
import org.apache.shardingsphere.infra.binder.segment.select.projection.impl.SubqueryProjection;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OracleDatabaseType;
+import org.apache.shardingsphere.infra.database.oracle.OracleDatabaseType;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 98f7362e01e..da6bf408bf5 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -42,7 +42,7 @@ import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.connection.kernel.KernelProcessor;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.audit.SQLAuditEngine;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroup;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index e815455e672..333613ee1a2 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -42,7 +42,7 @@ import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.connection.kernel.KernelProcessor;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.audit.SQLAuditEngine;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroup;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
index 9d894f47e27..0bf616767f4 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConne
import org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSpherePreparedStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java
index 97af5d5327a..bac3a0c6eb1 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConne
import org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSpherePreparedStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
index 30521512f39..ef32fe2f8c5 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.driver.state;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/util/JDBCStreamQueryUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/util/JDBCStreamQueryUtils.java
index 2f0b58c9b10..129af2ec2d0 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/util/JDBCStreamQueryUtils.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/util/JDBCStreamQueryUtils.java
@@ -22,8 +22,8 @@ import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.core.type.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import java.sql.Connection;
import java.sql.PreparedStatement;
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
index a243e1853d5..883a2e2740b 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.data.pipeline.core.dumper.ColumnValueReaderEngi
import org.apache.shardingsphere.data.pipeline.core.exception.PipelineSQLException;
import org.apache.shardingsphere.data.pipeline.core.exception.data.PipelineTableDataConsistencyCheckLoadingFailedException;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.util.close.QuietlyCloser;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/InventoryDumper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/InventoryDumper.java
index dbccafaa1b3..47e4c2ce838 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/InventoryDumper.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/InventoryDumper.java
@@ -47,7 +47,7 @@ import org.apache.shardingsphere.data.pipeline.core.exception.IngestException;
import org.apache.shardingsphere.data.pipeline.core.exception.param.PipelineInvalidParameterException;
import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import javax.sql.DataSource;
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryRecordsCountCalculator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryRecordsCountCalculator.java
index 7371637862d..7efe0907b4f 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryRecordsCountCalculator.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryRecordsCountCalculator.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSou
import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineCommonSQLBuilder;
import org.apache.shardingsphere.data.pipeline.core.exception.job.SplitPipelineJobByUniqueKeyException;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import javax.sql.DataSource;
diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceWrapperTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceWrapperTest.java
index 45003fe2de2..c469ee9fd30 100644
--- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceWrapperTest.java
+++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceWrapperTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.data.pipeline.common.datasource;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java
index 5d7a6729855..9bd9e955058 100644
--- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java
+++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumn
import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineIndexMetaData;
import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineTableMetaData;
import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceWrapper;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java
index 704c772ea98..dd0185b8310 100644
--- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java
+++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.api.datasource.config.yaml.YamlJd
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.BaseLogSequenceNumber;
import org.apache.shardingsphere.infra.database.core.metadata.url.JdbcUrl;
import org.apache.shardingsphere.infra.database.core.metadata.url.StandardJdbcUrlParser;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
import org.opengauss.PGProperty;
import org.opengauss.jdbc.PgConnection;
import org.opengauss.replication.LogSequenceNumber;
diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java
index 74b342dfb2f..2aed186e9f3 100644
--- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java
+++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java
@@ -47,7 +47,7 @@ import org.apache.shardingsphere.data.pipeline.core.task.PipelineTaskUtils;
import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator;
import org.apache.shardingsphere.infra.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
import java.sql.SQLException;
import java.util.Collection;
diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/handler/CDCBackendHandler.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/handler/CDCBackendHandler.java
index 2e6a76adb00..20cc739eaaf 100644
--- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/handler/CDCBackendHandler.java
+++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/handler/CDCBackendHandler.java
@@ -47,7 +47,7 @@ import org.apache.shardingsphere.data.pipeline.common.context.PipelineContextMan
import org.apache.shardingsphere.data.pipeline.core.exception.job.PipelineJobNotFoundException;
import org.apache.shardingsphere.data.pipeline.core.exception.param.PipelineInvalidParameterException;
import org.apache.shardingsphere.data.pipeline.core.job.PipelineJobCenter;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
diff --git a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtilsTest.java b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtilsTest.java
index f54ae0ca235..9a4ac1b4ab0 100644
--- a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtilsTest.java
+++ b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtilsTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.data.pipeline.cdc.util;
import org.apache.shardingsphere.data.pipeline.cdc.protocol.request.StreamDataRequestBody.SchemaTable;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
diff --git a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDeciderTest.java b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDeciderTest.java
index bd6aa3f85a9..f1061f24699 100644
--- a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDeciderTest.java
+++ b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDeciderTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.single.decider;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
diff --git a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableStatementUpdaterTest.java b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableStatementUpdaterTest.java
index 614c7f87c01..6b08b6cc559 100644
--- a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableStatementUpdaterTest.java
+++ b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableStatementUpdaterTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.single.distsql.handler.update;
import org.apache.shardingsphere.dialect.exception.syntax.table.TableExistsException;
import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
diff --git a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/metadata/util/SQLFederationDataTypeUtils.java b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/metadata/util/SQLFederationDataTypeUtils.java
index d7d37c52474..0c8aaa12dc9 100644
--- a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/metadata/util/SQLFederationDataTypeUtils.java
+++ b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/metadata/util/SQLFederationDataTypeUtils.java
@@ -24,7 +24,7 @@ import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rel.type.RelDataTypeFactory;
import org.apache.calcite.rel.type.RelDataTypeFactory.Builder;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereColumn;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
diff --git a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
index d8f0e01f4a3..5ddb1c969b8 100644
--- a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
+++ b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.connection.kernel.KernelProcessor;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroup;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupReportContext;
diff --git a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/SQLStatementCompilerIT.java b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/SQLStatementCompilerIT.java
index 9c70bb9982c..e42366a6585 100644
--- a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/SQLStatementCompilerIT.java
+++ b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/SQLStatementCompilerIT.java
@@ -29,7 +29,7 @@ import org.apache.calcite.sql.validate.SqlValidator;
import org.apache.calcite.sql2rel.SqlToRelConverter;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereColumn;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
diff --git a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/SQLFederationEngineTest.java b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/SQLFederationEngineTest.java
index 1f8604b01c0..ab89cc0d568 100644
--- a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/SQLFederationEngineTest.java
+++ b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/SQLFederationEngineTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementConte
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
diff --git a/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRuleTest.java b/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRuleTest.java
index 9a7d57dded2..ca00985083e 100644
--- a/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRuleTest.java
+++ b/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRuleTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.sqltranslator.rule;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.sqltranslator.api.config.SQLTranslatorRuleConfiguration;
import org.apache.shardingsphere.sqltranslator.exception.syntax.UnsupportedTranslatedDatabaseException;
import org.junit.jupiter.api.Test;
diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionSavepointManager.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionSavepointManager.java
index 9dcd59f6ffd..0a7cfff0259 100644
--- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionSavepointManager.java
+++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionSavepointManager.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.transaction;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import java.sql.Connection;
import java.sql.SQLException;
diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
index 92cf42a4000..d104d63df13 100644
--- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
+++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.transaction.rule;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 9d1fb71417a..f9bf86a3d64 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.datasource.storage.StorageUtils;
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManagerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManagerTest.java
index 96f355281b2..9675816ab3e 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManagerTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManagerTest.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.mode.manager.cluster;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.InstanceContext;
@@ -64,12 +64,10 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
- new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
+ ModeConfiguration modeConfig = new ModeConfiguration("Type", new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
- clusterModeContextManager
- .setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ clusterModeContextManager.setContextManagerAware(
+ new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.createDatabase("db"));
}
@@ -80,12 +78,10 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
- new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
+ ModeConfiguration modeConfig = new ModeConfiguration("Type", new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
- clusterModeContextManager
- .setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ clusterModeContextManager.setContextManagerAware(
+ new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.dropDatabase("db"));
}
@@ -96,12 +92,10 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
- new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
+ ModeConfiguration modeConfig = new ModeConfiguration("Type", new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
- clusterModeContextManager
- .setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ clusterModeContextManager.setContextManagerAware(
+ new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.createSchema("db", "Schema Name"));
}
@@ -109,15 +103,12 @@ class ClusterModeContextManagerTest {
void assertAlterSchema() {
ShardingSphereMetaData shardingSphereMetaData = new ShardingSphereMetaData();
shardingSphereMetaData.addDatabase("db", new H2DatabaseType(), new ConfigurationProperties(new Properties()));
- MetaDataContexts metaDataContexts = new MetaDataContexts(
- new MetaDataPersistService(new ClusterPersistRepositoryFixture()), shardingSphereMetaData);
+ MetaDataContexts metaDataContexts = new MetaDataContexts(new MetaDataPersistService(new ClusterPersistRepositoryFixture()), shardingSphereMetaData);
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
- new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
+ ModeConfiguration modeConfig = new ModeConfiguration("Type", new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
- ContextManager contextManager = new ContextManager(metaDataContexts, new InstanceContext(instance,
- workerIdGenerator, modeConfiguration, modeContextManager, null, new EventBusContext()));
+ ContextManager contextManager = new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfig, modeContextManager, null, new EventBusContext()));
contextManager.getResourceMetaDataContextManager().addSchema("db", "Schema Name");
ClusterModeContextManager clusterModeContextManager = new ClusterModeContextManager();
clusterModeContextManager.setContextManagerAware(contextManager);
@@ -131,11 +122,10 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
- new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
+ ModeConfiguration modeConfig = new ModeConfiguration("Type", new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager.setContextManagerAware(
- new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfiguration, modeContextManager, null, new EventBusContext())));
+ new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.dropSchema("db", new LinkedList<>()));
}
@@ -146,15 +136,11 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
- new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
+ ModeConfiguration modeConfig = new ModeConfiguration("Type", new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
- clusterModeContextManager
- .setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
- Collection<String> stringList = new LinkedList<>();
- stringList.add("foo");
- assertDoesNotThrow(() -> clusterModeContextManager.dropSchema("db", stringList));
+ clusterModeContextManager.setContextManagerAware(
+ new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfig, modeContextManager, null, new EventBusContext())));
+ assertDoesNotThrow(() -> clusterModeContextManager.dropSchema("db", Collections.singleton("foo")));
}
@Test
@@ -164,12 +150,10 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
- new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
+ ModeConfiguration modeConfig = new ModeConfiguration("Type", new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
- clusterModeContextManager
- .setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ clusterModeContextManager.setContextManagerAware(
+ new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfig, modeContextManager, null, new EventBusContext())));
Collection<String> stringList = new LinkedList<>();
stringList.add("/");
stringList.add("foo");
@@ -183,12 +167,10 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
- new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
+ ModeConfiguration modeConfig = new ModeConfiguration("Type", new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
- clusterModeContextManager
- .setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ clusterModeContextManager.setContextManagerAware(
+ new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfig, modeContextManager, null, new EventBusContext())));
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new AlterSchemaMetaDataPOJO("db", "Schema Name");
clusterModeContextManager.alterSchemaMetaData(alterSchemaMetaDataPOJO);
assertNull(alterSchemaMetaDataPOJO.getLogicDataSourceName());
@@ -201,12 +183,10 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
- new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
+ ModeConfiguration modeConfig = new ModeConfiguration("Type", new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
- clusterModeContextManager
- .setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ clusterModeContextManager.setContextManagerAware(
+ new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.registerStorageUnits("db", new TreeMap<>()));
}
@@ -217,12 +197,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.alterStorageUnits("db", new TreeMap<>()));
}
@@ -234,12 +214,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.alterStorageUnits("db", new TreeMap<>()));
}
@@ -250,12 +230,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
Map<String, DataSourceProperties> stringDataSourcePropertiesMap = new HashMap<>();
stringDataSourcePropertiesMap.put("active_version", new DataSourceProperties("active_version", new HashMap<>()));
assertDoesNotThrow(() -> clusterModeContextManager.alterStorageUnits("db", stringDataSourcePropertiesMap));
@@ -268,12 +248,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
Map<String, DataSourceProperties> stringDataSourcePropertiesMap = new HashMap<>();
stringDataSourcePropertiesMap.put("\n", new DataSourceProperties("\n", new HashMap<>()));
stringDataSourcePropertiesMap.put("active_version", new DataSourceProperties("active_version", new HashMap<>()));
@@ -291,12 +271,12 @@ class ClusterModeContextManagerTest {
new ShardingSphereMetaData(databases, mock(ShardingSphereResourceMetaData.class), globalRuleMetaData, new ConfigurationProperties(new Properties())));
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.alterStorageUnits("db", new TreeMap<>()));
}
@@ -308,12 +288,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
Map<String, DataSourceProperties> stringDataSourcePropertiesMap = new HashMap<>(new TreeMap<>());
assertDoesNotThrow(() -> clusterModeContextManager.alterStorageUnits("db", stringDataSourcePropertiesMap));
}
@@ -326,12 +306,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
Map<String, DataSourceProperties> stringDataSourcePropertiesMap = new HashMap<>();
stringDataSourcePropertiesMap.put("42", new DataSourceProperties("active_version", new HashMap<>()));
assertDoesNotThrow(() -> clusterModeContextManager.alterStorageUnits("db", stringDataSourcePropertiesMap));
@@ -344,12 +324,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, createShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.unregisterStorageUnits("db", new LinkedList<>()));
}
@@ -361,12 +341,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, createShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.unregisterStorageUnits("db", new LinkedList<>()));
}
@@ -392,12 +372,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, createShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
Collection<RuleConfiguration> ruleConfigurationList = new LinkedList<>();
ruleConfigurationList.add(new RuleConfigurationFixture());
assertDoesNotThrow(() -> clusterModeContextManager.alterRuleConfiguration("db", ruleConfigurationList));
@@ -416,12 +396,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, createShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
Collection<RuleConfiguration> ruleConfigurationList = new LinkedList<>();
ruleConfigurationList.add(new RuleConfigurationFixture());
ruleConfigurationList.add(new RuleConfigurationFixture());
@@ -436,12 +416,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, createShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
Collection<RuleConfiguration> ruleConfigurationList = new LinkedList<>();
ruleConfigurationList.add(new RuleConfigurationFixture());
assertDoesNotThrow(() -> clusterModeContextManager.alterRuleConfiguration("db", ruleConfigurationList));
@@ -454,12 +434,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, createShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.alterGlobalRuleConfiguration(new LinkedList<>()));
}
@@ -470,12 +450,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
Collection<RuleConfiguration> ruleConfigurationList = new LinkedList<>();
ruleConfigurationList.add(new RuleConfigurationFixture());
assertDoesNotThrow(() -> clusterModeContextManager.alterGlobalRuleConfiguration(ruleConfigurationList));
@@ -488,12 +468,12 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
Collection<RuleConfiguration> ruleConfigurationList = new LinkedList<>();
ruleConfigurationList.add(new RuleConfigurationFixture());
ruleConfigurationList.add(new RuleConfigurationFixture());
@@ -507,27 +487,26 @@ class ClusterModeContextManagerTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData());
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
clusterModeContextManager
.setContextManagerAware(new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator,
- modeConfiguration, modeContextManager, null, new EventBusContext())));
+ modeConfig, modeContextManager, null, new EventBusContext())));
assertDoesNotThrow(() -> clusterModeContextManager.alterProperties(new Properties()));
}
@Test
void assertConstructor() {
- ClusterModeContextManager actualClusterModeContextManager = new ClusterModeContextManager();
MetaDataPersistService persistService = new MetaDataPersistService(new ClusterPersistRepositoryFixture());
try (MetaDataContexts metaDataContexts = new MetaDataContexts(persistService, new ShardingSphereMetaData())) {
ComputeNodeInstance instance = new ComputeNodeInstance(new JDBCInstanceMetaData("42"));
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- ModeConfiguration modeConfiguration = new ModeConfiguration("Type",
+ ModeConfiguration modeConfig = new ModeConfiguration("Type",
new ClusterPersistRepositoryConfiguration("Type", "Namespace", "Server Lists", new Properties()));
ClusterModeContextManager modeContextManager = new ClusterModeContextManager();
- assertDoesNotThrow(() -> actualClusterModeContextManager.setContextManagerAware(
- new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfiguration, modeContextManager, null, new EventBusContext()))));
+ assertDoesNotThrow(() -> new ClusterModeContextManager().setContextManagerAware(
+ new ContextManager(metaDataContexts, new InstanceContext(instance, workerIdGenerator, modeConfig, modeContextManager, null, new EventBusContext()))));
}
}
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
index ba14fdbaed7..8d6e2b9189d 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.proc
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.process.Process;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
import org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry;
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
index 66578345dd8..1182281c694 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.datasource.props.DataSourcePropertiesCreator;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
index bcbb5726eab..8ce0fd287bb 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.datasource.props.DataSourcePropertiesCreator;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java
index 967ab962635..d521e8f3c29 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.datasource.state.DataSourceState;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
diff --git a/parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java b/parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java
index 9b0af7062b6..b3b3b3c27b2 100644
--- a/parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java
+++ b/parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.distsql.parser.segment.converter;
import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment;
import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment;
import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandler.java
index 486cb7b6150..67982765f09 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandler.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandler.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.handler.transaction;
import org.apache.shardingsphere.dialect.exception.transaction.InTransactionException;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.proxy.backend.connector.TransactionManager;
import org.apache.shardingsphere.proxy.backend.connector.jdbc.transaction.BackendTransactionManager;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorFactoryTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorFactoryTest.java
index 3c7b79de40d..2db3620bdcb 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorFactoryTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorFactoryTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphere
import org.apache.shardingsphere.infra.session.query.QueryContext;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
index 81a114302a5..236a36056d2 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementConte
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.JDBCDriverType;
import org.apache.shardingsphere.infra.instance.InstanceContext;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSourceTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSourceTest.java
index a7f17a421ad..752072247fe 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSourceTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSourceTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.connector.jdbc.datasource;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
import org.apache.shardingsphere.infra.exception.OverallConnectionNotEnoughException;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
index ad45c10eb2c..e89c95c15a3 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.context;
import org.apache.shardingsphere.dialect.exception.syntax.database.NoDatabaseSelectedException;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
index 951c1c49fda..ecfbda1ca12 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.handler.admin.executor;
import org.apache.shardingsphere.authority.provider.database.model.privilege.DatabasePermittedPrivileges;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandlerTest.java
index 89e099b69c2..61824f6160a 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandlerTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseBackendHandlerTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphere
import org.apache.shardingsphere.infra.session.query.QueryContext;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
index 45b085532ef..75c4dc970da 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.handler.database;
import org.apache.shardingsphere.dialect.exception.syntax.database.DatabaseCreateExistsException;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutorTest.java
index 0773ed5fc13..2a53ee43ccc 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutorTest.java
@@ -21,7 +21,7 @@ import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import lombok.SneakyThrows;
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ConvertYamlConfigurationStatement;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALBackendHandlerTest.java
index de7ce01a988..c02d1c4c305 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALBackendHandlerTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALBackendHandlerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
import io.netty.util.DefaultAttributeMap;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.proxy.backend.exception.UnsupportedVariableException;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java
index 1a24c28f25e..40c8a41edb0 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule;
import io.netty.util.DefaultAttributeMap;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandlerTest.java
index 0e2303997b1..5b465508d97 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandlerTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandlerTest.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment;
import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment;
import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment;
import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterStorageUnitStatement;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandlerTest.java
index 5d86357ca88..9293fb227a9 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandlerTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandlerTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment;
import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment;
import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment;
import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java
index ece6e9f11fe..de5b276da5e 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql;
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.RULBackendHandler;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java
index 24a5257be38..492449bd57f 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java
@@ -21,8 +21,8 @@ import com.google.gson.Gson;
import com.google.gson.JsonParser;
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement;
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java
index 366fb36fcdc..63cd6f0cf4d 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.session;
import org.apache.shardingsphere.infra.session.query.QueryContext;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.connector.ProxyDatabaseConnectionManager;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCreateDatabaseExecutorTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCreateDatabaseExecutorTest.java
index 739a79a70a8..f09ac4ebc29 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCreateDatabaseExecutorTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCreateDatabaseExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java
index 54f711e9674..8ffaa0e45ec 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
import org.apache.shardingsphere.authority.provider.simple.model.privilege.AllPrivilegesPermittedShardingSpherePrivileges;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutorTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutorTest.java
index 05d481972a3..628aabe4365 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutorTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutorTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutorTest.java
index bca444bc504..f0c2da50318 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutorTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java
index 0f8e11d46c1..85dbdac9aa2 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
import io.netty.util.DefaultAttributeMap;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.process.Process;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java
index 4f552e3c460..1d218aff3d2 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutorTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResultMetaData;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
index ff19b16ea0b..2ff9e906259 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/UseDatabaseExecutorTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
import org.apache.shardingsphere.dialect.exception.syntax.database.UnknownDatabaseException;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java
index 5d0be18133c..a2360c35183 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.inf
import org.apache.shardingsphere.authority.provider.database.model.privilege.DatabasePermittedPrivileges;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/TransactionIsolationValueProviderTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/TransactionIsolationValueProviderTest.java
index 87db219a2ad..084b0231958 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/TransactionIsolationValueProviderTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/TransactionIsolationValueProviderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sysvar.provider;
import io.netty.util.DefaultAttributeMap;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sysvar.Scope;
import org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sysvar.MySQLSystemVariable;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/TransactionReadOnlyValueProviderTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/TransactionReadOnlyValueProviderTest.java
index 2e8f5e5d00d..282d6b473d1 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/TransactionReadOnlyValueProviderTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/TransactionReadOnlyValueProviderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sysvar.provider;
import io.netty.util.DefaultAttributeMap;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sysvar.Scope;
import org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sysvar.MySQLSystemVariable;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/VersionValueProviderTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/VersionValueProviderTest.java
index 45cb2c33482..e2afbc67745 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/VersionValueProviderTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/provider/VersionValueProviderTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sys
import io.netty.util.DefaultAttributeMap;
import org.apache.shardingsphere.db.protocol.constant.DatabaseProtocolServerInfo;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sysvar.MySQLSystemVariable;
import org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sysvar.Scope;
diff --git a/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutorTest.java b/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutorTest.java
index 42bf8b52cc5..0fb98bf1d06 100644
--- a/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutorTest.java
+++ b/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutorTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.opengauss.handler.admin;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResultMetaData;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
index 474afcd7a10..9686b9b5c34 100644
--- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
+++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.frontend.protocol;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
index 0ba62483237..78e67a0d1fe 100644
--- a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
+++ b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.UnknownSQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.UpdateStatementContext;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.session.query.QueryContext;
import org.apache.shardingsphere.proxy.backend.connector.ProxyDatabaseConnectionManager;
diff --git a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
index c10d8e603b7..7f48cfce334 100644
--- a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
+++ b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.dialect.mysql.exception.UnsupportedPreparedStat
import org.apache.shardingsphere.infra.binder.statement.dml.InsertStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.UpdateStatementContext;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
diff --git a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
index 7e85738928d..f95e0f59d9a 100644
--- a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
+++ b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.db.protocol.mysql.packet.command.query.text.que
import org.apache.shardingsphere.db.protocol.mysql.packet.generic.MySQLOKPacket;
import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.logging.rule.LoggingRule;
diff --git a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
index 673a99fd384..695294d8e16 100644
--- a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
+++ b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsHandlerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
diff --git a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
index d3056824762..64ddbbb9223 100644
--- a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
+++ b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.InsertStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
diff --git a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PortalTest.java b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PortalTest.java
index 640d122d3a0..e835429ccd7 100644
--- a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PortalTest.java
+++ b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PortalTest.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.infra.binder.statement.UnknownSQLStatementConte
import org.apache.shardingsphere.infra.binder.statement.dml.InsertStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.session.query.QueryContext;
diff --git a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java
index e949da8e780..4fe6e82c730 100644
--- a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java
+++ b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.InsertStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
diff --git a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
index 919ada2c3a3..44a59d80e0b 100644
--- a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
+++ b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.ext
import org.apache.shardingsphere.infra.binder.statement.dml.InsertStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
diff --git a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java
index f157c24419b..12ff375d154 100644
--- a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java
+++ b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.ext
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.PostgreSQLBindCompletePacket;
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.PostgreSQLComBindPacket;
import org.apache.shardingsphere.infra.binder.statement.UnknownSQLStatementContext;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
index d2e9765aced..d15543950c9 100644
--- a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
+++ b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.InsertStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java
index 7cbf8466de9..452d1f4fa75 100644
--- a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java
+++ b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.ext
import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement;
import org.apache.shardingsphere.infra.binder.statement.CommonSQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.InsertStatementContext;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
index f534f937ec3..4e6134be9c9 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
@@ -28,9 +28,9 @@ import org.apache.shardingsphere.data.pipeline.common.job.JobStatus;
import org.apache.shardingsphere.data.pipeline.common.job.type.JobType;
import org.apache.shardingsphere.infra.database.core.metadata.url.JdbcUrlAppender;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
index bcdc196aafe..b89598b7fea 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
@@ -36,9 +36,9 @@ import org.apache.shardingsphere.data.pipeline.core.consistencycheck.Consistency
import org.apache.shardingsphere.data.pipeline.core.consistencycheck.SingleTableInventoryDataConsistencyChecker;
import org.apache.shardingsphere.data.pipeline.core.consistencycheck.algorithm.DataMatchDataConsistencyCalculateAlgorithm;
import org.apache.shardingsphere.data.pipeline.core.consistencycheck.result.DataConsistencyCheckResult;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.sharding.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.task.E2EIncrementalTask;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index b2e592427ee..d0a925a622e 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.test.e2e.data.pipeline.cases.createtable;
import org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.test.e2e.data.pipeline.entity.CreateTableSQLGeneratorAssertionEntity;
import org.apache.shardingsphere.test.e2e.data.pipeline.entity.CreateTableSQLGeneratorAssertionsRootEntity;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
index b6bc302c7e2..d49d7f50215 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration;
import com.google.common.base.Strings;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
import org.apache.shardingsphere.test.e2e.data.pipeline.command.MigrationDistSQLCommand;
import org.apache.shardingsphere.test.e2e.data.pipeline.env.PipelineE2EEnvironment;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
index fe11c1d0c8e..9ded13104a1 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.general
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.sharding.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLTimeTypesMigrationE2EIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLTimeTypesMigrationE2EIT.java
index 5f89b3754af..2f2fd24ad58 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLTimeTypesMigrationE2EIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLTimeTypesMigrationE2EIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.general;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
import org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ECondition;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
index ce17df8cb02..3b3e28e20ed 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.general
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.sharding.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/RulesMigrationE2EIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/RulesMigrationE2EIT.java
index 950eb97d21a..72ba608f9e0 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/RulesMigrationE2EIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/RulesMigrationE2EIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.general;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.sharding.algorithm.keygen.UUIDKeyGenerateAlgorithm;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/IndexesMigrationE2EIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/IndexesMigrationE2EIT.java
index e5901d7a75b..00dadc2bc2d 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/IndexesMigrationE2EIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/IndexesMigrationE2EIT.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.primary
import lombok.SneakyThrows;
import org.apache.commons.codec.binary.Hex;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.wrapper.SQLWrapperException;
import org.apache.shardingsphere.sharding.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
import org.apache.shardingsphere.sharding.algorithm.keygen.UUIDKeyGenerateAlgorithm;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/MariaDBMigrationE2EIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/MariaDBMigrationE2EIT.java
index 30b89c9103f..43eef5c2f92 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/MariaDBMigrationE2EIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/MariaDBMigrationE2EIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.primary
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.sharding.algorithm.keygen.UUIDKeyGenerateAlgorithm;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
index 49eab8703fc..1a14f000a5c 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.primarykey;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.sharding.algorithm.keygen.UUIDKeyGenerateAlgorithm;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
index 2d15d723c13..7943ee4f2f0 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
@@ -21,9 +21,9 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
import org.apache.shardingsphere.test.e2e.data.pipeline.cases.base.BaseIncrementTask;
import org.apache.shardingsphere.test.e2e.data.pipeline.framework.helper.PipelineCaseHelper;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
index 079953864a7..4dcd0c58d19 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.com
import lombok.Getter;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.config.proxy.PipelineProxyClusterContainerConfigurationFactory;
import org.apache.shardingsphere.test.e2e.data.pipeline.util.DockerImageVersion;
import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
index 1eb2c7e807b..f4b1a15bde4 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.con
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.ProxyClusterContainerConfigurationFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
index b223062972d..13afab60011 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
@@ -25,9 +25,9 @@ import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
import org.apache.shardingsphere.test.e2e.data.pipeline.util.AutoIncrementKeyGenerateAlgorithm;
diff --git a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java
index 6d49933226a..8b8b84e151a 100644
--- a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java
+++ b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.showprocesslist.engine;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.apache.shardingsphere.test.e2e.showprocesslist.container.composer.ClusterShowProcessListContainerComposer;
import org.apache.shardingsphere.test.e2e.showprocesslist.env.ShowProcessListEnvironment;
import org.apache.shardingsphere.test.e2e.showprocesslist.env.enums.ShowProcessListEnvTypeEnum;
@@ -54,7 +54,7 @@ class ShowProcessListE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@ArgumentsSource(TestCaseArgumentsProvider.class)
- void assertShowProcessList(final ShowProcessListTestParameter testParam) throws SQLException, InterruptedException {
+ void assertShowProcessList(final ShowProcessListTestParameter testParam) throws SQLException {
try (ClusterShowProcessListContainerComposer containerComposer = new ClusterShowProcessListContainerComposer(testParam)) {
containerComposer.start();
CompletableFuture<Void> executeSelectSleep = CompletableFuture.runAsync(getExecuteSleepThread("proxy", containerComposer));
diff --git a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
index 3f0c729a682..e9bf2b9afc3 100644
--- a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
+++ b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
@@ -21,9 +21,9 @@ import com.google.common.base.Preconditions;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
diff --git a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
index dab0ce7eec4..add0e54c73e 100644
--- a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
+++ b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.e2e.transaction.framework.container.confi
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
index 23e854061ba..267c09d52d1 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.test.e2e.env;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.infra.database.core.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.postgresql.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/consistencycheck/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/consistencycheck/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java
index 0f0c09a4c49..9a3cf929a81 100644
--- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/consistencycheck/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java
+++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/consistencycheck/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.data.pipeline.core.consistencycheck.DataConsist
import org.apache.shardingsphere.data.pipeline.core.consistencycheck.algorithm.DataMatchDataConsistencyCalculateAlgorithm;
import org.apache.shardingsphere.data.pipeline.core.consistencycheck.result.DataConsistencyCalculatedResult;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
+import org.apache.shardingsphere.infra.database.h2.H2DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/dump/ColumnValueReaderEngineTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/dump/ColumnValueReaderEngineTest.java
index a3d9d9658c6..60e80984ce2 100644
--- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/dump/ColumnValueReaderEngineTest.java
+++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/dump/ColumnValueReaderEngineTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.dump;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.shardingsphere.data.pipeline.core.dumper.ColumnValueReaderEngine;
-import org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.mysql.MySQLDatabaseType;
import org.junit.jupiter.api.Test;
import java.sql.Connection;