This is an automated email from the ASF dual-hosted git repository.
panjuan 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 b6d4348 add schema name for example (#11849)
b6d4348 is described below
commit b6d43480e6ddb573675d14227e7e063cc9651fb9
Author: zhaojinchao <[email protected]>
AuthorDate: Mon Aug 16 21:29:47 2021 +0800
add schema name for example (#11849)
---
.../governance/raw/jdbc/GovernanceRawYamlConfigurationExample.java | 1 -
.../resources/META-INF/zookeeper/local/sharding-databases-tables.yaml | 2 ++
.../application-local-zookeeper-sharding-databases-tables.properties | 2 ++
.../META-INF/zookeeper/local/application-sharding-databases-tables.xml | 2 +-
.../src/main/resources/META-INF/sharding-databases-range.yaml | 2 ++
.../src/main/resources/META-INF/application-sharding-databases.xml | 2 +-
6 files changed, 8 insertions(+), 3 deletions(-)
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/GovernanceRawYamlConfigurationExample.java
b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/GovernanceRawYamlConfigurationExample.java
index 5d970ec..d1a673b 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/GovernanceRawYamlConfigurationExample.java
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/GovernanceRawYamlConfigurationExample.java
@@ -46,7 +46,6 @@ public final class GovernanceRawYamlConfigurationExample {
// private static boolean loadConfigFromRegCenter = true;
private static RegistryCenterType registryCenterType =
RegistryCenterType.ZOOKEEPER;
-// private static RegistryCenterType registryCenterType =
RegistryCenterType.NACOS;
public static void main(final String[] args) throws Exception {
DataSource dataSource = getDataSource(registryCenterType,
loadConfigFromRegCenter, shardingType);
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
index fa1531f..7cb191d 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
@@ -15,6 +15,8 @@
# limitations under the License.
#
+schemaName: sharding-databases-tables
+
mode:
type: Cluster
repository:
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
index 6638621..87381eb 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
@@ -15,6 +15,8 @@
# limitations under the License.
#
+spring.shardingsphere.schema.name=sharding-databases-tables
+
spring.shardingsphere.datasource.names=ds-0,ds-1
spring.shardingsphere.datasource.ds-0.type=com.zaxxer.hikari.HikariDataSource
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
index 4851862..373fbba 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
@@ -95,7 +95,7 @@
</sharding:broadcast-table-rules>
</sharding:rule>
- <governance:data-source id="shardingDatabasesTablesDataSource"
data-source-names="demo_ds_0, demo_ds_1" reg-center-ref="regCenter"
rule-refs="shardingRule" />
+ <governance:data-source id="shardingDatabasesTablesDataSource"
schema-name="sharding-databases-tables" data-source-names="demo_ds_0,
demo_ds_1" reg-center-ref="regCenter" rule-refs="shardingRule" />
<bean id="transactionManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="shardingDatabasesTablesDataSource" />
diff --git
a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml
b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml
index 3abd42b..15f8ec0 100644
---
a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml
+++
b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-range.yaml
@@ -15,6 +15,8 @@
# limitations under the License.
#
+schemaName: sharding-databases-range
+
dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
diff --git
a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
index 5d4fbb3..ee5996b 100644
---
a/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
+++
b/examples/shardingsphere-jdbc-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -79,7 +79,7 @@
</sharding:broadcast-table-rules>
</sharding:rule>
- <shardingsphere:data-source id="shardingDataSource"
data-source-names="demo_ds_0, demo_ds_1" rule-refs="shardingRule" />
+ <shardingsphere:data-source id="shardingDataSource"
schema-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" />
