weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-12 19:30:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 恢复 Dictionary<string, object>；

Browse Source
This commit is contained in:
2881099
2025-04-20 17:27:41 +08:00
parent 88c96786fa
commit d90257fa1f
4 changed files with 12 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.xml
View File

@@ -82,7 +82,7 @@
举例2：RightJoin("table1", "id", "user.id", "xid", "user.xid") -> RIGTH JOIN [table1] b ON b.[id] = [a].id] AND b.[xid] = a.[xid] 举例2：RightJoin("table1", "id", "user.id", "xid", "user.xid") -> RIGTH JOIN [table1] b ON b.[id] = [a].id] AND b.[xid] = a.[xid]
</summary> </summary>
</member> </member>
<member name="M:FreeSql.Extensions.ZeroEntity.ZeroDbContext.SelectImpl.Where(System.Collections.Generic.IEnumerable{System.Collections.Generic.IDictionary{System.String,System.Object}})"> <member name="M:FreeSql.Extensions.ZeroEntity.ZeroDbContext.SelectImpl.Where(System.Collections.Generic.IEnumerable{System.Collections.Generic.Dictionary{System.String,System.Object}})">
<summary> <summary>
WHERE [Id] IN (...) WHERE [Id] IN (...)
</summary> </summary>

6
Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs
View File

