Adjust RoundGenerator to consider Math.Round methods

Author: hazzik

src/NHibernate/Linq/Functions/DecimalGenerator.cs

@@ -103,22 +103,4 @@ public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject,
 			return treeBuilder.TransparentCast(treeBuilder.Negate(visitor.Visit(arguments[0]).AsExpression()), typeof(decimal));
 		}
 	}
-
-	public class DecimalRoundGenerator : BaseHqlGeneratorForMethod
-	{
-		public DecimalRoundGenerator()
-		{
-			SupportedMethods = new[]
-			{
-				ReflectHelper.GetMethodDefinition(() => decimal.Round(default(decimal))),
-				ReflectHelper.GetMethodDefinition(() => decimal.Round(default(decimal), default(int))),
-			};
-		}
-
-		public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
-		{
-			HqlExpression numberOfDecimals = (arguments.Count == 2) ? visitor.Visit(arguments[1]).AsExpression() : treeBuilder.Constant(0);
-			return treeBuilder.TransparentCast(treeBuilder.MethodCall("round", visitor.Visit(arguments[0]).AsExpression(), numberOfDecimals), typeof(decimal));
-		}
-	}
 }

src/NHibernate/Linq/Functions/DefaultLinqToHqlGeneratorsRegistry.cs

@@ -58,7 +58,7 @@ public DefaultLinqToHqlGeneratorsRegistry()
 			this.Merge(new DecimalSubtractGenerator());
 			this.Merge(new DecimalRemainderGenerator());
 			this.Merge(new DecimalNegateGenerator());
-			this.Merge(new DecimalRoundGenerator());
+			this.Merge(new RoundGenerator());
 		}
 
 		protected bool GetRuntimeMethodGenerator(MethodInfo method, out IHqlGeneratorForMethod methodGenerator)

src/NHibernate/Linq/Functions/MathGenerator.cs

@@ -45,16 +45,14 @@ public MathGenerator()
 				ReflectHelper.GetMethodDefinition(() => Math.Sign(default(short))),
 				ReflectHelper.GetMethodDefinition(() => Math.Sign(default(sbyte))),
 
-				ReflectHelper.GetMethodDefinition(() => Math.Round(default(decimal))),
-				ReflectHelper.GetMethodDefinition(() => Math.Round(default(decimal), default(int))),
-				ReflectHelper.GetMethodDefinition(() => Math.Round(default(double))),
-				ReflectHelper.GetMethodDefinition(() => Math.Round(default(double), default(int))),
 				ReflectHelper.GetMethodDefinition(() => Math.Floor(default(decimal))),
 				ReflectHelper.GetMethodDefinition(() => Math.Floor(default(double))),
 				ReflectHelper.GetMethodDefinition(() => decimal.Floor(default(decimal))),
+				
 				ReflectHelper.GetMethodDefinition(() => Math.Ceiling(default(decimal))),
 				ReflectHelper.GetMethodDefinition(() => Math.Ceiling(default(double))),
 				ReflectHelper.GetMethodDefinition(() => decimal.Ceiling(default(decimal))),
+				
 				ReflectHelper.GetMethodDefinition(() => Math.Truncate(default(decimal))),
 				ReflectHelper.GetMethodDefinition(() => Math.Truncate(default(double))),
 

src/NHibernate/Linq/Functions/RoundGenerator.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq.Expressions;
+using System.Reflection;
+using NHibernate.Hql.Ast;
+using NHibernate.Linq.Visitors;
+using NHibernate.Util;
+
+namespace NHibernate.Linq.Functions
+{
+	internal class RoundGenerator : BaseHqlGeneratorForMethod
+	{
+		public RoundGenerator()
+		{
+			SupportedMethods = new[]
+			{
+				ReflectHelper.GetMethodDefinition(() => Math.Round(default(double))),
+				ReflectHelper.GetMethodDefinition(() => Math.Round(default(double), default(int))),
+				ReflectHelper.GetMethodDefinition(() => Math.Round(default(decimal))),
+				ReflectHelper.GetMethodDefinition(() => Math.Round(default(decimal), default(int))),
+				ReflectHelper.GetMethodDefinition(() => decimal.Round(default(decimal))),
+				ReflectHelper.GetMethodDefinition(() => decimal.Round(default(decimal), default(int))),
+			};
+		}
+
+		public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
+		{
+			var numberOfDecimals = arguments.Count == 2
+				? visitor.Visit(arguments[1]).AsExpression()
+				: treeBuilder.Constant(0);
+			return treeBuilder.TransparentCast(
+				treeBuilder.MethodCall("round", visitor.Visit(arguments[0]).AsExpression(), numberOfDecimals),
+				method.ReturnType);
+		}
+	}
+}