From e22c2617c4faf650e1aefeb47c1e299baed7535f Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Mon, 28 Sep 2020 04:33:55 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BC=98=E5=8C=96=20=E9=80=9A=E7=94=A8=20O?=
 =?UTF-8?q?dbc=20=E6=94=AF=E6=8C=81=20Limit=20=E9=A3=8E=E6=A0=BC=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=EF=BC=9B#469?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Default/Curd/OdbcSelect.cs                | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/Providers/FreeSql.Provider.Odbc/Default/Curd/OdbcSelect.cs b/Providers/FreeSql.Provider.Odbc/Default/Curd/OdbcSelect.cs
index 963db3a3..8452c685 100644
--- a/Providers/FreeSql.Provider.Odbc/Default/Curd/OdbcSelect.cs
+++ b/Providers/FreeSql.Provider.Odbc/Default/Curd/OdbcSelect.cs
@@ -34,18 +34,9 @@ namespace FreeSql.Odbc.Default
                 if (_distinct) sb.Append("DISTINCT ");
                 if (_limit > 0 && _utils.Adapter.SelectTopStyle == OdbcAdapter.SelecTopStyle.Top) sb.Append("TOP ").Append(_skip + _limit).Append(" ");
                 sb.Append(field);
-                if (_skip > 0)
-                {
-                    if (string.IsNullOrEmpty(_orderby))
-                    {
-                        var pktb = _tables.Where(a => a.Table.Primarys.Any()).FirstOrDefault();
-                        if (pktb != null) _orderby = string.Concat(" \r\nORDER BY ", pktb.Alias, ".", _commonUtils.QuoteSqlName(pktb?.Table.Primarys.First().Attribute.Name));
-                        else _orderby = string.Concat(" \r\nORDER BY ", _tables.First().Alias, ".", _commonUtils.QuoteSqlName(_tables.First().Table.Columns.First().Value.Attribute.Name));
-                    }
-                    sb.Append(", ROW_NUMBER() OVER(").Append(_orderby).Append(") AS __rownum__");
-
+                if (_skip > 0 && _utils.Adapter.SelectTopStyle == OdbcAdapter.SelecTopStyle.Top)
                     throw new NotImplementedException("FreeSql.Odbc.Default 未实现 Skip/Offset 功能，如果需要分页请使用判断上一次 id");
-                }
+
                 sb.Append(" \r\nFROM ");
                 var tbsjoin = _tables.Where(a => a.Type != SelectTableInfoType.From).ToArray();
                 var tbsfrom = _tables.Where(a => a.Type == SelectTableInfoType.From).ToArray();
@@ -116,13 +107,11 @@ namespace FreeSql.Odbc.Default
                     if (string.IsNullOrEmpty(_having) == false)
                         sb.Append(" \r\nHAVING ").Append(_having.Substring(5));
                 }
-                if (_skip <= 0)
-                    sb.Append(_orderby);
-                else
-                    sb.Insert(0, "WITH t AS ( ").Append(" ) SELECT t.* FROM t where __rownum__ > ").Append(_skip);
+                sb.Append(_orderby);
+                if (_limit > 0 && _utils.Adapter.SelectTopStyle == OdbcAdapter.SelecTopStyle.Limit) sb.Append(" \r\nLIMIT ").Append(_limit);
+                if (_skip > 0 && _utils.Adapter.SelectTopStyle == OdbcAdapter.SelecTopStyle.Limit) sb.Append(" \r\nOFFSET ").Append(_skip);
 
                 sbnav.Clear();
-                if (_limit > 0 && _utils.Adapter.SelectTopStyle == OdbcAdapter.SelecTopStyle.Limit) sb.Append(" \r\nLIMIT ").Append(_skip + _limit);
                 if (tbUnionsGt0) sb.Append(") ftb");
             }
             return sb.Append(_tosqlAppendContent).ToString();