Bring back enumerable Concat/Append translations for ExecuteUpdate (#…

…3005) Fixes #3001
npgsql · Dec 4, 2023 · 91ccdf6 · 91ccdf6
1 parent 631b330
commit 91ccdf6
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 0 deletions.
diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlArrayMethodTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlArrayMethodTranslator.cs
@@ -1,6 +1,7 @@
 using Npgsql.EntityFrameworkCore.PostgreSQL.Internal;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal.Mapping;
 using static Npgsql.EntityFrameworkCore.PostgreSQL.Utilities.Statics;
+using ExpressionExtensions = Microsoft.EntityFrameworkCore.Query.ExpressionExtensions;
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query.ExpressionTranslators.Internal;
 
@@ -33,6 +34,17 @@ public class NpgsqlArrayMethodTranslator : IMethodCallTranslator
     private static readonly MethodInfo Enumerable_SequenceEqual =
         typeof(Enumerable).GetTypeInfo().GetMethods(BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly)
             .Single(m => m.Name == nameof(Enumerable.SequenceEqual) && m.GetParameters().Length == 2);
+
+    // TODO: Enumerable Append and Concat are only here because primitive collections aren't handled in ExecuteUpdate,
+    // https://github.com/dotnet/efcore/issues/32494
+    private static readonly MethodInfo Enumerable_Append =
+        typeof(Enumerable).GetTypeInfo().GetMethods(BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly)
+            .Single(m => m.Name == nameof(Enumerable.Append) && m.GetParameters().Length == 2);
+
+    private static readonly MethodInfo Enumerable_Concat =
+        typeof(Enumerable).GetTypeInfo().GetMethods(BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly)
+            .Single(m => m.Name == nameof(Enumerable.Concat) && m.GetParameters().Length == 2);
+
     // ReSharper restore InconsistentNaming
 
     #endregion Methods
@@ -155,6 +167,38 @@ static bool IsMappedToNonArray(SqlExpression arrayOrList)
                     _sqlExpressionFactory.Constant(-1));
             }
 
+            // TODO: Enumerable Append and Concat are only here because primitive collections aren't handled in ExecuteUpdate,
+            // https://github.com/dotnet/efcore/issues/32494
+            if (method.IsClosedFormOf(Enumerable_Append))
+            {
+                var (item, array) = _sqlExpressionFactory.ApplyTypeMappingsOnItemAndArray(arguments[0], arrayOrList);
+
+                return _sqlExpressionFactory.Function(
+                    "array_append",
+                    new[] { array, item },
+                    nullable: true,
+                    TrueArrays[2],
+                    arrayOrList.Type,
+                    arrayOrList.TypeMapping);
+            }
+
+            if (method.IsClosedFormOf(Enumerable_Concat))
+            {
+                var inferredMapping = ExpressionExtensions.InferTypeMapping(arrayOrList, arguments[0]);
+
+                return _sqlExpressionFactory.Function(
+                    "array_cat",
+                    new[]
+                    {
+                        _sqlExpressionFactory.ApplyTypeMapping(arrayOrList, inferredMapping),
+                        _sqlExpressionFactory.ApplyTypeMapping(arguments[0], inferredMapping)
+                    },
+                    nullable: true,
+                    TrueArrays[2],
+                    arrayOrList.Type,
+                    inferredMapping);
+            }
+
             return null;
         }
     }

diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs
@@ -151,6 +151,41 @@ public override async Task Update_with_alias_uniquification_in_setter_subquery(b
 """);
     }
 
+    [ConditionalTheory] // #3001
+    [MemberData(nameof(IsAsyncData))]
+    public virtual async Task Update_with_primitive_collection_in_value_selector(bool async)
+    {
+        var contextFactory = await InitializeAsync<Context3001>(
+            seed: ctx =>
+            {
+                ctx.AddRange(new EntityWithPrimitiveCollection { Tags = new List<string> { "tag1", "tag2" }});
+                ctx.SaveChanges();
+            });
+
+        await AssertUpdate(
+            async,
+            contextFactory.CreateContext,
+            ss => ss.EntitiesWithPrimitiveCollection,
+            s => s.SetProperty(x => x.Tags, x => x.Tags.Append("another_tag")),
+            rowsAffectedCount: 1);
+    }
+
+    protected class Context3001 : DbContext
+    {
+        public Context3001(DbContextOptions options)
+            : base(options)
+        {
+        }
+
+        public DbSet<EntityWithPrimitiveCollection> EntitiesWithPrimitiveCollection { get; set; }
+    }
+
+    protected class EntityWithPrimitiveCollection
+    {
+        public int Id { get; set; }
+        public List<string> Tags { get; set; }
+    }
+
     private void AssertSql(params string[] expected)
         => TestSqlLoggerFactory.AssertBaseline(expected);