Refactor integrate sqlserver test cases.

apache · Aug 14, 2017 · b865778 · b865778
1 parent ddb2e77
commit b865778
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 17 deletions.
diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/env/DatabaseTestMode.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/env/DatabaseTestMode.java
@@ -34,6 +34,7 @@ public List<DatabaseType> databaseTypes() {
         } else if (LOCAL == this) {
             result.add(DatabaseType.MySQL);
             result.add(DatabaseType.PostgreSQL);
+            result.add(DatabaseType.SQLServer);
             result.add(DatabaseType.H2);
         } else if (TEST == this) {
             result.add(DatabaseType.H2);

diff --git a/...ources/integrate/dataset/db/expect/select/oracle/SelectPagingWithOffsetAndRowCountSql.xml b/...ources/integrate/dataset/db/expect/select/oracle/SelectPagingWithOffsetAndRowCountSql.xml
@@ -0,0 +1,4 @@
+<dataset>
+    <t_order_item order_by_derived_0="190801" order_id="1908" rownum_="1" user_id="19" status="init_slave" />
+    <t_order_item order_by_derived_0="190800" order_id="1908" rownum_="2" user_id="19" status="init_slave" />
+</dataset>
diff --git a/.../test/resources/integrate/dataset/db/expect/select/oracle/SelectPagingWithRowCountSql.xml b/.../test/resources/integrate/dataset/db/expect/select/oracle/SelectPagingWithRowCountSql.xml
@@ -0,0 +1,4 @@
+<dataset>
+    <t_order_item order_by_derived_0="190901" rownum_="1" order_id="1909" user_id="19" status="init_slave" />
+    <t_order_item order_by_derived_0="190900" rownum_="2" order_id="1909" user_id="19" status="init_slave" />
+</dataset>
diff --git a/...ces/integrate/dataset/db/expect/select/sqlserver/SelectPagingWithOffsetAndRowCountSql.xml b/...ces/integrate/dataset/db/expect/select/sqlserver/SelectPagingWithOffsetAndRowCountSql.xml
@@ -0,0 +1,4 @@
+<dataset>
+    <t_order_item item_id="190002" rownum_="3" order_id="1900" user_id="19" status="init" />
+    <t_order_item item_id="190001" rownum_="4" order_id="1900" user_id="19" status="init" />
+</dataset>
diff --git a/...st/resources/integrate/dataset/db/expect/select/sqlserver/SelectPagingWithRowCountSql.xml b/...st/resources/integrate/dataset/db/expect/select/sqlserver/SelectPagingWithRowCountSql.xml
@@ -0,0 +1,4 @@
+<dataset>
+    <t_order_item item_id="190102" rownum_="1" order_id="1901" user_id="19" status="init" />
+    <t_order_item item_id="190101" rownum_="2" order_id="1901" user_id="19" status="init" />
+</dataset>
diff --git a/...rces/integrate/dataset/dbtbl/expect/select/mysql/SelectPagingWithOffsetAndRowCountSql.xml b/...rces/integrate/dataset/dbtbl/expect/select/mysql/SelectPagingWithOffsetAndRowCountSql.xml
diff --git a/...est/resources/integrate/dataset/dbtbl/expect/select/mysql/SelectPagingWithRowCountSql.xml b/...est/resources/integrate/dataset/dbtbl/expect/select/mysql/SelectPagingWithRowCountSql.xml
diff --git a/...ntegrate/dataset/masterslave/expect/select/mysql/SelectPagingWithOffsetAndRowCountSql.xml b/...ntegrate/dataset/masterslave/expect/select/mysql/SelectPagingWithOffsetAndRowCountSql.xml
diff --git a/...sources/integrate/dataset/masterslave/expect/select/mysql/SelectPagingWithRowCountSql.xml b/...sources/integrate/dataset/masterslave/expect/select/mysql/SelectPagingWithRowCountSql.xml
diff --git a/...rate/dataset/masterslave/expect/select/sqlserver/SelectPagingWithOffsetAndRowCountSql.xml b/...rate/dataset/masterslave/expect/select/sqlserver/SelectPagingWithOffsetAndRowCountSql.xml
@@ -1,3 +1,4 @@
 <dataset>
-    <t_order_item item_id="190900" order_id="1909" rownum_="2" user_id="19" status="init_slave" />
+    <t_order_item item_id="190801" rownum_="1" order_id="1908" user_id="19" status="init_slave" />
+    <t_order_item item_id="190800" rownum_="2" order_id="1908" user_id="19" status="init_slave" />
 </dataset>