Merge remote-tracking branch 'origin/1.5.0.M2' into 1.5.0.M2

apache · Jun 30, 2017 · 4391c6c · 4391c6c
2 parents 17141df + 283e790
commit 4391c6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -10,7 +10,7 @@ next = "/00-overview/contribution/"
 
 ## 1.5.0.M2
 
-1. 简单子查询支持
+1. 非功能型子查询支持
 1. Oracle与SQLServer分页支持
 
 ### 缺陷修正

diff --git a/sharding-jdbc-doc/content/02-guide/subquery.md b/sharding-jdbc-doc/content/02-guide/subquery.md
@@ -82,6 +82,7 @@ SELECT * FROM t_order o ORDER BY id OFFSET ? ROW FETCH NEXT ? ROWS ONLY
 ```
 
 目前不支持使用WITH xxx AS (SELECT ...)的方式进行分页。由于Hibernate自动生成的SQLServer分页语句使用了WITH语句，因此目前并不支持基于Hibernate的SQLServer分页。
+目前也不支持使用两个TOP + 子查询的方式实现分页。
 
 ## MySQL, PostgreSQL