This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 59bca5c8547 Replace SQLServerDatabaseType instantiation with
TypedSPILoader (#35332)
59bca5c8547 is described below
commit 59bca5c8547f9a17faad102bd3836aab79d3dbb4
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon May 5 15:31:21 2025 +0800
Replace SQLServerDatabaseType instantiation with TypedSPILoader (#35332)
* Optimize Oracle database handling in container composers
- Remove unused import of OracleDatabaseType
- Simplify Oracle-specific logic in DockerContainerComposer and
NativeContainerComposer
- Use string comparison instead of instance check for Oracle database type
- Refactor PipelineContainerComposer to use DatabaseTypeRegistry for
identifier formatting
* Replace SQLServerDatabaseType instantiation with TypedSPILoader
---
.../metadata/data/loader/SQLServerMetaDataLoaderTest.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git
a/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/metadata/data/loader/SQLServerMetaDataLoaderTest.java
b/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/metadata/data/loader/SQLServerMetaDataLoaderTest.java
index 87babd6e0f1..4e8840adb41 100644
---
a/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/metadata/data/loader/SQLServerMetaDataLoaderTest.java
+++
b/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/metadata/data/loader/SQLServerMetaDataLoaderTest.java
@@ -26,7 +26,6 @@ import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMe
import
org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DataTypeRegistry;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.database.sqlserver.type.SQLServerDatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
@@ -80,6 +79,8 @@ class SQLServerMetaDataLoaderTest {
+ " LEFT JOIN sys.columns col ON obj.object_id = col.object_id"
+ " WHERE idx.index_id NOT IN (0, 255) AND obj.name IN ('tbl')
ORDER BY idx.index_id";
+ private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "SQLServer");
+
@Test
void assertLoadWithoutTablesWithHighVersion() throws SQLException {
DataSource dataSource = mockDataSource();
@@ -92,7 +93,7 @@ class SQLServerMetaDataLoaderTest {
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(15);
DataTypeRegistry.load(dataSource, "SQLServer");
Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
- new MetaDataLoaderMaterial(Collections.emptyList(), "foo_ds",
dataSource, new SQLServerDatabaseType(), "sharding_db"));
+ new MetaDataLoaderMaterial(Collections.emptyList(), "foo_ds",
dataSource, databaseType, "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -112,7 +113,7 @@ class SQLServerMetaDataLoaderTest {
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(14);
DataTypeRegistry.load(dataSource, "SQLServer");
Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
- new MetaDataLoaderMaterial(Collections.emptyList(), "foo_ds",
dataSource, new SQLServerDatabaseType(), "sharding_db"));
+ new MetaDataLoaderMaterial(Collections.emptyList(), "foo_ds",
dataSource, databaseType, "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -131,7 +132,7 @@ class SQLServerMetaDataLoaderTest {
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(15);
DataTypeRegistry.load(dataSource, "SQLServer");
Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
- new MetaDataLoaderMaterial(Collections.singletonList("tbl"),
"foo_ds", dataSource, new SQLServerDatabaseType(), "sharding_db"));
+ new MetaDataLoaderMaterial(Collections.singletonList("tbl"),
"foo_ds", dataSource, databaseType, "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -150,7 +151,7 @@ class SQLServerMetaDataLoaderTest {
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(14);
DataTypeRegistry.load(dataSource, "SQLServer");
Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
- new MetaDataLoaderMaterial(Collections.singletonList("tbl"),
"foo_ds", dataSource, new SQLServerDatabaseType(), "sharding_db"));
+ new MetaDataLoaderMaterial(Collections.singletonList("tbl"),
"foo_ds", dataSource, databaseType, "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
