Query: Mark entity shaper nullable only when correct (#22533)

dotnet · Oct 8, 2020 · e3a059b · e3a059b
1 parent 2403579
commit e3a059b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/EFCore.Relational/Query/SqlExpressions/SelectExpression.cs b/src/EFCore.Relational/Query/SqlExpressions/SelectExpression.cs
@@ -1641,9 +1641,10 @@ static void ValidateIdentifyingProjection(SelectExpression selectExpression)
                         if (!innerSelectProjectionExpressions.Contains(innerSelectIdentifier.Column)
                             && (selectExpression.GroupBy.Count == 0
                                 || !selectExpression.GroupBy.Contains(innerSelectIdentifier.Column)))
-
+                        {
                             throw new InvalidOperationException(RelationalStrings.MissingIdentifyingProjectionInDistinctGroupBySubquery(
                                 innerSelectIdentifier.Column.Table.Alias + "." + innerSelectIdentifier.Column.Name));
+                        }
                     }
                 }
             }
@@ -2046,7 +2047,10 @@ private Expression AddJoin(
                 }
             }
 
-            innerShaper = new EntityShaperNullableMarkingExpressionVisitor().Visit(innerShaper);
+            if (innerNullable)
+            {
+                innerShaper = new EntityShaperNullableMarkingExpressionVisitor().Visit(innerShaper);
+            }
 
             return New(
                 transparentIdentifierType.GetTypeInfo().DeclaredConstructors.Single(),