Do not override Equals

MarkMpn · Dec 11, 2024 · 70b6b38 · 70b6b38
1 parent 5cb65f1
commit 70b6b38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 33 deletions.
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/FetchXmlScan.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/FetchXmlScan.cs
@@ -1749,7 +1749,7 @@ private object[] RemoveDuplicatedConditions(object[] items)
             {
                 if (item is condition c)
                 {
-                    if (newItems.OfType<condition>().Any(existing => existing.Equals(c)))
+                    if (newItems.OfType<condition>().Any(existing => existing.IsSameAs(c)))
                         continue;
                 }
 

diff --git a/MarkMpn.Sql4Cds.Engine/FetchXml.Extensions.cs b/MarkMpn.Sql4Cds.Engine/FetchXml.Extensions.cs
@@ -15,11 +15,8 @@ partial class condition
         [DefaultValue(false)]
         public bool IsVariable { get; set; }
 
-        public override bool Equals(object obj)
+        public bool IsSameAs(condition other)
         {
-            if (!(obj is condition other))
-                return false;
-
             if (other.entityname != entityname ||
                 other.attribute != attribute ||
                 other.@operator != @operator ||
@@ -52,34 +49,6 @@ public override bool Equals(object obj)
 
             return true;
         }
-
-        public override int GetHashCode()
-        {
-            var hash = 0;
-            hash ^= entityname?.GetHashCode() ?? 0;
-            hash ^= attribute?.GetHashCode() ?? 0;
-            hash ^= @operator.GetHashCode();
-            hash ^= value?.GetHashCode() ?? 0;
-            hash ^= ValueOf?.GetHashCode() ?? 0;
-            hash ^= IsVariable.GetHashCode();
-            hash ^= aggregate.GetHashCode();
-            hash ^= aggregateSpecified.GetHashCode();
-            hash ^= alias?.GetHashCode() ?? 0;
-            hash ^= column?.GetHashCode() ?? 0;
-            hash ^= rowaggregate.GetHashCode();
-            hash ^= rowaggregateSpecified.GetHashCode();
-
-            if (Items != null)
-            {
-                foreach (var item in Items)
-                {
-                    hash ^= item.Value?.GetHashCode() ?? 0;
-                    hash ^= item.IsVariable.GetHashCode();
-                }
-            }
-
-            return hash;
-        }
     }
 
     partial class conditionValue