@@ -8,7 +8,7 @@ using System.Data;
using System.Data.Common; using System.Data.Common;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using T = System.Collections.Generic.IDictionary<string, object>; using T = System.Collections.Generic.Dictionary<string, object>;
namespace FreeSql.Extensions.ZeroEntity namespace FreeSql.Extensions.ZeroEntity
{ {
@@ -249,7 +249,7 @@ namespace FreeSql.Extensions.ZeroEntity
T FetchResult(DbDataReader reader) T FetchResult(DbDataReader reader)
{ {
var fieldIndex = 0; var fieldIndex = 0;
T result = new Dictionary<string, object>(); var result = new T();
for (var aliasIndex = 0; aliasIndex < _tableAlias.Count; aliasIndex++) for (var aliasIndex = 0; aliasIndex < _tableAlias.Count; aliasIndex++)
{ {
var navValue = result; var navValue = result;
@@ -281,7 +281,7 @@ namespace FreeSql.Extensions.ZeroEntity
fieldIndex += _tableAlias[aliasIndex].Table.Columns.Count; fieldIndex += _tableAlias[aliasIndex].Table.Columns.Count;
continue; continue;
} }
drctx.Result = new Dictionary<string, object>(); drctx.Result = new T();
navValue[_tableAlias[aliasIndex].NavPath.LastOrDefault()] = drctx.Result; navValue[_tableAlias[aliasIndex].NavPath.LastOrDefault()] = drctx.Result;
} }
_fieldReader[aliasIndex](drctx); _fieldReader[aliasIndex](drctx);

16
Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.cs
View File

@@ -10,7 +10,7 @@ using System.Collections.Generic;
using System.Data.Common; using System.Data.Common;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using T = System.Collections.Generic.IDictionary<string, object>; using T = System.Collections.Generic.Dictionary<string, object>;
namespace FreeSql.Extensions.ZeroEntity namespace FreeSql.Extensions.ZeroEntity
{ {
@@ -607,7 +607,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
{ {
var valueEach = _AuditJsonElementMethodJsonElementEnumerateObject.Invoke(value, new object[0]) as IEnumerable; var valueEach = _AuditJsonElementMethodJsonElementEnumerateObject.Invoke(value, new object[0]) as IEnumerable;
if (valueEach == null) return resetValue?.Invoke(null); if (valueEach == null) return resetValue?.Invoke(null);
var newValue = new Dictionary<string, object>(); var newValue = new T();
foreach (var valueItem in valueEach) foreach (var valueItem in valueEach)
{ {
if (valueItem == null) continue; if (valueItem == null) continue;
@@ -1101,7 +1101,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
var key = GetEntityKeyString(table, entityFrom); var key = GetEntityKeyString(table, entityFrom);
if (key == null) return; if (key == null) return;
var state = new EntityState(new Dictionary<string, object>(), key); var state = new EntityState(new T(), key);
LocalMapEntityValue(table, entityFrom, state.Value); LocalMapEntityValue(table, entityFrom, state.Value);
@@ -1140,7 +1140,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
//entityTo.Remove(nav.Key); //entityTo.Remove(nav.Key);
continue; continue;
} }
var valTo = new Dictionary<string, object>(); var valTo = new T();
SetNavigateRelationshipValue(nav.Value, entityFrom, valFrom); SetNavigateRelationshipValue(nav.Value, entityFrom, valFrom);
if (LocalMapEntityValue(nav.Value.RefTable, valFrom, valTo)) if (LocalMapEntityValue(nav.Value.RefTable, valFrom, valTo))
entityTo[nav.Key] = valTo; entityTo[nav.Key] = valTo;
@@ -1159,7 +1159,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
foreach (var fromObj in valFromList) foreach (var fromObj in valFromList)
{ {
if (fromObj is T fromItem == false || fromItem == null) continue; if (fromObj is T fromItem == false || fromItem == null) continue;
var toItem = new Dictionary<string, object>(); var toItem = new T();
if (LocalMapEntityValue(nav.Value.RefTable, fromItem, toItem)) if (LocalMapEntityValue(nav.Value.RefTable, fromItem, toItem))
valTo.Add(toItem); valTo.Add(toItem);
} }
@@ -1179,7 +1179,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
{ {
if (fromObj is T fromItem == false || fromItem == null) continue; if (fromObj is T fromItem == false || fromItem == null) continue;
LocalAttachCascade(nav.Value.RefTable, fromItem, includeOutside); //创建新的 states LocalAttachCascade(nav.Value.RefTable, fromItem, includeOutside); //创建新的 states
var toItem = new Dictionary<string, object>(); var toItem = new T();
foreach (var col in nav.Value.RefTable.Primarys) //多对多状态只存储 PK foreach (var col in nav.Value.RefTable.Primarys) //多对多状态只存储 PK
if (fromItem.TryGetValue(col.CsName, out var colval)) if (fromItem.TryGetValue(col.CsName, out var colval))
toItem[col.CsName] = colval; toItem[col.CsName] = colval;
@@ -1197,7 +1197,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
continue; continue;
} }
LocalAttachCascade(nav.Value.RefTable, valFrom, includeOutside); //创建新的 states LocalAttachCascade(nav.Value.RefTable, valFrom, includeOutside); //创建新的 states
var valTo = new Dictionary<string, object>(); var valTo = new T();
foreach (var col in nav.Value.RefTable.Columns.Values) foreach (var col in nav.Value.RefTable.Columns.Values)
if (valFrom.TryGetValue(col.CsName, out var colval)) if (valFrom.TryGetValue(col.CsName, out var colval))
valTo[col.CsName] = colval; valTo[col.CsName] = colval;
@@ -1568,7 +1568,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
foreach (var ritem in rights) foreach (var ritem in rights)
{ {
if (ritem is T right == false || right == null) continue; if (ritem is T right == false || right == null) continue;
var midval = new Dictionary<string, object>(); var midval = new T();
for (var x = 0; x < nav.Columns.Count; x++) for (var x = 0; x < nav.Columns.Count; x++)
if (entity.TryGetValue(nav.Columns[x], out var colval)) if (entity.TryGetValue(nav.Columns[x], out var colval))
midval[nav.MiddleColumns[x]] = colval; midval[nav.MiddleColumns[x]] = colval;

109
FreeSql/FreeSql.xml
View File

@@ -1097,93 +1097,6 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
<summary>
动态创建实体类型
</summary>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.#ctor(IFreeSql,System.String,System.Attribute[])">
<summary>
配置Class
</summary>
<param name="className">类名</param>
<param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
<returns></returns>
</member>
<member name="P:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.TypeBuilder">
<summary>
获取类型构建器，可作为要构建的Type来引用
</summary>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Attribute[])">
<summary>
配置属性
</summary>
<param name="propertyName">属性名称</param>
<param name="propertyType">属性类型</param>
<param name="attributes">属性标记的特性-支持多个</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Attribute[])">
<summary>
配置属性
</summary>
<param name="propertyName">属性名称</param>
<param name="propertyType">属性类型</param>
<param name="isOverride">该属性是否重写父类属性</param>
<param name="attributes">属性标记的特性-支持多个</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Object,System.Attribute[])">
<summary>
配置属性
</summary>
<param name="propertyName">属性名称</param>
<param name="propertyType">属性类型</param>
<param name="isOverride">该属性是否重写父类属性</param>
<param name="defaultValue">属性默认值</param>
<param name="attributes">属性标记的特性-支持多个</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Extend(System.Type)">
<summary>
配置父类
</summary>
<param name="superClass">父类类型</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.OverrideProperty(System.Reflection.Emit.TypeBuilder@,System.Reflection.Emit.MethodBuilder,FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.PropertyMethodEnum,System.String)">
<summary>
Override属性
</summary>
<param name="typeBuilder"></param>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
<summary>
Emit动态创建出Class - Type
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.BuildJustType">
<summary>
Emit动态创建出Class - Type，不附带获取TableInfo
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToLower(System.String)">
<summary>
首字母小写
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToUpper(System.String)">
<summary>
首字母大写
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)"> <member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)">
<summary> <summary>
获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 "" 获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 ""
@@ -5984,28 +5897,6 @@
对象池 对象池
</summary> </summary>
</member> </member>
<member name="M:FreeSqlGlobalDynamicEntityExtensions.DynamicEntity(FreeSql.ICodeFirst,System.String,System.Attribute[])">
<summary>
动态构建Class Type
</summary>
<returns></returns>
</member>
<member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateInstance(FreeSql.Internal.Model.TableInfo,System.Collections.Generic.Dictionary{System.String,System.Object})">
<summary>
根据字典，创建 table 对应的实体对象
</summary>
<param name="table"></param>
<param name="dict"></param>
<returns></returns>
</member>
<member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateDictionary(FreeSql.Internal.Model.TableInfo,System.Object)">
<summary>
根据实体对象，创建 table 对应的字典
</summary>
<param name="table"></param>
<param name="instance"></param>
<returns></returns>
</member>
<member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)"> <member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)">
<summary> <summary>
C#： that >= between &amp;&amp; that &lt;= and<para></para> C#： that >= between &amp;&amp; that &lt;= and<para></para>