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 5cfd3bddbdc Use database default schema in single rule (#39619)
5cfd3bddbdc is described below
commit 5cfd3bddbdc1ed643146d2f288d212c5686285ee
Author: Haoran Meng <[email protected]>
AuthorDate: Fri Aug 28 18:17:46 2026 +0800
Use database default schema in single rule (#39619)
---
.../main/java/org/apache/shardingsphere/single/rule/SingleRule.java | 2 +-
.../java/org/apache/shardingsphere/single/rule/SingleRuleTest.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
index d969f516c9d..717fb474714 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
@@ -234,7 +234,7 @@ public final class SingleRule implements DatabaseRule {
return result;
}
return
sqlStatementContext.getSqlStatement().getAttributes().findAttribute(IndexSQLStatementAttribute.class)
- .map(optional -> IndexMetaDataUtils.getTableNames(database,
protocolType, optional.getIndexes())).orElse(result);
+ .map(optional -> IndexMetaDataUtils.getTableNames(database,
optional.getIndexes())).orElse(result);
}
private Collection<QualifiedTable> getQualifiedTables(final
ShardingSphereDatabase database, final Collection<SimpleTableSegment>
tableSegments) {
diff --git
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/rule/SingleRuleTest.java
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/rule/SingleRuleTest.java
index c3a9eb8c226..0b36e750b96 100644
---
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/rule/SingleRuleTest.java
+++
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/rule/SingleRuleTest.java
@@ -390,7 +390,8 @@ class SingleRuleTest {
SingleRule singleRule = new SingleRule(ruleConfig, "foo_db",
databaseType, dataSourceMap, Collections.singleton(builtRule));
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
ShardingSphereDatabase database = mockDatabase();
- String defaultSchemaName = database.getName();
+ String defaultSchemaName = "foo_default_schema";
+ when(database.getDefaultSchemaName()).thenReturn(defaultSchemaName);
if (useSimpleTableSegments) {
Collection<SimpleTableSegment> simpleTableSegments =
createSimpleTableSegments();
when(sqlStatementContext.getTablesContext().getSimpleTables()).thenReturn(simpleTableSegments);