Fixes the previous commit, unskips tests.

Something to do with `MemberAccessBindingExpressionVisitor`
happens under some specific circumstances that coincide with a
compiled query.

Added an `IsSafeToVisit` helper to `NpgsqlSqlTranslating...Visitor`
for an additional guard when handling arrays that could be
some type of replaced parameter.

QueryBaseline.cs

@@ -4014,53 +4014,3 @@
 
 
 
-System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) : 
-            AssertSql(
-                @"SELECT (o.""OrderDate"" + MAKE_INTERVAL(secs => 1)) AS ""OrderDate""
-FROM ""Orders"" AS o
-WHERE ((o.""OrderDate"" <> NULL) OR (o.""OrderDate"" IS NULL OR NULL IS NULL)) AND (o.""OrderDate"" IS NOT NULL OR NULL IS NOT NULL)");
-
-
-
-System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) : 
-            AssertSql(
-                @"SELECT (o.""OrderDate"" + MAKE_INTERVAL(years => 1)) AS ""OrderDate""
-FROM ""Orders"" AS o
-WHERE ((o.""OrderDate"" <> NULL) OR (o.""OrderDate"" IS NULL OR NULL IS NULL)) AND (o.""OrderDate"" IS NOT NULL OR NULL IS NOT NULL)");
-
-
-
-System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) : 
-            AssertSql(
-                @"SELECT (o.""OrderDate"" + MAKE_INTERVAL(mins => 1)) AS ""OrderDate""
-FROM ""Orders"" AS o
-WHERE ((o.""OrderDate"" <> NULL) OR (o.""OrderDate"" IS NULL OR NULL IS NULL)) AND (o.""OrderDate"" IS NOT NULL OR NULL IS NOT NULL)");
-
-
-
-System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) : 
-            AssertSql(
-                @"@__years_0='2'
-
-SELECT (o.""OrderDate"" + MAKE_INTERVAL(years => @__years_0)) AS ""OrderDate""
-FROM ""Orders"" AS o
-WHERE ((o.""OrderDate"" <> NULL) OR (o.""OrderDate"" IS NULL OR NULL IS NULL)) AND (o.""OrderDate"" IS NOT NULL OR NULL IS NOT NULL)");
-
-
-
-System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) : 
-            AssertSql(
-                @"SELECT (o.""OrderDate"" + MAKE_INTERVAL(months => 1)) AS ""OrderDate""
-FROM ""Orders"" AS o
-WHERE ((o.""OrderDate"" <> NULL) OR (o.""OrderDate"" IS NULL OR NULL IS NULL)) AND (o.""OrderDate"" IS NOT NULL OR NULL IS NOT NULL)");
-
-
-
-System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) : 
-            AssertSql(
-                @"SELECT (o.""OrderDate"" + MAKE_INTERVAL(hours => 1)) AS ""OrderDate""
-FROM ""Orders"" AS o
-WHERE ((o.""OrderDate"" <> NULL) OR (o.""OrderDate"" IS NULL OR NULL IS NULL)) AND (o.""OrderDate"" IS NOT NULL OR NULL IS NOT NULL)");
-
-
-

src/EFCore.PG/Extensions/NpgsqlArrayExtensions.cs

@@ -23,9 +23,10 @@
 
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Utilities;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
@@ -49,7 +50,7 @@ public static class NpgsqlArrayExtensions
         /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
         /// </exception>
         public static string ArrayToString<T>([CanBeNull] this DbFunctions _, [NotNull] T[] array, [CanBeNull] string delimiter)
-            => throw new ClientEvaluationNotSupportedException();
+            => throw ClientEvaluationNotSupportedException();
 
         /// <summary>
         /// Concatenates elements using the supplied delimiter.
@@ -65,7 +66,7 @@ public static string ArrayToString<T>([CanBeNull] this DbFunctions _, [NotNull]
         /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
         /// </exception>
         public static string ArrayToString<T>([CanBeNull] this DbFunctions _, [NotNull] List<T> list, [CanBeNull] string delimiter)
-            => throw new ClientEvaluationNotSupportedException();
+            => throw ClientEvaluationNotSupportedException();
 
         /// <summary>
         /// Concatenates elements using the supplied delimiter and the string representation for null elements.
@@ -82,7 +83,7 @@ public static string ArrayToString<T>([CanBeNull] this DbFunctions _, [NotNull]
         /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
         /// </exception>
         public static string ArrayToString<T>([CanBeNull] this DbFunctions _, [NotNull] T[] array, [CanBeNull] string delimiter, [CanBeNull] string nullString)
-            => throw new ClientEvaluationNotSupportedException();
+            => throw ClientEvaluationNotSupportedException();
 
         /// <summary>
         /// Concatenates elements using the supplied delimiter and the string representation for null elements.
@@ -99,7 +100,7 @@ public static string ArrayToString<T>([CanBeNull] this DbFunctions _, [NotNull]
         /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
         /// </exception>
         public static string ArrayToString<T>([CanBeNull] this DbFunctions _, [NotNull] List<T> list, [CanBeNull] string delimiter, [CanBeNull] string nullString)
-            => throw new ClientEvaluationNotSupportedException();
+            => throw ClientEvaluationNotSupportedException();
 
         /// <summary>
         /// Converts the input string into an array using the supplied delimiter and the string representation for null elements.
@@ -116,7 +117,7 @@ public static string ArrayToString<T>([CanBeNull] this DbFunctions _, [NotNull]
         /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
         /// </exception>
         public static T[] StringToArray<T>([CanBeNull] this DbFunctions _, [NotNull] string input, [CanBeNull] string delimiter, [CanBeNull] string nullString)
-            => throw new ClientEvaluationNotSupportedException();
+            => throw ClientEvaluationNotSupportedException();
 
         /// <summary>
         /// Converts the input string into a <see cref="List{T}"/> using the supplied delimiter and the string representation for null elements.
@@ -133,6 +134,21 @@ public static T[] StringToArray<T>([CanBeNull] this DbFunctions _, [NotNull] str
         /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
         /// </exception>
         public static List<T> StringToList<T>([CanBeNull] this DbFunctions _, [NotNull] string input, [CanBeNull] string delimiter, [CanBeNull] string nullString)
-            => throw new ClientEvaluationNotSupportedException();
+            => throw ClientEvaluationNotSupportedException();
+
+        #region Utilities
+
+        /// <summary>
+        /// Helper method to throw a <see cref="NotSupportedException"/> with the name of the throwing method.
+        /// </summary>
+        /// <param name="method">The method that throws the exception.</param>
+        /// <returns>
+        /// A <see cref="NotSupportedException"/>.
+        /// </returns>
+        [NotNull]
+        static NotSupportedException ClientEvaluationNotSupportedException([CallerMemberName] string method = default)
+            => new NotSupportedException($"{method} is only intended for use via SQL translation as part of an EF Core LINQ query.");
+
+        #endregion
     }
 }

src/EFCore.PG/Query/ExpressionVisitors/NpgsqlSqlTranslatingExpressionVisitor.cs

@@ -34,6 +34,7 @@
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.Expressions;
 using Microsoft.EntityFrameworkCore.Query.ExpressionVisitors;
+using Microsoft.EntityFrameworkCore.Query.ExpressionVisitors.Internal;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Query.Expressions.Internal;
 using Remotion.Linq.Clauses;
 using Remotion.Linq.Clauses.Expressions;
@@ -80,24 +81,36 @@ public class NpgsqlSqlTranslatingExpressionVisitor : SqlTranslatingExpressionVis
 
         #endregion
 
+        /// <summary>
+        /// The current query model visitor.
+        /// </summary>
+        [NotNull] readonly RelationalQueryModelVisitor _queryModelVisitor;
+
+        /// <summary>
+        /// The current query compilation context.
+        /// </summary>
+        [NotNull]
+        RelationalQueryCompilationContext Context => _queryModelVisitor.QueryCompilationContext;
+
         /// <inheritdoc />
         public NpgsqlSqlTranslatingExpressionVisitor(
             [NotNull] SqlTranslatingExpressionVisitorDependencies dependencies,
             [NotNull] RelationalQueryModelVisitor queryModelVisitor,
             [CanBeNull] SelectExpression targetSelectExpression = null,
             [CanBeNull] Expression topLevelPredicate = null,
             bool inProjection = false)
-            : base(dependencies, queryModelVisitor, targetSelectExpression, topLevelPredicate, inProjection) {}
+            : base(dependencies, queryModelVisitor, targetSelectExpression, topLevelPredicate, inProjection)
+            => _queryModelVisitor = queryModelVisitor;
 
         #region Overrides
 
         /// <inheritdoc />
         protected override Expression VisitBinary(BinaryExpression expression)
-            => expression.NodeType is ExpressionType.ArrayIndex
-                ? Expression.MakeIndex(
+            => expression.NodeType is ExpressionType.ArrayIndex &&
+               IsSafeToVisit(expression, Context)
+                ? Expression.ArrayAccess(
                     Visit(expression.Left) ?? expression.Left,
-                    indexer: null,
-                    new[] { Visit(expression.Right) ?? expression.Right, })
+                    Visit(expression.Right) ?? expression.Right)
                 : base.VisitBinary(expression);
 
         /// <inheritdoc />
@@ -312,6 +325,17 @@ protected virtual Expression VisitArrayContains([NotNull] Expression array, [Not
         /// </returns>
         static bool IsArrayOrList([NotNull] Type type) => type.IsArray || type.IsGenericType && typeof(List<>) == type.GetGenericTypeDefinition();
 
+        /// <summary>
+        /// True if the expression is safe to visitat this stage.
+        /// </summary>
+        /// <param name="expression">The expression to check</param>
+        /// <param name="context">The context to use.</param>
+        /// <returns>
+        /// True to visit this expression; otherwise false.
+        /// </returns>
+        static bool IsSafeToVisit(BinaryExpression expression, RelationalQueryCompilationContext context)
+            => MemberAccessBindingExpressionVisitor.GetPropertyPath(expression.Left, context, out _).Count != 0;
+
         #endregion
     }
 }

src/EFCore.PG/Query/Expressions/Internal/PgFunctionExpression.cs

@@ -29,6 +29,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Text;
 using JetBrains.Annotations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Query.Sql.Internal;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Utilities;