- 调整 ZeroDbContext Dictionary -> IDictionary

Author: 2881099

Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.xml

@@ -8,7 +8,7 @@
 using System.Data.Common;
 using System.Linq;
 using System.Text;
-using T = System.Collections.Generic.Dictionary<string, object>;
+using T = System.Collections.Generic.IDictionary<string, object>;
 
 namespace FreeSql.Extensions.ZeroEntity
 {
@@ -249,7 +249,7 @@ TableAliasInfo FlagFetchResult(ZeroTableInfo table, string alias, string navPath
 			T FetchResult(DbDataReader reader)
 			{
 				var fieldIndex = 0;
-				var result = new T();
+				T result = new Dictionary<string, object>();
 				for (var aliasIndex = 0; aliasIndex < _tableAlias.Count; aliasIndex++)
 				{
 					var navValue = result;
@@ -281,7 +281,7 @@ T FetchResult(DbDataReader reader)
 							fieldIndex += _tableAlias[aliasIndex].Table.Columns.Count;
 							continue;
 						}
-						drctx.Result = new T();
+						drctx.Result = new Dictionary<string, object>();
 						navValue[_tableAlias[aliasIndex].NavPath.LastOrDefault()] = drctx.Result;
 					}
 					_fieldReader[aliasIndex](drctx);
@@ -603,7 +603,7 @@ public SelectImpl Where(IEnumerable<T> items)
             public SelectImpl WhereDynamic(object dywhere)
 			{
 				if (dywhere == null) return this;
-				if (dywhere is Dictionary<string, object> dict)
+				if (dywhere is IDictionary<string, object> dict)
 				{
 					foreach(var kv in dict)
                         WhereDynamicFilter(new DynamicFilterInfo { Field = kv.Key, Operator = DynamicFilterOperator.Eq, Value = kv.Value });

Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs

@@ -10,7 +10,7 @@
 using System.Data.Common;
 using System.Linq;
 using System.Reflection;
-using T = System.Collections.Generic.Dictionary<string, object>;
+using T = System.Collections.Generic.IDictionary<string, object>;
 
 namespace FreeSql.Extensions.ZeroEntity
 {
@@ -607,7 +607,7 @@ object LocalAuditJsonElement(Func<object, object> resetValue, object value)
                                     {
                                         var valueEach = _AuditJsonElementMethodJsonElementEnumerateObject.Invoke(value, new object[0]) as IEnumerable;
                                         if (valueEach == null) return resetValue?.Invoke(null);
-                                        var newValue = new T();
+                                        var newValue = new Dictionary<string, object>();
                                         foreach (var valueItem in valueEach)
                                         {
                                             if (valueItem == null) continue;
@@ -1101,7 +1101,7 @@ void LocalAttachCascade(ZeroTableInfo table, T entityFrom, bool flag)
 
                 var key = GetEntityKeyString(table, entityFrom);
                 if (key == null) return;
-                var state = new EntityState(new T(), key);
+                var state = new EntityState(new Dictionary<string, object>(), key);
 
                 LocalMapEntityValue(table, entityFrom, state.Value);
 
@@ -1140,7 +1140,7 @@ bool LocalMapEntityValue(ZeroTableInfo table, T entityFrom, T entityTo)
                                     //entityTo.Remove(nav.Key);
                                     continue;
                                 }
-                                var valTo = new T();
+                                var valTo = new Dictionary<string, object>();
                                 SetNavigateRelationshipValue(nav.Value, entityFrom, valFrom);
                                 if (LocalMapEntityValue(nav.Value.RefTable, valFrom, valTo))
                                     entityTo[nav.Key] = valTo;
@@ -1159,7 +1159,7 @@ bool LocalMapEntityValue(ZeroTableInfo table, T entityFrom, T entityTo)
                                 foreach (var fromObj in valFromList)
                                 {
                                     if (fromObj is T fromItem == false || fromItem == null) continue;
-                                    var toItem = new T();
+                                    var toItem = new Dictionary<string, object>();
                                     if (LocalMapEntityValue(nav.Value.RefTable, fromItem, toItem))
                                         valTo.Add(toItem);
                                 }
@@ -1179,7 +1179,7 @@ bool LocalMapEntityValue(ZeroTableInfo table, T entityFrom, T entityTo)
                                 {
                                     if (fromObj is T fromItem == false || fromItem == null) continue;
                                     LocalAttachCascade(nav.Value.RefTable, fromItem, includeOutside); //创建新的 states
-                                    var toItem = new T();
+                                    var toItem = new Dictionary<string, object>();
                                     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 @@ bool LocalMapEntityValue(ZeroTableInfo table, T entityFrom, T entityTo)
                                     continue;
                                 }
                                 LocalAttachCascade(nav.Value.RefTable, valFrom, includeOutside); //创建新的 states
-                                var valTo = new T();
+                                var valTo = new Dictionary<string, object>();
                                 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 @@ List<T> GetManyToManyObjects(ZeroTableRef nav, T entity, string navName)
             foreach (var ritem in rights)
             {
                 if (ritem is T right == false || right == null) continue;
-                var midval = new T();
+                var midval = new Dictionary<string, object>();
                 for (var x = 0; x < nav.Columns.Count; x++)
                     if (entity.TryGetValue(nav.Columns[x], out var colval))
                         midval[nav.MiddleColumns[x]] = colval;