lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-10-15 18:55:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Async

Browse Source
This commit is contained in:
sunkaixuan
2019-05-18 18:17:13 +08:00
parent 43dbae53c1
commit 3f8751c951
6 changed files with 323 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs
View File

@@ -1,8 +1,11 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SqlSugar
{
public partial class DbBindAccessory
@@ -32,6 +35,31 @@ namespace SqlSugar
}
return result;
}
protected async Task<List<T>> GetEntityListAsync<T>(SqlSugarProvider context, IDataReader dataReader)
{
Type type = typeof(T);
var fieldNames = GetDataReaderNames(dataReader);
string cacheKey = GetCacheKey(type, fieldNames);
IDataReaderEntityBuilder<T> entytyList = context.Utilities.GetReflectionInoCacheInstance().GetOrCreate(cacheKey, () =>
{
var cacheResult = new IDataReaderEntityBuilder<T>(context, dataReader, fieldNames).CreateBuilder(type);
return cacheResult;
});
List<T> result = new List<T>();
try
{
if (dataReader == null) return result;
while (await((DbDataReader)dataReader).ReadAsync())
{
result.Add(entytyList.Build(dataReader));
}
}
catch (Exception ex)
{
Check.Exception(true, ErrorMessage.EntityMappingError, ex.Message);
}
return result;
}
private string GetCacheKey(Type type,List<string> keys)
{
@@ -60,6 +88,23 @@ namespace SqlSugar
{
List<T> result = new List<T>();
while (dataReader.Read())
{
GetKeyValueList(type, dataReader, result);
}
return result;
}
protected async Task<List<T>> GetKeyValueListAsync<T>(Type type, IDataReader dataReader)
{
List<T> result = new List<T>();
while (await ((DbDataReader)dataReader).ReadAsync())
{
GetKeyValueList(type, dataReader, result);
}
return result;
}
private static void GetKeyValueList<T>(Type type, IDataReader dataReader, List<T> result)
{
if (UtilConstants.DicOO == type)
{
@@ -96,6 +141,17 @@ namespace SqlSugar
Check.Exception(true, ErrorMessage.NotSupportedDictionary);
}
}
protected async Task<List<T>> GetArrayListAsync<T>(Type type, IDataReader dataReader)
{
List<T> result = new List<T>();
int count = dataReader.FieldCount;
var childType = type.GetElementType();
while (await((DbDataReader)dataReader).ReadAsync())
{
GetArrayList(type, dataReader, result, count, childType);
}
return result;
}
@@ -105,6 +161,15 @@ namespace SqlSugar
int count = dataReader.FieldCount;
var childType = type.GetElementType();
while (dataReader.Read())
{
GetArrayList(type, dataReader, result, count, childType);
}
return result;
}
private static void GetArrayList<T>(Type type, IDataReader dataReader, List<T> result, int count, Type childType)
{
object[] array = new object[count];
for (int i = 0; i < count; i++)
@@ -130,13 +195,27 @@ namespace SqlSugar
else
Check.Exception(true, ErrorMessage.NotSupportedArray);
}
return result;
}
protected List<T> GetValueTypeList<T>(Type type, IDataReader dataReader)
{
List<T> result = new List<T>();
while (dataReader.Read())
{
GetValueTypeList(type, dataReader, result);
}
return result;
}
protected async Task<List<T>> GetValueTypeListAsync<T>(Type type, IDataReader dataReader)
{
List<T> result = new List<T>();
while (await ((DbDataReader)dataReader).ReadAsync())
{
GetValueTypeList(type, dataReader, result);
}
return result;
}
private static void GetValueTypeList<T>(Type type, IDataReader dataReader, List<T> result)
{
var value = dataReader.GetValue(0);
if (type == UtilConstants.GuidType)
@@ -156,7 +235,5 @@ namespace SqlSugar
result.Add((T)Convert.ChangeType(value, UtilMethods.GetUnderType(type)));
}
}
return result;
}
}
}

