Merge in 'release/5.0' changes

dotnet · Jan 13, 2021 · 67e0e23 · 67e0e23
2 parents 9b43879 + 214bc46
commit 67e0e23
Show file tree

Hide file tree

Showing 4 changed files with 322 additions and 32 deletions.
diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs
@@ -660,6 +660,20 @@ private static bool ProcessJoinCondition(
                 }
             }
 
+            if (!(AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue23593", out var enabled)
+                && enabled)
+                && joinCondition is MethodCallExpression methodCallExpression
+                && methodCallExpression.Method.IsStatic
+                && methodCallExpression.Method.DeclaringType == typeof(object)
+                && methodCallExpression.Method.Name == nameof(object.Equals)
+                && methodCallExpression.Arguments.Count == 2)
+            {
+                leftExpressions.Add(methodCallExpression.Arguments[0]);
+                rightExpressions.Add(methodCallExpression.Arguments[1]);
+
+                return true;
+            }
+
             return false;
         }
 

diff --git a/src/EFCore/ChangeTracking/Internal/NavigationFixer.cs b/src/EFCore/ChangeTracking/Internal/NavigationFixer.cs
@@ -33,6 +33,9 @@ public class NavigationFixer : INavigationFixer
         private readonly bool _useOldBehaviorFor23659
             = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue23659", out var enabled) && enabled;
 
+        private readonly bool _useOldBehaviorFor23787
+            = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue23787", out var enabled) && enabled;
+
         private readonly IChangeDetector _changeDetector;
         private readonly IEntityGraphAttacher _attacher;
         private bool _inFixup;
@@ -831,6 +834,11 @@ private void InitialFixup(
 
                                 AddToCollection(otherEntry, skipNavigation.Inverse, entry, fromQuery);
                             }
+
+                            if (!_useOldBehaviorFor23787)
+                            {
+                                entry.AddToCollectionSnapshot(skipNavigation, otherEntity);
+                            }
                         }
                     }
                 }

diff --git a/test/EFCore.InMemory.FunctionalTests/Query/QueryBugsInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/QueryBugsInMemoryTest.cs
@@ -1160,6 +1160,98 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         #endregion
 
+        #region Issue23593
+
+        [ConditionalFact]
+        public virtual void Join_with_enum_as_key_selector()
+        {
+            using (CreateScratch<MyContext23593>(Seed23593, "23593"))
+            {
+                using var context = new MyContext23593();
+
+                var query = from sm in context.StatusMaps
+                            join sme in context.StatusMapEvents on sm.Id equals sme.Id
+                            select sm;
+
+                var result = Assert.Single(query);
+                Assert.Equal(StatusMapCode23593.Two, result.Id);
+            }
+        }
+
+        [ConditionalFact]
+        public virtual void Join_with_enum_inside_anonymous_type_as_key_selector()
+        {
+            using (CreateScratch<MyContext23593>(Seed23593, "23593"))
+            {
+                using var context = new MyContext23593();
+
+                var query = from sm in context.StatusMaps
+                            join sme in context.StatusMapEvents on new { sm.Id } equals new { sme.Id }
+                            select sm;
+
+                var result = Assert.Single(query);
+                Assert.Equal(StatusMapCode23593.Two, result.Id);
+            }
+        }
+
+        [ConditionalFact]
+        public virtual void Join_with_enum_inside_anonymous_type_with_other_property_as_key_selector()
+        {
+            using (CreateScratch<MyContext23593>(Seed23593, "23593"))
+            {
+                using var context = new MyContext23593();
+
+                var query = from sm in context.StatusMaps
+                            join sme in context.StatusMapEvents on new { sm.Id, A = 1 } equals new { sme.Id, A = 1 }
+                            select sm;
+
+                var result = Assert.Single(query);
+                Assert.Equal(StatusMapCode23593.Two, result.Id);
+            }
+        }
+
+        private static void Seed23593(MyContext23593 context)
+        {
+            context.Add(new StatusMap23593 { Id = StatusMapCode23593.One });
+            context.Add(new StatusMap23593 { Id = StatusMapCode23593.Two });
+            context.Add(new StatusMapEvent23593 { Id = StatusMapCode23593.Two });
+
+            context.SaveChanges();
+        }
+
+        private enum StatusMapCode23593
+        {
+            One,
+            Two,
+            Three,
+            Four
+        }
+
+        private class StatusMap23593
+        {
+            public StatusMapCode23593 Id { get; set; }
+        }
+        private class StatusMapEvent23593
+        {
+            public StatusMapCode23593 Id { get; set; }
+        }
+
+
+        private class MyContext23593 : DbContext
+        {
+            public DbSet<StatusMap23593> StatusMaps { get; set; }
+            public DbSet<StatusMapEvent23593> StatusMapEvents { get; set; }
+
+            protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+            {
+                optionsBuilder
+                    .UseInternalServiceProvider(InMemoryFixture.DefaultServiceProvider)
+                    .UseInMemoryDatabase("23593");
+            }
+        }
+
+        #endregion
+
         #region SharedHelper
 
         private static InMemoryTestStore CreateScratch<TContext>(Action<TContext> seed, string databaseName)