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

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2023-06-13 17:37:27 +08:00
parent e35b565ee6
commit da406a64bb
3 changed files with 139 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs
View File

@ -1718,6 +1718,10 @@ namespace SqlSugar
{
result = this.Context.Utilities.DataReaderToExpandoObjectList(dataReader) as List<TResult>;
}
else if (entityType.Name?.StartsWith("ValueTuple`")==true)
{
result = Db.Context.Utilities.DataReaderToValueTupleType<TResult>(dataReader);
}
else if (entityType == UtilConstants.ObjType)
{
result = this.Context.Utilities.DataReaderToExpandoObjectList(dataReader).Select(it => ((TResult)(object)it)).ToList();
@ -1750,6 +1754,10 @@ namespace SqlSugar
{
result = await this.Context.Utilities.DataReaderToExpandoObjectListAsync(dataReader) as List<TResult>;
}
else if (entityType.Name?.StartsWith("ValueTuple`") == true)
{
result =await Db.Context.Utilities.DataReaderToValueTupleTypeAsync<TResult>(dataReader);
}
else if (entityType == UtilConstants.ObjType)
{
var expObj = await this.Context.Utilities.DataReaderToExpandoObjectListAsync(dataReader);

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

@ -4,6 +4,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.DirectoryServices.ActiveDirectory;
using System.Dynamic;
using System.Linq;
using System.Linq.Expressions;
@ -19,6 +20,77 @@ namespace SqlSugar
public QueryBuilder QueryBuilder { get; set; }
#region DataReader
public List<T> DataReaderToValueTupleType<T>(IDataReader reader)
{
var result = new List<T>();
// Get the property names and types dynamically
var propertyNames = Enumerable.Range(0, reader.FieldCount)
.Select(reader.GetName).ToList();
var propertyTypes = Enumerable.Range(0, reader.FieldCount)
.Select(reader.GetFieldType).ToList();
using (reader)
{
while (reader.Read())
{
// Create a new instance of the tuple type using the property types
var tupleType = typeof(T);
var tupleInstance = Activator.CreateInstance(tupleType);
// Set the property values dynamically
for (int i = 0; i < reader.FieldCount; i++)
{
var propertyName = propertyNames[i];
var propertyValue = reader.GetValue(i);
var propertyType = propertyTypes[i];
var propertyInfo = tupleType.GetFields()[i];
propertyInfo.SetValue(tupleInstance, UtilMethods.ChangeType2(propertyValue, propertyType));
}
// Add the tuple instance to the result list
result.Add((T)tupleInstance);
}
}
return result;
}
public async Task<List<T>> DataReaderToValueTupleTypeAsync<T>(IDataReader reader)
{
var result = new List<T>();
// Get the property names and types dynamically
var propertyNames = Enumerable.Range(0, reader.FieldCount)
.Select(reader.GetName).ToList();
var propertyTypes = Enumerable.Range(0, reader.FieldCount)
.Select(reader.GetFieldType).ToList();
using (reader)
{
while ( await ((DbDataReader)reader).ReadAsync())
{
// Create a new instance of the tuple type using the property types
var tupleType = typeof(T);
var tupleInstance = Activator.CreateInstance(tupleType);
// Set the property values dynamically
for (int i = 0; i < reader.FieldCount; i++)
{
var propertyName = propertyNames[i];
var propertyValue = reader.GetValue(i);
var propertyType = propertyTypes[i];
var propertyInfo = tupleType.GetFields()[i];
propertyInfo.SetValue(tupleInstance, Convert.ChangeType(propertyValue, propertyType));
}
// Add the tuple instance to the result list
result.Add((T)tupleInstance);
}
}
return result;
}
/// <summary>
///DataReader to Dynamic
@ -78,7 +150,7 @@ namespace SqlSugar
List<ExpandoObject> result = new List<ExpandoObject>();
if (reader != null && !reader.IsClosed)
{
while (await((DbDataReader)reader).ReadAsync())
while (await ((DbDataReader)reader).ReadAsync())
{
result.Add(DataReaderToExpandoObject(reader));
}
@ -442,7 +514,7 @@ namespace SqlSugar
{
addValue = Convert.ToInt64(addValue);
}
else if (UtilMethods.GetUnderType(item.PropertyType).IsEnum()&& addValue is decimal)
else if (UtilMethods.GetUnderType(item.PropertyType).IsEnum() && addValue is decimal)
{
addValue = Convert.ToInt64(addValue);
}
@ -489,9 +561,9 @@ namespace SqlSugar
private static bool IsBytes(Dictionary<string, object> readerValues, PropertyInfo item)
{
return item.PropertyType == UtilConstants.ByteArrayType &&
readerValues.ContainsKey(item.Name.ToLower())&&
(readerValues[item.Name.ToLower()]==null||
readerValues[item.Name.ToLower()].GetType()==UtilConstants.ByteArrayType);
readerValues.ContainsKey(item.Name.ToLower()) &&
(readerValues[item.Name.ToLower()] == null ||
readerValues[item.Name.ToLower()].GetType() == UtilConstants.ByteArrayType);
}
private static bool IsJsonItem(Dictionary<string, object> readerValuesOld, string name)
@ -500,7 +572,7 @@ namespace SqlSugar
if (readerValuesOld.Any(it => it.Key.EqualCase(name)))
{
var data = readerValuesOld.First(it => it.Key.EqualCase(name));
readerValues.Add(data.Key,data.Value);
readerValues.Add(data.Key, data.Value);
}
return readerValues != null &&
readerValues.Count == 1 &&
@ -513,23 +585,23 @@ namespace SqlSugar
private static bool IsArrayItem(Dictionary<string, object> readerValues, PropertyInfo item)
{
var isArray= item.PropertyType.IsArray && readerValues.Any(y => y.Key.EqualCase(item.Name)) && readerValues.FirstOrDefault(y => y.Key.EqualCase(item.Name)).Value is string;
var isListItem = item.PropertyType.FullName.IsCollectionsList()&&
item.PropertyType.GenericTypeArguments.Length==1&&
item.PropertyType.GenericTypeArguments .First().IsClass()==false&& readerValues.FirstOrDefault(y => y.Key.EqualCase(item.Name)).Value is string;
var isArray = item.PropertyType.IsArray && readerValues.Any(y => y.Key.EqualCase(item.Name)) && readerValues.FirstOrDefault(y => y.Key.EqualCase(item.Name)).Value is string;
var isListItem = item.PropertyType.FullName.IsCollectionsList() &&
item.PropertyType.GenericTypeArguments.Length == 1 &&
item.PropertyType.GenericTypeArguments.First().IsClass() == false && readerValues.FirstOrDefault(y => y.Key.EqualCase(item.Name)).Value is string;
return isArray || isListItem;
}
private static bool IsJsonList(Dictionary<string, object> readerValues, PropertyInfo item)
{
return item.PropertyType.FullName.IsCollectionsList() &&
readerValues.Any(y=>y.Key.EqualCase(item.Name)) &&
readerValues.Any(y => y.Key.EqualCase(item.Name)) &&
readerValues.First(y => y.Key.EqualCase(item.Name)).Value != null &&
readerValues.First(y => y.Key.EqualCase(item.Name)).Value.GetType() == UtilConstants.StringType &&
Regex.IsMatch(readerValues.First(y => y.Key.EqualCase(item.Name)).Value.ToString(), @"^\[{.+\}]$");
}
private Dictionary<string, object> DataReaderToDynamicList_Part<T>(Dictionary<string, object> readerValues, PropertyInfo item, List<T> reval, Dictionary<string, string> mappingKeys=null)
private Dictionary<string, object> DataReaderToDynamicList_Part<T>(Dictionary<string, object> readerValues, PropertyInfo item, List<T> reval, Dictionary<string, string> mappingKeys = null)
{
Dictionary<string, object> result = new Dictionary<string, object>();
var type = item.PropertyType;
@ -553,14 +625,14 @@ namespace SqlSugar
var typeName = type.Name;
if (prop.PropertyType.IsClass())
{
var suagrColumn=prop.GetCustomAttribute<SugarColumn>();
var suagrColumn = prop.GetCustomAttribute<SugarColumn>();
if (suagrColumn != null && suagrColumn.IsJson)
{
if (mappingKeys!=null&&mappingKeys.ContainsKey(item.Name))
if (mappingKeys != null && mappingKeys.ContainsKey(item.Name))
{
var key = mappingKeys[item.Name];
Json(readerValues, result, name, typeName,key);
Json(readerValues, result, name, typeName, key);
}
else
{
@ -590,17 +662,17 @@ namespace SqlSugar
info = readerValues.Select(it => it.Key).FirstOrDefault(it => it.ToLower() == key.ToLower());
}
var oldInfo = info;
if (mappingKeys!=null&&mappingKeys.ContainsKey(item.Name))
if (mappingKeys != null && mappingKeys.ContainsKey(item.Name))
{
key = mappingKeys[item.Name]+"."+typeName + "." + name;
key = mappingKeys[item.Name] + "." + typeName + "." + name;
info = readerValues.Select(it => it.Key).FirstOrDefault(it => it.ToLower() == key.ToLower());
}
else if (mappingKeys != null && mappingKeys.ContainsKey("Single_" + name))
{
key =mappingKeys["Single_" + name];
key = mappingKeys["Single_" + name];
info = readerValues.Select(it => it.Key).FirstOrDefault(it => it.ToLower() == key.ToLower());
}
if (info == null&&oldInfo!=null)
if (info == null && oldInfo != null)
{
info = oldInfo;
}
@ -609,14 +681,15 @@ namespace SqlSugar
var addItem = readerValues[info];
if (addItem == DBNull.Value)
addItem = null;
if (prop.PropertyType == UtilConstants.IntType )
if (prop.PropertyType == UtilConstants.IntType)
{
addItem = addItem.ObjToInt();
} else if (UtilMethods.GetUnderType(prop.PropertyType) == UtilConstants.IntType && addItem != null)
{
addItem= addItem.ObjToInt();
}
else if (prop.PropertyType.IsEnum()&&addItem is decimal)
else if (UtilMethods.GetUnderType(prop.PropertyType) == UtilConstants.IntType && addItem != null)
{
addItem = addItem.ObjToInt();
}
else if (prop.PropertyType.IsEnum() && addItem is decimal)
{
addItem = Convert.ToInt64(addItem);
}
@ -627,7 +700,7 @@ namespace SqlSugar
return result;
}
private void Json(Dictionary<string, object> readerValues, Dictionary<string, object> result, string name, string typeName,string shortName=null)
private void Json(Dictionary<string, object> readerValues, Dictionary<string, object> result, string name, string typeName, string shortName = null)
{
var key = (typeName + "." + name).ToLower();
if (readerValues.Any(it => it.Key.EqualCase(key)))
@ -637,7 +710,7 @@ namespace SqlSugar
}
else
{
key = (shortName+"."+typeName + "." + name).ToLower();
key = (shortName + "." + typeName + "." + name).ToLower();
if (readerValues.Any(it => it.Key.EqualCase(key)))
{
var jsonString = readerValues.First(it => it.Key.EqualCase(key)).Value;
@ -687,7 +760,7 @@ namespace SqlSugar
}
else
{
var isSugar = this.Context.EntityMaintenance.GetEntityInfo(type).Columns.Any(it=>it.NoSerialize || it.SerializeDateTimeFormat.HasValue());
var isSugar = this.Context.EntityMaintenance.GetEntityInfo(type).Columns.Any(it => it.NoSerialize || it.SerializeDateTimeFormat.HasValue());
if (isSugar)
{
return Context.CurrentConnectionConfig.ConfigureExternalServices.SerializeService.SugarSerializeObject(value);
@ -755,7 +828,7 @@ namespace SqlSugar
var columnNames = list.First();
foreach (var item in columnNames)
{
result.Columns.Add(item.Key,item.Value==null?typeof(object):item.Value.GetType());
result.Columns.Add(item.Key, item.Value == null ? typeof(object) : item.Value.GetType());
}
foreach (var item in list)
{
@ -810,7 +883,7 @@ namespace SqlSugar
public DataTable ListToDataTable<T>(List<T> list)
{
DataTable result = new DataTable();
if (list!=null&&list.Count > 0)
if (list != null && list.Count > 0)
{
PropertyInfo[] propertys = list[0].GetType().GetProperties();
foreach (PropertyInfo pi in propertys)
@ -846,7 +919,7 @@ namespace SqlSugar
result.TableName = entityInfo.DbTableName;
if (list != null && list.Count > 0)
{
var colimnInfos = entityInfo.Columns.Where(it=>it.IsIgnore==false);
var colimnInfos = entityInfo.Columns.Where(it => it.IsIgnore == false);
foreach (var pi in colimnInfos)
{
//获取类型
@ -926,9 +999,9 @@ namespace SqlSugar
#endregion
#region Page Each
public void PageEach<T>(IEnumerable<T> pageItems,int pageSize, Action<List<T>> action)
public void PageEach<T>(IEnumerable<T> pageItems, int pageSize, Action<List<T>> action)
{
if (pageItems != null&& pageItems.Any())
if (pageItems != null && pageItems.Any())
{
int totalRecord = pageItems.Count();
int pageCount = (totalRecord + pageSize - 1) / pageSize;
@ -940,7 +1013,7 @@ namespace SqlSugar
}
}
public async Task PageEachAsync<T>(IEnumerable<T> pageItems, int pageSize, Func<List<T>,Task> action)
public async Task PageEachAsync<T>(IEnumerable<T> pageItems, int pageSize, Func<List<T>, Task> action)
{
if (pageItems != null && pageItems.Any())
{
@ -1060,7 +1133,7 @@ namespace SqlSugar
public List<T> ToTree<T>(List<T> list, Expression<Func<T, IEnumerable<object>>> childListExpression, Expression<Func<T, object>> parentIdExpression, Expression<Func<T, object>> pkExpression, object rootValue)
{
var pk = ExpressionTool.GetMemberName(pkExpression);
return (this.Context.Queryable<T>() as QueryableProvider<T>).GetTreeRoot(childListExpression,parentIdExpression,pk,list,rootValue);
return (this.Context.Queryable<T>() as QueryableProvider<T>).GetTreeRoot(childListExpression, parentIdExpression, pk, list, rootValue);
}
#endregion
}

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

@ -13,6 +13,8 @@ namespace SqlSugar
{
SqlSugarProvider Context { get; set; }
QueryBuilder QueryBuilder { get; set; }
List<T> DataReaderToValueTupleType<T>(IDataReader reader);
Task<List<T>> DataReaderToValueTupleTypeAsync<T>(IDataReader reader);
ExpandoObject DataReaderToExpandoObject(IDataReader reader);
List<ExpandoObject> DataReaderToExpandoObjectList(IDataReader reader);
Task<List<ExpandoObject>> DataReaderToExpandoObjectListAsync(IDataReader dataReader);