[shardingsphere] branch master updated: Fix new RDL handler for single table (#26648)

[zhaojinchao]

This is an automated email from the ASF dual-hosted git repository.

zhaojinchao 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 a5ab97bd0a7 Fix new RDL handler for single table (#26648)
a5ab97bd0a7 is described below

commit a5ab97bd0a75bef6612d2822f17bb10635e508b4
Author: ChenJiaHao <pace2...@163.com>
AuthorDate: Wed Jun 28 11:10:10 2023 +0800

    Fix new RDL handler for single table (#26648)
---
 .../handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
index 030b76996c1..eef8476ccfb 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
@@ -102,7 +102,8 @@ public final class NewRuleDefinitionBackendHandler<T 
extends RuleDefinitionState
             updater.updateCurrentRuleConfiguration(currentRuleConfig, 
toBeCreatedRuleConfig);
         }
         if (sqlStatement instanceof LoadSingleTableStatement || sqlStatement 
instanceof SetDefaultSingleTableStorageUnitStatement) {
-            return 
ProxyContext.getInstance().getContextManager().getInstanceContext().getModeContextManager().alterRuleConfiguration(database.getName(),
 currentRuleConfig);
+            return 
ProxyContext.getInstance().getContextManager().getInstanceContext().getModeContextManager().alterRuleConfiguration(database.getName(),
+                    null == currentRuleConfig ? toBeCreatedRuleConfig : 
currentRuleConfig);
         }
         return 
ProxyContext.getInstance().getContextManager().getInstanceContext().getModeContextManager().alterRuleConfiguration(database.getName(),
 toBeCreatedRuleConfig);
     }