Add ability to store dynamic component in any format

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH2664Dynamic/Fixture.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using NUnit.Framework;
 using System.Collections.Generic;
+using System.Dynamic;
 using System.Linq.Dynamic.Core;
 
 namespace NHibernate.Test.NHSpecificTest.NH2664Dynamic
@@ -22,37 +23,38 @@ protected override void OnSetUp()
 			using (var session = OpenSession())
 			using (var tran = session.BeginTransaction())
 			{
+				var properties1 = new Dictionary<string, object>
+				{
+					["Name"] = "First Product",
+					["Description"] = "First Description"
+				};
 				session.Save(
 					new Product
 					{
 						ProductId = "1",
-						Properties = new Dictionary<string, object>
-						{
-							["Name"] = "First Product",
-							["Description"] = "First Description"
-						}
+						Properties = properties1
 					});
 
+				var properties2 = new
+				{
+					Name = "Second Product",
+					Description = "Second Description"
+				};
 				session.Save(
 					new Product
 					{
 						ProductId = "2",
-						Properties = new Dictionary<string, object>
-						{
-							["Name"] = "Second Product",
-							["Description"] = "Second Description"
-						}
+						Properties = properties2
 					});
 
+				dynamic properties3 = new ExpandoObject();
+				properties3.Name = "Third Product";
+				properties3.Description = "Third Description";
 				session.Save(
 					new Product
 					{
 						ProductId = "3",
-						Properties = new Dictionary<string, object>
-						{
-							["Name"] = "val",
-							["Description"] = "val"
-						}
+						Properties = properties3
 					});
 
 				tran.Commit();

src/NHibernate/NHibernate.csproj

@@ -49,6 +49,7 @@
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Configuration" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
@@ -63,6 +64,7 @@
     <PackageReference Include="System.Security.Permissions" Version="4.4.1" />
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
   </ItemGroup>
 
   <ItemGroup>

src/NHibernate/Properties/MapAccessor.cs

@@ -2,87 +2,79 @@
 using System.Reflection;
 using NHibernate.Engine;
 using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Microsoft.CSharp.RuntimeBinder;
+using Binder = Microsoft.CSharp.RuntimeBinder.Binder;
+
 namespace NHibernate.Properties
 {
 	[Serializable]
 	public class MapAccessor : IPropertyAccessor
-	{
-		#region IPropertyAccessor Members
+	{		
+		public IGetter GetGetter(System.Type theClass, string propertyName) => new MapGetter(propertyName);
 
-		public IGetter GetGetter(System.Type theClass, string propertyName)
-		{
-			return new MapGetter(propertyName);
-		}
+		public ISetter GetSetter(System.Type theClass, string propertyName) => new MapSetter(propertyName);
 
-		public ISetter GetSetter(System.Type theClass, string propertyName)
-		{
-			return new MapSetter(propertyName);
-		}
+		public bool CanAccessThroughReflectionOptimizer => false;
 
-		public bool CanAccessThroughReflectionOptimizer
-		{
-			get { return false; }
-		}
-
-		#endregion
 		[Serializable]
 		public sealed class MapSetter : ISetter
 		{
-			private readonly string name;
+			private readonly string _name;
 
-			internal MapSetter(string name)
-			{
-				this.name = name;
-			}
+			internal MapSetter(string name) => _name = name;
 
-			public MethodInfo Method
-			{
-				get { return null; }
-			}
+			public MethodInfo Method => null;
 
-			public string PropertyName
-			{
-				get { return null; }
-			}
+			public string PropertyName => null;
 
 			public void Set(object target, object value)
 			{
-				((IDictionary)target)[name] = value;
+				((IDictionary) target)[_name] = value;
 			}
 		}
+		
 		[Serializable]
 		public sealed class MapGetter : IGetter
 		{
-			private readonly string name;
+			private static readonly ConcurrentDictionary<string, CallSite<Func<CallSite, object, object>>> GetMemberSites =
+				new ConcurrentDictionary<string, CallSite<Func<CallSite, object, object>>>();
 
-			internal MapGetter(string name)
-			{
-				this.name = name;
-			}
+			private readonly string _name;
 
-			public MethodInfo Method
-			{
-				get { return null; }
-			}
+			internal MapGetter(string name) => _name = name;
 
-			public object GetForInsert(object owner, IDictionary mergeMap, ISessionImplementor session)
-			{
-				return Get(owner);
-			}
+			public MethodInfo Method => null;
 
-			public string PropertyName
-			{
-				get { return null; }
-			}
+			public object GetForInsert(object owner, IDictionary mergeMap, ISessionImplementor session) => Get(owner);
 
-			public System.Type ReturnType
-			{
-				get { return typeof(object); }
-			}
+			public string PropertyName => null;
+
+			public System.Type ReturnType => typeof(object);
 
 			public object Get(object target)
 			{
-				return ((IDictionary)target)[name];
+				switch (target)
+				{
+					case IDictionary d:
+						return d[_name];
+					case IDictionary<string, object> d:
+						d.TryGetValue(_name, out var result);
+						return result;
+					default:
+						var site = GetMemberSites.GetOrAdd(
+							_name,
+							name => CallSite<Func<CallSite, object, object>>.Create(
+								Binder.GetMember(
+									CSharpBinderFlags.None,
+									name,
+									target.GetType(),
+									new[] {CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null)})));
+						
+						return site.Target(site, target);
+				}
 			}
 		}
 	}