lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-08-23 13:06:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update access

Browse Source
This commit is contained in:
sunkaixuan 2022-02-26 16:18:42 +08:00
parent 35d841a39c
commit b9da3f285d
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Src/Asp.Net/AccessTest/Demo/Demo1_Queryable.cs
View File

@ -100,7 +100,9 @@ namespace OrmTest
Console.WriteLine("#### Examples Start ####"); Console.WriteLine("#### Examples Start ####");
var db = GetInstance(); var db = GetInstance();
var dbTime = db.GetDate(); var dbTime = db.GetDate();
var getAll = db.Queryable<Order>().Where(it=> SqlFunc.EqualsNull(it.Name,null)).ToList(); var getAll = db.Queryable<Order>().ToList();
var getTake = db.Queryable<Order>().Take(2).ToList();
var getSkip = db.Queryable<Order>().Skip(2).ToList();
var getOrderBy = db.Queryable<Order>().OrderBy(it => it.Name,OrderByType.Desc).ToList(); var getOrderBy = db.Queryable<Order>().OrderBy(it => it.Name,OrderByType.Desc).ToList();
var getOrderBy2 = db.Queryable<Order>().OrderBy(it => it.Id).OrderBy(it => it.Name, OrderByType.Desc).ToList(); var getOrderBy2 = db.Queryable<Order>().OrderBy(it => it.Id).OrderBy(it => it.Name, OrderByType.Desc).ToList();
var getOrderBy3 = db.Queryable<Order>().OrderBy(it =>new { it.Name,it.Id}).ToList(); var getOrderBy3 = db.Queryable<Order>().OrderBy(it =>new { it.Name,it.Id}).ToList();
@ -135,7 +137,7 @@ namespace OrmTest
//test09.Wait(); //test09.Wait();
int c = 0; int c = 0;
var test10 = db.Queryable<Order>().ToPageList(1, 2, ref c); var test10 = db.Queryable<Order>().OrderBy(it=>it.Id).ToPageList(3,5, ref c);
var test11 = db.Queryable<Order>().GroupBy(it=>new { it.CreateTime.Year }).Select(it=>it.CreateTime.Year).ToList(); var test11 = db.Queryable<Order>().GroupBy(it=>new { it.CreateTime.Year }).Select(it=>it.CreateTime.Year).ToList();
// var test12 = db.Queryable<Order>().GroupBy(it => it.CreateTime.Date ).Select(it => it.CreateTime.Date).ToList(); // var test12 = db.Queryable<Order>().GroupBy(it => it.CreateTime.Date ).Select(it => it.CreateTime.Date).ToList();
//var test13 = db.Queryable<Order>().GroupBy(it => new { it.CreateTime.Date ,it.CreateTime.Year,it.CreateTime.Minute }) //var test13 = db.Queryable<Order>().GroupBy(it => new { it.CreateTime.Date ,it.CreateTime.Year,it.CreateTime.Minute })

35
Src/Asp.Net/SqlSugar.Access/Access/SqlBuilder/AccessQueryBuilder.cs
View File

@ -26,12 +26,14 @@ namespace SqlSugar.Access
if (this.OrderByValue == null && (Skip != null || Take != null)) this.OrderByValue = " ORDER BY now() "; if (this.OrderByValue == null && (Skip != null || Take != null)) this.OrderByValue = " ORDER BY now() ";
if (this.PartitionByValue.HasValue()) if (this.PartitionByValue.HasValue())
{ {
this.OrderByValue = this.PartitionByValue + this.OrderByValue; throw new Exception("sqlite no support partition by");
} }
var isFirst = (Skip == 0 || Skip == null) && Take == 1 && DisableTop == false; var isFirst = (Skip == 0 || Skip == null) && Take == 1 && DisableTop == false;
var isRowNumber = (Skip != null || Take != null) && !isFirst; var isRowNumber = (Skip != null || Take != null) && !isFirst;
var isPage = isRowNumber; var isPage = isRowNumber;
isRowNumber = false; isRowNumber = false;
var oldSkip = Skip;
var oldTake = Take;
Skip = null; Skip = null;
Take = null; Take = null;
var rowNumberString = string.Format(",ROW_NUMBER() OVER({0}) AS RowIndex ", GetOrderByString); var rowNumberString = string.Format(",ROW_NUMBER() OVER({0}) AS RowIndex ", GetOrderByString);
@ -44,12 +46,7 @@ namespace SqlSugar.Access
var result = isFirst ? sql.ToString() : ToPageSql(sql.ToString(), this.Take, this.Skip); var result = isFirst ? sql.ToString() : ToPageSql(sql.ToString(), this.Take, this.Skip);
if (ExternalPageIndex > 0) if (ExternalPageIndex > 0)
{ {
if (externalOrderBy.IsNullOrEmpty()) throw new Exception("sqlite no support partition by");
{
externalOrderBy = " ORDER BY now() ";
}
result = string.Format("SELECT *,ROW_NUMBER() OVER({0}) AS RowIndex2 FROM ({1}) ExternalTable ", GetExternalOrderBy(externalOrderBy), result);
result = ToPageSql2(result, ExternalPageIndex, ExternalPageSize, true);
} }
this.OrderByValue = oldOrderBy; this.OrderByValue = oldOrderBy;
if (!string.IsNullOrEmpty(this.Offset)) if (!string.IsNullOrEmpty(this.Offset))
@ -57,10 +54,34 @@ namespace SqlSugar.Access
if (this.OrderByValue.IsNullOrEmpty()) if (this.OrderByValue.IsNullOrEmpty())
{ {
result += " ORDER BY now() "; result += " ORDER BY now() ";
this.OrderByValue = " ORDER BY now() ";
} }
result += this.Offset; result += this.Offset;
} }
result = GetSqlQuerySql(result); result = GetSqlQuerySql(result);
if (isPage)
{
var colums=this.Context.EntityMaintenance.GetEntityInfo(this.EntityType).Columns;
if (!colums.Any(x => x.IsPrimarykey))
{
throw new Exception("sqlite page need primary key , entity name: "+ this.EntityName);
}
var pkName =this.Builder.GetTranslationColumnName(colums.Where(x => x.IsPrimarykey).First().DbColumnName);
var takeSql = $@" SELECT { (oldTake == null ? "" : ("Top " + oldTake)) }
*FROM({ result}) ACCTABLE1";
var skipSql = $@"
WHERE {pkName} NOT IN
(SELECT { (oldSkip == null ? "" : ("Top " + oldSkip))} {pkName} FROM ({result}) ACCTABLE2 { this.OrderByValue })";
if (oldSkip == 0)
{
result = takeSql;
}
else
{
result = takeSql+skipSql;
}
}
return result; return result;
} }
} }