Skip to content

Commit

Permalink
Merge pull request #1337 from haocao/dev
Browse files Browse the repository at this point in the history 
for sharding-sphere#1316, update insert_on_duplicate_key_update test cases
  • Loading branch information
@terrymanu
terrymanu authored Oct 13, 2018
2 parents 53485b5 + 9faa1eb commit 1b01f42
Show file tree
Hide file tree
Showing 9 changed files with 699 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ...rding-jdbc-core/src/test/java/io/shardingsphere/dbtest/env/datasource/DataSourceUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private static DataSource createDBCP(final DatabaseType databaseType, final Stri
result.setUrl(null == dataSourceName ? databaseEnvironment.getURL() : databaseEnvironment.getURL(dataSourceName));
result.setUsername(databaseEnvironment.getUsername());
result.setPassword(databaseEnvironment.getPassword());
result.setMaxTotal(50);
result.setMaxTotal(5);
result.setValidationQuery("SELECT 1");
if (DatabaseType.Oracle == databaseType) {
result.setConnectionInitSqls(Collections.singleton("ALTER SESSION SET CURRENT_SCHEMA = " + dataSourceName));
Expand All @@ -93,7 +93,7 @@ private static DataSource createHikariCP(final DatabaseType databaseType, final
result.setJdbcUrl(null == dataSourceName ? databaseEnvironment.getURL() : databaseEnvironment.getURL(dataSourceName));
result.setUsername(databaseEnvironment.getUsername());
result.setPassword(databaseEnvironment.getPassword());
result.setMaximumPoolSize(50);
result.setMaximumPoolSize(5);
result.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
result.setConnectionTestQuery("SELECT 1");
if (DatabaseType.Oracle == databaseType) {
Expand Down
49 changes: 49 additions & 0 deletions ...rc/test/resources/integrate/cases/dml/dataset/db/insert_multiple_values_for_order_1_2.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<dataset update-count="2">
<metadata data-nodes="db_${0..9}.t_order">
<column name="order_id" type="numeric" />
<column name="user_id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
<row data-node="db_0.t_order" values="1000, 10, init" />
<row data-node="db_0.t_order" values="1001, 10, init" />
<row data-node="db_0.t_order" values="2000, 20, init" />
<row data-node="db_0.t_order" values="2001, 20, init" />
<row data-node="db_1.t_order" values="1, 1, insert" />
<row data-node="db_1.t_order" values="1100, 11, init" />
<row data-node="db_1.t_order" values="1101, 11, init" />
<row data-node="db_1.t_order" values="2100, 21, init" />
<row data-node="db_1.t_order" values="2101, 21, init" />
<row data-node="db_2.t_order" values="2, 2, insert2" />
<row data-node="db_2.t_order" values="1200, 12, init" />
<row data-node="db_2.t_order" values="1201, 12, init" />
<row data-node="db_2.t_order" values="2200, 22, init" />
<row data-node="db_2.t_order" values="2201, 22, init" />
<row data-node="db_3.t_order" values="1300, 13, init" />
<row data-node="db_3.t_order" values="1301, 13, init" />
<row data-node="db_3.t_order" values="2300, 23, init" />
<row data-node="db_3.t_order" values="2301, 23, init" />
<row data-node="db_4.t_order" values="1400, 14, init" />
<row data-node="db_4.t_order" values="1401, 14, init" />
<row data-node="db_4.t_order" values="2400, 24, init" />
<row data-node="db_4.t_order" values="2401, 24, init" />
<row data-node="db_5.t_order" values="1500, 15, init" />
<row data-node="db_5.t_order" values="1501, 15, init" />
<row data-node="db_5.t_order" values="2500, 25, init" />
<row data-node="db_5.t_order" values="2501, 25, init" />
<row data-node="db_6.t_order" values="1600, 16, init" />
<row data-node="db_6.t_order" values="1601, 16, init" />
<row data-node="db_6.t_order" values="2600, 26, init" />
<row data-node="db_6.t_order" values="2601, 26, init" />
<row data-node="db_7.t_order" values="1700, 17, init" />
<row data-node="db_7.t_order" values="1701, 17, init" />
<row data-node="db_7.t_order" values="2700, 27, init" />
<row data-node="db_7.t_order" values="2701, 27, init" />
<row data-node="db_8.t_order" values="1800, 18, init" />
<row data-node="db_8.t_order" values="1801, 18, init" />
<row data-node="db_8.t_order" values="2800, 28, init" />
<row data-node="db_8.t_order" values="2801, 28, init" />
<row data-node="db_9.t_order" values="1900, 19, init" />
<row data-node="db_9.t_order" values="1901, 19, init" />
<row data-node="db_9.t_order" values="2900, 29, init" />
<row data-node="db_9.t_order" values="2901, 29, init" />
</dataset>
47 changes: 47 additions & 0 deletions ...core/src/test/resources/integrate/cases/dml/dataset/db/insert_on_duplicate_key_update.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<dataset update-count="2">
<metadata data-nodes="db_${0..9}.t_order">
<column name="order_id" type="numeric" />
<column name="user_id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
<row data-node="db_0.t_order" values="1000, 10, update" />
<row data-node="db_0.t_order" values="1001, 10, init" />
<row data-node="db_0.t_order" values="2000, 20, init" />
<row data-node="db_0.t_order" values="2001, 20, init" />
<row data-node="db_1.t_order" values="1100, 11, init" />
<row data-node="db_1.t_order" values="1101, 11, init" />
<row data-node="db_1.t_order" values="2100, 21, init" />
<row data-node="db_1.t_order" values="2101, 21, init" />
<row data-node="db_2.t_order" values="1200, 12, init" />
<row data-node="db_2.t_order" values="1201, 12, init" />
<row data-node="db_2.t_order" values="2200, 22, init" />
<row data-node="db_2.t_order" values="2201, 22, init" />
<row data-node="db_3.t_order" values="1300, 13, init" />
<row data-node="db_3.t_order" values="1301, 13, init" />
<row data-node="db_3.t_order" values="2300, 23, init" />
<row data-node="db_3.t_order" values="2301, 23, init" />
<row data-node="db_4.t_order" values="1400, 14, init" />
<row data-node="db_4.t_order" values="1401, 14, init" />
<row data-node="db_4.t_order" values="2400, 24, init" />
<row data-node="db_4.t_order" values="2401, 24, init" />
<row data-node="db_5.t_order" values="1500, 15, init" />
<row data-node="db_5.t_order" values="1501, 15, init" />
<row data-node="db_5.t_order" values="2500, 25, init" />
<row data-node="db_5.t_order" values="2501, 25, init" />
<row data-node="db_6.t_order" values="1600, 16, init" />
<row data-node="db_6.t_order" values="1601, 16, init" />
<row data-node="db_6.t_order" values="2600, 26, init" />
<row data-node="db_6.t_order" values="2601, 26, init" />
<row data-node="db_7.t_order" values="1700, 17, init" />
<row data-node="db_7.t_order" values="1701, 17, init" />
<row data-node="db_7.t_order" values="2700, 27, init" />
<row data-node="db_7.t_order" values="2701, 27, init" />
<row data-node="db_8.t_order" values="1800, 18, init" />
<row data-node="db_8.t_order" values="1801, 18, init" />
<row data-node="db_8.t_order" values="2800, 28, init" />
<row data-node="db_8.t_order" values="2801, 28, init" />
<row data-node="db_9.t_order" values="1900, 19, init" />
<row data-node="db_9.t_order" values="1901, 19, init" />
<row data-node="db_9.t_order" values="2900, 29, init" />
<row data-node="db_9.t_order" values="2901, 29, init" />
</dataset>
Loading

0 comments on commit 1b01f42

Please sign in to comment.