v3.2.683-preview20221025 - 扩展 UseMessagePackMap

Directory.Build.props

@@ -11,7 +11,7 @@
 	<!--
 	经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
 	<PropertyGroup>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 	-->
 	

Examples/base_entity/MessagePackMap.cs

@@ -0,0 +1,104 @@
+using FreeSql.DataAnnotations;
+using MessagePack;
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Threading;
+
+class MessagePackMapInfo
+{
+    public Guid id { get; set; }
+    [MessagePackMap]
+    public MessagePackMap01 Info { get; set; }
+}
+
+[MessagePackObject]
+public class MessagePackMap01
+{
+    [Key(0)]
+    public string name { get; set; }
+    [Key(1)]
+    public string address { get;set; }
+}
+
+namespace FreeSql.DataAnnotations
+{
+    public class MessagePackMapAttribute : Attribute { }
+}
+
+public static class FreeSqlMessagePackMapCoreExtensions
+{
+    internal static int _isAoped = 0;
+    static ConcurrentDictionary<Type, bool> _dicTypes = new ConcurrentDictionary<Type, bool>();
+    static MethodInfo MethodMessagePackSerializerDeserialize = typeof(MessagePackSerializer).GetMethod("Deserialize", new[] { typeof(Type), typeof(ReadOnlyMemory<byte>), typeof(MessagePackSerializerOptions), typeof(CancellationToken) });
+    static MethodInfo MethodMessagePackSerializerSerialize = typeof(MessagePackSerializer).GetMethod("Serialize", new[] { typeof(Type), typeof(object), typeof(MessagePackSerializerOptions), typeof(CancellationToken) });
+    static ConcurrentDictionary<Type, ConcurrentDictionary<string, bool>> _dicMessagePackMapFluentApi = new ConcurrentDictionary<Type, ConcurrentDictionary<string, bool>>();
+    static object _concurrentObj = new object();
+
+    public static ColumnFluent MessagePackMap(this ColumnFluent col)
+    {
+        _dicMessagePackMapFluentApi.GetOrAdd(col._entityType, et => new ConcurrentDictionary<string, bool>())
+                            .GetOrAdd(col._property.Name, pn => true);
+        return col;
+    }
+
+    public static void UseMessagePackMap(this IFreeSql that)
+    {
+        UseMessagePackMap(that, MessagePackSerializerOptions.Standard);
+    }
+
+    public static void UseMessagePackMap(this IFreeSql that, MessagePackSerializerOptions settings)
+    {
+        if (Interlocked.CompareExchange(ref _isAoped, 1, 0) == 0)
+        {
+            FreeSql.Internal.Utils.GetDataReaderValueBlockExpressionSwitchTypeFullName.Add((LabelTarget returnTarget, Expression valueExp, Type type) =>
+            {
+                if (_dicTypes.ContainsKey(type)) 
+                    return Expression.IfThenElse(
+                    Expression.TypeIs(valueExp, type),
+                    Expression.Return(returnTarget, valueExp),
+                    Expression.Return(returnTarget, Expression.TypeAs(
+                        Expression.Call(MethodMessagePackSerializerDeserialize,
+                            Expression.Constant(type),
+                            Expression.New(typeof(ReadOnlyMemory<byte>).GetConstructor(new[] { typeof(byte[]) }), Expression.Convert(valueExp, typeof(byte[]))),
+                            Expression.Constant(settings, typeof(MessagePackSerializerOptions)),
+                            Expression.Constant(default(CancellationToken), typeof(CancellationToken)))
+                    , type))
+                );
+                return null;
+            });
+        }
+
+        that.Aop.ConfigEntityProperty += (s, e) =>
+        {
+            var isMessagePackMap = e.Property.GetCustomAttributes(typeof(MessagePackMapAttribute), false).Any() || _dicMessagePackMapFluentApi.TryGetValue(e.EntityType, out var tryjmfu) && tryjmfu.ContainsKey(e.Property.Name);
+            if (isMessagePackMap)
+            {
+                e.ModifyResult.MapType = typeof(byte[]);
+                e.ModifyResult.StringLength = -2;
+                if (_dicTypes.TryAdd(e.Property.PropertyType, true))
+                {
+                    lock (_concurrentObj)
+                    {
+                        FreeSql.Internal.Utils.dicExecuteArrayRowReadClassOrTuple[e.Property.PropertyType] = true;
+                        FreeSql.Internal.Utils.GetDataReaderValueBlockExpressionObjectToBytesIfThenElse.Add((LabelTarget returnTarget, Expression valueExp, Expression elseExp, Type type) =>
+                        {
+                            return Expression.IfThenElse(
+                                Expression.TypeIs(valueExp, e.Property.PropertyType),
+                                Expression.Return(returnTarget,
+                                    Expression.Call(MethodMessagePackSerializerSerialize,
+                                        Expression.Constant(e.Property.PropertyType, typeof(Type)),
+                                        Expression.Convert(valueExp, typeof(object)),
+                                        Expression.Constant(settings, typeof(MessagePackSerializerOptions)),
+                                        Expression.Constant(default(CancellationToken), typeof(CancellationToken)))
+                                , typeof(object)),
+                            elseExp);
+                        });
+                    }
+                }
+            }
+        };
+    }
+}

Examples/base_entity/Program.cs

@@ -422,13 +422,19 @@ namespace base_entity
 
                 //.UseConnectionString(FreeSql.DataType.OdbcDameng, "Driver={DM8 ODBC DRIVER};Server=127.0.0.1:5236;Persist Security Info=False;Trusted_Connection=Yes;UID=USER1;PWD=123456789")
 
