This is an automated email from the ASF dual-hosted git repository.
menghaoranss 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 5c5adcdf579 Use actual schema to instead of lowercase schema for
federation (#39045)
5c5adcdf579 is described below
commit 5c5adcdf579529416e91bc6cecb71ff02b509bd9
Author: Haoran Meng <[email protected]>
AuthorDate: Wed Jul 8 11:40:46 2026 +0800
Use actual schema to instead of lowercase schema for federation (#39045)
---
.../refresher/federation/FederationMetaDataRefreshEngine.java | 2 +-
.../mode/metadata/refresher/util/SchemaRefreshUtils.java | 11 -----------
.../federation/FederationMetaDataRefreshEngineTest.java | 6 +++---
.../mode/metadata/refresher/util/SchemaRefreshUtilsTest.java | 10 ----------
4 files changed, 4 insertions(+), 25 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngine.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngine.java
index ce3b68459eb..26165f1a829 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngine.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngine.java
@@ -64,7 +64,7 @@ public final class FederationMetaDataRefreshEngine {
return;
}
refresher.get().refresh(metaDataManagerPersistService,
sqlStatementContext.getSqlStatement().getDatabaseType(),
- database, SchemaRefreshUtils.getSchemaName(database,
sqlStatementContext), sqlStatementContext.getSqlStatement());
+ database, SchemaRefreshUtils.getActualSchemaName(database,
sqlStatementContext), sqlStatementContext.getSqlStatement());
}
@SuppressWarnings("rawtypes")
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtils.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtils.java
index e9075572ffd..b49b502e380 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtils.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtils.java
@@ -39,17 +39,6 @@ import java.util.Optional;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class SchemaRefreshUtils {
- /**
- * Get schema name.
- *
- * @param database database
- * @param sqlStatementContext SQL statement context
- * @return schema name
- */
- public static String getSchemaName(final ShardingSphereDatabase database,
final SQLStatementContext sqlStatementContext) {
- return getRawSchemaName(database,
sqlStatementContext).getValue().toLowerCase();
- }
-
/**
* Get actual schema name.
*
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngineTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngineTest.java
index ee66f530367..eae626ce302 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngineTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/federation/FederationMetaDataRefreshEngineTest.java
@@ -88,7 +88,7 @@ class FederationMetaDataRefreshEngineTest {
when(sqlStatementContext.getSqlStatement()).thenReturn(sqlStatement);
FederationMetaDataRefresher<CreateViewStatement> refresher =
mock(FederationMetaDataRefresher.class);
when(TypedSPILoader.findService(FederationMetaDataRefresher.class,
CreateViewStatement.class)).thenReturn(Optional.of(refresher));
- when(SchemaRefreshUtils.getSchemaName(database,
sqlStatementContext)).thenReturn("foo_schema");
+ when(SchemaRefreshUtils.getActualSchemaName(database,
sqlStatementContext)).thenReturn("foo_schema");
new
FederationMetaDataRefreshEngine(sqlStatementContext).refresh(metaDataManagerPersistService,
database);
verify(refresher).refresh(metaDataManagerPersistService, databaseType,
database, "foo_schema", sqlStatement);
}
@@ -99,7 +99,7 @@ class FederationMetaDataRefreshEngineTest {
when(sqlStatementContext.getSqlStatement()).thenReturn(sqlStatement);
FederationMetaDataRefresher<AlterViewStatement> refresher =
mock(FederationMetaDataRefresher.class);
when(TypedSPILoader.findService(FederationMetaDataRefresher.class,
AlterViewStatement.class)).thenReturn(Optional.of(refresher));
- when(SchemaRefreshUtils.getSchemaName(database,
sqlStatementContext)).thenReturn("bar_schema");
+ when(SchemaRefreshUtils.getActualSchemaName(database,
sqlStatementContext)).thenReturn("bar_schema");
new
FederationMetaDataRefreshEngine(sqlStatementContext).refresh(metaDataManagerPersistService,
database);
verify(refresher).refresh(metaDataManagerPersistService, databaseType,
database, "bar_schema", sqlStatement);
}
@@ -117,7 +117,7 @@ class FederationMetaDataRefreshEngineTest {
when(sqlStatementContext.getSqlStatement()).thenReturn(sqlStatement);
FederationMetaDataRefresher<CreateViewStatement> refresher =
mock(FederationMetaDataRefresher.class);
when(TypedSPILoader.findService(FederationMetaDataRefresher.class,
CreateViewStatement.class)).thenReturn(Optional.of(refresher));
- when(SchemaRefreshUtils.getSchemaName(database,
sqlStatementContext)).thenReturn("foo_schema");
+ when(SchemaRefreshUtils.getActualSchemaName(database,
sqlStatementContext)).thenReturn("foo_schema");
FederationMetaDataRefreshEngine engine = new
FederationMetaDataRefreshEngine(sqlStatementContext);
engine.refresh(metaDataManagerPersistService, database);
engine.refresh(metaDataManagerPersistService, database);
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtilsTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtilsTest.java
index a9b50604eb7..4d6f4e2051d 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtilsTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtilsTest.java
@@ -49,16 +49,6 @@ class SchemaRefreshUtilsTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
- @Test
- void assertGetSchemaNameWithSchemaFromContext() {
- assertThat(SchemaRefreshUtils.getSchemaName(createDatabase(),
createSQLStatementContextWithSchema("Foo_Schema")), is("foo_schema"));
- }
-
- @Test
- void assertGetSchemaNameWithDefaultSchema() {
- assertThat(SchemaRefreshUtils.getSchemaName(createDatabase(),
createSQLStatementContextWithoutSchema()), is("foo_db"));
- }
-
@Test
void assertGetActualSchemaNameWithInsensitiveProps() {
assertThat(SchemaRefreshUtils.getActualSchemaName(createDatabase(),
new IdentifierValue("Foo_Schema")), is("foo_schema"));
