From ec830810fc36f0b2258d41b150748f6b5e5772de Mon Sep 17 00:00:00 2001
From: Smit Patel <smitpatel@users.noreply.github.com>
Date: Tue, 17 Nov 2020 09:59:56 -0800
Subject: [PATCH] Add quirk

---
 .../Query/SqlExpressions/SqlFunctionExpression.cs           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/EFCore.Relational/Query/SqlExpressions/SqlFunctionExpression.cs b/src/EFCore.Relational/Query/SqlExpressions/SqlFunctionExpression.cs
index d2cc8b30450..4308480eebb 100644
--- a/src/EFCore.Relational/Query/SqlExpressions/SqlFunctionExpression.cs
+++ b/src/EFCore.Relational/Query/SqlExpressions/SqlFunctionExpression.cs
@@ -23,6 +23,9 @@ namespace Microsoft.EntityFrameworkCore.Query.SqlExpressions
     /// </summary>
     public class SqlFunctionExpression : SqlExpression
     {
+        private static readonly bool _useOldBehavior = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue23336", out var enabled)
+            && enabled;
+
         /// <summary>
         ///     Creates a new instance of the <see cref="SqlFunctionExpression" /> class which represents a built-in niladic function.
         /// </summary>
@@ -394,7 +397,8 @@ public override int GetHashCode()
             hash.Add(IsNiladic);
             hash.Add(Schema);
             hash.Add(Instance);
-            if (Arguments != null)
+            if (Arguments != null
+                || _useOldBehavior)
             {
                 for (var i = 0; i < Arguments.Count; i++)
                 {