NH-3929 - Reimplement NH-3904

Author: hazzik

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

@@ -22,7 +22,6 @@ protected override string MappingsAssembly
 
 		protected override void Configure(Configuration configuration)
 		{
-			base.Configure(configuration);
 			configuration.LinqToHqlGeneratorsRegistry<EntityWithUserTypePropertyGeneratorsRegistry>();
 		}
 
@@ -81,11 +80,11 @@ public void EqualityWorksForUserType()
 					.Where(x => x.Example == newItem)
 					.ToList();
 
-				Assert.AreEqual(1, entities.Count);
+				Assert.That(entities.Count, Is.EqualTo(1));
 			}
 		}
 
-		[Test, Ignore("Not implemented yet")]
+		[Test]
 		public void LinqMethodWorksForUserType()
 		{
 			using (var session = OpenSession())
@@ -96,7 +95,7 @@ public void LinqMethodWorksForUserType()
 					.Where(x => x.Example.IsEquivalentTo(newItem))
 					.ToList();
 
-				Assert.AreEqual(2, entities.Count);
+				Assert.That(entities.Count, Is.EqualTo(2));
 			}
 		}
 
@@ -111,7 +110,7 @@ public void EqualityWorksForExplicitUserType()
 					.Where(x => x.Example == newItem.MappedAs(NHibernateUtil.Custom(typeof(ExampleUserType))))
 					.ToList();
 
-				Assert.AreEqual(1, entities.Count);
+				Assert.That(entities.Count, Is.EqualTo(1));
 			}
 		}
 
@@ -126,7 +125,7 @@ public void LinqMethodWorksForExplicitUserType()
 					.Where(x => x.Example.IsEquivalentTo(newItem.MappedAs(NHibernateUtil.Custom(typeof(ExampleUserType)))))
 					.ToList();
 
-				Assert.AreEqual(2, entities.Count);
+				Assert.That(entities.Count, Is.EqualTo(2));
 			}
 		}
 
@@ -140,7 +139,7 @@ public void LinqMethodWorksForStandardStringProperty()
 					.Where(x => x.Name == "Bob")
 					.ToList();
 
-				Assert.AreEqual(1, entities.Count);
+				Assert.That(entities.Count, Is.EqualTo(1));
 			}
 		}
 
@@ -155,7 +154,7 @@ public void CanQueryWithHql()
 				q.SetParameter("exampleItem", newItem);
 				var entities = q.List<EntityWithUserTypeProperty>();
 
-				Assert.AreEqual(1, entities.Count);
+				Assert.That(entities.Count, Is.EqualTo(1));
 			}
 		}
 	}

src/NHibernate/Linq/Visitors/ExpressionParameterVisitor.cs

@@ -4,8 +4,10 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using NHibernate.Engine;
+using NHibernate.Metadata;
 using NHibernate.Param;
 using NHibernate.Type;
+using NHibernate.UserTypes;
 using Remotion.Linq.Parsing;
 
 namespace NHibernate.Linq.Visitors
@@ -26,9 +28,25 @@ public class ExpressionParameterVisitor : ExpressionTreeVisitor
 				ReflectionHelper.GetMethodDefinition(() => Enumerable.Take<object>(null, 0)),
 			};
 
+		readonly List<IType> _allMappedCustomTypes;
+
 		public ExpressionParameterVisitor(ISessionFactoryImplementor sessionFactory)
 		{
 			_sessionFactory = sessionFactory;
+			_allMappedCustomTypes = GetAllPropertyTypes(sessionFactory)
+				.Where(t => t is CustomType || t is CompositeCustomType)
+				.Distinct()
+				.ToList();
+		}
+
+		static IEnumerable<IType> GetAllPropertyTypes(ISessionFactory sessionFactory)
+		{
+			foreach (var c in sessionFactory.GetAllClassMetadata().Values)
+			{
+				yield return c.IdentifierType;
+				foreach (var propertyType in c.PropertyTypes)
+					yield return propertyType;
+			}
 		}
 
 		public static IDictionary<ConstantExpression, NamedParameter> Visit(Expression expression, ISessionFactoryImplementor sessionFactory)
