You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/05/18 03:00:12 UTC
[shardingsphere] branch master updated: Replace remaining schemaName with databaseName in config file and doc (#17760)
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 504147f4b91 Replace remaining schemaName with databaseName in config file and doc (#17760)
504147f4b91 is described below
commit 504147f4b916a9487263e0b971474c71fafaf687
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Wed May 18 11:00:05 2022 +0800
Replace remaining schemaName with databaseName in config file and doc (#17760)
---
.../shardingsphere-jdbc/spring-namespace-configuration.cn.md | 2 +-
.../user-manual/shardingsphere-jdbc/spring-namespace/_index.cn.md | 4 ++--
.../user-manual/shardingsphere-jdbc/spring-namespace/_index.en.md | 4 ++--
.../shardingsphere-jdbc/spring-namespace/data-source.cn.md | 2 +-
.../shardingsphere-jdbc/spring-namespace/data-source.en.md | 2 +-
.../user-manual/shardingsphere-jdbc/spring-namespace/mode.cn.md | 6 +++---
.../user-manual/shardingsphere-jdbc/spring-namespace/mode.en.md | 6 +++---
.../docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml | 2 +-
.../META-INF/zookeeper/cloud/sharding-databases-tables.yaml | 2 +-
.../META-INF/zookeeper/local/sharding-databases-tables.yaml | 2 +-
...application-cloud-zookeeper-sharding-databases-tables.properties | 2 +-
...application-local-zookeeper-sharding-databases-tables.properties | 2 +-
.../zookeeper/cloud/application-sharding-databases-tables.xml | 2 +-
.../zookeeper/local/application-sharding-databases-tables.xml | 2 +-
.../src/main/resources/META-INF/application-sharding-databases.xml | 2 +-
.../src/main/resources/META-INF/sharding-databases-range.yaml | 2 +-
.../src/main/resources/META-INF/application-sharding-databases.xml | 2 +-
.../src/main/resources/conf/config-readwrite-splitting.yaml | 2 +-
.../src/main/resources/conf/config-sharding.yaml | 2 +-
.../src/main/resources/server/config-schema.yaml | 4 ++--
.../src/main/resources/conf/config-databases-only.yaml | 2 +-
.../src/main/resources/conf/config-databases-tables.yaml | 2 +-
.../src/main/resources/conf/config-sql-hint-data-source.yaml | 2 +-
.../src/main/resources/conf/config-write-only.yaml | 2 +-
.../src/test/resources/config/config-encrypt-query-with-cipher.yaml | 2 +-
.../src/test/resources/config/config-encrypt-query-with-plain.yaml | 2 +-
.../src/test/resources/config/config-readwrite-splitting.yaml | 2 +-
.../src/test/resources/config/config-shadow.yaml | 2 +-
.../src/test/resources/config/config-sharding.yaml | 2 +-
.../src/test/resources/config/driver/bar-driver-fixture.yaml | 2 +-
.../src/test/resources/config/driver/foo-driver-fixture.yaml | 2 +-
.../src/test/resources/application.properties | 2 +-
.../src/test/resources/conf/local/config-db.yaml | 2 +-
.../src/test/resources/docker/proxy/conf/config-db.yaml | 2 +-
.../src/test/resources/docker/proxy/conf/config-db.yaml | 2 +-
.../yaml/integrate/sharding/configWithDataSourceWithProps.yaml | 2 +-
.../test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml | 2 +-
.../resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml | 2 +-
.../proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml | 2 +-
.../conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml | 2 +-
.../mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml | 2 +-
.../config-dbtbl-with-readwrite-splitting-and-encrypt.yaml | 2 +-
.../scenario/empty_rules/proxy/conf/mysql/config-empty-rules.yaml | 2 +-
.../empty_rules/proxy/conf/postgresql/config-empty-rules.yaml | 2 +-
.../env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml | 2 +-
.../env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml | 2 +-
.../proxy/conf/mysql/config-readwrite-splitting.yaml | 2 +-
.../proxy/conf/postgresql/config-readwrite-splitting.yaml | 2 +-
.../env/scenario/shadow/proxy/conf/mysql/config-shadow.yaml | 2 +-
.../env/scenario/shadow/proxy/conf/postgresql/config-shadow.yaml | 2 +-
.../resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml | 2 +-
.../env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml | 2 +-
52 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/docs/document/content/reference/api-change-history/shardingsphere-jdbc/spring-namespace-configuration.cn.md b/docs/document/content/reference/api-change-history/shardingsphere-jdbc/spring-namespace-configuration.cn.md
index b978d20475c..9b2b800c7c2 100644
--- a/docs/document/content/reference/api-change-history/shardingsphere-jdbc/spring-namespace-configuration.cn.md
+++ b/docs/document/content/reference/api-change-history/shardingsphere-jdbc/spring-namespace-configuration.cn.md
@@ -244,7 +244,7 @@ weight = 3
| *名称* | *类型* | *说明* |
| ----------------- | ------ | ------------------------------------------------------------------------- |
| id | 属性 | 注册中心实例名称 |
-| schema-name (?) | 属性 | JDBC 数据源别名，该参数可实现 JDBC 与 PROXY 共享配置 |
+| database-name (?) | 属性 | JDBC 数据源别名，该参数可实现 JDBC 与 PROXY 共享配置 |
| type | 属性 | 注册中心类型。如：ZooKeeper, etcd |
| namespace | 属性 | 注册中心命名空间 |
| server-lists | 属性 | 注册中心服务列表。包括 IP 地址和端口号。多个地址用逗号分隔。如: host1:2181,host2:2181 |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/_index.cn.md
index f3b9ea18266..2b392304189 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/_index.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/_index.cn.md
@@ -31,7 +31,7 @@ ShardingSphere-JDBC 提供官方的 Spring 命名空间，使开发者可以非
| *名称* | *类型* | *说明* |
| ----------------- | ----- | --------------------------------------------------------------------------------- |
| id | 属性 | Spring Bean Id |
-| schema-name (?) | 属性 | JDBC 数据源别名 |
+| database-name (?) | 属性 | JDBC 数据源别名 |
| data-source-names | 标签 | 数据源名称，多个数据源以逗号分隔 |
| rule-refs | 标签 | 规则名称，多个规则以逗号分隔 |
| mode (?) | 标签 | 运行模式配置 |
@@ -48,7 +48,7 @@ ShardingSphere-JDBC 提供官方的 Spring 命名空间，使开发者可以非
http://shardingsphere.apache.org/schema/shardingsphere/datasource
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
">
- <shardingsphere:data-source id="ds" schema-name="foo_schema" data-source-names="..." rule-refs="...">
+ <shardingsphere:data-source id="ds" database-name="foo_schema" data-source-names="..." rule-refs="...">
<shardingsphere:mode type="..." />
<props>
<prop key="xxx.xxx">${xxx.xxx}</prop>
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/_index.en.md
index 27ba16a6533..3d6444573d6 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/_index.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/_index.en.md
@@ -31,7 +31,7 @@ Namespace: [http://shardingsphere.apache.org/schema/shardingsphere/datasource/da
| *Name* | *Type* | *Description* |
| ----------------- | --------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
| id | Attribute | Spring Bean Id |
-| schema-name (?) | Attribute | JDBC data source alias |
+| database-name (?) | Attribute | JDBC data source alias |
| data-source-names | Attribute | Data source name, multiple data source names are separated by commas |
| rule-refs | Attribute | Rule name, multiple rule names are separated by commas |
| mode (?) | Tag | Mode configuration |
@@ -48,7 +48,7 @@ Namespace: [http://shardingsphere.apache.org/schema/shardingsphere/datasource/da
http://shardingsphere.apache.org/schema/shardingsphere/datasource
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
">
- <shardingsphere:data-source id="ds" schema-name="foo_schema" data-source-names="..." rule-refs="...">
+ <shardingsphere:data-source id="ds" database-name="foo_schema" data-source-names="..." rule-refs="...">
<shardingsphere:mode type="..." />
<props>
<prop key="xxx.xxx">${xxx.xxx}</prop>
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/data-source.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/data-source.cn.md
index b832a37ae6f..2a33d8789f5 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/data-source.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/data-source.cn.md
@@ -33,6 +33,6 @@ chapter = true
<property name="password" value="" />
</bean>
- <shardingsphere:data-source id="ds" schema-name="foo_schema" data-source-names="ds1,ds2" rule-refs="..." />
+ <shardingsphere:data-source id="ds" database-name="foo_schema" data-source-names="ds1,ds2" rule-refs="..." />
</beans>
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/data-source.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/data-source.en.md
index 9adac290031..fa69d9357fd 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/data-source.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/data-source.en.md
@@ -33,6 +33,6 @@ In this example, the database driver is MySQL, and connection pool is HikariCP,
<property name="password" value="" />
</bean>
- <shardingsphere:data-source id="ds" schema-name="foo_schema" data-source-names="ds1,ds2" rule-refs="..." />
+ <shardingsphere:data-source id="ds" database-name="foo_schema" data-source-names="ds1,ds2" rule-refs="..." />
</beans>
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.cn.md
index a4825fc7663..08845a99509 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.cn.md
@@ -31,7 +31,7 @@ weight = 1
http://shardingsphere.apache.org/schema/shardingsphere/datasource
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd">
- <shardingsphere:data-source id="ds" schema-name="foo_schema" data-source-names="..." rule-refs="..." />
+ <shardingsphere:data-source id="ds" database-name="foo_schema" data-source-names="..." rule-refs="..." />
</beans>
```
@@ -69,7 +69,7 @@ weight = 1
</props>
</standalone:repository>
- <shardingsphere:data-source id="ds" schema-name="foo_schema" data-source-names="..." rule-refs="..." >
+ <shardingsphere:data-source id="ds" database-name="foo_schema" data-source-names="..." rule-refs="..." >
<shardingsphere:mode type="Standalone" repository-ref="standaloneRepository" overwrite="true" />
</shardingsphere:data-source>
</beans>
@@ -112,7 +112,7 @@ weight = 1
</props>
</cluster:repository>
- <shardingsphere:data-source id="ds" schema-name="foo_schema" data-source-names="..." rule-refs="...">
+ <shardingsphere:data-source id="ds" database-name="foo_schema" data-source-names="..." rule-refs="...">
<shardingsphere:mode type="Cluster" repository-ref="clusterRepository" overwrite="true" />
</shardingsphere:data-source>
</beans>
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.en.md
index 46fe3e82724..b081c9ef8f4 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.en.md
@@ -31,7 +31,7 @@ It is the default value.
http://shardingsphere.apache.org/schema/shardingsphere/datasource
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd">
- <shardingsphere:data-source id="ds" schema-name="foo_schema" data-source-names="..." rule-refs="..." />
+ <shardingsphere:data-source id="ds" database-name="foo_schema" data-source-names="..." rule-refs="..." />
</beans>
```
@@ -69,7 +69,7 @@ Namespace: [http://shardingsphere.apache.org/schema/shardingsphere/mode-reposito
</props>
</standalone:repository>
- <shardingsphere:data-source id="ds" schema-name="foo_schema" data-source-names="..." rule-refs="..." >
+ <shardingsphere:data-source id="ds" database-name="foo_schema" data-source-names="..." rule-refs="..." >
<shardingsphere:mode type="Standalone" repository-ref="standaloneRepository" overwrite="true" />
</shardingsphere:data-source>
</beans>
@@ -112,7 +112,7 @@ Namespace: [http://shardingsphere.apache.org/schema/shardingsphere/mode-reposito
</props>
</cluster:repository>
- <shardingsphere:data-source id="ds" schema-name="foo_schema" data-source-names="..." rule-refs="...">
+ <shardingsphere:data-source id="ds" database-name="foo_schema" data-source-names="..." rule-refs="...">
<shardingsphere:mode type="Cluster" repository-ref="clusterRepository" overwrite="true" />
</shardingsphere:data-source>
</beans>
diff --git a/examples/docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml b/examples/docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml
index b6e53aea8a7..fcdc3e48287 100644
--- a/examples/docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml
+++ b/examples/docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml
@@ -22,7 +22,7 @@
#
######################################################################################################
-schemaName: sharding_db
+databaseName: sharding_db
dataSources:
ds_0:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
index 88f2dfb8618..832e5a7460d 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: sharding-databases-tables
+databaseName: sharding-databases-tables
mode:
type: Cluster
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
index ee1fc2d890d..cf0733ab6d5 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: sharding-databases-tables
+databaseName: sharding-databases-tables
mode:
type: Cluster
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
index 608bf27c958..587d5039550 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-spring.shardingsphere.schema.name=sharding-databases-tables
+spring.shardingsphere.database.name=sharding-databases-tables
spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
index 12670178883..ce53607e9d7 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-spring.shardingsphere.schema.name=sharding-databases-tables
+spring.shardingsphere.database.name=sharding-databases-tables
spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml
index 2fc5194a50a..ffd6cfe641e 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml
@@ -32,7 +32,7 @@
<import resource="classpath*:META-INF/zookeeper/registry-center.xml" />
<context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
- <shardingsphere:data-source id="shardingDatabasesTablesDataSource" schema-name="sharding-databases-tables">
+ <shardingsphere:data-source id="shardingDatabasesTablesDataSource" database-name="sharding-databases-tables">
<shardingsphere:mode type="Cluster" repository-ref="clusterRepository" />
</shardingsphere:data-source>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
index 47cffa05d33..317bbd87da3 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
@@ -90,7 +90,7 @@
</sharding:broadcast-table-rules>
</sharding:rule>
- <shardingsphere:data-source id="shardingDatabasesTablesDataSource" schema-name="sharding-databases-tables" data-source-names="demo_ds_0, demo_ds_1" rule-refs="shardingRule">
+ <shardingsphere:data-source id="shardingDatabasesTablesDataSource" database-name="sharding-databases-tables" data-source-names="demo_ds_0, demo_ds_1" rule-refs="shardingRule">
<shardingsphere:mode type="Cluster" repository-ref="clusterRepository" />
<props>
<prop key="sql-show">true</prop>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/m [...]
index 187e4ff7e43..b69dafe7698 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -77,7 +77,7 @@
</sharding:broadcast-table-rules>
</sharding:rule>
- <shardingsphere:data-source id="shardingDataSource" schema-name="sharding-databases" data-source-names="demo_ds_0, demo_ds_1" rule-refs="shardingRule" />
+ <shardingsphere:data-source id="shardingDataSource" database-name="sharding-databases" data-source-names="demo_ds_0, demo_ds_1" rule-refs="shardingRule" />
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="shardingDataSource" />
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml
index ffa415821c5..eb335b2529f 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: sharding-databases-range
+databaseName: sharding-databases-range
mode:
type: Memory
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
index 90a8537f58a..40d21030ab9 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -76,7 +76,7 @@
</sharding:broadcast-table-rules>
</sharding:rule>
- <shardingsphere:data-source id="shardingDataSource" schema-name="sharding-databases" data-source-names="demo_ds_0, demo_ds_1" rule-refs="shardingRule" />
+ <shardingsphere:data-source id="shardingDataSource" database-name="sharding-databases" data-source-names="demo_ds_0, demo_ds_1" rule-refs="shardingRule" />
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="shardingDataSource" />
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-readwrite-splitting.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-readwrite-splitting.yaml
index cac1e98fc87..604f0ce3f29 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-readwrite-splitting.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-readwrite-splitting.yaml
@@ -22,7 +22,7 @@
#
######################################################################################################
-schemaName: readwrite-splitting_db
+databaseName: readwrite-splitting_db
dataSources:
write_ds:
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-sharding.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-sharding.yaml
index 3446686887e..cd07e4f30fc 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-sharding.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-sharding.yaml
@@ -22,7 +22,7 @@
#
######################################################################################################
-schemaName: sharding_db
+databaseName: sharding_db
dataSources:
ds_0:
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/config-schema.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/config-schema.yaml
index 9cba58640ce..566f650cde3 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/config-schema.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/config-schema.yaml
@@ -22,7 +22,7 @@
#
######################################################################################################
#
-#schemaName: example_db
+#databaseName: example_db
#
#dataSources:
# ds_0:
@@ -52,7 +52,7 @@
#
######################################################################################################
-schemaName: example_db
+databaseName: example_db
dataSources:
ds_0:
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-only.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-only.yaml
index d5ae9948be0..04916ce7ded 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-only.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-only.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: databases_only
+databaseName: databases_only
dataSources:
ds_0:
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-tables.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-tables.yaml
index d27611dbbf7..a5f65e16af3 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-tables.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-tables.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: databases_tables
+databaseName: databases_tables
dataSources:
ds_0:
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-sql-hint-data-source.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-sql-hint-data-source.yaml
index da46f3dfb43..dbeeeb09325 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-sql-hint-data-source.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-sql-hint-data-source.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: sql_hint
+databaseName: sql_hint
dataSources:
ds_0:
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-write-only.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-write-only.yaml
index dd4fdc7b72e..79b385f78da 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-write-only.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-write-only.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: write_only
+databaseName: write_only
dataSources:
write_ds:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-encrypt-query-with-cipher.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-encrypt-query-with-cipher.yaml
index a9dc1483b3e..11d5aa064f6 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-encrypt-query-with-cipher.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-encrypt-query-with-cipher.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: logic_db
+databaseName: logic_db
rules:
- !ENCRYPT
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-encrypt-query-with-plain.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-encrypt-query-with-plain.yaml
index 689a8e38934..a607ee84932 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-encrypt-query-with-plain.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-encrypt-query-with-plain.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: logic_db
+databaseName: logic_db
rules:
- !ENCRYPT
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-readwrite-splitting.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-readwrite-splitting.yaml
index 688e03e5416..01479c64596 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-readwrite-splitting.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-readwrite-splitting.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: logic_db
+databaseName: logic_db
rules:
- !READWRITE_SPLITTING
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-shadow.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-shadow.yaml
index 5ee75b95128..fd24268e246 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-shadow.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-shadow.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: logic_db
+databaseName: logic_db
props:
sql-show: true
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-sharding.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-sharding.yaml
index a6c293f73a0..ae8fa4d3642 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-sharding.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-sharding.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: logic_db
+databaseName: logic_db
rules:
- !SHARDING
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/driver/bar-driver-fixture.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/driver/bar-driver-fixture.yaml
index c98845eeb05..12c95b42e55 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/driver/bar-driver-fixture.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/driver/bar-driver-fixture.yaml
@@ -15,4 +15,4 @@
# limitations under the License.
#
-schemaName: bar_driver_fixture_db
+databaseName: bar_driver_fixture_db
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/driver/foo-driver-fixture.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/driver/foo-driver-fixture.yaml
index 862f18955e7..51c73d240b1 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/driver/foo-driver-fixture.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/driver/foo-driver-fixture.yaml
@@ -15,4 +15,4 @@
# limitations under the License.
#
-schemaName: foo_driver_fixture_db
+databaseName: foo_driver_fixture_db
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application.properties b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application.properties
index 20f4992a887..846fb8e541a 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application.properties
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-spring.shardingsphere.schema.name=foo_db
+spring.shardingsphere.database.name=foo_db
spring.shardingsphere.datasource.names=ds${0..1}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/config-db.yaml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/config-db.yaml
index 1984eaea015..d341e560770 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/config-db.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/config-db.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: db
+databaseName: db
dataSources:
ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/resources/docker/proxy/conf/config-db.yaml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/resources/docker/proxy/conf/config-db.yaml
index 80ee2bd1d78..06dbc913321 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/resources/docker/proxy/conf/config-db.yaml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/resources/docker/proxy/conf/config-db.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: agent-metrics-db
+databaseName: agent-metrics-db
dataSources:
ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/docker/proxy/conf/config-db.yaml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/docker/proxy/conf/config-db.yaml
index 23d5eecda73..e0146264b7c 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/docker/proxy/conf/config-db.yaml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/docker/proxy/conf/config-db.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: agent-tracing-opentelemetry-db
+databaseName: agent-tracing-opentelemetry-db
dataSources:
ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
index 93f5a2f59bc..6537f398811 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: logic_db
+databaseName: logic_db
dataSources:
db0:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml
index 7840063d0e4..fd1f52ebb25 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: db
+databaseName: db
dataSources:
ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml
index 1f577ba884a..984c22724c3 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: db
+databaseName: db
dataSources:
ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml
index 48bb5120ae2..781a7bdf1f0 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: dbtbl_with_readwrite_splitting
+databaseName: dbtbl_with_readwrite_splitting
dataSources:
write_ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml
index 6e67815fed8..72e59dcf471 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: dbtbl_with_readwrite_splitting
+databaseName: dbtbl_with_readwrite_splitting
dataSources:
write_ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
index e89a0e30582..89f982e914b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: dbtbl_with_readwrite_splitting_and_encrypt
+databaseName: dbtbl_with_readwrite_splitting_and_encrypt
dataSources:
encrypt_write_ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
index 77a8682c7fb..25e14f52c05 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: dbtbl_with_readwrite_splitting_and_encrypt
+databaseName: dbtbl_with_readwrite_splitting_and_encrypt
dataSources:
encrypt_write_ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/config-empty-rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/config-empty-rules.yaml
index c61e63bdaee..9351e5b368c 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/config-empty-rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/config-empty-rules.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: empty_rules
+databaseName: empty_rules
dataSources:
encrypt_write_ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/config-empty-rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/config-empty-rules.yaml
index 375fe449f6f..f61cd912d15 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/config-empty-rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/config-empty-rules.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: empty_rules
+databaseName: empty_rules
dataSources:
encrypt_write_ds_0:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
index e7926a3573f..e5b576c9c0d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: encrypt
+databaseName: encrypt
dataSources:
encrypt:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml
index d8b06c713fe..c18f1cd5d86 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: encrypt
+databaseName: encrypt
dataSources:
encrypt:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/readwrite_splitting/proxy/conf/mysql/config-readwrite-splitting.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/readwrite_splitting/proxy/conf/mysql/config-readwrite-splitting.yaml
index db4b18fa363..fe86cc8dde4 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/readwrite_splitting/proxy/conf/mysql/config-readwrite-splitting.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/readwrite_splitting/proxy/conf/mysql/config-readwrite-splitting.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: readwrite_splitting
+databaseName: readwrite_splitting
dataSources:
write_ds:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/readwrite_splitting/proxy/conf/postgresql/config-readwrite-splitting.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/readwrite_splitting/proxy/conf/postgresql/config-readwrite-splitting.yaml
index 661e05ff04e..65c59c3767a 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/readwrite_splitting/proxy/conf/postgresql/config-readwrite-splitting.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/readwrite_splitting/proxy/conf/postgresql/config-readwrite-splitting.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: readwrite_splitting
+databaseName: readwrite_splitting
dataSources:
write_ds:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/shadow/proxy/conf/mysql/config-shadow.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/shadow/proxy/conf/mysql/config-shadow.yaml
index d21789548dc..4f707c3fe99 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/shadow/proxy/conf/mysql/config-shadow.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/shadow/proxy/conf/mysql/config-shadow.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: shadow
+databaseName: shadow
dataSources:
db:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/shadow/proxy/conf/postgresql/config-shadow.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/shadow/proxy/conf/postgresql/config-shadow.yaml
index 5a82cbcdc4a..71aabce405d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/shadow/proxy/conf/postgresql/config-shadow.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/shadow/proxy/conf/postgresql/config-shadow.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: shadow
+databaseName: shadow
dataSources:
db:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml
index ae9915a03d8..81265d2ef91 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: tbl
+databaseName: tbl
dataSources:
tbl:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml
index a4af5378d24..acb798276bc 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-schemaName: tbl
+databaseName: tbl
dataSources:
tbl: