Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.5.2-SNAPSHOT

sharding-jdbc-core/src/test/resources/sql/dql/select_order_by.xml

@@ -4,5 +4,5 @@
     <sql id="assertSelectWithOrderByForIndex" value="SELECT i.* FROM t_order o, t_order_item i WHERE o.order_id = i.order_id AND o.status = 'init' ORDER BY o.order_id DESC, 1" />
     <sql id="assertSelectWithOrderByForAlias" value="SELECT o.order_id as gen_order_id_ FROM t_order o ORDER BY o.order_id" />
     <sql id="assertSelectWithOrderByForNullsFirst" value="SELECT o.order_id as gen_order_id_ FROM t_order o ORDER BY o.order_id NULLS FIRST" type="Oracle" />
-    <sql id="assertSelectWithOrderByForNullsLast" value="SELECT o.order_id as gen_order_id_ FROM t_order o ORDER BY o.order_id DESC NULLS LAST" type="Oracle" />
+    <sql id="assertSelectWithOrderByForNullsLast" value="SELECT o.order_id as gen_order_id_ FROM t_order o ORDER BY o.order_id ASC NULLS LAST" type="Oracle" />
 </sqls>