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 e5161d217a9 Add MetaDataLoaderMaterial.storageUnitName (#32661)
e5161d217a9 is described below
commit e5161d217a94b90fce11fcebbbd42570b1eda2b8
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Aug 24 23:30:42 2024 +0800
Add MetaDataLoaderMaterial.storageUnitName (#32661)
---
.../database/schema/util/SchemaMetaDataUtils.java | 2 +-
.../data/loader/MetaDataLoaderMaterial.java | 2 ++
.../data/loader/type/TableMetaDataLoaderTest.java | 6 ++++--
.../metadata/data/loader/H2MetaDataLoaderTest.java | 4 ++--
.../data/loader/MySQLMetaDataLoaderTest.java | 4 ++--
.../data/loader/OpenGaussMetaDataLoaderTest.java | 4 ++--
.../data/loader/OracleMetaDataLoaderTest.java | 21 ++++++++++++++-------
.../data/loader/PostgreSQLMetaDataLoaderTest.java | 4 ++--
.../data/loader/SQLServerMetaDataLoaderTest.java | 12 ++++++++----
9 files changed, 37 insertions(+), 22 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
index f9f1dc2dcd2..245fce61f15 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
@@ -68,7 +68,7 @@ public final class SchemaMetaDataUtils {
for (Entry<String, Collection<String>> entry :
dataSourceTableGroups.entrySet()) {
DatabaseType storageType =
material.getStorageTypes().get(entry.getKey());
String defaultSchemaName =
getDefaultSchemaNameByStorageType(storageType, material.getDefaultSchemaName());
- MetaDataLoaderMaterial metaDataLoaderMaterial = new
MetaDataLoaderMaterial(entry.getValue(), getDataSource(material,
entry.getKey()), storageType, defaultSchemaName);
+ MetaDataLoaderMaterial metaDataLoaderMaterial = new
MetaDataLoaderMaterial(entry.getValue(), entry.getKey(),
getDataSource(material, entry.getKey()), storageType, defaultSchemaName);
result.add(metaDataLoaderMaterial);
}
return result;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderMaterial.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderMaterial.java
index 44eace8a98b..7e35e736c36 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderMaterial.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderMaterial.java
@@ -33,6 +33,8 @@ public final class MetaDataLoaderMaterial {
private final Collection<String> actualTableNames;
+ private final String storageUnitName;
+
private final DataSource dataSource;
private final DatabaseType storageType;
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoaderTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoaderTest.java
index d782eb8e123..19ede1cd40b 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoaderTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoaderTest.java
@@ -111,7 +111,8 @@ class TableMetaDataLoaderTest {
@Test
void assertLoadWithExistedTable() throws SQLException {
- Map<String, SchemaMetaData> actual =
MetaDataLoader.load(Collections.singleton(new
MetaDataLoaderMaterial(Collections.singleton(TEST_TABLE), dataSource,
databaseType, "sharding_db")));
+ Map<String, SchemaMetaData> actual = MetaDataLoader.load(
+ Collections.singleton(new
MetaDataLoaderMaterial(Collections.singleton(TEST_TABLE), "foo_ds", dataSource,
databaseType, "sharding_db")));
TableMetaData tableMetaData =
actual.get("sharding_db").getTables().iterator().next();
Collection<ColumnMetaData> columns = tableMetaData.getColumns();
assertThat(columns.size(), is(2));
@@ -133,7 +134,8 @@ class TableMetaDataLoaderTest {
@Test
void assertLoadWithNotExistedTable() throws SQLException {
- Map<String, SchemaMetaData> actual =
MetaDataLoader.load(Collections.singleton(new
MetaDataLoaderMaterial(Collections.singleton(NOT_EXISTED_TABLE), dataSource,
databaseType, "sharding_db")));
+ Map<String, SchemaMetaData> actual = MetaDataLoader.load(
+ Collections.singleton(new
MetaDataLoaderMaterial(Collections.singleton(NOT_EXISTED_TABLE), "foo_ds",
dataSource, databaseType, "sharding_db")));
assertFalse(actual.isEmpty());
assertTrue(actual.containsKey("sharding_db"));
assertTrue(actual.get("sharding_db").getTables().isEmpty());
diff --git
a/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/metadata/data/loader/H2MetaDataLoaderTest.java
b/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/metadata/data/loader/H2MetaDataLoaderTest.java
index 52dfd69d72e..7be7308819d 100644
---
a/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/metadata/data/loader/H2MetaDataLoaderTest.java
+++
b/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/metadata/data/loader/H2MetaDataLoaderTest.java
@@ -67,7 +67,7 @@ class H2MetaDataLoaderTest {
"SELECT C.TABLE_NAME TABLE_NAME, C.COLUMN_NAME COLUMN_NAME,
COALESCE(I.IS_GENERATED, FALSE) IS_GENERATED FROM INFORMATION_SCHEMA.COLUMNS C
RIGHT JOIN"
+ " INFORMATION_SCHEMA.INDEXES I ON
C.TABLE_NAME=I.TABLE_NAME WHERE C.TABLE_CATALOG=? AND C.TABLE_SCHEMA=?")
.executeQuery()).thenReturn(generatedInfo);
- assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.emptyList(), dataSource, new
H2DatabaseType(), "sharding_db")));
+ assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.emptyList(), "foo_ds", dataSource, new
H2DatabaseType(), "sharding_db")));
}
@Test
@@ -91,7 +91,7 @@ class H2MetaDataLoaderTest {
"SELECT C.TABLE_NAME TABLE_NAME, C.COLUMN_NAME COLUMN_NAME,
COALESCE(I.IS_GENERATED, FALSE) IS_GENERATED FROM INFORMATION_SCHEMA.COLUMNS C"
+ " RIGHT JOIN INFORMATION_SCHEMA.INDEXES I ON
C.TABLE_NAME=I.TABLE_NAME WHERE C.TABLE_CATALOG=? AND C.TABLE_SCHEMA=? AND
C.TABLE_NAME IN ('tbl')")
.executeQuery()).thenReturn(generatedInfo);
- assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singletonList("tbl"), dataSource, new
H2DatabaseType(), "sharding_db")));
+ assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singletonList("tbl"), "foo_ds", dataSource,
new H2DatabaseType(), "sharding_db")));
}
private DataSource mockDataSource() throws SQLException {
diff --git
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/metadata/data/loader/MySQLMetaDataLoaderTest.java
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/metadata/data/loader/MySQLMetaDataLoaderTest.java
index 12ac455db59..81baad2b212 100644
---
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/metadata/data/loader/MySQLMetaDataLoaderTest.java
+++
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/metadata/data/loader/MySQLMetaDataLoaderTest.java
@@ -57,7 +57,7 @@ class MySQLMetaDataLoaderTest {
ResultSet indexResultSet = mockIndexMetaDataResultSet();
when(dataSource.getConnection().prepareStatement("SELECT TABLE_NAME,
INDEX_NAME, NON_UNIQUE, COLUMN_NAME FROM information_schema.statistics "
+ "WHERE TABLE_SCHEMA=? and TABLE_NAME IN ('tbl') ORDER BY
NON_UNIQUE, INDEX_NAME,
SEQ_IN_INDEX").executeQuery()).thenReturn(indexResultSet);
- assertTableMetaDataMap(dialectMetaDataLoader.load(new
MetaDataLoaderMaterial(Collections.emptyList(), dataSource, new
MySQLDatabaseType(), "sharding_db")));
+ assertTableMetaDataMap(dialectMetaDataLoader.load(new
MetaDataLoaderMaterial(Collections.emptyList(), "foo_ds", dataSource, new
MySQLDatabaseType(), "sharding_db")));
}
@Test
@@ -71,7 +71,7 @@ class MySQLMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement("SELECT TABLE_NAME,
INDEX_NAME, NON_UNIQUE, COLUMN_NAME FROM information_schema.statistics WHERE
TABLE_SCHEMA=? and TABLE_NAME IN ('tbl') "
+ "ORDER BY NON_UNIQUE, INDEX_NAME, SEQ_IN_INDEX")
.executeQuery()).thenReturn(indexResultSet);
- assertTableMetaDataMap(dialectMetaDataLoader.load(new
MetaDataLoaderMaterial(Collections.singletonList("tbl"), dataSource, new
MySQLDatabaseType(), "sharding_db")));
+ assertTableMetaDataMap(dialectMetaDataLoader.load(new
MetaDataLoaderMaterial(Collections.singletonList("tbl"), "foo_ds", dataSource,
new MySQLDatabaseType(), "sharding_db")));
}
private DataSource mockDataSource() throws SQLException {
diff --git
a/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/metadata/data/loader/OpenGaussMetaDataLoaderTest.java
b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/metadata/data/loader/OpenGaussMetaDataLoaderTest.java
index 966a8136520..827c0a74751 100644
---
a/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/metadata/data/loader/OpenGaussMetaDataLoaderTest.java
+++
b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/metadata/data/loader/OpenGaussMetaDataLoaderTest.java
@@ -78,7 +78,7 @@ class OpenGaussMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(BASIC_INDEX_META_DATA_SQL).executeQuery()).thenReturn(indexResultSet);
ResultSet advanceIndexResultSet = mockAdvanceIndexMetaDataResultSet();
when(dataSource.getConnection().prepareStatement(ADVANCE_INDEX_META_DATA_SQL).executeQuery()).thenReturn(advanceIndexResultSet);
- assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.emptyList(), dataSource, new
OpenGaussDatabaseType(), "sharding_db")));
+ assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.emptyList(), "foo_ds", dataSource, new
OpenGaussDatabaseType(), "sharding_db")));
}
private ResultSet mockSchemaMetaDataResultSet() throws SQLException {
@@ -101,7 +101,7 @@ class OpenGaussMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(BASIC_INDEX_META_DATA_SQL).executeQuery()).thenReturn(indexResultSet);
ResultSet advanceIndexResultSet = mockAdvanceIndexMetaDataResultSet();
when(dataSource.getConnection().prepareStatement(ADVANCE_INDEX_META_DATA_SQL).executeQuery()).thenReturn(advanceIndexResultSet);
- assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singletonList("tbl"), dataSource, new
OpenGaussDatabaseType(), "sharding_db")));
+ assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singletonList("tbl"), "foo_ds", dataSource,
new OpenGaussDatabaseType(), "sharding_db")));
}
private DataSource mockDataSource() throws SQLException {
diff --git
a/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/metadata/data/loader/OracleMetaDataLoaderTest.java
b/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/metadata/data/loader/OracleMetaDataLoaderTest.java
index 004efe546bf..c7d4f94ff2d 100644
---
a/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/metadata/data/loader/OracleMetaDataLoaderTest.java
+++
b/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/metadata/data/loader/OracleMetaDataLoaderTest.java
@@ -88,7 +88,8 @@ class OracleMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(ALL_CONSTRAINTS_SQL_WITHOUT_TABLES).executeQuery()).thenReturn(primaryKeys);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(12);
when(dataSource.getConnection().getMetaData().getDatabaseMinorVersion()).thenReturn(2);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singleton("tbl"), dataSource, new
OracleDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.singleton("tbl"),
"foo_ds", dataSource, new OracleDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -107,7 +108,8 @@ class OracleMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(ALL_CONSTRAINTS_SQL_WITHOUT_TABLES).executeQuery()).thenReturn(primaryKeys);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(12);
when(dataSource.getConnection().getMetaData().getDatabaseMinorVersion()).thenReturn(1);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singleton("tbl"), dataSource, new
OracleDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.singleton("tbl"),
"foo_ds", dataSource, new OracleDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -126,7 +128,8 @@ class OracleMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(ALL_CONSTRAINTS_SQL_WITHOUT_TABLES).executeQuery()).thenReturn(primaryKeys);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(11);
when(dataSource.getConnection().getMetaData().getDatabaseMinorVersion()).thenReturn(2);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singleton("tbl"), dataSource, new
OracleDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.singleton("tbl"),
"foo_ds", dataSource, new OracleDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -146,7 +149,8 @@ class OracleMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(ALL_CONSTRAINTS_SQL_WITH_TABLES).executeQuery()).thenReturn(primaryKeys);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(12);
when(dataSource.getConnection().getMetaData().getDatabaseMinorVersion()).thenReturn(2);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singleton("tbl"), dataSource, new
OracleDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.singleton("tbl"),
"foo_ds", dataSource, new OracleDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -166,7 +170,8 @@ class OracleMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(ALL_CONSTRAINTS_SQL_WITH_TABLES).executeQuery()).thenReturn(primaryKeys);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(12);
when(dataSource.getConnection().getMetaData().getDatabaseMinorVersion()).thenReturn(1);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singleton("tbl"), dataSource, new
OracleDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.singleton("tbl"),
"foo_ds", dataSource, new OracleDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -186,7 +191,8 @@ class OracleMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(ALL_CONSTRAINTS_SQL_WITH_TABLES).executeQuery()).thenReturn(primaryKeys);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(11);
when(dataSource.getConnection().getMetaData().getDatabaseMinorVersion()).thenReturn(2);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singleton("tbl"), dataSource, new
OracleDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.singleton("tbl"),
"foo_ds", dataSource, new OracleDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -206,7 +212,8 @@ class OracleMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(ALL_CONSTRAINTS_SQL_WITH_TABLES).executeQuery()).thenReturn(primaryKeys);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(12);
when(dataSource.getConnection().getMetaData().getDatabaseMinorVersion()).thenReturn(2);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singleton("tbl"), dataSource, new
OracleDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.singleton("tbl"),
"foo_ds", dataSource, new OracleDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
diff --git
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/metadata/data/loader/PostgreSQLMetaDataLoaderTest.java
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/metadata/data/loader/PostgreSQLMetaDataLoaderTest.java
index 61e78b3b7cf..00a94964565 100644
---
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/metadata/data/loader/PostgreSQLMetaDataLoaderTest.java
+++
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/metadata/data/loader/PostgreSQLMetaDataLoaderTest.java
@@ -91,7 +91,7 @@ class PostgreSQLMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(BASIC_CONSTRAINT_META_DATA_SQL).executeQuery()).thenReturn(constraintResultSet);
ResultSet roleTableGrantsResultSet = mockRoleTableGrantsResultSet();
when(dataSource.getConnection().prepareStatement(startsWith(LOAD_ALL_ROLE_TABLE_GRANTS_SQL)).executeQuery()).thenReturn(roleTableGrantsResultSet);
- assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.emptyList(), dataSource, new
PostgreSQLDatabaseType(), "sharding_db")));
+ assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.emptyList(), "foo_ds", dataSource, new
PostgreSQLDatabaseType(), "sharding_db")));
}
private ResultSet mockSchemaMetaDataResultSet() throws SQLException {
@@ -118,7 +118,7 @@ class PostgreSQLMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(BASIC_CONSTRAINT_META_DATA_SQL).executeQuery()).thenReturn(constraintResultSet);
ResultSet roleTableGrantsResultSet = mockRoleTableGrantsResultSet();
when(dataSource.getConnection().prepareStatement(startsWith(LOAD_ALL_ROLE_TABLE_GRANTS_SQL)).executeQuery()).thenReturn(roleTableGrantsResultSet);
- assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singletonList("tbl"), dataSource, new
PostgreSQLDatabaseType(), "sharding_db")));
+ assertTableMetaDataMap(getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singletonList("tbl"), "foo_ds", dataSource,
new PostgreSQLDatabaseType(), "sharding_db")));
}
private ResultSet mockRoleTableGrantsResultSet() throws SQLException {
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 8fd6d306396..dcc71b93cdd 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
@@ -89,7 +89,8 @@ class SQLServerMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(LOAD_INDEX_META_DATA)
.executeQuery()).thenReturn(indexResultSet);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(15);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.emptyList(), dataSource, new
SQLServerDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.emptyList(), "foo_ds",
dataSource, new SQLServerDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -107,7 +108,8 @@ class SQLServerMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(LOAD_INDEX_META_DATA)
.executeQuery()).thenReturn(indexResultSet);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(14);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.emptyList(), dataSource, new
SQLServerDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.emptyList(), "foo_ds",
dataSource, new SQLServerDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -124,7 +126,8 @@ class SQLServerMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(LOAD_INDEX_META_DATA)
.executeQuery()).thenReturn(indexResultSet);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(15);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singletonList("tbl"), dataSource, new
SQLServerDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.singletonList("tbl"),
"foo_ds", dataSource, new SQLServerDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
@@ -141,7 +144,8 @@ class SQLServerMetaDataLoaderTest {
when(dataSource.getConnection().prepareStatement(LOAD_INDEX_META_DATA)
.executeQuery()).thenReturn(indexResultSet);
when(dataSource.getConnection().getMetaData().getDatabaseMajorVersion()).thenReturn(14);
- Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(new
MetaDataLoaderMaterial(Collections.singletonList("tbl"), dataSource, new
SQLServerDatabaseType(), "sharding_db"));
+ Collection<SchemaMetaData> actual =
getDialectTableMetaDataLoader().load(
+ new MetaDataLoaderMaterial(Collections.singletonList("tbl"),
"foo_ds", dataSource, new SQLServerDatabaseType(), "sharding_db"));
assertTableMetaDataMap(actual);
TableMetaData actualTableMetaData =
actual.iterator().next().getTables().iterator().next();
Iterator<ColumnMetaData> columnsIterator =
actualTableMetaData.getColumns().iterator();
