From 6e924aa3859e08b11ccc882e51733ef29a9c05a4 Mon Sep 17 00:00:00 2001
From: zqlovejyc <943620963@qq.com>
Date: Fri, 31 Dec 2021 08:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Oracle=20Page=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SQLBuilder.Core/Entry/SqlBuilderCore.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SQLBuilder.Core/Entry/SqlBuilderCore.cs b/SQLBuilder.Core/Entry/SqlBuilderCore.cs
index 63f65b1..c2e6ea5 100644
--- a/SQLBuilder.Core/Entry/SqlBuilderCore.cs
+++ b/SQLBuilder.Core/Entry/SqlBuilderCore.cs
@@ -4590,13 +4590,13 @@ public SqlBuilderCore<T> Page(int pageSize, int pageIndex, string orderField, st
                     sb.Append($"SELECT {countSyntax} AS [TOTAL] FROM ({sql}) AS T;SELECT * FROM (SELECT ROW_NUMBER() OVER ({order}) AS [ROWNUMBER], * FROM ({sql}) AS T) AS N WHERE [ROWNUMBER] BETWEEN {(pageIndex - 1) * pageSize + 1} AND {pageIndex * pageSize};");
             }
 
-            //Oracle，注意Oracle需要分开查询总条数和分页数据，此方法仅包含分页语句
+            //Oracle，注意Oracle需要Split(';')分开单独查询总条数和分页数据
             if (this.sqlWrapper.DatabaseType == DatabaseType.Oracle)
             {
                 if (dbVersion > 11)
-                    sb.Append($"{sql} {order} OFFSET {pageSize * (pageIndex - 1)} ROWS FETCH NEXT {pageSize} ROWS ONLY");
+                    sb.Append($"SELECT {countSyntax} AS \"TOTAL\" FROM ({sql}) T;{sql} {order} OFFSET {pageSize * (pageIndex - 1)} ROWS FETCH NEXT {pageSize} ROWS ONLY");
                 else
-                    sb.Append($"SELECT * FROM (SELECT X.*,ROWNUM AS \"ROWNUMBER\" FROM ({sql} {order}) X WHERE ROWNUM <= {pageSize * pageIndex}) T WHERE \"ROWNUMBER\" >= {pageSize * (pageIndex - 1) + 1}");
+                    sb.Append($"SELECT {countSyntax} AS \"TOTAL\" FROM ({sql}) T;SELECT * FROM (SELECT X.*,ROWNUM AS \"ROWNUMBER\" FROM ({sql} {order}) X WHERE ROWNUM <= {pageSize * pageIndex}) T WHERE \"ROWNUMBER\" >= {pageSize * (pageIndex - 1) + 1}");
             }
 
             //MySQL，注意8.0版本才支持WITH语法
@@ -4664,13 +4664,13 @@ public SqlBuilderCore<T> PageByWith(int pageSize, int pageIndex, string orderFie
                     sb.Append($"{sql} SELECT {countSyntax} AS [TOTAL] FROM T;{sql},R AS (SELECT ROW_NUMBER() OVER ({order}) AS [ROWNUMBER], * FROM T) SELECT * FROM R WHERE [ROWNUMBER] BETWEEN {(pageIndex - 1) * pageSize + 1} AND {pageIndex * pageSize};");
             }
 
-            //Oracle，注意Oracle需要分开查询总条数和分页数据，此方法仅包含分页语句
+            //Oracle，注意Oracle需要Split(';')分开单独查询总条数和分页数据
             if (this.sqlWrapper.DatabaseType == DatabaseType.Oracle)
             {
                 if (dbVersion > 11)
-                    sb.Append($"{sql.Remove(sql.LastIndexOf(")"), 1)} {order}) SELECT * FROM T OFFSET {pageSize * (pageIndex - 1)} ROWS FETCH NEXT {pageSize} ROWS ONLY");
+                    sb.Append($"{sql} SELECT {countSyntax} AS \"TOTAL\" FROM T;{sql.Remove(sql.LastIndexOf(")"), 1)} {order}) SELECT * FROM T OFFSET {pageSize * (pageIndex - 1)} ROWS FETCH NEXT {pageSize} ROWS ONLY");
                 else
-                    sb.Append($"{sql.Remove(sql.LastIndexOf(")"), 1)} {order}),R AS (SELECT ROWNUM AS \"ROWNUMBER\",T.* FROM T WHERE ROWNUM <= {pageSize * pageIndex}) SELECT * FROM R WHERE \"ROWNUMBER\">={pageSize * (pageIndex - 1) + 1}");
+                    sb.Append($"{sql} SELECT {countSyntax} AS \"TOTAL\" FROM T;{sql.Remove(sql.LastIndexOf(")"), 1)} {order}),R AS (SELECT ROWNUM AS \"ROWNUMBER\",T.* FROM T WHERE ROWNUM <= {pageSize * pageIndex}) SELECT * FROM R WHERE \"ROWNUMBER\">={pageSize * (pageIndex - 1) + 1}");
             }
 
             //MySQL，注意8.0版本才支持WITH语法