24
Src/Asp.Net/SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs
View File

@@ -5,6 +5,8 @@ using System.Data.SqlClient;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace SqlSugar
{
public abstract partial class DbBindProvider : DbBindAccessory, IDbBind
@@ -201,6 +203,28 @@ namespace SqlSugar
}
}
}
public virtual async Task<List<T>> DataReaderToListAsync<T>(Type type, IDataReader dataReader)
{
using (dataReader)
{
if (type.Name.Contains("KeyValuePair"))
{
return await GetKeyValueListAsync<T>(type, dataReader);
}
else if (type.IsValueType() || type == UtilConstants.StringType || type == UtilConstants.ByteArrayType)
{
return await GetValueTypeListAsync<T>(type, dataReader);
}
else if (type.IsArray)
{
return await GetArrayListAsync<T>(type, dataReader);
}
else
{
return await GetEntityListAsync<T>(Context, dataReader);
}
}
}
public virtual List<T> DataReaderToListNoUsing<T>(Type type, IDataReader dataReader)
{
if (type.Name.Contains("KeyValuePair"))

45
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@@ -916,7 +916,8 @@ namespace SqlSugar
public Task<List<T>> ToListAsync()
{
return Task.FromResult(ToList());
InitMapping();
return _ToListAsync<T>();
}
public Task<string> ToJsonAsync()
@@ -1132,6 +1133,23 @@ namespace SqlSugar
_Mapper(result);
return result;
}
protected async Task<List<TResult>> _ToListAsync<TResult>()
{
List<TResult> result = null;
var sqlObj = this.ToSql();
if (IsCache)
{
var cacheService = this.Context.CurrentConnectionConfig.ConfigureExternalServices.DataInfoCacheService;
result = CacheSchemeMain.GetOrCreate<List<TResult>>(cacheService, this.QueryBuilder, () => { return GetData<TResult>(sqlObj); }, CacheTime, this.Context);
}
else
{
result =await GetDataAsync<TResult>(sqlObj);
}
RestoreMapping();
_Mapper(result);
return result;
}
protected void _Mapper<TResult>(List<TResult> result)
{
@@ -1544,7 +1562,7 @@ namespace SqlSugar
var isComplexModel = QueryBuilder.IsComplexModel(sqlObj.Key);
var entityType = typeof(TResult);
var dataReader = await this.Db.GetDataReaderAsync(sqlObj.Key, sqlObj.Value.ToArray());
result = GetData<TResult>(isComplexModel, entityType, dataReader);
result =await GetDataAsync<TResult>(isComplexModel, entityType, dataReader);
return result;
}
@@ -1570,6 +1588,29 @@ namespace SqlSugar
SetContextModel(result, entityType);
return result;
}
private async Task<List<TResult>> GetDataAsync<TResult>(bool isComplexModel, Type entityType, IDataReader dataReader)
{
List<TResult> result;
if (entityType == UtilConstants.DynamicType)
{
result =await this.Context.Utilities.DataReaderToExpandoObjectListAsync(dataReader) as List<TResult>;
}
else if (entityType == UtilConstants.ObjType)
{
var expObj = await this.Context.Utilities.DataReaderToExpandoObjectListAsync(dataReader);
result = expObj.Select(it => ((TResult)(object)it)).ToList();
}
else if (entityType.IsAnonymousType() || isComplexModel)
{
result =await this.Context.Utilities.DataReaderToListAsync<TResult>(dataReader);
}
else
{
result =await this.Bind.DataReaderToListAsync<TResult>(entityType, dataReader);
}
SetContextModel(result, entityType);
return result;
}
protected void _InQueryable(Expression expression, KeyValuePair<string, List<SugarParameter>> sqlObj)
{

65
Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs
View File

@@ -2,6 +2,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Dynamic;
using System.Linq;
using System.Reflection;
@@ -60,6 +61,26 @@ namespace SqlSugar
return result;
}
}
/// <summary>
///DataReader to Dynamic List
/// </summary>
/// <param name="reader"></param>
/// <returns></returns>
public async Task<List<ExpandoObject>> DataReaderToExpandoObjectListAsync(IDataReader reader)
{
using (reader)
{
List<ExpandoObject> result = new List<ExpandoObject>();
if (reader != null && !reader.IsClosed)
{
while (await((DbDataReader)reader).ReadAsync())
{
result.Add(DataReaderToExpandoObject(reader));
}
}
return result;
}
}
/// <summary>
///DataReader to DataReaderToDictionary
@@ -129,6 +150,42 @@ namespace SqlSugar
if (reader != null && !reader.IsClosed)
{
while (reader.Read())
{
Dictionary<string, object> result = DataReaderToList(reader, tType, classProperties, reval);
var stringValue = SerializeObject(result);
reval.Add((T)DeserializeObject<T>(stringValue));
}
}
return reval;
}
}
/// <summary>
/// DataReaderToList
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="reader"></param>
/// <returns></returns>
public async Task<List<T>> DataReaderToListAsync<T>(IDataReader reader)
{
using (reader)
{
var tType = typeof(T);
var classProperties = tType.GetProperties().ToList();
var reval = new List<T>();
if (reader != null && !reader.IsClosed)
{
while (await ((DbDataReader)reader).ReadAsync())
{
Dictionary<string, object> result = DataReaderToList(reader, tType, classProperties, reval);
var stringValue = SerializeObject(result);
reval.Add((T)DeserializeObject<T>(stringValue));
}
}
return reval;
}
}
private Dictionary<string, object> DataReaderToList<T>(IDataReader reader, Type tType, List<PropertyInfo> classProperties, List<T> reval)
{
var readerValues = DataReaderToDictionary(reader, tType);
var result = new Dictionary<string, object>();
@@ -176,12 +233,8 @@ namespace SqlSugar
}
}
}
var stringValue = SerializeObject(result);
reval.Add((T)DeserializeObject<T>(stringValue));
}
}
return reval;
}
return result;
}
private Dictionary<string, object> DataReaderToDynamicList_Part<T>(Dictionary<string, object> readerValues, PropertyInfo item, List<T> reval)