-                .UseMonitorCommand(null, (umcmd, log) => Console.WriteLine(umcmd.Connection.ConnectionString + ":" + umcmd.CommandText + "\r\n"))
+                .UseMonitorCommand(cmd => Console.WriteLine(cmd.CommandText + "\r\n"))
                 .UseLazyLoading(true)
                 //.UseGenerateCommandParameterWithLambda(true)
                 .Build();
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
 
+            fsql.UseMessagePackMap();
+
+            fsql.Delete<MessagePackMapInfo>().Where("1=1").ExecuteAffrows();
+            fsql.Insert(new MessagePackMapInfo { id = Guid.NewGuid(), Info = new MessagePackMap01 { name = "0023 中国国家1", address = "001address" } }).ExecuteAffrows();
+            var rem1 = fsql.Select<MessagePackMapInfo>().ToList();
+
             var result1x = fsql.Ado.QuerySingle(() => new
             {
                 DateTime.Now,

Examples/base_entity/base_entity.csproj

@@ -14,6 +14,7 @@
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 		<PackageReference Include="Npgsql.NetTopologySuite" Version="6.0.4" />
+		<PackageReference Include="MessagePack" Version="2.4.35" />
 	</ItemGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositoryAsync.cs

@@ -42,6 +42,7 @@ namespace FreeSql
             var localAffrows = 0;
             try
             {
+                rootRepository.DbContextOptions.EnableCascadeSave = false;
                 return await LocalInsertAsync(rootRepository, rootEntitys, true);
             }
             finally

Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositorySync.cs

@@ -95,6 +95,7 @@ namespace FreeSql
             var localAffrows = 0;
             try
             {
+                rootRepository.DbContextOptions.EnableCascadeSave = false;
                 return LocalInsert(rootRepository, rootEntitys, true);
             }
             finally

Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj

@@ -19,7 +19,7 @@
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
 		<LangVersion>latest</LangVersion>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Generator/FreeSql.Generator.csproj

@@ -13,7 +13,7 @@
 		<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
 		<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql.All/FreeSql.All.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql.DbContext/FreeSql.DbContext.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -800,5 +800,14 @@
             <param name="that"></param>
             <returns></returns>
         </member>
+        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
+            <summary>
+            批量注入 Repository，可以参考代码自行调整
+            </summary>
+            <param name="services"></param>
+            <param name="globalDataFilter"></param>
+            <param name="assemblies"></param>
+            <returns></returns>
+        </member>
     </members>
 </doc>

FreeSql.Repository/FreeSql.Repository.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql/FreeSql.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql/Internal/UtilsExpressionTree.cs

@@ -2014,6 +2014,7 @@ namespace FreeSql.Internal
 
         public static ConcurrentBag<Func<LabelTarget, Expression, Type, Expression>> GetDataReaderValueBlockExpressionSwitchTypeFullName = new ConcurrentBag<Func<LabelTarget, Expression, Type, Expression>>();
         public static ConcurrentBag<Func<LabelTarget, Expression, Expression, Type, Expression>> GetDataReaderValueBlockExpressionObjectToStringIfThenElse = new ConcurrentBag<Func<LabelTarget, Expression, Expression, Type, Expression>>();
+        public static ConcurrentBag<Func<LabelTarget, Expression, Expression, Type, Expression>> GetDataReaderValueBlockExpressionObjectToBytesIfThenElse = new ConcurrentBag<Func<LabelTarget, Expression, Expression, Type, Expression>>();
         public static Expression GetDataReaderValueBlockExpression(Type type, Expression value)
         {
             var returnTarget = Expression.Label(typeof(object));
@@ -2025,6 +2026,9 @@ namespace FreeSql.Internal
                     switch (type.FullName)
                     {
                         case "System.Byte[]":
+                            Expression callToBytesExp = Expression.Return(returnTarget, Expression.Call(Expression.Constant(DefaultEncoding), MethodEncodingGetBytes, Expression.Call(MethodToString, valueExp)));
+                            foreach (var toBytesFunc in GetDataReaderValueBlockExpressionObjectToBytesIfThenElse)
+                                callToBytesExp = toBytesFunc(returnTarget, valueExp, callToBytesExp, type);
                             return Expression.IfThenElse(
                                 Expression.TypeEqual(valueExp, type),
                                 Expression.Return(returnTarget, valueExp),
@@ -2034,7 +2038,7 @@ namespace FreeSql.Internal
                                     Expression.IfThenElse(
                                         Expression.OrElse(Expression.TypeEqual(valueExp, typeof(Guid)), Expression.TypeEqual(valueExp, typeof(Guid?))),
                                         Expression.Return(returnTarget, Expression.Call(MethodGuidToBytes, Expression.Convert(valueExp, typeof(Guid)))),
-                                        Expression.Return(returnTarget, Expression.Call(Expression.Constant(DefaultEncoding), MethodEncodingGetBytes, Expression.Call(MethodToString, valueExp)))
+                                        callToBytesExp
                                     )
                                 )
                             );

Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj

@@ -19,7 +19,7 @@
 		<SignAssembly>False</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.OracleOledb/FreeSql.Provider.OracleOledb.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<DelaySign>false</DelaySign>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj

@@ -18,7 +18,7 @@
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
         <DelaySign>false</DelaySign>
-		<Version>3.2.682</Version>
+		<Version>3.2.683-preview20221025</Version>
     </PropertyGroup>
 
     <ItemGroup>