Support queryable array parameters and columns

Closes npgsql#2677

src/EFCore.PG.NTS/Storage/Internal/NpgsqlGeometryTypeMapping.cs

@@ -7,14 +7,32 @@
 // ReSharper disable once CheckNamespace
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;
 
+/// <summary>
+///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+///     any release. You should only use it directly in your code with extreme caution and knowing that
+///     doing so can result in application failures when updating to a new Entity Framework Core release.
+/// </summary>
+public interface INpgsqlGeometryTypeMapping
+{
+    /// <summary>
+    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+    ///     any release. You should only use it directly in your code with extreme caution and knowing that
+    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+    /// </summary>
+    RelationalTypeMapping CloneWithElementTypeMapping(RelationalTypeMapping elementTypeMapping);
+}
+
 /// <summary>
 ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
 ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
 ///     any release. You should only use it directly in your code with extreme caution and knowing that
 ///     doing so can result in application failures when updating to a new Entity Framework Core release.
 /// </summary>
 [UsedImplicitly]
-public class NpgsqlGeometryTypeMapping<TGeometry> : RelationalGeometryTypeMapping<TGeometry, TGeometry>, INpgsqlTypeMapping
+public class NpgsqlGeometryTypeMapping<TGeometry> : RelationalGeometryTypeMapping<TGeometry, TGeometry>,
+    INpgsqlTypeMapping, INpgsqlGeometryTypeMapping
 {
     private readonly bool _isGeography;
 
@@ -49,6 +67,16 @@ protected NpgsqlGeometryTypeMapping(RelationalTypeMappingParameters parameters)
     protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters parameters)
         => new NpgsqlGeometryTypeMapping<TGeometry>(parameters);
 
+    /// <summary>
+    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+    ///     any release. You should only use it directly in your code with extreme caution and knowing that
+    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+    /// </summary>
+    RelationalTypeMapping INpgsqlGeometryTypeMapping.CloneWithElementTypeMapping(RelationalTypeMapping elementTypeMapping)
+        => new NpgsqlGeometryTypeMapping<TGeometry>(
+            Parameters.WithCoreParameters(Parameters.CoreParameters.WithElementTypeMapping(elementTypeMapping)));
+
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in

src/EFCore.PG.NTS/Storage/Internal/NpgsqlNetTopologySuiteTypeMappingSourcePlugin.cs

@@ -57,9 +57,15 @@ public NpgsqlNetTopologySuiteTypeMappingSourcePlugin(INpgsqlNetTopologySuiteOpti
         var storeTypeName = mappingInfo.StoreTypeName;
         var isGeography = _options.IsGeographyDefault;
 
-        if (clrType is not null && !typeof(Geometry).IsAssignableFrom(clrType))
+        if (clrType is not null)
         {
-            return null;
+            if (!clrType.IsAssignableTo(typeof(Geometry)))
+            {
+                return null;
+            }
+
+            // TODO: if store type is null, consider setting it based on the CLR type, i.e. create GEOMETRY(Point) instead of Geometry when
+            // the CLR property is NTS Point.
         }
 
         if (storeTypeName is not null)
@@ -69,18 +75,34 @@ public NpgsqlNetTopologySuiteTypeMappingSourcePlugin(INpgsqlNetTopologySuiteOpti
                 return null;
             }
 
-            if (clrType is null)
-            {
-                clrType = parsedSubtype;
-            }
+            clrType ??= parsedSubtype;
+        }
+
+        storeTypeName ??= isGeography ? "geography" : "geometry";
+
+        Check.DebugAssert(clrType is not null, "clrType is not null");
+
+        var typeMapping = (RelationalTypeMapping)Activator.CreateInstance(
+            typeof(NpgsqlGeometryTypeMapping<>).MakeGenericType(clrType), storeTypeName, isGeography)!;
+
+        // TODO: Also restrict the element type mapping based on the user-specified store type?
+        var elementType = clrType == typeof(MultiPoint)
+            ? typeof(Point)
+            : clrType == typeof(MultiLineString)
+                ? typeof(LineString)
+                : clrType == typeof(MultiPolygon)
+                    ? typeof(Polygon)
+                    : clrType == typeof(GeometryCollection)
+                        ? typeof(Geometry)
+                        : null;
+
+        if (elementType is not null)
+        {
+            var elementTypeMapping = FindMapping(new() { ClrType = elementType })!;
+            typeMapping = ((INpgsqlGeometryTypeMapping)typeMapping).CloneWithElementTypeMapping(elementTypeMapping);
         }
 
-        return clrType is not null || storeTypeName is not null
-            ? (RelationalTypeMapping)Activator.CreateInstance(
-                typeof(NpgsqlGeometryTypeMapping<>).MakeGenericType(clrType ?? typeof(Geometry)),
-                storeTypeName ?? (isGeography ? "geography" : "geometry"),
-                isGeography)!
-            : null;
+        return typeMapping;
     }
 
     /// <summary>

src/EFCore.PG/Extensions/NpgsqlServiceCollectionExtensions.cs

