mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-11-08 18:34:55 +08:00
Update Oracle
This commit is contained in:
@@ -29,7 +29,7 @@ namespace SqlSugar
|
|||||||
}
|
}
|
||||||
else if (this.Take==1&&this.Skip==0)
|
else if (this.Take==1&&this.Skip==0)
|
||||||
{
|
{
|
||||||
return OffsetPage();
|
return FirstSql();
|
||||||
}
|
}
|
||||||
var oldTake = Take;
|
var oldTake = Take;
|
||||||
var oldSkip = Skip;
|
var oldSkip = Skip;
|
||||||
@@ -67,6 +67,24 @@ namespace SqlSugar
|
|||||||
this.Take = null;
|
this.Take = null;
|
||||||
this.Offset = null;
|
this.Offset = null;
|
||||||
var pageSql = $"SELECT * FROM ( SELECT PAGETABLE1.*,ROWNUM PAGEINDEX FROM( { this.ToSqlString() }) PAGETABLE1 WHERE ROWNUM<={skip+take}) WHERE PAGEINDEX>={(skip==0?skip:(skip+1))}";
|
var pageSql = $"SELECT * FROM ( SELECT PAGETABLE1.*,ROWNUM PAGEINDEX FROM( { this.ToSqlString() }) PAGETABLE1 WHERE ROWNUM<={skip+take}) WHERE PAGEINDEX>={(skip==0?skip:(skip+1))}";
|
||||||
|
if (TranLock != null)
|
||||||
|
{
|
||||||
|
pageSql = pageSql + TranLock;
|
||||||
|
}
|
||||||
|
return pageSql;
|
||||||
|
}
|
||||||
|
private string FirstSql()
|
||||||
|
{
|
||||||
|
var skip = this.Skip ?? 1;
|
||||||
|
var take = this.Take;
|
||||||
|
this.Skip = null;
|
||||||
|
this.Take = null;
|
||||||
|
this.Offset = null;
|
||||||
|
var pageSql = $"SELECT * FROM( {this.ToSqlString()}) PAGETABLE1 WHERE ROWNUM<={skip + take}";
|
||||||
|
if (TranLock != null)
|
||||||
|
{
|
||||||
|
pageSql = pageSql + TranLock;
|
||||||
|
}
|
||||||
return pageSql;
|
return pageSql;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user