From 6ba85cfc75ee5268b030401b983ac8153f527c7d Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Sun, 22 Nov 2020 12:40:02 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20SqlServer=20RowNumber?=
=?UTF-8?q?=20=E5=88=86=E9=A1=B5=E6=9C=89=E5=8F=AF=E8=83=BD=E4=BA=A7?=
=?UTF-8?q?=E7=94=9F=E9=A1=BA=E5=BA=8F=E4=B8=8D=E5=AF=B9=E7=9A=84=20bug?=
=?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FreeSql/FreeSql.xml | 160 ------------------
.../SqlServer/Curd/OdbcSqlServerSelect.cs | 5 +-
.../Curd/SqlServerSelect.cs | 5 +-
3 files changed, 6 insertions(+), 164 deletions(-)
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
index 3632c4f9..c52db9a4 100644
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@@ -3050,154 +3050,6 @@
-
-
- 测试数据库是否连接正确，本方法执行如下命令：
- MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1
- Oracle: SELECT 1 FROM dual
-
- 命令超时设置(秒)
- true: 成功, false: 失败
-
-
-
- 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
-
-
-
-
-
-
-
-
- 查询，ExecuteReaderAsync(dr => {}, "select * from user where age > ?age", new { age = 25 })
- 提示：parms 参数还可以传 Dictionary<string, object>
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
- 查询，ExecuteArrayAsync("select * from user where age > ?age", new { age = 25 })
- 提示：parms 参数还可以传 Dictionary<string, object>
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
- 查询，ExecuteDataSetAsync("select * from user where age > ?age; select 2", new { age = 25 })
- 提示：parms 参数还可以传 Dictionary<string, object>
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
- 查询，ExecuteDataTableAsync("select * from user where age > ?age", new { age = 25 })
- 提示：parms 参数还可以传 Dictionary<string, object>
-
-
-
-
-
-
-
- 在【主库】执行
-
-
-
-
-
-
-
- 在【主库】执行，ExecuteNonQueryAsync("delete from user where age > ?age", new { age = 25 })
- 提示：parms 参数还可以传 Dictionary<string, object>
-
-
-
-
-
-
-
- 在【主库】执行
-
-
-
-
-
-
-
- 在【主库】执行，ExecuteScalarAsync("select 1 from user where age > ?age", new { age = 25 })
- 提示：parms 参数还可以传 Dictionary<string, object>
-
-
-
-
-
-
-
- 执行SQL返回对象集合，QueryAsync<User>("select * from user where age > ?age", new SqlParameter { ParameterName = "age", Value = 25 })
-
-
-
-
-
-
-
-
-
- 执行SQL返回对象集合，QueryAsync<User>("select * from user where age > ?age", new { age = 25 })
- 提示：parms 参数还可以传 Dictionary<string, object>
-
-
-
-
-
-
-
-
- 执行SQL返回对象集合，Query<User>("select * from user where age > ?age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
-
-
-
-
-
-
-
-
-
- 执行SQL返回对象集合，Query<User, Address>("select * from user where age > ?age; select * from address", new { age = 25 })
- 提示：parms 参数还可以传 Dictionary<string, object>
-
-
-
-
-
-
可自定义解析表达式
@@ -4026,12 +3878,6 @@
超时
-
-
- 获取资源
-
-
-
使用完毕后，归还资源
@@ -4102,12 +3948,6 @@
资源对象
-
-
- 从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
-
- 资源对象
-
归还对象给对象池的时候触发
diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs
index 6302576f..342d74ed 100644
--- a/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs
+++ b/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerSelect.cs
@@ -38,7 +38,8 @@ namespace FreeSql.Odbc.SqlServer
var sbnav = new StringBuilder();
sb.Append(_select);
if (_distinct) sb.Append("DISTINCT ");
- if (_limit > 0) sb.Append("TOP ").Append(_skip + _limit).Append(" ");
+ //if (_limit > 0) sb.Append("TOP ").Append(_skip + _limit).Append(" "); //TOP 会引发 __rownum__ 无序的问题
+ if (_skip <= 0 && _limit > 0) sb.Append("TOP ").Append(_limit).Append(" ");
sb.Append(field);
if (_skip > 0)
{
@@ -123,7 +124,7 @@ namespace FreeSql.Odbc.SqlServer
if (_skip <= 0)
sb.Append(_orderby);
else
- sb.Insert(0, "WITH t AS ( ").Append(" ) SELECT t.* FROM t where __rownum__ > ").Append(_skip);
+ sb.Insert(0, "WITH t AS ( ").Append(" ) SELECT t.* FROM t where __rownum__ between ").Append(_skip + 1).Append(" and ").Append(_skip + _limit);
sbnav.Clear();
if (tbUnionsGt0) sb.Append(") ftb");
diff --git a/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs b/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs
index fa1c1af6..25698185 100644
--- a/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs
+++ b/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerSelect.cs
@@ -38,7 +38,8 @@ namespace FreeSql.SqlServer.Curd
var sbnav = new StringBuilder();
sb.Append(_select);
if (_distinct) sb.Append("DISTINCT ");
- if (_limit > 0) sb.Append("TOP ").Append(_skip + _limit).Append(" ");
+ //if (_limit > 0) sb.Append("TOP ").Append(_skip + _limit).Append(" "); //TOP 会引发 __rownum__ 无序的问题
+ if (_skip <= 0 && _limit > 0) sb.Append("TOP ").Append(_limit).Append(" ");
sb.Append(field);
if (_skip > 0)
{
@@ -123,7 +124,7 @@ namespace FreeSql.SqlServer.Curd
if (_skip <= 0)
sb.Append(_orderby);
else
- sb.Insert(0, "WITH t AS ( ").Append(" ) SELECT t.* FROM t where __rownum__ > ").Append(_skip);
+ sb.Insert(0, "WITH t AS ( ").Append(" ) SELECT t.* FROM t where __rownum__ between ").Append(_skip + 1).Append(" and ").Append(_skip + _limit);
sbnav.Clear();
if (tbUnionsGt0) sb.Append(") ftb");