Add support for dynamic components

Author: maca88

src/NHibernate.DomainModel/Northwind/Entities/DynamicUser.cs

@@ -0,0 +1,13 @@
+using System.Collections;
+
+namespace NHibernate.DomainModel.Northwind.Entities
+{
+	public class DynamicUser
+	{
+		public virtual int Id { get; set; }
+
+		public virtual dynamic Properties { get; set; }
+
+		public virtual IDictionary Settings { get; set; }
+	}
+}

src/NHibernate.DomainModel/Northwind/Entities/Northwind.cs

@@ -69,6 +69,11 @@ public IQueryable<User> Users
             get { return _session.Query<User>(); }
         }
 
+        public IQueryable<DynamicUser> DynamicUsers
+        {
+            get { return _session.Query<DynamicUser>(); }
+        }
+
         public IQueryable<PatientRecord> PatientRecords
         {
             get { return _session.Query<PatientRecord>(); }

src/NHibernate.DomainModel/Northwind/Mappings/DynamicUser.hbm.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
+  <class name="DynamicUser" mutable="false">
+    <subselect>
+      select * from Users
+    </subselect>
+
+    <id name="Id" column="UserId" type="Int32">
+      <generator class="assigned" />
+    </id>
+
+    <dynamic-component name="Properties">
+      <property name="Name" type="AnsiString" />
+      <property name="Enum1" type="NHibernate.DomainModel.Northwind.Entities.EnumStoredAsStringType, NHibernate.DomainModel">
+        <column name="Enum1" length="12" />
+      </property>
+      <many-to-one name="CreatedBy" class="User" not-null="true" lazy="false">
+        <column name="CreatedById" not-null="true" />
+      </many-to-one>
+    </dynamic-component>
+
+    <dynamic-component name="Settings">
+      <property name="Property1" type="AnsiString" />
+      <property name="Property2" type="AnsiString" />
+      <many-to-one name="ModifiedBy" class="User" lazy="false">
+        <column name="ModifiedById" />
+      </many-to-one>
+    </dynamic-component>
+  </class>
+</hibernate-mapping>

src/NHibernate.Test/Linq/LinqTestCase.cs

@@ -34,7 +34,8 @@ protected override string[] Mappings
 					"Northwind.Mappings.User.hbm.xml",
 					"Northwind.Mappings.TimeSheet.hbm.xml",
 					"Northwind.Mappings.Animal.hbm.xml",
-					"Northwind.Mappings.Patient.hbm.xml"
+					"Northwind.Mappings.Patient.hbm.xml",
+					"Northwind.Mappings.DynamicUser.hbm.xml"
 				};
 			}
 		}

…te.Test/Linq/ConstantTypeLocatorTests.cs …e.Test/Linq/ParameterTypeLocatorTests.cssrc/NHibernate.Test/Linq/ConstantTypeLocatorTests.cs renamed to src/NHibernate.Test/Linq/ParameterTypeLocatorTests.cs src/NHibernate.Test/Linq/ConstantTypeLocatorTests.cs renamed to src/NHibernate.Test/Linq/ParameterTypeLocatorTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Linq.Dynamic.Core;
 using System.Linq.Expressions;
 using NHibernate.DomainModel.Northwind.Entities;
 using NHibernate.Engine.Query;
