Feedback

dotnet · Dec 6, 2021 · 57d1ec9 · 57d1ec9
1 parent 9db26bd
commit 57d1ec9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs b/src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs
@@ -232,20 +232,22 @@ private bool PrepareForAdd(EntityState newState)
 
     private void SetEntityState(EntityState oldState, EntityState newState, bool acceptChanges, bool modifyProperties)
     {
+        var entityType = EntityType;
+
         // Prevent temp values from becoming permanent values
         if (oldState == EntityState.Added
             && newState != EntityState.Added
             && newState != EntityState.Detached)
         {
             // ReSharper disable once LoopCanBeConvertedToQuery
-            foreach (var property in EntityType.GetProperties())
+            foreach (var property in entityType.GetProperties())
             {
                 if (property.IsKey() && HasTemporaryValue(property))
                 {
                     throw new InvalidOperationException(
                         CoreStrings.TempValuePersists(
                             property.Name,
-                            EntityType.DisplayName(), newState));
+                            entityType.DisplayName(), newState));
                 }
             }
         }
@@ -255,10 +257,10 @@ private void SetEntityState(EntityState oldState, EntityState newState, bool acc
         if (newState == EntityState.Modified
             && modifyProperties)
         {
-            _stateData.FlagAllProperties(EntityType.PropertyCount(), PropertyFlag.Modified, flagged: true);
+            _stateData.FlagAllProperties(entityType.PropertyCount(), PropertyFlag.Modified, flagged: true);
 
             // Hot path; do not use LINQ
-            foreach (var property in EntityType.GetProperties())
+            foreach (var property in entityType.GetProperties())
             {
                 if (property.GetAfterSaveBehavior() != PropertySaveBehavior.Save)
                 {
@@ -275,7 +277,7 @@ private void SetEntityState(EntityState oldState, EntityState newState, bool acc
         if (newState == EntityState.Unchanged)
         {
             _stateData.FlagAllProperties(
-                EntityType.PropertyCount(), PropertyFlag.Modified,
+                entityType.PropertyCount(), PropertyFlag.Modified,
                 flagged: false);
         }
 
@@ -318,7 +320,7 @@ private void SetEntityState(EntityState oldState, EntityState newState, bool acc
                 || newState == EntityState.Detached)
             && HasConceptualNull)
         {
-            _stateData.FlagAllProperties(EntityType.PropertyCount(), PropertyFlag.Null, flagged: false);
+            _stateData.FlagAllProperties(entityType.PropertyCount(), PropertyFlag.Null, flagged: false);
         }
 
         if (oldState == EntityState.Detached
@@ -339,7 +341,7 @@ private void SetEntityState(EntityState oldState, EntityState newState, bool acc
 
         FireStateChanged(oldState);
 
-        HandleSharedIdentityEntry(oldState, newState, EntityType);
+        HandleSharedIdentityEntry(oldState, newState, entityType);
 
         if ((newState == EntityState.Deleted
                 || newState == EntityState.Detached)

diff --git a/src/EFCore/Query/Internal/SubqueryMemberPushdownExpressionVisitor.cs b/src/EFCore/Query/Internal/SubqueryMemberPushdownExpressionVisitor.cs
@@ -128,12 +128,6 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                     innerMethodCall,
                     (target, nullable) =>
                     {
-                        var propertyType = methodCallExpression.Type;
-                        if (nullable && !propertyType.IsNullableType())
-                        {
-                            propertyType.MakeNullable();
-                        }
-
                         var indexerExpression = Expression.Call(
                             target,
                             methodCallExpression.Method, methodCallExpression.Arguments[0]);