- 增加 EfCoreFluentApi HasData 设定 CodeFirst 种子数据；

- 完善 EfCoreFluentApi 功能测试；
- 增加 DbContextOptions.NoneParameter 设置是否使用参数化执行 Insert/Update；

FreeSql/DataAnnotations/TableFluent.cs

@@ -8,22 +8,17 @@ namespace FreeSql.DataAnnotations
 {
     public class TableFluent
     {
-
-        public TableFluent(ICodeFirst codeFirst, Type entityType, TableAttribute table)
+        public TableFluent(Type entityType, TableAttribute table)
         {
-            _codeFirst = codeFirst;
             _entityType = entityType;
             _properties = _entityType.GetPropertiesDictIgnoreCase();
             _table = table;
         }
 
-        ICodeFirst _codeFirst;
         Type _entityType;
         Dictionary<string, PropertyInfo> _properties;
         TableAttribute _table;
 
-        public void ConfigEntity<T2>(Action<TableFluent<T2>> fluent2) => _codeFirst.ConfigEntity<T2>(fluent2);
-
         /// <summary>
         /// 数据库表名
         /// </summary>
@@ -89,20 +84,15 @@ namespace FreeSql.DataAnnotations
 
     public class TableFluent<T>
     {
-
-        public TableFluent(ICodeFirst codeFirst, TableAttribute table)
+        public TableFluent(TableAttribute table)
         {
-            _codeFirst = codeFirst;
             _properties = typeof(T).GetPropertiesDictIgnoreCase();
             _table = table;
         }
 
-        ICodeFirst _codeFirst;
         Dictionary<string, PropertyInfo> _properties;
         TableAttribute _table;
 
-        public void ConfigEntity<T2>(Action<TableFluent<T2>> fluent2) => _codeFirst.ConfigEntity<T2>(fluent2);
-
         /// <summary>
         /// 数据库表名
         /// </summary>
@@ -131,7 +121,9 @@ namespace FreeSql.DataAnnotations
 
         public ColumnFluent Property<TProto>(Expression<Func<T, TProto>> column)
         {
-            var proto = (column.Body as MemberExpression)?.Member;
+            var exp = column?.Body;
+            if (exp?.NodeType == ExpressionType.Convert) exp = (exp as UnaryExpression)?.Operand;
+            var proto = (exp as MemberExpression)?.Member;
             if (proto == null) throw new FormatException($"错误的表达式格式 {column}");
             return Property(proto.Name);
         }
@@ -152,7 +144,9 @@ namespace FreeSql.DataAnnotations
         /// <returns></returns>
         public TableFluent<T> Navigate<TProto>(Expression<Func<T, TProto>> proto, string bind, Type manyToMany = null)
         {
-            var member = (proto.Body as MemberExpression)?.Member;
+            var exp = proto?.Body;
+            if (exp.NodeType == ExpressionType.Convert) exp = (exp as UnaryExpression)?.Operand;
+            var member = (exp as MemberExpression)?.Member;
             if (member == null) throw new FormatException($"错误的表达式格式 {proto}");
             return Navigate(member.Name, bind, manyToMany);
         }

FreeSql/Extensions/FreeSqlGlobalExtensions.cs

@@ -58,6 +58,7 @@ public static partial class FreeSqlGlobalExtensions
         if (type == null) return null;
         if (type == typeof(void)) return "void";
         if (type.IsGenericParameter) return type.Name;
+        if (type.IsArray) return $"{DisplayCsharp(type.GetElementType())}[]";
         var sb = new StringBuilder();
         var nestedType = type;
         while (nestedType.IsNested)

FreeSql/FreeSql.xml

@@ -2317,6 +2317,137 @@
             <param name="parms"></param>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{System.Data.Common.DbDataReader,System.Threading.Tasks.Task},System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
+            <summary>
+            查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
+            </summary>
+            <param name="readerHander"></param>
+            <param name="cmdType"></param>
+            <param name="cmdText"></param>
+            <param name="cmdParms"></param>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{System.Data.Common.DbDataReader,System.Threading.Tasks.Task},System.String,System.Object)">
+            <summary>
+            查询，ExecuteReaderAsync(dr => {}, "select * from user where age > ?age", new { age = 25 })
+            </summary>
+            <param name="cmdText"></param>
+            <param name="parms"></param>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
+            <summary>
+            查询
+            </summary>
+            <param name="cmdText"></param>
+            <param name="cmdParms"></param>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.String,System.Object)">
+            <summary>
+            查询，ExecuteArrayAsync("select * from user where age > ?age", new { age = 25 })
+            </summary>
+            <param name="cmdText"></param>
+            <param name="parms"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
+            <summary>
+            查询
+            </summary>
+            <param name="cmdText"></param>
+            <param name="cmdParms"></param>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.String,System.Object)">
+            <summary>
+            查询，ExecuteDataSetAsync("select * from user where age > ?age; select 2", new { age = 25 })
+            </summary>
+            <param name="cmdText"></param>
+            <param name="parms"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
+            <summary>
+            查询
+            </summary>
+            <param name="cmdText"></param>
+            <param name="cmdParms"></param>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.String,System.Object)">
+            <summary>
+            查询，ExecuteDataTableAsync("select * from user where age > ?age", new { age = 25 })
+            </summary>
+            <param name="cmdText"></param>
+            <param name="parms"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
+            <summary>
+            在【主库】执行
+            </summary>
+            <param name="cmdType"></param>
+            <param name="cmdText"></param>
+            <param name="cmdParms"></param>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.String,System.Object)">
+            <summary>
+            在【主库】执行，ExecuteNonQueryAsync("delete from user where age > ?age", new { age = 25 })
+            </summary>
+            <param name="cmdText"></param>
+            <param name="parms"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
+            <summary>
+            在【主库】执行
+            </summary>
+            <param name="cmdType"></param>
+            <param name="cmdText"></param>
+            <param name="cmdParms"></param>
+        </member>
+        <member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.String,System.Object)">
+            <summary>
+            在【主库】执行，ExecuteScalarAsync("select 1 from user where age > ?age", new { age = 25 })
+            </summary>
+            <param name="cmdText"></param>
+            <param name="parms"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.IAdo.QueryAsync``1(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
+            <summary>
+            执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > ?age", new SqlParameter { ParameterName = "age", Value = 25 })
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="cmdType"></param>
+            <param name="cmdText"></param>
+            <param name="cmdParms"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.IAdo.QueryAsync``1(System.String,System.Object)">
+            <summary>
+            执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > ?age", new { age = 25 })
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="cmdText"></param>
+            <param name="parms"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.IAdo.QueryAsync``2(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
+            <summary>
+            执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
+            </summary>
+            <typeparam name="T1"></typeparam>
+            <param name="cmdType"></param>
+            <param name="cmdText"></param>
+            <param name="cmdParms"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.IAdo.QueryAsync``2(System.String,System.Object)">
+            <summary>
+            执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age; select * from address", new { age = 25 })
+            </summary>
+            <typeparam name="T1"></typeparam>
+            <param name="cmdText"></param>
+            <param name="parms"></param>
+            <returns></returns>
+        </member>
         <member name="E:FreeSql.IAop.ParseExpression">
             <summary>
             可自定义解析表达式
@@ -2840,6 +2971,12 @@
             <param name="timeout">超时</param>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.GetAsync">
+            <summary>
+            获取资源
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)">
             <summary>
             使用完毕后，归还资源
@@ -2910,6 +3047,12 @@
             </summary>
             <param name="obj">资源对象</param>
         </member>
+        <member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnGetAsync(FreeSql.Internal.ObjectPool.Object{`0})">
+            <summary>
+            从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
+            </summary>
+            <param name="obj">资源对象</param>
+        </member>
         <member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})">
             <summary>
             归还对象给对象池的时候触发

FreeSql/FreeSqlBuilder.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.Data.Common;
 using System.Linq;
 using System.Reflection;
@@ -308,7 +309,7 @@ namespace FreeSql
                 {
                     ret.Aop.SyncStructureAfter += new EventHandler<Aop.SyncStructureAfterEventArgs>((s, e) =>
                     {
-                        if (string.IsNullOrEmpty(e.Sql)) return;
+                        if (_seedData._data.Any() == false) return;
                         foreach (var et in e.EntityTypes)
                         {
                             if (_seedData._data.TryGetValue(et, out var sd) == false) continue;
@@ -320,6 +321,7 @@ namespace FreeSql
                                 .InsertIdentity()
                                 .AppendData(sd.ToArray())
                                 .ExecuteAffrows();
+                            _seedData._data.TryRemove(et, out var old);
                         }
                     });
 
@@ -335,11 +337,11 @@ namespace FreeSql
 
         public class SeedDataBuilder
         {
-            internal Dictionary<Type, List<object>> _data = new Dictionary<Type, List<object>>();
+            internal ConcurrentDictionary<Type, List<object>> _data = new ConcurrentDictionary<Type, List<object>>();
             public SeedDataBuilder Apply<T>(T data) where T : class
             {
                 if (_data.TryGetValue(typeof(T), out var ds) == false)
-                    _data.Add(typeof(T), ds = new List<object>());
+                    _data.TryAdd(typeof(T), ds = new List<object>());
                 ds.Add(data);
                 return this;
             }

FreeSql/Internal/CommonProvider/CodeFirstProvider.cs

@@ -17,9 +17,9 @@ namespace FreeSql.Internal.CommonProvider
     public abstract partial class CodeFirstProvider : ICodeFirst
     {
 
-        protected IFreeSql _orm;
-        protected CommonUtils _commonUtils;
-        protected CommonExpression _commonExpression;
+        public IFreeSql _orm;
+        public CommonUtils _commonUtils;
+        public CommonExpression _commonExpression;
         public CodeFirstProvider(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression)
         {
             _orm = orm;

FreeSql/Internal/CommonProvider/InsertProvider.cs

@@ -134,6 +134,8 @@ namespace FreeSql.Internal.CommonProvider
         public static void AuditDataValue(object sender, T1 data, IFreeSql orm, TableInfo table, Dictionary<string, bool> changedDict)
         {
             if (data == null) return;
+            if (typeof(T1) == typeof(object) && data.GetType() != table.Type)
+                throw new Exception($"操作的数据类型({data.GetType().DisplayCsharp()}) 与 AsType({table.Type.DisplayCsharp()}) 不一致，请检查。");
             foreach (var col in table.Columns.Values)
             {
                 object val = col.GetMapValue(data);

FreeSql/Internal/CommonProvider/UpdateProvider.cs

@@ -351,6 +351,8 @@ namespace FreeSql.Internal.CommonProvider
         {
             if (orm.Aop.AuditValueHandler == null) return;
             if (data == null) return;
+            if (typeof(T1) == typeof(object) && data.GetType() != table.Type) 
+                throw new Exception($"操作的数据类型({data.GetType().DisplayCsharp()}) 与 AsType({table.Type.DisplayCsharp()}) 不一致，请检查。");
             foreach (var col in table.Columns.Values)
             {
                 object val = col.GetMapValue(data);

FreeSql/Internal/CommonUtils.cs

@@ -79,7 +79,7 @@ namespace FreeSql.Internal
             if (entity == null) return _orm.CodeFirst;
             var type = typeof(T);
             var table = dicConfigEntity.GetOrAdd(type, new TableAttribute());
-            var fluent = new TableFluent<T>(CodeFirst, table);
+            var fluent = new TableFluent<T>(table);
             entity.Invoke(fluent);
             Utils.RemoveTableByEntity(type, this); //remove cache
             return _orm.CodeFirst;
@@ -88,7 +88,7 @@ namespace FreeSql.Internal
         {
             if (entity == null) return _orm.CodeFirst;
             var table = dicConfigEntity.GetOrAdd(type, new TableAttribute());
-            var fluent = new TableFluent(CodeFirst, type, table);
+            var fluent = new TableFluent(type, table);
             entity.Invoke(fluent);
             Utils.RemoveTableByEntity(type, this); //remove cache
             return _orm.CodeFirst;