Skip to content

Commit e0f50c8

Browse files
committed
Merge DecimalEqualsGenerator into EqualsGenerator
1 parent 4b51cfb commit e0f50c8

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

src/NHibernate/Linq/Functions/DecimalGenerator.cs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,6 @@ public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject,
5656
}
5757
}
5858

59-
public class DecimalEqualsGenerator : BaseHqlGeneratorForMethod
60-
{
61-
public DecimalEqualsGenerator()
62-
{
63-
SupportedMethods = new[]
64-
{
65-
ReflectHelper.GetMethodDefinition(() => decimal.Equals(default(decimal), default(decimal)))
66-
};
67-
}
68-
69-
public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
70-
{
71-
return treeBuilder.Equality(visitor.Visit(arguments[0]).AsExpression(), visitor.Visit(arguments[1]).AsExpression());
72-
}
73-
}
74-
7559
public class DecimalMultiplyGenerator : BaseHqlGeneratorForMethod
7660
{
7761
public DecimalMultiplyGenerator()

src/NHibernate/Linq/Functions/DefaultLinqToHqlGeneratorsRegistry.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public DefaultLinqToHqlGeneratorsRegistry()
5555
this.Merge(new DecimalAddGenerator());
5656
this.Merge(new DecimalCompareGenerator());
5757
this.Merge(new DecimalDivideGenerator());
58-
this.Merge(new DecimalEqualsGenerator());
5958
this.Merge(new DecimalMultiplyGenerator());
6059
this.Merge(new DecimalSubtractGenerator());
6160
this.Merge(new DecimalRemainderGenerator());

src/NHibernate/Linq/Functions/EqualsGenerator.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public EqualsGenerator()
3232

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

3739
ReflectHelper.GetMethodDefinition<Guid>(x => x.Equals(x)),

0 commit comments

Comments
 (0)