3
Src/Asp.Net/SqlSugar/Interface/IContextMethods.cs
View File

@@ -13,7 +13,9 @@ namespace SqlSugar
SqlSugarProvider Context { get; set; }
ExpandoObject DataReaderToExpandoObject(IDataReader reader);
List<ExpandoObject> DataReaderToExpandoObjectList(IDataReader reader);
Task<List<ExpandoObject>> DataReaderToExpandoObjectListAsync(IDataReader dataReader);
List<T> DataReaderToList<T>(IDataReader reader);
Task<List<T>> DataReaderToListAsync<T>(IDataReader dataReader);
string SerializeObject(object value);
string SerializeObject(object value, Type type);
T DeserializeObject<T>(string value);
@@ -27,6 +29,5 @@ namespace SqlSugar
void RemoveCacheAll<T>();
void RemoveCache<T>(string key);
void PageEach<T>(IEnumerable<T> pageItems, int pageSize, Action<List<T>> action);
}
}

4
Src/Asp.Net/SqlSugar/Interface/IDbBind.cs
View File

@@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SqlSugar
{
public partial interface IDbBind
@@ -21,6 +23,8 @@ namespace SqlSugar
string GetCsharpTypeName(string dbTypeName);
List<KeyValuePair<string, CSharpDataType>> MappingTypes { get; }
List<T> DataReaderToList<T>(Type type, IDataReader reader);
Task<List<T>> DataReaderToListAsync<T>(Type entityType, IDataReader dataReader);
List<T> DataReaderToListNoUsing<T>(Type type, IDataReader reader);
}
}