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 833e0cb9d5b Remove unreached codes on SQLServerMetaDataLoader (#38147)
833e0cb9d5b is described below
commit 833e0cb9d5b68f52bbd755ae60c8e6d21bc28a2f
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Feb 22 23:05:57 2026 +0800
Remove unreached codes on SQLServerMetaDataLoader (#38147)
---
.../data/loader/SQLServerMetaDataLoader.java | 5 +--
.../data/loader/SQLServerMetaDataLoaderTest.java | 52 ----------------------
2 files changed, 1 insertion(+), 56 deletions(-)
diff --git
a/database/connector/dialect/sqlserver/src/main/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/metadata/data/loader/SQLServerMetaDataLoader.java
b/database/connector/dialect/sqlserver/src/main/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/metadata/data/loader/SQLServerMetaDataLoader.java
index 7dc93fa1b02..71162780945 100644
---
a/database/connector/dialect/sqlserver/src/main/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/metadata/data/loader/SQLServerMetaDataLoader.java
+++
b/database/connector/dialect/sqlserver/src/main/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/metadata/data/loader/SQLServerMetaDataLoader.java
@@ -53,8 +53,6 @@ public final class SQLServerMetaDataLoader implements
DialectMetaDataLoader {
private static final String ORDER_BY_COLUMN_ID = " ORDER BY col.column_id";
- private static final String TABLE_META_DATA_SQL =
TABLE_META_DATA_SQL_NO_ORDER + ORDER_BY_COLUMN_ID;
-
private static final String TABLE_META_DATA_SQL_IN_TABLES =
TABLE_META_DATA_SQL_NO_ORDER + " WHERE obj.name IN (%s)" + ORDER_BY_COLUMN_ID;
private static final String INDEX_META_DATA_SQL = "SELECT idx.name AS
INDEX_NAME, obj.name AS TABLE_NAME, col.name AS COLUMN_NAME,"
@@ -116,8 +114,7 @@ public final class SQLServerMetaDataLoader implements
DialectMetaDataLoader {
stringBuilder.append("is_hidden AS IS_HIDDEN,");
}
String hiddenFlag = stringBuilder.toString();
- return tables.isEmpty() ? String.format(TABLE_META_DATA_SQL,
hiddenFlag)
- : String.format(TABLE_META_DATA_SQL_IN_TABLES, hiddenFlag,
tables.stream().map(each -> String.format("'%s'",
each)).collect(Collectors.joining(",")));
+ return String.format(TABLE_META_DATA_SQL_IN_TABLES, hiddenFlag,
tables.stream().map(each -> String.format("'%s'",
each)).collect(Collectors.joining(",")));
}
private boolean versionContainsHiddenColumn(final DatabaseMetaData
databaseMetaData) throws SQLException {
diff --git
a/database/connector/dialect/sqlserver/src/test/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/metadata/data/loader/SQLServerMetaDataLoaderTest.java
b/database/connector/dialect/sqlserver/src/test/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/metadata/data/loader/SQLServerMetaDataLoaderTest.java
index d4ef5641a88..a9eb7e91c9d 100644
---
a/database/connector/dialect/sqlserver/src/test/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/metadata/data/loader/SQLServerMetaDataLoaderTest.java
+++
b/database/connector/dialect/sqlserver/src/test/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/metadata/data/loader/SQLServerMetaDataLoaderTest.java
@@ -47,18 +47,6 @@ import static org.mockito.Mockito.when;
class SQLServerMetaDataLoaderTest {
- private static final String
LOAD_COLUMN_META_DATA_WITHOUT_TABLES_HIGH_VERSION = "SELECT obj.name AS
TABLE_NAME, col.name AS COLUMN_NAME, t.name AS DATA_TYPE,"
- + " col.collation_name AS COLLATION_NAME, col.column_id,
is_identity AS IS_IDENTITY, col.is_nullable AS IS_NULLABLE, is_hidden AS
IS_HIDDEN,"
- + " (SELECT TOP 1 ind.is_primary_key FROM sys.index_columns ic
LEFT JOIN sys.indexes ind ON ic.object_id = ind.object_id"
- + " AND ic.index_id = ind.index_id AND ind.name LIKE 'PK_%' WHERE
ic.object_id = obj.object_id AND ic.column_id = col.column_id) AS
IS_PRIMARY_KEY"
- + " FROM sys.objects obj INNER JOIN sys.columns col ON
obj.object_id = col.object_id LEFT JOIN sys.types t ON t.user_type_id =
col.user_type_id ORDER BY col.column_id";
-
- private static final String
LOAD_COLUMN_META_DATA_WITHOUT_TABLES_LOW_VERSION = "SELECT obj.name AS
TABLE_NAME, col.name AS COLUMN_NAME, t.name AS DATA_TYPE,"
- + " col.collation_name AS COLLATION_NAME, col.column_id,
is_identity AS IS_IDENTITY, col.is_nullable AS IS_NULLABLE,"
- + " (SELECT TOP 1 ind.is_primary_key FROM sys.index_columns ic
LEFT JOIN sys.indexes ind ON ic.object_id = ind.object_id"
- + " AND ic.index_id = ind.index_id AND ind.name LIKE 'PK_%' WHERE
ic.object_id = obj.object_id AND ic.column_id = col.column_id) AS
IS_PRIMARY_KEY"
- + " FROM sys.objects obj INNER JOIN sys.columns col ON
obj.object_id = col.object_id LEFT JOIN sys.types t ON t.user_type_id =
col.user_type_id ORDER BY col.column_id";
-
private static final String LOAD_COLUMN_META_DATA_WITH_TABLES_HIGH_VERSION
= "SELECT obj.name AS TABLE_NAME, col.name AS COLUMN_NAME, t.name AS DATA_TYPE,"
+ " col.collation_name AS COLLATION_NAME, col.column_id,
is_identity AS IS_IDENTITY, col.is_nullable AS IS_NULLABLE, is_hidden AS
IS_HIDDEN,"
+ " (SELECT TOP 1 ind.is_primary_key FROM sys.index_columns ic
LEFT JOIN sys.indexes ind ON ic.object_id = ind.object_id"
@@ -81,46 +69,6 @@ class SQLServerMetaDataLoaderTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "SQLServer");
- @Test
- void assertLoadWithoutTablesWithHighVersion() throws SQLException {
- DataSource dataSource = mockDataSource();
- ResultSet resultSet = mockTableMetaDataResultSet();
-
when(dataSource.getConnection().prepareStatement(LOAD_COLUMN_META_DATA_WITHOUT_TABLES_HIGH_VERSION)
- .executeQuery()).thenReturn(resultSet);
- ResultSet indexResultSet = mockIndexMetaDataResultSet();
- when(dataSource.getConnection().prepareStatement(LOAD_INDEX_META_DATA)
- .executeQuery()).thenReturn(indexResultSet);
-
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(15);
- DataTypeRegistry.load(dataSource, "SQLServer");
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
- 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();
- assertColumnMetaData(columnsIterator.next(), new ColumnMetaData("id",
Types.INTEGER, false, true, true, true, false, false));
- assertColumnMetaData(columnsIterator.next(), new
ColumnMetaData("name", Types.VARCHAR, false, false, false, false, false, true));
- }
-
- @Test
- void assertLoadWithoutTablesWithLowVersion() throws SQLException {
- DataSource dataSource = mockDataSource();
- ResultSet resultSet = mockTableMetaDataResultSet();
-
when(dataSource.getConnection().prepareStatement(LOAD_COLUMN_META_DATA_WITHOUT_TABLES_LOW_VERSION)
- .executeQuery()).thenReturn(resultSet);
- ResultSet indexResultSet = mockIndexMetaDataResultSet();
- when(dataSource.getConnection().prepareStatement(LOAD_INDEX_META_DATA)
- .executeQuery()).thenReturn(indexResultSet);
-
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(14);
- DataTypeRegistry.load(dataSource, "SQLServer");
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
- 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();
- assertColumnMetaData(columnsIterator.next(), new ColumnMetaData("id",
Types.INTEGER, false, true, true, true, false, false));
- assertColumnMetaData(columnsIterator.next(), new
ColumnMetaData("name", Types.VARCHAR, false, false, false, true, false, true));
- }
-
@Test
void assertLoadWithTablesWithHighVersion() throws SQLException {
DataSource dataSource = mockDataSource();
