Fix TryGetEntityName for custom entity names

Author: maca88

src/NHibernate/Linq/Functions/ListIndexerGenerator.cs

@@ -12,20 +12,30 @@ namespace NHibernate.Linq.Functions
 {
 	internal class ListIndexerGenerator : BaseHqlGeneratorForMethod,IRuntimeMethodHqlGenerator
 	{
+		private static readonly HashSet<MethodInfo> _supportedMethods = new HashSet<MethodInfo>
+		{
+			ReflectHelper.GetMethodDefinition(() => Enumerable.ElementAt<object>(null, 0)),
+			ReflectHelper.GetMethodDefinition(() => Queryable.ElementAt<object>(null, 0))
+		};
+
 		public ListIndexerGenerator()
 		{
-			SupportedMethods = new[]
-			{
-				ReflectHelper.GetMethodDefinition(() => Enumerable.ElementAt<object>(null, 0)),
-				ReflectHelper.GetMethodDefinition(() => Queryable.ElementAt<object>(null, 0))
-			};
+			SupportedMethods = _supportedMethods;
 		}
 
 		public bool SupportsMethod(MethodInfo method)
 		{
-			return method != null &&
-			       method.Name == "get_Item" &&
-			       (method.IsMethodOf(typeof(IList)) || method.IsMethodOf(typeof(IList<>)));
+			return IsRuntimeMethodSupported(method);
+		}
+
+		public static bool IsMethodSupported(MethodInfo method)
+		{
+			if (method.IsGenericMethod)
+			{
+				method = method.GetGenericMethodDefinition();
+			}
+
+			return _supportedMethods.Contains(method) || IsRuntimeMethodSupported(method);
 		}
 
 		public IHqlGeneratorForMethod GetMethodGenerator(MethodInfo method)
@@ -40,5 +50,12 @@ public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject,
 
 			return treeBuilder.Index(collection, index);
 		}
+
+		private static bool IsRuntimeMethodSupported(MethodInfo method)
+		{
+			return method != null &&
+					method.Name == "get_Item" &&
+					(method.IsMethodOf(typeof(IList)) || method.IsMethodOf(typeof(IList<>)));
+		}
 	}
-}
+}

src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs

@@ -242,6 +242,9 @@ constant.Value is CallSite site &&
 
 		protected HqlTreeNode VisitNhAverage(NhAverageExpression expression)
 		{
+			// We need to cast the argument when its type is different from Average method return type,
+			// otherwise the result may be incorrect. In SQL Server avg always returns int
+			// when the argument is int.
 			var hqlExpression = VisitExpression(expression.Expression).AsExpression();
 			hqlExpression = IsCastRequired(expression.Expression, expression.Type, out _)
 				? (HqlExpression) _hqlTreeBuilder.Cast(hqlExpression, expression.Type)
@@ -269,7 +272,7 @@ protected HqlTreeNode VisitNhMax(NhMaxExpression expression)
 
 		protected HqlTreeNode VisitNhSum(NhSumExpression expression)
 		{
-			return IsCastRequired(expression.Type, "sum", out _)
+			return IsCastRequired("sum", expression.Expression, expression.Type)
 				? (HqlTreeNode) _hqlTreeBuilder.Cast(_hqlTreeBuilder.Sum(VisitExpression(expression.Expression).AsExpression()), expression.Type)
 				: _hqlTreeBuilder.TransparentCast(_hqlTreeBuilder.Sum(VisitExpression(expression.Expression).AsExpression()), expression.Type);
 		}
@@ -595,7 +598,8 @@ protected HqlTreeNode VisitNewArrayExpression(NewArrayExpression expression)
 		private bool IsCastRequired(Expression expression, System.Type toType, out bool existType)
 		{
 			existType = false;
-			return toType != typeof(object) && IsCastRequired(GetType(expression), TypeFactory.GetDefaultTypeFor(toType), out existType);
+			return toType != typeof(object) &&
+					IsCastRequired(GetType(expression), TypeFactory.GetDefaultTypeFor(toType), out existType);
 		}
 
 		private bool IsCastRequired(IType type, IType toType, out bool existType)
@@ -637,59 +641,38 @@ private bool IsCastRequired(IType type, IType toType, out bool existType)
 			return castTypeName != toCastTypeName;
 		}
 
