Query: Don't terminate translation if indexer method does not bind to…

… indexer property Resolves #23410
dotnet · Nov 24, 2020 · 9535eda · 9535eda
1 parent 6ec33b4
commit 9535eda
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs
@@ -465,7 +465,13 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
             // EF Indexer property
             if (methodCallExpression.TryGetIndexerArguments(_model, out source, out propertyName))
             {
-                return TryBindMember(Visit(source), MemberIdentity.Create(propertyName));
+                var result = TryBindMember(Visit(source), MemberIdentity.Create(propertyName));
+                var useOldBehavior = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue23410", out var enabled) && enabled;
+                if (result != null
+                    || useOldBehavior)
+                {
+                    return result;
+                }
             }
 
             // GroupBy Aggregate case