[shardingsphere] branch master updated: Set databaseName at pipeline data source configuration (#25297)

[zhonghongsheng]

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

zhonghongsheng 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 ac83350aeea Set databaseName at pipeline data source configuration 
(#25297)
ac83350aeea is described below

commit ac83350aeeadd4e887be5c29b9fd5415d1ac74d0
Author: Xinze Guo <101622833+aze...@users.noreply.github.com>
AuthorDate: Mon Apr 24 14:38:07 2023 +0800

    Set databaseName at pipeline data source configuration (#25297)
    
    * Add databaseName at pipeline data source configuration
    
    * Add schemaName too
    
    * Rollback YamlParameterConfiguration
---
 .../datasource/creator/ShardingSpherePipelineDataSourceCreator.java   | 4 ++--
 .../config/impl/ShardingSpherePipelineDataSourceConfiguration.java    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
 
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
index 214eb1942e9..e0570a1f9a1 100644
--- 
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
+++ 
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
@@ -40,8 +40,8 @@ public final class ShardingSpherePipelineDataSourceCreator 
implements PipelineDa
         YamlRootConfiguration rootConfig = 
YamlEngine.unmarshal(YamlEngine.marshal(dataSourceConfig), 
YamlRootConfiguration.class);
         enableStreamingQuery(rootConfig);
         
ShardingRuleConfigurationConverter.findYamlShardingRuleConfiguration(rootConfig.getRules()).ifPresent(this::enableRangeQueryForInline);
-        rootConfig.setDatabaseName(null);
-        rootConfig.setSchemaName(null);
+        rootConfig.setDatabaseName(rootConfig.getDatabaseName());
+        rootConfig.setSchemaName(rootConfig.getSchemaName());
         return 
YamlShardingSphereDataSourceFactory.createDataSourceWithoutCache(rootConfig);
     }
     
diff --git 
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
 
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
index 3bbfe647169..0cf14746d29 100644
--- 
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
+++ 
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
@@ -71,7 +71,7 @@ public final class 
ShardingSpherePipelineDataSourceConfiguration implements Pipe
     }
     
     public ShardingSpherePipelineDataSourceConfiguration(final 
YamlRootConfiguration rootConfig) {
-        this(YamlEngine.marshal(new 
YamlParameterConfiguration(rootConfig.getDataSources(), 
rootConfig.getRules())));
+        this(YamlEngine.marshal(new 
YamlParameterConfiguration(rootConfig.getDatabaseName(), 
rootConfig.getDataSources(), rootConfig.getRules())));
     }
     
     private String getJdbcUrl(final Map<String, Object> props) {
@@ -135,6 +135,8 @@ public final class 
ShardingSpherePipelineDataSourceConfiguration implements Pipe
     @Setter
     private static class YamlParameterConfiguration implements 
YamlConfiguration {
         
+        private String databaseName;
+        
         private Map<String, Map<String, Object>> dataSources = new HashMap<>();
         
         private Collection<YamlRuleConfiguration> rules = new LinkedList<>();