for #490

apache · Dec 14, 2017 · 97d1214 · 97d1214
1 parent a438b1b
commit 97d1214
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...set/sharding/tbl/expect/select/oracle/SelectSingleTablePagingWithOffsetAndRowCountSql.xml b/...set/sharding/tbl/expect/select/oracle/SelectSingleTablePagingWithOffsetAndRowCountSql.xml
@@ -1,4 +1,4 @@
 <dataset>
+    <t_order order_id="1108" rownum_="1" user_id="11" status="init" />
     <t_order order_id="1107" rownum_="1" user_id="11" status="init" />
-    <t_order order_id="1106" rownum_="2" user_id="11" status="init" />
 </dataset>
diff --git a/.../sharding/tbl/expect/select/sqlserver/SelectSingleTablePagingWithOffsetAndRowCountSql.xml b/.../sharding/tbl/expect/select/sqlserver/SelectSingleTablePagingWithOffsetAndRowCountSql.xml
@@ -1,4 +1,4 @@
 <dataset>
     <t_order ORDER_BY_DERIVED_0="1107" order_id="1107" rownum_="1" user_id="11" status="init" />
-    <t_order ORDER_BY_DERIVED_0="1106" order_id="1106" rownum_="2" user_id="11" status="init" />
+    <t_order ORDER_BY_DERIVED_0="1106" order_id="1106" rownum_="1" user_id="11" status="init" />
 </dataset>
diff --git a/sharding-jdbc-core/src/test/resources/parser/select_pagination.xml b/sharding-jdbc-core/src/test/resources/parser/select_pagination.xml
@@ -241,10 +241,10 @@
         <table-tokens>
             <table-token begin-position="62" original-literals="t_order" />
         </table-tokens>
-        <offset-token begin-position="139" offset="1" />
-        <row-count-token begin-position="110" row-count="4" />
+        <offset-token begin-position="140" offset="1" />
+        <row-count-token begin-position="111" row-count="4" />
         <order-by-columns>
-            <order-by-column name="user_id" order-by-type="DESC" />
+            <order-by-column name="order_id" order-by-type="DESC" />
         </order-by-columns>
         <limit offset="1" offset-index="1" row-count-index="0" row-count="4" />
     </assert>

diff --git a/sharding-jdbc-core/src/test/resources/sql/dql/select_pagination.xml b/sharding-jdbc-core/src/test/resources/sql/dql/select_pagination.xml
@@ -10,5 +10,5 @@
     <sql id="assertSelectPaginationWithTopAndRange" value="SELECT * FROM (SELECT TOP (%s) row_number() OVER (ORDER BY i.item_id DESC) AS rownum_, i.item_id, o.order_id as order_id, o.status as status, o.user_id as user_id FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id WHERE o.user_id IN (%s, %s) AND o.order_id BETWEEN %s AND %s) AS row_ WHERE row_.rownum_ &gt; %s" type="SQLServer" />
     <sql id="assertSelectSingleTablePaginationWithTopAndRange" value="SELECT * FROM (SELECT TOP (%s) row_number() OVER (ORDER BY o.order_id DESC) AS rownum_, o.order_id as order_id, o.status as status, o.user_id as user_id FROM t_order o) AS row_ WHERE row_.rownum_ &gt; %s" type="SQLServer" />
     <sql id="assertSelectPaginationWithRowNumberAndRange" value="SELECT * FROM (SELECT row_.*, rownum rownum_ FROM (SELECT order0_.order_id as order_id, order0_.status as status, order0_.user_id as user_id FROM t_order order0_ JOIN t_order_item i ON order0_.user_id = i.user_id AND order0_.order_id = i.order_id WHERE order0_.user_id IN (%s, %s) AND order0_.order_id BETWEEN %s AND %s ORDER BY i.item_id DESC) row_ WHERE rownum &lt;= %s) t WHERE t.rownum_ &gt; %s" type="Oracle" />
-    <sql id="assertSelectSingleTablePaginationWithRowNumberAndRange" value="SELECT * FROM (SELECT t.*, ROWNUM rownum_ FROM (SELECT * FROM t_order ORDER BY user_id DESC) t WHERE ROWNUM &lt; %s) row_ WHERE row_.rownum_ &gt; %s" type="Oracle" />
+    <sql id="assertSelectSingleTablePaginationWithRowNumberAndRange" value="SELECT * FROM (SELECT t.*, ROWNUM rownum_ FROM (SELECT * FROM t_order ORDER BY order_id DESC) t WHERE ROWNUM &lt; %s) row_ WHERE row_.rownum_ &gt; %s" type="Oracle" />
 </sqls>