Minor changes resulting from PG sync work to rc1 (#31581)

Author: roji

src/EFCore.Relational/Query/Internal/RelationalProjectionBindingExpressionVisitor.cs

@@ -182,15 +182,17 @@ public virtual Expression Translate(SelectExpression selectExpression, Expressio
 
                 if (expression is MethodCallExpression methodCallExpression)
                 {
-                    if (methodCallExpression.Method.IsGenericMethod
-                        && methodCallExpression.Method.DeclaringType == typeof(Enumerable)
-                        && methodCallExpression.Method.Name == nameof(Enumerable.ToList)
-                        && methodCallExpression.Arguments.Count == 1
-                        && methodCallExpression.Arguments[0].Type.TryGetElementType(typeof(IQueryable<>)) != null)
+                    if (methodCallExpression is
+                        {
+                            Method.IsGenericMethod: true,
+                            Method.Name: nameof(Enumerable.ToList),
+                            Method: var method,
+                            Arguments: [var argument]
+                        }
+                        && method.DeclaringType == typeof(Enumerable)
+                        && argument.Type.TryGetElementType(typeof(IQueryable<>)) != null)
                     {
-                        var subquery = _queryableMethodTranslatingExpressionVisitor.TranslateSubquery(
-                            methodCallExpression.Arguments[0]);
-                        if (subquery != null)
+                        if (_queryableMethodTranslatingExpressionVisitor.TranslateSubquery(argument) is ShapedQueryExpression subquery)
                         {
                             _clientProjections!.Add(subquery);
                             // expression.Type here will be List<T>

src/EFCore.Relational/Query/SqlExpressions/CrossApplyExpression.cs

@@ -38,7 +38,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
     /// </summary>
     /// <param name="table">The <see cref="JoinExpressionBase.Table" /> property of the result.</param>
     /// <returns>This expression if no children changed, or an expression with the updated children.</returns>
-    public virtual CrossApplyExpression Update(TableExpressionBase table)
+    public override CrossApplyExpression Update(TableExpressionBase table)
         => table != Table
             ? new CrossApplyExpression(table, GetAnnotations())
             : this;

src/EFCore.Relational/Query/SqlExpressions/CrossJoinExpression.cs

@@ -38,7 +38,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
     /// </summary>
     /// <param name="table">The <see cref="JoinExpressionBase.Table" /> property of the result.</param>
     /// <returns>This expression if no children changed, or an expression with the updated children.</returns>
-    public virtual CrossJoinExpression Update(TableExpressionBase table)
+    public override CrossJoinExpression Update(TableExpressionBase table)
         => table != Table
             ? new CrossJoinExpression(table, GetAnnotations())
             : this;

src/EFCore.Relational/Query/SqlExpressions/InnerJoinExpression.cs

@@ -48,11 +48,22 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
     /// <param name="table">The <see cref="JoinExpressionBase.Table" /> property of the result.</param>
     /// <param name="joinPredicate">The <see cref="PredicateJoinExpressionBase.JoinPredicate" /> property of the result.</param>
     /// <returns>This expression if no children changed, or an expression with the updated children.</returns>
-    public virtual InnerJoinExpression Update(TableExpressionBase table, SqlExpression joinPredicate)
+    public override InnerJoinExpression Update(TableExpressionBase table, SqlExpression joinPredicate)
         => table != Table || joinPredicate != JoinPredicate
             ? new InnerJoinExpression(table, joinPredicate, GetAnnotations())
             : this;
 
+    /// <summary>
+    ///     Creates a new expression that is like this one, but using the supplied children. If all of the children are the same, it will
+    ///     return this expression.
+    /// </summary>
+    /// <param name="table">The <see cref="JoinExpressionBase.Table" /> property of the result.</param>
+    /// <returns>This expression if no children changed, or an expression with the updated children.</returns>
+    public override InnerJoinExpression Update(TableExpressionBase table)
+        => table != Table
+            ? new InnerJoinExpression(table, JoinPredicate, GetAnnotations())
+            : this;
+
     /// <inheritdoc />
     protected override TableExpressionBase CreateWithAnnotations(IEnumerable<IAnnotation> annotations)
         => new InnerJoinExpression(Table, JoinPredicate, annotations);

src/EFCore.Relational/Query/SqlExpressions/JoinExpressionBase.cs

@@ -39,6 +39,14 @@ protected JoinExpressionBase(TableExpressionBase table, IEnumerable<IAnnotation>
     /// </summary>
     public virtual TableExpressionBase Table { get; }
 
+    /// <summary>
+    ///     Creates a new expression that is like this one, but using the supplied children. If all of the children are the same, it will
+    ///     return this expression.
+    /// </summary>
+    /// <param name="table">The <see cref="JoinExpressionBase.Table" /> property of the result.</param>
+    /// <returns>This expression if no children changed, or an expression with the updated children.</returns>
+    public abstract JoinExpressionBase Update(TableExpressionBase table);
+
     /// <inheritdoc />
     public override bool Equals(object? obj)
         => obj != null

src/EFCore.Relational/Query/SqlExpressions/LeftJoinExpression.cs

@@ -48,11 +48,22 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
     /// <param name="table">The <see cref="JoinExpressionBase.Table" /> property of the result.</param>
     /// <param name="joinPredicate">The <see cref="PredicateJoinExpressionBase.JoinPredicate" /> property of the result.</param>
     /// <returns>This expression if no children changed, or an expression with the updated children.</returns>
-    public virtual LeftJoinExpression Update(TableExpressionBase table, SqlExpression joinPredicate)
+    public override LeftJoinExpression Update(TableExpressionBase table, SqlExpression joinPredicate)
         => table != Table || joinPredicate != JoinPredicate
             ? new LeftJoinExpression(table, joinPredicate, GetAnnotations())
             : this;
 
+    /// <summary>
+    ///     Creates a new expression that is like this one, but using the supplied children. If all of the children are the same, it will
+    ///     return this expression.
+    /// </summary>
+    /// <param name="table">The <see cref="JoinExpressionBase.Table" /> property of the result.</param>
+    /// <returns>This expression if no children changed, or an expression with the updated children.</returns>
+    public override LeftJoinExpression Update(TableExpressionBase table)
+        => table != Table
+            ? new LeftJoinExpression(table, JoinPredicate, GetAnnotations())
+            : this;
+
     /// <inheritdoc />
     protected override TableExpressionBase CreateWithAnnotations(IEnumerable<IAnnotation> annotations)
         => new LeftJoinExpression(Table, JoinPredicate, annotations);

src/EFCore.Relational/Query/SqlExpressions/OuterApplyExpression.cs

@@ -38,7 +38,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
     /// </summary>
     /// <param name="table">The <see cref="JoinExpressionBase.Table" /> property of the result.</param>
     /// <returns>This expression if no children changed, or an expression with the updated children.</returns>
-    public virtual OuterApplyExpression Update(TableExpressionBase table)
+    public override OuterApplyExpression Update(TableExpressionBase table)
         => table != Table
             ? new OuterApplyExpression(table, GetAnnotations())
             : this;

src/EFCore.Relational/Query/SqlExpressions/PredicateJoinExpressionBase.cs

@@ -44,6 +44,15 @@ protected PredicateJoinExpressionBase(
     /// </summary>
     public virtual SqlExpression JoinPredicate { get; }
 
+    /// <summary>
+    ///     Creates a new expression that is like this one, but using the supplied children. If all of the children are the same, it will
+    ///     return this expression.
+    /// </summary>
+    /// <param name="table">The <see cref="JoinExpressionBase.Table" /> property of the result.</param>
+    /// <param name="joinPredicate">The <see cref="PredicateJoinExpressionBase.JoinPredicate" /> property of the result.</param>
+    /// <returns>This expression if no children changed, or an expression with the updated children.</returns>
+    public abstract PredicateJoinExpressionBase Update(TableExpressionBase table, SqlExpression joinPredicate);
+
     /// <inheritdoc />
     public override bool Equals(object? obj)
         => obj != null

src/EFCore.Relational/Storage/RelationalTypeMappingSource.cs

@@ -225,11 +225,12 @@ protected override CoreTypeMapping FindMapping(in TypeMappingInfo mappingInfo)
         Type? providerType,
         CoreTypeMapping? elementMapping)
     {
-        var elementType = modelType.TryGetElementType(typeof(IEnumerable<>))!;
+        if (TryFindJsonCollectionMapping(
+                info.CoreTypeMappingInfo, modelType, providerType, ref elementMapping, out var collectionReaderWriter))
+        {
+            var elementType = modelType.TryGetElementType(typeof(IEnumerable<>))!;
 
-        return TryFindJsonCollectionMapping(
-            info.CoreTypeMappingInfo, modelType, providerType, ref elementMapping, out var collectionReaderWriter)
-            ? (RelationalTypeMapping)FindMapping(
+            return (RelationalTypeMapping)FindMapping(
                     info.WithConverter(
                         // Note that the converter info is only used temporarily here and never creates an instance.
                         new ValueConverterInfo(modelType, typeof(string), _ => null!)))!
@@ -242,8 +243,10 @@ protected override CoreTypeMapping FindMapping(in TypeMappingInfo mappingInfo)
                             : typeof(ListComparer<>).MakeGenericType(elementMapping!.Comparer.Type),
                         elementMapping!.Comparer),
                     elementMapping,
-                    collectionReaderWriter)
-            : null;
+                    collectionReaderWriter);
+        }
+
+        return null;
     }
 
     /// <summary>

src/EFCore.SqlServer/Query/Internal/SqlServerJsonPostprocessor.cs

@@ -92,12 +92,9 @@ public virtual Expression Process(Expression expression)
 
                         table = table switch
                         {
-                            InnerJoinExpression ij => ij.Update(newOpenJsonExpression, ij.JoinPredicate),
-                            LeftJoinExpression lj => lj.Update(newOpenJsonExpression, lj.JoinPredicate),
-                            CrossJoinExpression cj => cj.Update(newOpenJsonExpression),
-                            CrossApplyExpression ca => ca.Update(newOpenJsonExpression),
-                            OuterApplyExpression oa => oa.Update(newOpenJsonExpression),
-                            _ => newOpenJsonExpression,
+                            JoinExpressionBase j => j.Update(newOpenJsonExpression),
+                            SqlServerOpenJsonExpression => newOpenJsonExpression,
+                            _ => throw new UnreachableException()
                         };
 
                         foreach (var columnInfo in openJsonExpression.ColumnInfos!)