@@ -13,7 +14,7 @@
 
 namespace NHibernate.Test.Linq
 {
-	public class ConstantTypeLocatorTests : LinqTestCase
+	public class ParameterTypeLocatorTests : LinqTestCase
 	{
 		[Test]
 		public void AddIntegerTest()
@@ -172,8 +173,7 @@ public void ConditionalTest()
 				new Dictionary<string, Predicate<IType>>
 				{
 					{"2", o => o is EnumStoredAsStringType},
-					{"Unspecified", o => o is EnumStoredAsStringType},
-					{"null", o => o is PersistentEnumType}, // HasValue
+					{"Unspecified", o => o is EnumStoredAsStringType}
 				},
 				db.Users.Where(o => (o.NullableEnum2.HasValue ? o.Enum1 : EnumStoredAsString.Unspecified) == EnumStoredAsString.Medium),
 				db.Users.Where(o => EnumStoredAsString.Medium == (o.NullableEnum2.HasValue ? EnumStoredAsString.Unspecified : o.Enum1))
@@ -189,8 +189,7 @@ public void DoubleConditionalTest()
 					{"0", o => o is PersistentEnumType},
 					{"2", o => o is EnumStoredAsStringType},
 					{"Small", o => o is EnumStoredAsStringType},
-					{"Unspecified", o => o is EnumStoredAsStringType},
-					{"null", o => o is PersistentEnumType}, // HasValue
+					{"Unspecified", o => o is EnumStoredAsStringType}
 				},
 				db.Users.Where(o => (o.Enum2 != EnumStoredAsInt32.Unspecified
 										? (o.NullableEnum2.HasValue ? o.Enum1 : EnumStoredAsString.Unspecified)
@@ -228,6 +227,36 @@ public void ConditionalMemberTest()
 			);
 		}
 
+		[Test]
+		public void DynamicMemberTest()
+		{
+			AssertResults(
+				new Dictionary<string, Predicate<IType>>
+				{
+					{"\"test\"", o => o is AnsiStringType},
+				},
+				db.DynamicUsers.Where("Properties.Name == @0", "test"),
+				db.DynamicUsers.Where("@0 == Properties.Name", "test")
+			);
+		}
+
+		[Test]
+		public void DynamicDictionaryMemberTest()
+		{
+			AssertResults(
+				new Dictionary<string, Predicate<IType>>
+				{
+					{"\"test\"", o => o is AnsiStringType},
+				},
+#pragma warning disable CS0252
+				db.DynamicUsers.Where(o => o.Settings["Property1"] == "test"),
+#pragma warning restore CS0252
+#pragma warning disable CS0253
+				db.DynamicUsers.Where(o => "test" == o.Settings["Property1"])
+#pragma warning restore CS0253
+			);
+		}
+
 		[Test]
 		public void AssignMemberTest()
 		{
@@ -373,19 +402,20 @@ private void AssertResult(
 			System.Type targetType)
 		{
 			var result = NhRelinqQueryParser.PreTransform(expression, new PreTransformationParameters(queryMode, Sfi));
+			var parameters = ExpressionParameterVisitor.Visit(result);
 			expression = result.Expression;
 			var queryModel = NhRelinqQueryParser.Parse(expression);
-			var types = ConstantTypeLocator.GetTypes(queryModel, targetType, Sfi);
-			Assert.That(types.Count, Is.EqualTo(expectedResults.Count), "Incorrect number of constants");
-			foreach (var pair in types)
+			ParameterTypeLocator.SetParameterTypes(parameters, queryModel, targetType, Sfi);
+			Assert.That(parameters.Count, Is.EqualTo(expectedResults.Count), "Incorrect number of parameters");
+			foreach (var pair in parameters)
 			{
 				var origCulture = CultureInfo.CurrentCulture;
 				try
 				{
 					CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
 					var expressionText = pair.Key.ToString();
 					Assert.That(expectedResults.ContainsKey(expressionText), Is.True, $"{expressionText} constant is not expected");
-					Assert.That(expectedResults[expressionText](pair.Value), Is.True, $"Invalid type, actual type: {pair.Value?.Name ?? "null"}");
+					Assert.That(expectedResults[expressionText](pair.Value.Type), Is.True, $"Invalid type, actual type: {pair.Value?.Name ?? "null"}");
 				}
 				finally
 				{

src/NHibernate/Linq/NhLinqExpression.cs

@@ -91,7 +91,7 @@ public IASTNode Translate(ISessionFactoryImplementor sessionFactory, bool filter
 			var requiredHqlParameters = new List<NamedParameterDescriptor>();
 			var queryModel = NhRelinqQueryParser.Parse(_expression);
 			queryModel.TransformExpressions(TransparentIdentifierRemovingExpressionVisitor.ReplaceTransparentIdentifiers);
-			SetParameterTypes(sessionFactory, queryModel);
+			ParameterTypeLocator.SetParameterTypes(_constantToParameterMap, queryModel, TargetType, sessionFactory, true);
 			var visitorParameters = new VisitorParameters(sessionFactory, _constantToParameterMap, requiredHqlParameters,
 				new QuerySourceNamer(), TargetType, QueryMode);
 
@@ -122,24 +122,6 @@ internal void CopyExpressionTranslation(NhLinqExpression other)
 			Type = other.Type;
 		}
 
-		private void SetParameterTypes(
-			ISessionFactoryImplementor sessionFactory,
-			QueryModel queryModel)
-		{
-			if (_constantToParameterMap.Count == 0)
-			{
-				return;
-			}
-
-			foreach (var pair in ConstantTypeLocator.GetTypes(queryModel, TargetType, sessionFactory, true))
-			{
-				if (_constantToParameterMap.TryGetValue(pair.Key, out var parameter))
-				{
-					parameter.Type = pair.Value;
-				}
-			}
-		}
-
 		private static IASTNode DuplicateTree(IASTNode ast)
 		{
 			var thisNode = ast.DupNode();

src/NHibernate/Linq/Visitors/ExpressionKeyVisitor.cs

@@ -10,6 +10,7 @@
 using NHibernate.Engine;
 using NHibernate.Param;
 using NHibernate.Type;
+using NHibernate.Util;
 using Remotion.Linq.Parsing;
 
 namespace NHibernate.Linq.Visitors
@@ -206,6 +207,19 @@ protected override Expression VisitMember(MemberExpression expression)
 			return expression;
 		}
 
+		protected override Expression VisitInvocation(InvocationExpression expression)
+		{
+			if (ExpressionsHelper.TryGetDynamicMemberBinder(expression, out var memberBinder))
+			{
+				Visit(expression.Arguments[1]);
+				_string.Append(".");
+				_string.Append(memberBinder.Name);
+				return expression;
+			}
+
+			return base.VisitInvocation(expression);
+		}
+
 		protected override Expression VisitMethodCall(MethodCallExpression expression)
 		{
 			Visit(expression.Object);

src/NHibernate/Linq/Visitors/ExpressionParameterVisitor.cs

@@ -106,6 +106,18 @@ protected override Expression VisitMethodCall(MethodCallExpression expression)
 			return base.VisitMethodCall(expression);
 		}
 
+		protected override Expression VisitInvocation(InvocationExpression expression)
+		{
+			if (ExpressionsHelper.TryGetDynamicMemberBinder(expression, out _))
+			{
+				// Avoid adding System.Runtime.CompilerServices.CallSite instance as a parameter
+				base.Visit(expression.Arguments[1]);
+				return expression;
+			}
+
+			return base.VisitInvocation(expression);
+		}
+
 		protected override Expression VisitConstant(ConstantExpression expression)
 		{
 			if (!_parameters.ContainsKey(expression) && !typeof(IQueryable).IsAssignableFrom(expression.Type) && !IsNullObject(expression))

src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs

@@ -226,12 +226,7 @@ private HqlTreeNode VisitNhNominated(NhNominatedExpression nhNominatedExpression
 
 		private HqlTreeNode VisitInvocationExpression(InvocationExpression expression)
 		{
-			//This is an ugly workaround for dynamic expressions.
-			//Unfortunately we can not tap into the expression tree earlier to intercept the dynamic expression
-			if (expression.Arguments.Count == 2 &&
-			    expression.Arguments[0] is ConstantExpression constant &&
-			    constant.Value is CallSite site &&
-			    site.Binder is GetMemberBinder binder)
+			if (ExpressionsHelper.TryGetDynamicMemberBinder(expression, out var binder))
 			{
 				return _hqlTreeBuilder.Dot(
 					VisitExpression(expression.Arguments[1]).AsExpression(),