Sync to EF 11.0.0-preview.2.26116.101

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Copilot

Directory.Packages.props

@@ -1,7 +1,8 @@
   <Project>
   <PropertyGroup>
-    <EFCoreVersion>11.0.0-preview.1.26104.118</EFCoreVersion>
-    <MicrosoftExtensionsVersion>11.0.0-preview.1.26104.118</MicrosoftExtensionsVersion>
+    <EFCoreVersion>11.0.0-preview.2.26116.101</EFCoreVersion>
+    <MicrosoftExtensionsVersion>11.0.0-preview.2.26116.101</MicrosoftExtensionsVersion>
+    <MicrosoftExtensionsConfigurationVersion>11.0.0-preview.2.26078.113</MicrosoftExtensionsConfigurationVersion>
     <NpgsqlVersion>10.0.0</NpgsqlVersion>
   </PropertyGroup>
 
@@ -16,8 +17,8 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="[$(EFCoreVersion)]" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="[$(EFCoreVersion)]" />
 
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
 
     <PackageVersion Include="Npgsql" Version="$(NpgsqlVersion)" />

src/EFCore.PG/Extensions/Internal/NpgsqlShapedQueryExpressionExtensions.cs

@@ -120,7 +120,7 @@ public static bool TryExtractJsonArray(
                     && orderingTableAlias == tvf.Alias))
             && TryGetScalarProjection(source, out var projectedScalar))
         {
-            jsonArray = json;
+            jsonArray = (SqlExpression)json;
 
             // The projected ColumnExpression is wrapped in a Convert to apply the element type mapping - unless it happens to be text.
             switch (projectedScalar)

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

@@ -46,6 +46,7 @@ public override void Validate(IModel model, IDiagnosticsLogger<DbLoggerCategory.
         ValidateIndexIncludeProperties(model);
         ValidateWithoutOverlaps(model);
         ValidatePeriod(model);
+        ValidateNpgsqlValueGenerationStrategies(model);
     }
 
     /// <summary>
@@ -90,10 +91,10 @@ protected virtual void ValidateIdentityVersionCompatibility(IModel model)
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     protected override void ValidateValueGeneration(
-        IEntityType entityType,
         IKey key,
         IDiagnosticsLogger<DbLoggerCategory.Model.Validation> logger)
     {
+        var entityType = key.DeclaringEntityType;
         if (entityType.GetTableName() != null
             && (string?)entityType[RelationalAnnotationNames.MappingStrategy] == RelationalAnnotationNames.TpcMappingStrategy)
         {
@@ -107,12 +108,9 @@ protected override void ValidateValueGeneration(
     }
 
     /// <inheritdoc/>
-    protected override void ValidateTypeMappings(
-        IModel model,
-        IDiagnosticsLogger<DbLoggerCategory.Model.Validation> logger)
+    protected virtual void ValidateNpgsqlValueGenerationStrategies(
+        IModel model)
     {
-        base.ValidateTypeMappings(model, logger);
-
         foreach (var entityType in model.GetEntityTypes())
         {
             foreach (var property in entityType.GetFlattenedDeclaredProperties())
@@ -203,27 +201,24 @@ protected virtual void ValidateIndexIncludeProperties(IModel model)
 
     /// <inheritdoc />
     protected override void ValidateStoredProcedures(
-        IModel model,
+        IEntityType entityType,
         IDiagnosticsLogger<DbLoggerCategory.Model.Validation> logger)
     {
-        base.ValidateStoredProcedures(model, logger);
+        base.ValidateStoredProcedures(entityType, logger);
 
-        foreach (var entityType in model.GetEntityTypes())
+        if (entityType.GetDeleteStoredProcedure() is { } deleteStoredProcedure)
         {
-            if (entityType.GetDeleteStoredProcedure() is { } deleteStoredProcedure)
-            {
-                ValidateSproc(deleteStoredProcedure, logger);
-            }
+            ValidateSproc(deleteStoredProcedure, logger);
+        }
 
-            if (entityType.GetInsertStoredProcedure() is { } insertStoredProcedure)
-            {
-                ValidateSproc(insertStoredProcedure, logger);
-            }
+        if (entityType.GetInsertStoredProcedure() is { } insertStoredProcedure)
+        {
+            ValidateSproc(insertStoredProcedure, logger);
+        }
 
-            if (entityType.GetUpdateStoredProcedure() is { } updateStoredProcedure)
-            {
-                ValidateSproc(updateStoredProcedure, logger);
-            }
+        if (entityType.GetUpdateStoredProcedure() is { } updateStoredProcedure)
+        {
+            ValidateSproc(updateStoredProcedure, logger);
         }
 
         static void ValidateSproc(IStoredProcedure sproc, IDiagnosticsLogger<DbLoggerCategory.Model.Validation> logger)

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

@@ -54,7 +54,7 @@ public class PgTableValuedFunctionExpression : TableValuedFunctionExpression, IE
     public PgTableValuedFunctionExpression(
         string alias,
         string name,
-        IReadOnlyList<SqlExpression> arguments,
+        IReadOnlyList<Expression> arguments,
         IReadOnlyList<ColumnInfo>? columnInfos = null,
         bool withOrdinality = true)
         : base(alias, name, schema: null, builtIn: true, arguments)
@@ -75,18 +75,18 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
     ///     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 override PgTableValuedFunctionExpression Update(IReadOnlyList<SqlExpression> arguments)
+    public override PgTableValuedFunctionExpression Update(IReadOnlyList<Expression> arguments)
         => arguments.SequenceEqual(Arguments, ReferenceEqualityComparer.Instance)
             ? this
             : new PgTableValuedFunctionExpression(Alias, Name, arguments, ColumnInfos, WithOrdinality);
 
     /// <inheritdoc />
     public override TableExpressionBase Clone(string? alias, ExpressionVisitor cloningExpressionVisitor)
     {
-        var arguments = new SqlExpression[Arguments.Count];
+        var arguments = new Expression[Arguments.Count];
         for (var i = 0; i < arguments.Length; i++)
         {
-            arguments[i] = (SqlExpression)cloningExpressionVisitor.Visit(Arguments[i]);
+            arguments[i] = cloningExpressionVisitor.Visit(Arguments[i]);
         }
 
         return new PgTableValuedFunctionExpression(Alias, Name, arguments, ColumnInfos, WithOrdinality);

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

@@ -33,7 +33,7 @@ public class PgUnnestExpression : PgTableValuedFunctionExpression
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </remarks>
     public virtual SqlExpression Array
-        => Arguments[0];
+        => (SqlExpression)Arguments[0];
 
     /// <summary>
     ///     The name of the column to be projected out from the <c>unnest</c> call.
@@ -75,8 +75,8 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
     ///     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 override PgUnnestExpression Update(IReadOnlyList<SqlExpression> arguments)
-        => arguments is [var singleArgument]
+    public override PgUnnestExpression Update(IReadOnlyList<Expression> arguments)
+        => arguments is [SqlExpression singleArgument]
             ? Update(singleArgument)
             : throw new ArgumentException();
 

src/EFCore.PG/Storage/Internal/Mapping/NpgsqlStructuralJsonTypeMapping.cs

@@ -9,7 +9,7 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal.Mapping;
 ///     See <see cref="NpgsqlJsonTypeMapping" /> for the older Npgsql-specific support, which allows mapping json/jsonb to text, to e.g.
 ///     <see cref="JsonElement" /> (weakly-typed mapping) or to arbitrary POCOs (but without them being modeled).
 /// </summary>
-public class NpgsqlStructuralJsonTypeMapping : JsonTypeMapping
+public class NpgsqlStructuralJsonTypeMapping : StructuralJsonTypeMapping
 {
     /// <summary>
     ///     The database type used by Npgsql (<see cref="NpgsqlDbType.Json" /> or <see cref="NpgsqlDbType.Jsonb" />.

test/EFCore.PG.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionNpgsqlTest.cs

@@ -151,7 +151,7 @@ public override async Task Select_unmapped_associate_scalar_property(QueryTracki
 
         AssertSql(
             """
-SELECT r."Id", r."Name", r."AssociateCollection", r."OptionalAssociate", r."RequiredAssociate"
+SELECT r."RequiredAssociate"
 FROM "RootEntity" AS r
 """);
     }
@@ -279,6 +279,20 @@ public override async Task Select_root_duplicated(QueryTrackingBehavior queryTra
 """);
     }
 
+    public override async Task Select_associate_and_target_to_index_based_binding_via_closure(QueryTrackingBehavior queryTrackingBehavior)
+    {
+        await base.Select_associate_and_target_to_index_based_binding_via_closure(queryTrackingBehavior);
+
+        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
+        {
+            AssertSql(
+                """
+SELECT r."Id", r."RequiredAssociate"
+FROM "RootEntity" AS r
+""");
+        }
+    }
+
     #endregion Multiple
 
     #region Subquery

test/EFCore.PG.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionNpgsqlTest.cs

@@ -153,7 +153,7 @@ public override async Task Select_unmapped_associate_scalar_property(QueryTracki
 
         AssertSql(
             """
-SELECT r."Id", r."Name", r."OptionalAssociate_Id", r."OptionalAssociate_Int", r."OptionalAssociate_Ints", r."OptionalAssociate_Name", r."OptionalAssociate_String", r."OptionalAssociate_OptionalNestedAssociate_Id", r."OptionalAssociate_OptionalNestedAssociate_Int", r."OptionalAssociate_OptionalNestedAssociate_Ints", r."OptionalAssociate_OptionalNestedAssociate_Name", r."OptionalAssociate_OptionalNestedAssociate_String", r."OptionalAssociate_RequiredNestedAssociate_Id", r."OptionalAssociate_RequiredNestedAssociate_Int", r."OptionalAssociate_RequiredNestedAssociate_Ints", r."OptionalAssociate_RequiredNestedAssociate_Name", r."OptionalAssociate_RequiredNestedAssociate_String", r."RequiredAssociate_Id", r."RequiredAssociate_Int", r."RequiredAssociate_Ints", r."RequiredAssociate_Name", r."RequiredAssociate_String", r."RequiredAssociate_OptionalNestedAssociate_Id", r."RequiredAssociate_OptionalNestedAssociate_Int", r."RequiredAssociate_OptionalNestedAssociate_Ints", r."RequiredAssociate_OptionalNestedAssociate_Name", r."RequiredAssociate_OptionalNestedAssociate_String", r."RequiredAssociate_RequiredNestedAssociate_Id", r."RequiredAssociate_RequiredNestedAssociate_Int", r."RequiredAssociate_RequiredNestedAssociate_Ints", r."RequiredAssociate_RequiredNestedAssociate_Name", r."RequiredAssociate_RequiredNestedAssociate_String"
+SELECT r."RequiredAssociate_Id", r."RequiredAssociate_Int", r."RequiredAssociate_Ints", r."RequiredAssociate_Name", r."RequiredAssociate_String", r."RequiredAssociate_OptionalNestedAssociate_Id", r."RequiredAssociate_OptionalNestedAssociate_Int", r."RequiredAssociate_OptionalNestedAssociate_Ints", r."RequiredAssociate_OptionalNestedAssociate_Name", r."RequiredAssociate_OptionalNestedAssociate_String", r."RequiredAssociate_RequiredNestedAssociate_Id", r."RequiredAssociate_RequiredNestedAssociate_Int", r."RequiredAssociate_RequiredNestedAssociate_Ints", r."RequiredAssociate_RequiredNestedAssociate_Name", r."RequiredAssociate_RequiredNestedAssociate_String"
 FROM "RootEntity" AS r
 """);
     }
@@ -191,7 +191,7 @@ public override async Task Select_nested_collection_on_required_associate(QueryT
 
         AssertSql(
             """
-SELECT r."Id", r."Name", r."OptionalAssociate_Id", r."OptionalAssociate_Int", r."OptionalAssociate_Ints", r."OptionalAssociate_Name", r."OptionalAssociate_String", r."OptionalAssociate_OptionalNestedAssociate_Id", r."OptionalAssociate_OptionalNestedAssociate_Int", r."OptionalAssociate_OptionalNestedAssociate_Ints", r."OptionalAssociate_OptionalNestedAssociate_Name", r."OptionalAssociate_OptionalNestedAssociate_String", r."OptionalAssociate_RequiredNestedAssociate_Id", r."OptionalAssociate_RequiredNestedAssociate_Int", r."OptionalAssociate_RequiredNestedAssociate_Ints", r."OptionalAssociate_RequiredNestedAssociate_Name", r."OptionalAssociate_RequiredNestedAssociate_String", r."RequiredAssociate_Id", r."RequiredAssociate_Int", r."RequiredAssociate_Ints", r."RequiredAssociate_Name", r."RequiredAssociate_String", r."RequiredAssociate_OptionalNestedAssociate_Id", r."RequiredAssociate_OptionalNestedAssociate_Int", r."RequiredAssociate_OptionalNestedAssociate_Ints", r."RequiredAssociate_OptionalNestedAssociate_Name", r."RequiredAssociate_OptionalNestedAssociate_String", r."RequiredAssociate_RequiredNestedAssociate_Id", r."RequiredAssociate_RequiredNestedAssociate_Int", r."RequiredAssociate_RequiredNestedAssociate_Ints", r."RequiredAssociate_RequiredNestedAssociate_Name", r."RequiredAssociate_RequiredNestedAssociate_String"
+SELECT r."RequiredAssociate_Id", r."RequiredAssociate_Int", r."RequiredAssociate_Ints", r."RequiredAssociate_Name", r."RequiredAssociate_String", r."RequiredAssociate_OptionalNestedAssociate_Id", r."RequiredAssociate_OptionalNestedAssociate_Int", r."RequiredAssociate_OptionalNestedAssociate_Ints", r."RequiredAssociate_OptionalNestedAssociate_Name", r."RequiredAssociate_OptionalNestedAssociate_String", r."RequiredAssociate_RequiredNestedAssociate_Id", r."RequiredAssociate_RequiredNestedAssociate_Int", r."RequiredAssociate_RequiredNestedAssociate_Ints", r."RequiredAssociate_RequiredNestedAssociate_Name", r."RequiredAssociate_RequiredNestedAssociate_String"
 FROM "RootEntity" AS r
 ORDER BY r."Id" NULLS FIRST
 """);
@@ -203,7 +203,7 @@ public override async Task Select_nested_collection_on_optional_associate(QueryT
 
         AssertSql(
             """
-SELECT r."Id", r."Name", r."OptionalAssociate_Id", r."OptionalAssociate_Int", r."OptionalAssociate_Ints", r."OptionalAssociate_Name", r."OptionalAssociate_String", r."OptionalAssociate_OptionalNestedAssociate_Id", r."OptionalAssociate_OptionalNestedAssociate_Int", r."OptionalAssociate_OptionalNestedAssociate_Ints", r."OptionalAssociate_OptionalNestedAssociate_Name", r."OptionalAssociate_OptionalNestedAssociate_String", r."OptionalAssociate_RequiredNestedAssociate_Id", r."OptionalAssociate_RequiredNestedAssociate_Int", r."OptionalAssociate_RequiredNestedAssociate_Ints", r."OptionalAssociate_RequiredNestedAssociate_Name", r."OptionalAssociate_RequiredNestedAssociate_String", r."RequiredAssociate_Id", r."RequiredAssociate_Int", r."RequiredAssociate_Ints", r."RequiredAssociate_Name", r."RequiredAssociate_String", r."RequiredAssociate_OptionalNestedAssociate_Id", r."RequiredAssociate_OptionalNestedAssociate_Int", r."RequiredAssociate_OptionalNestedAssociate_Ints", r."RequiredAssociate_OptionalNestedAssociate_Name", r."RequiredAssociate_OptionalNestedAssociate_String", r."RequiredAssociate_RequiredNestedAssociate_Id", r."RequiredAssociate_RequiredNestedAssociate_Int", r."RequiredAssociate_RequiredNestedAssociate_Ints", r."RequiredAssociate_RequiredNestedAssociate_Name", r."RequiredAssociate_RequiredNestedAssociate_String"
+SELECT r."OptionalAssociate_Id", r."OptionalAssociate_Int", r."OptionalAssociate_Ints", r."OptionalAssociate_Name", r."OptionalAssociate_String", r."OptionalAssociate_OptionalNestedAssociate_Id", r."OptionalAssociate_OptionalNestedAssociate_Int", r."OptionalAssociate_OptionalNestedAssociate_Ints", r."OptionalAssociate_OptionalNestedAssociate_Name", r."OptionalAssociate_OptionalNestedAssociate_String", r."OptionalAssociate_RequiredNestedAssociate_Id", r."OptionalAssociate_RequiredNestedAssociate_Int", r."OptionalAssociate_RequiredNestedAssociate_Ints", r."OptionalAssociate_RequiredNestedAssociate_Name", r."OptionalAssociate_RequiredNestedAssociate_String"
 FROM "RootEntity" AS r
 ORDER BY r."Id" NULLS FIRST
 """);

test/EFCore.PG.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionNpgsqlTest.cs

@@ -349,6 +349,22 @@ LEFT JOIN (
 """);
     }
 
+    public override async Task Select_associate_and_target_to_index_based_binding_via_closure(QueryTrackingBehavior queryTrackingBehavior)
+    {
+        await base.Select_associate_and_target_to_index_based_binding_via_closure(queryTrackingBehavior);
+
+        AssertSql(
+            """
+SELECT r."Id", a."Id", a."CollectionRootId", a."Int", a."Ints", a."Name", a."OptionalNestedAssociateId", a."RequiredNestedAssociateId", a."String", n."Id", n0."Id", n1."Id", n1."CollectionAssociateId", n1."Int", n1."Ints", n1."Name", n1."String", n."CollectionAssociateId", n."Int", n."Ints", n."Name", n."String", n0."CollectionAssociateId", n0."Int", n0."Ints", n0."Name", n0."String"
+FROM "RootEntity" AS r
+INNER JOIN "AssociateType" AS a ON r."RequiredAssociateId" = a."Id"
+LEFT JOIN "NestedAssociateType" AS n ON a."OptionalNestedAssociateId" = n."Id"
+INNER JOIN "NestedAssociateType" AS n0 ON a."RequiredNestedAssociateId" = n0."Id"
+LEFT JOIN "NestedAssociateType" AS n1 ON a."Id" = n1."CollectionAssociateId"
+ORDER BY r."Id" NULLS FIRST, a."Id" NULLS FIRST, n."Id" NULLS FIRST, n0."Id" NULLS FIRST
+""");
+    }
+
     #endregion Multiple
 
     #region Subquery

test/EFCore.PG.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionNpgsqlTest.cs

@@ -321,6 +321,20 @@ public override async Task Select_root_duplicated(QueryTrackingBehavior queryTra
 """);
     }
 
+    public override async Task Select_associate_and_target_to_index_based_binding_via_closure(QueryTrackingBehavior queryTrackingBehavior)
+    {
+        await base.Select_associate_and_target_to_index_based_binding_via_closure(queryTrackingBehavior);
+
+        if (queryTrackingBehavior is not QueryTrackingBehavior.TrackAll)
+        {
+            AssertSql(
+                """
+SELECT r."Id", r."RequiredAssociate"
+FROM "RootEntity" AS r
+""");
+        }
+    }
+
     #endregion Multiple
 
     #region Subquery