Skip to content

Commit 16719fd

Browse files
committed
Merge DecimalCompareGenerator into CompareGenerator
1 parent e0f50c8 commit 16719fd

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

src/NHibernate/Linq/Functions/CompareGenerator.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ internal class CompareGenerator : BaseHqlGeneratorForMethod, IRuntimeMethodHqlGe
3232

3333
ReflectHelper.GetMethodDefinition<float>(x => x.CompareTo(x)),
3434
ReflectHelper.GetMethodDefinition<double>(x => x.CompareTo(x)),
35+
36+
ReflectHelper.GetMethodDefinition(() => decimal.Compare(default(decimal), default(decimal))),
3537
ReflectHelper.GetMethodDefinition<decimal>(x => x.CompareTo(x)),
3638

3739
ReflectHelper.GetMethodDefinition<DateTime>(x => x.CompareTo(x)),

src/NHibernate/Linq/Functions/DecimalGenerator.cs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,6 @@ public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject,
2424
}
2525
}
2626

27-
public class DecimalCompareGenerator : BaseHqlGeneratorForMethod
28-
{
29-
public DecimalCompareGenerator()
30-
{
31-
SupportedMethods = new[]
32-
{
33-
ReflectHelper.GetMethodDefinition(() => decimal.Compare(default(decimal), default(decimal)))
34-
};
35-
}
36-
37-
public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
38-
{
39-
return treeBuilder.MethodCall("sign", treeBuilder.Subtract(visitor.Visit(arguments[0]).AsExpression(), visitor.Visit(arguments[1]).AsExpression()));
40-
}
41-
}
42-
4327
public class DecimalDivideGenerator : BaseHqlGeneratorForMethod
4428
{
4529
public DecimalDivideGenerator()

src/NHibernate/Linq/Functions/DefaultLinqToHqlGeneratorsRegistry.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public DefaultLinqToHqlGeneratorsRegistry()
5353
this.Merge(new DateTimePropertiesHqlGenerator());
5454

5555
this.Merge(new DecimalAddGenerator());
56-
this.Merge(new DecimalCompareGenerator());
5756
this.Merge(new DecimalDivideGenerator());
5857
this.Merge(new DecimalMultiplyGenerator());
5958
this.Merge(new DecimalSubtractGenerator());

0 commit comments

Comments
 (0)