mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-08-23 13:06:50 +08:00
WithCache ToDataTable bug
This commit is contained in:
parent
5f9b18ab5f
commit
116442d0e7
@ -321,6 +321,8 @@ namespace OrmTest.Demo
|
||||
var dbTime = db.GetDate();
|
||||
var getAll = db.Queryable<Student>().Select<object>("*").ToList();
|
||||
var getAll2 = db.Queryable<Student>().ToList();
|
||||
var getAll22 = db.Queryable<Student>().ToDataTable();
|
||||
var getAll222 = db.Queryable<Student>().ToJson();
|
||||
var getAll3 = db.Queryable<Student>().OrderBy(it => new { it.Id, it.Name }).GroupBy(it => new { it.Id, it.Name }).Select<object>("id").ToList();
|
||||
var getRandomList = db.Queryable<Student>().OrderBy(it => SqlFunc.GetRandom()).ToList();
|
||||
var getAllOrder = db.Queryable<Student>().OrderBy(it => it.Id).OrderBy(it => it.Name, OrderByType.Desc).ToList();
|
||||
|
@ -42,9 +42,8 @@ namespace OrmTest
|
||||
new SqlSugarPerformance(100).Select();
|
||||
|
||||
/***Demo***/
|
||||
Demo.Query.Init();
|
||||
Demo.Insert.Init();
|
||||
Demo.Delete.Init();
|
||||
Demo.Query.Init();
|
||||
Demo.Update.Init();
|
||||
Demo.DbFirst.Init();
|
||||
Demo.JoinSql.Init();
|
||||
@ -60,6 +59,7 @@ namespace OrmTest
|
||||
Demo.Mapper.Init();
|
||||
Demo.ExtEntity.Init();
|
||||
Demo.VersionValidation.Init();
|
||||
Demo.Delete.Init();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -586,7 +586,16 @@ namespace SqlSugar
|
||||
InitMapping();
|
||||
var sqlObj = this.ToSql();
|
||||
RestoreMapping();
|
||||
var result = this.Db.GetDataTable(sqlObj.Key, sqlObj.Value.ToArray());
|
||||
DataTable result = null;
|
||||
if (IsCache)
|
||||
{
|
||||
var cacheService = this.Context.CurrentConnectionConfig.ConfigureExternalServices.DataInfoCacheService;
|
||||
result = CacheSchemeMain.GetOrCreate<DataTable>(cacheService, this.QueryBuilder, () => { return this.Db.GetDataTable(sqlObj.Key, sqlObj.Value.ToArray()); }, CacheTime, this.Context);
|
||||
}
|
||||
else
|
||||
{
|
||||
result = this.Db.GetDataTable(sqlObj.Key, sqlObj.Value.ToArray());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
public virtual DataTable ToDataTablePage(int pageIndex, int pageSize)
|
||||
|
Loading…
Reference in New Issue
Block a user