Fix #173 t_user table for jpa example could not created successful.

* fix "org.hibernate.tool.hbm2ddl.SchemaExport : Cannot find table rule and default data source with logic table: 't_user'" * config default datasource name * config default datasource name * config default datasource name * config default datasource name
apache · Sep 17, 2019 · 08e2f75 · 08e2f75
1 parent 9c01b96
commit 08e2f75
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 4 deletions.
diff --git a/...ot-example/src/main/resources/application-local-etcd-sharding-databases-tables.properties b/...ot-example/src/main/resources/application-local-etcd-sharding-databases-tables.properties
@@ -17,6 +17,7 @@ spring.shardingsphere.datasource.ds_1.max-active=16
 spring.shardingsphere.sharding.default-database-strategy.inline.sharding-column=user_id
 spring.shardingsphere.sharding.default-database-strategy.inline.algorithm-expression=ds_$->{user_id % 2}
 spring.shardingsphere.sharding.binding-tables=t_order,t_order_item
+spring.shardingsphere.sharding.default-datasource-name=ds_0
 spring.shardingsphere.sharding.broadcast-tables=t_address
 
 spring.shardingsphere.sharding.tables.t_order.actual-data-nodes=ds_$->{0..1}.t_order_$->{0..1}

diff --git a/...ample/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties b/...ample/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
@@ -18,6 +18,7 @@ spring.shardingsphere.sharding.default-database-strategy.inline.sharding-column=
 spring.shardingsphere.sharding.default-database-strategy.inline.algorithm-expression=ds_$->{user_id % 2}
 
 spring.shardingsphere.sharding.binding-tables=t_order,t_order_item
+spring.shardingsphere.sharding.default-datasource-name=ds_0
 spring.shardingsphere.sharding.broadcast-tables=t_address
 
 spring.shardingsphere.sharding.tables.t_order.actual-data-nodes=ds_$->{0..1}.t_order_$->{0..1}
@@ -26,12 +27,13 @@ spring.shardingsphere.sharding.tables.t_order.table-strategy.inline.algorithm-ex
 spring.shardingsphere.sharding.tables.t_order.key-generator.column=order_id
 spring.shardingsphere.sharding.tables.t_order.key-generator.type=SNOWFLAKE
 spring.shardingsphere.sharding.tables.t_order.key-generator.props.worker.id=123
+
 spring.shardingsphere.sharding.tables.t_order_item.actual-data-nodes=ds_$->{0..1}.t_order_item_$->{0..1}
 spring.shardingsphere.sharding.tables.t_order_item.table-strategy.inline.sharding-column=order_id
 spring.shardingsphere.sharding.tables.t_order_item.table-strategy.inline.algorithm-expression=t_order_item_$->{order_id % 2}
 spring.shardingsphere.sharding.tables.t_order_item.key-generator.column=order_item_id
 spring.shardingsphere.sharding.tables.t_order_item.key-generator.type=SNOWFLAKE
-
+spring.shardingsphere.sharding.tables.t_order_item.key-generator.props.worker.id=123
 
 spring.shardingsphere.orchestration.name=demo_spring_boot_ds_sharding
 spring.shardingsphere.orchestration.overwrite=true

diff --git a/...ring-boot-jpa-example/src/main/resources/application-sharding-databases-tables.properties b/...ring-boot-jpa-example/src/main/resources/application-sharding-databases-tables.properties
@@ -18,6 +18,7 @@ spring.shardingsphere.sharding.default-database-strategy.inline.sharding-column=
 spring.shardingsphere.sharding.default-database-strategy.inline.algorithm-expression=ds_$->{user_id % 2}
 spring.shardingsphere.sharding.binding-tables=t_order,t_order_item
 spring.shardingsphere.sharding.broadcast-tables=t_address
+spring.shardingsphere.sharding.default-data-source-name=ds_0
 
 spring.shardingsphere.sharding.tables.t_order.actual-data-nodes=ds_$->{0..1}.t_order_$->{0..1}
 spring.shardingsphere.sharding.tables.t_order.table-strategy.inline.sharding-column=order_id

diff --git a/...ding-spring-boot-jpa-example/src/main/resources/application-sharding-databases.properties b/...ding-spring-boot-jpa-example/src/main/resources/application-sharding-databases.properties
@@ -16,6 +16,7 @@ spring.shardingsphere.sharding.default-database-strategy.inline.sharding-column=
 spring.shardingsphere.sharding.default-database-strategy.inline.algorithm-expression=ds_$->{user_id % 2}
 spring.shardingsphere.sharding.binding-tables=t_order,t_order_item
 spring.shardingsphere.sharding.broadcast-tables=t_address
