weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-09 01:40:56 +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]
</summary>
</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>
WHERE [Id] IN (...)
</summary>

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

@@ -8,7 +8,7 @@ using System.Data;
using System.Data.Common;
using System.Linq;
using System.Text;
using T = System.Collections.Generic.IDictionary<string, object>;
using T = System.Collections.Generic.Dictionary<string, object>;
namespace FreeSql.Extensions.ZeroEntity
{
@@ -249,7 +249,7 @@ namespace FreeSql.Extensions.ZeroEntity
T FetchResult(DbDataReader reader)
{
var fieldIndex = 0;
T result = new Dictionary<string, object>();
var result = new T();
for (var aliasIndex = 0; aliasIndex < _tableAlias.Count; aliasIndex++)
{
var navValue = result;
@@ -281,7 +281,7 @@ namespace FreeSql.Extensions.ZeroEntity
fieldIndex += _tableAlias[aliasIndex].Table.Columns.Count;
continue;
}
drctx.Result = new Dictionary<string, object>();
drctx.Result = new T();
navValue[_tableAlias[aliasIndex].NavPath.LastOrDefault()] = drctx.Result;
}
_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.Linq;
using System.Reflection;
using T = System.Collections.Generic.IDictionary<string, object>;
using T = System.Collections.Generic.Dictionary<string, object>;
namespace FreeSql.Extensions.ZeroEntity
{
@@ -607,7 +607,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
{
var valueEach = _AuditJsonElementMethodJsonElementEnumerateObject.Invoke(value, new object[0]) as IEnumerable;
if (valueEach == null) return resetValue?.Invoke(null);
var newValue = new Dictionary<string, object>();
var newValue = new T();
foreach (var valueItem in valueEach)
{
if (valueItem == null) continue;
@@ -1101,7 +1101,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
var key = GetEntityKeyString(table, entityFrom);
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);
@@ -1140,7 +1140,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
//entityTo.Remove(nav.Key);
continue;
}
var valTo = new Dictionary<string, object>();
var valTo = new T();
SetNavigateRelationshipValue(nav.Value, entityFrom, valFrom);
if (LocalMapEntityValue(nav.Value.RefTable, valFrom, valTo))
entityTo[nav.Key] = valTo;
@@ -1159,7 +1159,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
foreach (var fromObj in valFromList)
{
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))
valTo.Add(toItem);
}
@@ -1179,7 +1179,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
{
if (fromObj is T fromItem == false || fromItem == null) continue;
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
if (fromItem.TryGetValue(col.CsName, out var colval))
toItem[col.CsName] = colval;
@@ -1197,7 +1197,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
continue;
}
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)
if (valFrom.TryGetValue(col.CsName, out var colval))
valTo[col.CsName] = colval;
@@ -1568,7 +1568,7 @@ ManyToMany 级联删除中间表（注意不删除外部根）
foreach (var ritem in rights)
{
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++)
if (entity.TryGetValue(nav.Columns[x], out var colval))
midval[nav.MiddleColumns[x]] = colval;