@@ -87,12 +105,8 @@ protected override Expression VisitConstantExpression(ConstantExpression express
 			{
 				// We use null for the type to indicate that the caller should let HQL figure it out.
 				object value = expression.Value;
-				IType type = null;
 
-				// We have a bit more information about the null parameter value.
-				// Figure out a type so that HQL doesn't break on the null. (Related to NH-2430)
-				if (expression.Value == null)
-					type = NHibernateUtil.GuessType(expression.Type);
+				var type = GuessType(expression.Type);
 
 				// Constant characters should be sent as strings
 				if (expression.Type == typeof(char))
@@ -111,6 +125,39 @@ protected override Expression VisitConstantExpression(ConstantExpression express
 			return base.VisitConstantExpression(expression);
 		}
 
+		/// <summary>
+		/// Guesses the <see cref="IType"/> from the <see cref="System.Type"/>.
+		/// </summary>
+		/// <param name="clazz">The <see cref="System.Type"/> to guess the <see cref="IType"/> of.</param>
+		/// <returns>An <see cref="IType"/> for the <see cref="System.Type"/>.</returns>
+		/// <exception cref="ArgumentNullException">
+		/// Thrown when the <c>clazz</c> is null because the <see cref="IType"/>
+		/// can't be guess from a null type.
+		/// </exception>
+		IType GuessType(System.Type clazz)
+		{
+			if (clazz == null)
+				throw new ArgumentNullException("clazz", "The IType can not be guessed for a null value.");
+
+			var typename = clazz.AssemblyQualifiedName;
+			var heuristicType = TypeFactory.HeuristicType(typename);
+			var serializable = heuristicType is SerializableType;
+			if (heuristicType != null && !serializable)
+				return heuristicType;
+
+			if (_sessionFactory.TryGetEntityPersister(clazz.FullName) != null)
+				return NHibernateUtil.Entity(clazz);
+
+			var customType = _allMappedCustomTypes.Find(x => x.ReturnedClass.IsAssignableFrom(clazz));
+			if (customType != null)
+				return customType;
+
+			if (serializable)
+				return heuristicType;
+
+			return null;
+		}
+
 		private static bool IsNullObject(ConstantExpression expression)
 		{
 			return expression.Type == typeof(Object) && expression.Value == null;

src/NHibernate/Type/CompositeCustomType.cs

@@ -13,7 +13,7 @@
 namespace NHibernate.Type
 {
 	[Serializable]
-	public class CompositeCustomType : AbstractType, IAbstractComponentType
+	public class CompositeCustomType : AbstractType, IAbstractComponentType, IEquatable<CompositeCustomType>
 	{
 		private readonly ICompositeUserType userType;
 		private readonly string name;
@@ -206,14 +206,17 @@ public override string ToLoggableString(object value, ISessionFactoryImplementor
 			return value == null ? "null" : value.ToString();
 		}
 
-		public override bool Equals(object obj)
+		public bool Equals(CompositeCustomType other)
 		{
-			if (!base.Equals(obj))
-			{
-				return false;
-			}
+			if (ReferenceEquals(null, other)) return false;
+			if (ReferenceEquals(this, other)) return true;
 
-			return ((CompositeCustomType) obj).userType.GetType() == userType.GetType();
+			return other.userType.GetType() == userType.GetType();
+		}
+
+		public override bool Equals(object obj)
+		{
+			return Equals(obj as CompositeCustomType);
 		}
 
 		public override int GetHashCode()
@@ -274,4 +277,4 @@ public override bool[] ToColumnNullness(object value, IMapping mapping)
 		}
 
 	}
-}
+}

src/NHibernate/Type/CustomType.cs

@@ -17,7 +17,7 @@ namespace NHibernate.Type
 	/// <seealso cref="IUserType"/>
 	/// </summary>
 	[Serializable]
-	public class CustomType : AbstractType, IDiscriminatorType, IVersionType
+	public class CustomType : AbstractType, IDiscriminatorType, IVersionType, IEquatable<CustomType>
 	{
 		private readonly IUserType userType;
 		private readonly string name;
@@ -152,14 +152,17 @@ public override bool IsMutable
 			get { return userType.IsMutable; }
 		}
 
-		public override bool Equals(object obj)
+		public bool Equals(CustomType obj)
 		{
-			if (!base.Equals(obj))
-			{
-				return false;
-			}
+			if (ReferenceEquals(null, obj)) return false;
+			if (ReferenceEquals(this, obj)) return true;
 
-			return ((CustomType) obj).userType.GetType() == userType.GetType();
+			return obj.userType.GetType() == userType.GetType();
+		}
+
+		public override bool Equals(object obj)
+		{
+			return Equals(obj as CustomType);
 		}
 
 		public override int GetHashCode()
@@ -271,4 +274,4 @@ public virtual string ToXMLString(object value, ISessionFactoryImplementor facto
 			}
 		}
 	}
-}
+}