-		private bool IsCastRequired(System.Type type, string sqlFunctionName, out bool existType)
+		private bool IsCastRequired(string sqlFunctionName, Expression argumentExpression, System.Type returnType)
 		{
-			if (type == typeof(object))
+			var argumentType = GetType(argumentExpression);
+			if (argumentType == null || returnType == typeof(object))
 			{
-				existType = false;
 				return false;
 			}
 
-			var toType = TypeFactory.GetDefaultTypeFor(type);
-			if (toType == null)
+			var returnNhType = TypeFactory.GetDefaultTypeFor(returnType);
+			if (returnNhType == null)
 			{
-				existType = false;
 				return true; // Fallback to the old behavior
 			}
 
-			existType = true;
 			var sqlFunction = _parameters.SessionFactory.SQLFunctionRegistry.FindSQLFunction(sqlFunctionName);
 			if (sqlFunction == null)
 			{
 				return true; // Fallback to the old behavior
 			}
 
-			var fnReturnType = sqlFunction.ReturnType(toType, _parameters.SessionFactory);
-			return fnReturnType == null || IsCastRequired(fnReturnType, toType, out existType);
+			var fnReturnType = sqlFunction.ReturnType(argumentType, _parameters.SessionFactory);
+			return fnReturnType == null || IsCastRequired(fnReturnType, returnNhType, out _);
 		}
 
 		private IType GetType(Expression expression)
 		{
-			if (!(expression is MemberExpression memberExpression))
-			{
-				return expression.Type != typeof(object)
-					? TypeFactory.GetDefaultTypeFor(expression.Type)
-					: null;
-			}
-
 			// Try to get the mapped type for the member as it may be a non default one
-			var entityName = ExpressionsHelper.TryGetEntityName(_parameters.SessionFactory, memberExpression, out var memberPath);
-			if (entityName == null)
-			{
-				return TypeFactory.GetDefaultTypeFor(expression.Type); // Not mapped
-			}
-
-			var persister = _parameters.SessionFactory.GetEntityPersister(entityName);
-			var type = persister.EntityMetamodel.GetIdentifierPropertyType(memberPath);
-			if (type != null)
-			{
-				return type;
-			}
-
-			var index = persister.EntityMetamodel.GetPropertyIndexOrNull(memberPath);
-			return !index.HasValue
-				? TypeFactory.GetDefaultTypeFor(expression.Type) // Not mapped
-				: persister.EntityMetamodel.PropertyTypes[index.Value];
+			ExpressionsHelper.TryGetEntityName(_parameters.SessionFactory, expression, out _, out var type);
+			return type ??
+						(expression.Type != typeof(object)
+							? TypeFactory.GetDefaultTypeFor(expression.Type)
+							: null);
 		}
 	}
 }

src/NHibernate/Tuple/Entity/EntityMetamodel.cs

@@ -51,6 +51,7 @@ public class EntityMetamodel
 
 		private readonly Dictionary<string, int?> propertyIndexes = new Dictionary<string, int?>();
 		private readonly IDictionary<string, IType> _identifierPropertyTypes = new Dictionary<string, IType>();
+		private readonly IDictionary<string, IType> _propertyTypes = new Dictionary<string, IType>();
 		private readonly bool hasCollections;
 		private readonly bool hasMutableProperties;
 		private readonly bool hasLazyProperties;
@@ -418,15 +419,17 @@ private void MapPropertyToIndex(Mapping.Property prop, int i)
 
 		private void MapPropertyToIndex(string path, Mapping.Property prop, int i)
 		{
-			propertyIndexes[!string.IsNullOrEmpty(path) ? $"{path}.{prop.Name}" : prop.Name] = i;
+			var propPath = !string.IsNullOrEmpty(path) ? $"{path}.{prop.Name}" : prop.Name;
+			propertyIndexes[propPath] = i;
+			_propertyTypes[propPath] = prop.Type;
 			if (!(prop.Value is Mapping.Component comp))
 			{
 				return;
 			}
 
 			foreach (var subprop in comp.PropertyIterator)
 			{
-				MapPropertyToIndex(!string.IsNullOrEmpty(path) ? $"{path}.{prop.Name}" : prop.Name, subprop, i);
+				MapPropertyToIndex(propPath, subprop, i);
 			}
 		}
 
@@ -572,6 +575,13 @@ internal IType GetIdentifierPropertyType(string memberPath)
 			return _identifierPropertyTypes.TryGetValue(memberPath, out var propertyType) ? propertyType : null;
 		}
 
+		internal IType GetPropertyType(string memberPath)
+		{
+			return _propertyTypes.TryGetValue(memberPath, out var propertyType)
+				? propertyType
+				: GetIdentifierPropertyType(memberPath);
+		}
+
 		public bool HasCollections
 		{
 			get { return hasCollections; }