tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-18 20:08:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 SqlServer2005/2008 Skip 问题（未设置 Take 时）；

Browse Source
This commit is contained in:
2881099
2022-07-14 14:01:40 +08:00
parent 9088da180c
commit 50b7d5307d
6 changed files with 103 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs
View File

@ -31,7 +31,7 @@ namespace FreeSql.Odbc.SqlServer
var tbUnionsGt0 = tbUnions.Count > 1;
for (var tbUnionsIdx = 0; tbUnionsIdx < tbUnions.Count; tbUnionsIdx++)
{
if (tbUnionsIdx > 0) sb.Append("\r\n \r\nUNION ALL\r\n \r\n");
if (tbUnionsIdx > 0) sb.Append(" \r\n\r\nUNION ALL\r\n\r\n");
if (tbUnionsGt0) sb.Append(_select).Append(" * from (");
var tbUnion = tbUnions[tbUnionsIdx];
@ -42,7 +42,7 @@ namespace FreeSql.Odbc.SqlServer
if (_skip <= 0 && _limit > 0) sb.Append("TOP ").Append(_limit).Append(" ");
sb.Append(field);
if (_limit > 0)
if (_limit > 0 || _skip > 0)
{
if (string.IsNullOrEmpty(_orderby))
{
@ -56,7 +56,7 @@ namespace FreeSql.Odbc.SqlServer
_orderby = _groupby.Replace("GROUP BY ", "ORDER BY ");
}
if (_skip > 0) // 注意这个判断，大于 0 才使用 ROW_NUMBER ，否则属于第一页直接使用 TOP
sb.Append(", ROW_NUMBER() OVER(").Append(_orderby).Append(") AS __rownum__");
sb.Append(", ROW_NUMBER() OVER(").Append(_orderby.Trim('\r', '\n', ' ')).Append(") AS __rownum__");
}
sb.Append(" \r\nFROM ");
var tbsjoin = _tables.Where(a => a.Type != SelectTableInfoType.From).ToArray();
@ -133,7 +133,13 @@ namespace FreeSql.Odbc.SqlServer
if (_skip <= 0)
sb.Append(_orderby);
else
sb.Insert(0, "WITH t AS ( ").Append(" ) SELECT t.* FROM t where __rownum__ between ").Append(_skip + 1).Append(" and ").Append(_skip + _limit);
{
sb.Insert(0, "WITH t AS ( ").Append(" ) SELECT t.* FROM t where __rownum__");
if (_limit > 0)
sb.Append(" between ").Append(_skip + 1).Append(" and ").Append(_skip + _limit);
else
sb.Append(" > ").Append(_skip);
}
sbnav.Clear();
if (tbUnionsGt0) sb.Append(") ftb");