@@ -1,4 +1,3 @@
-using System.Data.Common;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Diagnostics.Internal;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal;
@@ -114,6 +113,7 @@ public static IServiceCollection AddEntityFrameworkNpgsql(this IServiceCollectio
             .TryAdd<IEvaluatableExpressionFilter, NpgsqlEvaluatableExpressionFilter>()
             .TryAdd<IQuerySqlGeneratorFactory, NpgsqlQuerySqlGeneratorFactory>()
             .TryAdd<IRelationalSqlTranslatingExpressionVisitorFactory, NpgsqlSqlTranslatingExpressionVisitorFactory>()
+            .TryAdd<IQueryTranslationPreprocessorFactory, NpgsqlQueryTranslationPreprocessorFactory>()
             .TryAdd<IQueryTranslationPostprocessorFactory, NpgsqlQueryTranslationPostprocessorFactory>()
             .TryAdd<IRelationalParameterBasedSqlProcessorFactory, NpgsqlParameterBasedSqlProcessorFactory>()
             .TryAdd<ISqlExpressionFactory, NpgsqlSqlExpressionFactory>()
@@ -130,4 +130,4 @@ public static IServiceCollection AddEntityFrameworkNpgsql(this IServiceCollectio
 
         return serviceCollection;
     }
-}
+}

src/EFCore.PG/Infrastructure/Internal/INpgsqlSingletonOptions.cs

@@ -13,9 +13,9 @@ public interface INpgsqlSingletonOptions : ISingletonOptions
     Version PostgresVersion { get; }
 
     /// <summary>
-    ///     The backend version to target, but returns <see langword="null" /> unless the user explicitly specified a version.
+    ///     Whether the user has explicitly set the backend version to target.
     /// </summary>
-    Version? PostgresVersionWithoutDefault { get; }
+    bool IsPostgresVersionSet { get; }
 
     /// <summary>
     ///     Whether to target Redshift.
@@ -41,4 +41,4 @@ public interface INpgsqlSingletonOptions : ISingletonOptions
     ///     The root service provider for the application, if available. />.
     /// </summary>
     IServiceProvider? ApplicationServiceProvider { get; }
-}
+}

src/EFCore.PG/Infrastructure/Internal/NpgsqlOptionsExtension.cs

@@ -32,8 +32,8 @@ public virtual Version PostgresVersion
     /// <summary>
     /// The backend version to target, but returns <see langword="null" /> unless the user explicitly specified a version.
     /// </summary>
-    public virtual Version? PostgresVersionWithoutDefault
-        => _postgresVersion;
+    public virtual bool IsPostgresVersionSet
+        => _postgresVersion is not null;
 
     /// <summary>
     ///     The <see cref="DbDataSource" />, or <see langword="null" /> if a connection string or <see cref="DbConnection" /> was used

src/EFCore.PG/Internal/NpgsqlSingletonOptions.cs

@@ -21,7 +21,7 @@ public class NpgsqlSingletonOptions : INpgsqlSingletonOptions
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public virtual Version? PostgresVersionWithoutDefault { get; private set; }
+    public virtual bool IsPostgresVersionSet { get; private set; }
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -79,7 +79,7 @@ public virtual void Initialize(IDbContextOptions options)
         var coreOptions = options.FindExtension<CoreOptionsExtension>() ?? new();
 
         PostgresVersion = npgsqlOptions.PostgresVersion;
-        PostgresVersionWithoutDefault = npgsqlOptions.PostgresVersionWithoutDefault;
+        IsPostgresVersionSet = npgsqlOptions.IsPostgresVersionSet;
         UseRedshift = npgsqlOptions.UseRedshift;
         ReverseNullOrderingEnabled = npgsqlOptions.ReverseNullOrdering;
         UserRangeDefinitions = npgsqlOptions.UserRangeDefinitions;

src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlMemberTranslatorProvider.cs