+spring.shardingsphere.sharding.default-data-source-name=ds_0
 
 spring.shardingsphere.sharding.tables.t_order.actual-data-nodes=ds_$->{0..1}.t_order
 spring.shardingsphere.sharding.tables.t_order.key-generator.column=order_id

diff --git a/...g-spring-boot-jpa-example/src/main/resources/application-sharding-master-slave.properties b/...g-spring-boot-jpa-example/src/main/resources/application-sharding-master-slave.properties
@@ -46,6 +46,7 @@ spring.shardingsphere.sharding.default-database-strategy.inline.sharding-column=
 spring.shardingsphere.sharding.default-database-strategy.inline.algorithm-expression=ds_$->{user_id % 2}
 spring.shardingsphere.sharding.binding-tables=t_order,t_order_item
 spring.shardingsphere.sharding.broadcast-tables=t_address
+spring.shardingsphere.sharding.default-data-source-name=ds_master_0
 
 spring.shardingsphere.sharding.tables.t_order.actual-data-nodes=ds_$->{0..1}.t_order_$->{0..1}
 spring.shardingsphere.sharding.tables.t_order.table-strategy.inline.sharding-column=order_id

diff --git a/...mespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml b/...mespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
@@ -62,7 +62,7 @@
     <sharding:key-generator id="itemKeyGenerator" type="SNOWFLAKE" column="order_item_id" props-ref="properties" />
 
     <sharding:data-source id="shardingDataSource">
-        <sharding:sharding-rule data-source-names="demo_ds_0, demo_ds_1">
+        <sharding:sharding-rule data-source-names="demo_ds_0, demo_ds_1" default-data-source-name="demo_ds_0">
             <sharding:table-rules>
                 <sharding:table-rule logic-table="t_order" actual-data-nodes="demo_ds_${0..1}.t_order_${0..1}" database-strategy-ref="databaseStrategy" table-strategy-ref="orderTableStrategy" key-generator-ref="orderKeyGenerator" />
                 <sharding:table-rule logic-table="t_order_item" actual-data-nodes="demo_ds_${0..1}.t_order_item_${0..1}" database-strategy-ref="databaseStrategy" table-strategy-ref="orderItemTableStrategy" key-generator-ref="itemKeyGenerator" />

diff --git a/...ring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml b/...ring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -58,7 +58,7 @@
     <sharding:key-generator id="itemKeyGenerator" type="SNOWFLAKE" column="order_item_id" props-ref="properties" />
 
     <sharding:data-source id="shardingDataSource">
-        <sharding:sharding-rule data-source-names="demo_ds_0, demo_ds_1">
+        <sharding:sharding-rule data-source-names="demo_ds_0, demo_ds_1" default-data-source-name="demo_ds_0">
             <sharding:table-rules>
                 <sharding:table-rule logic-table="t_order" database-strategy-ref="databaseStrategy" key-generator-ref="orderKeyGenerator" />
                 <sharding:table-rule logic-table="t_order_item" database-strategy-ref="databaseStrategy" key-generator-ref="itemKeyGenerator" />

diff --git a/...g-namespace-jpa-example/src/main/resources/META-INF/application-sharding-master-slave.xml b/...g-namespace-jpa-example/src/main/resources/META-INF/application-sharding-master-slave.xml
@@ -98,7 +98,7 @@
     <sharding:key-generator id="itemKeyGenerator" type="SNOWFLAKE" column="order_item_id" props-ref="properties" />
 
     <sharding:data-source id="shardingDataSource">
-        <sharding:sharding-rule data-source-names="demo_ds_master_0,demo_ds_master_1,demo_ds_master_0_slave_0, demo_ds_master_0_slave_1,demo_ds_master_1_slave_0, demo_ds_master_1_slave_1">
+        <sharding:sharding-rule data-source-names="demo_ds_master_0,demo_ds_master_1,demo_ds_master_0_slave_0, demo_ds_master_0_slave_1,demo_ds_master_1_slave_0, demo_ds_master_1_slave_1" default-data-source-name="demo_ds_master_0">
             <sharding:master-slave-rules>
                 <sharding:master-slave-rule id="demo_ds_ms_0" master-data-source-name="demo_ds_master_0" slave-data-source-names="demo_ds_master_0_slave_0, demo_ds_master_0_slave_1" strategy-ref="randomStrategy" />
                 <sharding:master-slave-rule id="demo_ds_ms_1" master-data-source-name="demo_ds_master_1" slave-data-source-names="demo_ds_master_1_slave_0, demo_ds_master_1_slave_1" strategy-ref="randomStrategy" />