@@ -29,8 +29,8 @@ public NpgsqlMemberTranslatorProvider(
         : base(dependencies)
     {
         var npgsqlOptions = contextOptions.FindExtension<NpgsqlOptionsExtension>() ?? new();
-        var supportsMultiranges = npgsqlOptions.PostgresVersionWithoutDefault is null
-            || npgsqlOptions.PostgresVersionWithoutDefault.AtLeast(14);
+        var supportsMultiranges = !npgsqlOptions.IsPostgresVersionSet
+            || npgsqlOptions.IsPostgresVersionSet && npgsqlOptions.PostgresVersion.AtLeast(14);
 
         var sqlExpressionFactory = (NpgsqlSqlExpressionFactory)dependencies.SqlExpressionFactory;
         JsonPocoTranslator = new NpgsqlJsonPocoTranslator(typeMappingSource, sqlExpressionFactory, model);

src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlMethodCallTranslatorProvider.cs

@@ -32,8 +32,8 @@ public NpgsqlMethodCallTranslatorProvider(
         : base(dependencies)
     {
         var npgsqlOptions = contextOptions.FindExtension<NpgsqlOptionsExtension>() ?? new();
-        var supportsMultiranges = npgsqlOptions.PostgresVersionWithoutDefault is null
-            || npgsqlOptions.PostgresVersionWithoutDefault.AtLeast(14);
+        var supportsMultiranges = !npgsqlOptions.IsPostgresVersionSet
+            || npgsqlOptions.IsPostgresVersionSet && npgsqlOptions.PostgresVersion.AtLeast(14);
 
         var sqlExpressionFactory = (NpgsqlSqlExpressionFactory)dependencies.SqlExpressionFactory;
         var typeMappingSource = (NpgsqlTypeMappingSource)dependencies.RelationalTypeMappingSource;

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

@@ -0,0 +1,98 @@
+namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query.Expressions.Internal;
+
+/// <summary>
+///     A SQL expression that represents a slicing into a PostgreSQL array (e.g. array[2:3]).
+/// </summary>
+/// <remarks>
+///     <see href="https://www.postgresql.org/docs/current/arrays.html#ARRAYS-ACCESSING" />.
+/// </remarks>
+public class PostgresArraySliceExpression : SqlExpression, IEquatable<PostgresArraySliceExpression>
+{
+    /// <summary>
+    ///     The array being sliced.
+    /// </summary>
+    public virtual SqlExpression Array { get; }
+
+    /// <summary>
+    ///     The lower bound of the slice.
+    /// </summary>
+    public virtual SqlExpression? LowerBound { get; }
+
+    /// <summary>
+    ///     The upper bound of the slice.
+    /// </summary>
+    public virtual SqlExpression? UpperBound { get; }
+
+    /// <summary>
+    ///     Creates a new instance of the <see cref="PostgresArraySliceExpression" /> class.
+    /// </summary>
+    /// <param name="array">The array tp slice into.</param>
+    /// <param name="lowerBound">The lower bound of the slice.</param>
+    /// <param name="upperBound">The upper bound of the slice.</param>
+    public PostgresArraySliceExpression(
+        SqlExpression array,
+        SqlExpression? lowerBound,
+        SqlExpression? upperBound)
+        : base(array.Type, array.TypeMapping)
+    {
+        Check.NotNull(array, nameof(array));
+
+        if (lowerBound is null && upperBound is null)
+        {
+            throw new ArgumentException("At least one of lowerBound or upperBound must be provided");
+        }
+
+        Array = array;
+        LowerBound = lowerBound;
+        UpperBound = upperBound;
+    }
+
+    /// <summary>
+    ///     Creates a new expression that is like this one, but using the supplied children. If all of the children are the same, it will
+    ///     return this expression.
+    /// </summary>
+    /// <param name="array">The <see cref="Array" /> property of the result.</param>
+    /// <param name="lowerBound">The lower bound of the slice.</param>
+    /// <param name="upperBound">The upper bound of the slice.</param>
+    /// <returns>This expression if no children changed, or an expression with the updated children.</returns>
+    public virtual PostgresArraySliceExpression Update(SqlExpression array, SqlExpression? lowerBound, SqlExpression? upperBound)
+        => array == Array && lowerBound == LowerBound && upperBound == UpperBound
+            ? this
+            : new PostgresArraySliceExpression(array, lowerBound, upperBound);
+
+    /// <inheritdoc />
+    protected override Expression VisitChildren(ExpressionVisitor visitor)
+        => Update(
+            (SqlExpression)visitor.Visit(Array),
+            (SqlExpression?)visitor.Visit(LowerBound),
+            (SqlExpression?)visitor.Visit(UpperBound));
+
+    /// <inheritdoc />
+    public virtual bool Equals(PostgresArraySliceExpression? other)
+        => ReferenceEquals(this, other)
+            || other is not null
+            && base.Equals(other)
+            && Array.Equals(other.Array)
+            && (LowerBound is null ? other.LowerBound is null : LowerBound.Equals(other.LowerBound))
+            && (UpperBound is null ? other.UpperBound is null : UpperBound.Equals(other.UpperBound));
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is PostgresArraySliceExpression e && Equals(e);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Array, LowerBound, UpperBound);
+
+    /// <inheritdoc />
+    protected override void Print(ExpressionPrinter expressionPrinter)
+    {
+        expressionPrinter.Visit(Array);
+        expressionPrinter.Append("[");
+        expressionPrinter.Visit(LowerBound);
+        expressionPrinter.Append(":");
+        expressionPrinter.Visit(UpperBound);
+        expressionPrinter.Append("]");
+    }
+
+    /// <inheritdoc />
+    public override string ToString() => $"{Array}[{LowerBound}:{UpperBound}]";
+}

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

@@ -123,7 +123,7 @@ protected override void Print(ExpressionPrinter expressionPrinter)
                 PostgresExpressionType.LTreeMatches
                     when Right.TypeMapping?.StoreType == "lquery" ||
                     Right.TypeMapping is NpgsqlArrayTypeMapping arrayMapping &&
-                    arrayMapping.ElementMapping.StoreType == "lquery"
+                    arrayMapping.ElementTypeMapping.StoreType == "lquery"
                     => "~",
                 PostgresExpressionType.LTreeMatches
                     when Right.TypeMapping?.StoreType == "ltxtquery"