Added metadata for complextypes for AddViews / TVF in RelationalModel

src/EFCore.Relational/Metadata/Internal/RelationalModel.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Data;
 using System.Text;
 
 namespace Microsoft.EntityFrameworkCore.Metadata.Internal;
@@ -713,8 +714,8 @@ private static void AddViews(
 
     private static void CreateViewMapping(
         IRelationalTypeMappingSource relationalTypeMappingSource,
-        IEntityType entityType,
-        IEntityType mappedType,
+        ITypeBase entityType,
+        ITypeBase mappedType,
         StoreObjectIdentifier mappedView,
         RelationalModel databaseModel,
         List<ViewMapping> viewMappings,
@@ -770,11 +771,43 @@ private static void CreateViewMapping(
             }
         }
 
+        // TODO: Change this to call GetComplexProperties()
+        // Issue #31248
+        foreach (var complexProperty in mappedType.GetDeclaredComplexProperties())
+        {
+            var complexType = complexProperty.ComplexType;
+
+            var complexViewMappings =
+                (List<ViewMapping>?)complexType.FindRuntimeAnnotationValue(RelationalAnnotationNames.ViewMappings);
+            if (complexViewMappings == null)
+            {
+                complexViewMappings = [];
+                complexType.AddRuntimeAnnotation(RelationalAnnotationNames.ViewMappings, complexViewMappings);
+            }
+
+            CreateViewMapping(
+                relationalTypeMappingSource,
+                complexType,
+                complexType,
+                mappedView,
+                databaseModel,
+                complexViewMappings,
+                includesDerivedTypes: true,
+                isSplitEntityTypePrincipal: isSplitEntityTypePrincipal == true ? false : isSplitEntityTypePrincipal);
+        }
+
         if (((ITableMappingBase)viewMapping).ColumnMappings.Any()
             || viewMappings.Count == 0)
         {
             viewMappings.Add(viewMapping);
-            view.EntityTypeMappings.Add(viewMapping);
+            if(entityType is IEntityType)
+            {
+                view.EntityTypeMappings.Add(viewMapping);
+            }
+            else
+            {
+                view.ComplexTypeMappings.Add(viewMapping);
+            }
         }
     }
 

src/EFCore.Relational/Metadata/Internal/RelationalTypeBaseExtensions.cs

@@ -22,9 +22,8 @@ public static class RelationalTypeBaseExtensions
     public static IEnumerable<ITableMappingBase> GetViewOrTableMappings(this ITypeBase typeBase)
     {
         typeBase.Model.EnsureRelationalModel();
-        return (IEnumerable<ITableMappingBase>?)(typeBase.FindRuntimeAnnotationValue(
-                    RelationalAnnotationNames.ViewMappings)
-                ?? typeBase.FindRuntimeAnnotationValue(RelationalAnnotationNames.TableMappings))
-            ?? [];
+        var viewMapping = typeBase.FindRuntimeAnnotationValue(RelationalAnnotationNames.ViewMappings);
+        var tableMapping = typeBase.FindRuntimeAnnotationValue(RelationalAnnotationNames.TableMappings);
+        return (IEnumerable<ITableMappingBase>?)(viewMapping ?? tableMapping) ?? [];
     }
 }

src/EFCore.Relational/Metadata/Internal/ViewMapping.cs

@@ -18,7 +18,7 @@ public class ViewMapping : TableMappingBase<ViewColumnMapping>, IViewMapping
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public ViewMapping(
-        IEntityType entityType,
+        ITypeBase entityType,
         View view,
         bool? includesDerivedTypes)
         : base(entityType, view, includesDerivedTypes)

src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.ExecuteUpdate.cs

@@ -300,7 +300,7 @@ bool TryTranslateMemberAccess(
                     [NotNullWhen(true)] out IPropertyBase? property)
                 {
                     if (IsMemberAccess(expression, QueryCompilationContext.Model, out var baseExpression, out var member)
-                        && _sqlTranslator.TryBindMember(_sqlTranslator.Visit(baseExpression), member, out var target, out var targetProperty))
+                        && _sqlTranslator.TryBindMember(_sqlTranslator.Visit(baseExpression), member, out var target, out var targetProperty, forUpdate: true))
                     {
                         translation = target;
                         property = targetProperty;
@@ -540,7 +540,7 @@ void ProcessComplexType(StructuralTypeShaperExpression shaperExpression, Express
                             RelationalStrings.ExecuteUpdateOverJsonIsNotSupported(complexProperty.ComplexType.DisplayName()));
                     }
 
-                    var nestedShaperExpression = (StructuralTypeShaperExpression)projection.BindComplexProperty(complexProperty);
+                    var nestedShaperExpression = (StructuralTypeShaperExpression)projection.BindComplexProperty(complexProperty, forUpdate: true);
                     var nestedValueExpression = CreateComplexPropertyAccessExpression(valueExpression, complexProperty);
                     ProcessComplexType(nestedShaperExpression, nestedValueExpression);
                 }
@@ -635,7 +635,7 @@ SqlParameterExpression parameter
                                 StructuralType: IComplexType,
                                 ValueBufferExpression: StructuralTypeProjectionExpression projection
                             }
-                                => projection.BindComplexProperty(complexProperty),
+                                => projection.BindComplexProperty(complexProperty, forUpdate: true),
 
                             _ => throw new UnreachableException()
                         };

src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs

@@ -1219,7 +1219,8 @@ public virtual bool TryBindMember(
         Expression? source,
         MemberIdentity member,
         [NotNullWhen(true)] out Expression? expression,
-        [NotNullWhen(true)] out IPropertyBase? property)
+        [NotNullWhen(true)] out IPropertyBase? property,
+        bool forUpdate = false)
     {
         if (source is not StructuralTypeReferenceExpression typeReference)
         {
@@ -1247,7 +1248,7 @@ public virtual bool TryBindMember(
 
         if (complexProperty is not null)
         {
-            expression = BindComplexProperty(typeReference, complexProperty);
+            expression = BindComplexProperty(typeReference, complexProperty, forUpdate: forUpdate);
             property = complexProperty;
             return true;
         }
@@ -1359,7 +1360,7 @@ private SqlExpression BindProperty(StructuralTypeReferenceExpression typeReferen
         }
     }
 
-    private Expression BindComplexProperty(StructuralTypeReferenceExpression typeReference, IComplexProperty complexProperty)
+    private Expression BindComplexProperty(StructuralTypeReferenceExpression typeReference, IComplexProperty complexProperty, bool forUpdate = false)
     {
         switch (typeReference)
         {
@@ -1370,7 +1371,7 @@ private Expression BindComplexProperty(StructuralTypeReferenceExpression typeRef
                         // TODO: Move all this logic into StructuralTypeProjectionExpression, #31376
                         Check.DebugAssert(structuralTypeProjection.IsNullable == shaper.IsNullable, "Nullability mismatch");
 
-                        return structuralTypeProjection.BindComplexProperty(complexProperty) switch
+                        return structuralTypeProjection.BindComplexProperty(complexProperty, forUpdate: forUpdate) switch
                         {
                             StructuralTypeShaperExpression s => new StructuralTypeReferenceExpression(s),
                             CollectionResultExpression c => c,

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

@@ -2855,14 +2855,15 @@ static TableExpressionBase FindRootTableExpressionForColumn(SelectExpression sel
     [EntityFrameworkInternal]
     public static Expression GenerateComplexPropertyShaperExpression(
         StructuralTypeProjectionExpression containerProjection,
-        IComplexProperty complexProperty)
+        IComplexProperty complexProperty,
+        bool forUpdate = false)
     {
         var complexType = complexProperty.ComplexType;
         var propertyExpressionMap = new Dictionary<IProperty, ColumnExpression>();
 
         // We do not support complex type splitting, so we will only ever have a single table/view mapping to it.
         // See Issue #32853 and Issue #31248
-        var complexTypeTable = complexType.GetViewOrTableMappings().Single().Table;
+        ITableBase complexTypeTable = forUpdate ? complexType.GetTableMappings().Single().Table : complexType.GetViewOrTableMappings().Single().Table;
 
         if (!containerProjection.TableMap.TryGetValue(complexTypeTable, out var tableAlias))
         {

src/EFCore.Relational/Query/StructuralTypeProjectionExpression.cs

@@ -369,9 +369,14 @@ public virtual ColumnExpression BindProperty(IProperty property)
     ///     Binds a complex property with this structural type projection to get a shaper expression for the target complex type.
     /// </summary>
     /// <param name="complexProperty">A complex property to bind.</param>
+    /// <param name="forUpdate">Is the mapping for read (false) or update (true).</param>
     /// <returns>A shaper expression for the target complex type.</returns>
-    public virtual Expression BindComplexProperty(IComplexProperty complexProperty)
+    public virtual Expression BindComplexProperty(IComplexProperty complexProperty, bool forUpdate = false)
     {
+        if (forUpdate)
+        {
+            return SelectExpression.GenerateComplexPropertyShaperExpression(this, complexProperty, forUpdate: true);
+        }
         if (_complexPropertyCache is null || !_complexPropertyCache.TryGetValue(complexProperty, out var resultShaper))
         {
             _complexPropertyCache ??= new Dictionary<IComplexProperty, Expression>();

test/EFCore.Relational.Specification.Tests/Query/UdfDbFunctionTestBase.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
 
 namespace Microsoft.EntityFrameworkCore.Query;
@@ -17,12 +18,23 @@ protected UDFSqlContext CreateContext()
 
     #region Model
 
+    [ComplexType]
+    public class Phone
+    {
+        public Phone(int code, int number)
+        {
+            Code = code;
+            Number = number;
+        }
+
+        public int Code { get; set; }
+        public int Number { get; set; }
+    }
     public class Customer
     {
         public int Id { get; set; }
         public string FirstName { get; set; }
         public string LastName { get; set; }
-
         public List<Order> Orders { get; set; }
         public List<Address> Addresses { get; set; }
     }
@@ -92,6 +104,31 @@ public class TopSellingProduct
         public int? AmountSold { get; set; }
     }
 
+    [ComplexType]
+    public class ComplexGpsCoordinates
+    {
+        public ComplexGpsCoordinates(double latitude, double longitude)
+        {
+            Latitude = latitude;
+            Longitude = longitude;
+        }
+
+        public double Latitude { get; set; }
+        public double Longitude { get; set; }
+    }
+
+    public class MapLocation
+    {
+        public int Id { get; set; }
+        public ComplexGpsCoordinates GpsCoordinates { get; set; }
+    }
+
+    public class MapLocationData
+    {
+        public int Id { get; set; }
+        public ComplexGpsCoordinates GpsCoordinates { get; set; }
+    }
+
     public class CustomerData
     {
         public int Id { get; set; }
@@ -107,6 +144,7 @@ protected class UDFSqlContext(DbContextOptions options) : PoolableDbContext(opti
         public DbSet<Order> Orders { get; set; }
         public DbSet<Product> Products { get; set; }
         public DbSet<Address> Addresses { get; set; }
+        public DbSet<MapLocation> MapLocations { get; set; }
 
         #endregion
 
@@ -355,6 +393,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<OrderByYear>().HasNoKey();
             modelBuilder.Entity<TopSellingProduct>().HasNoKey().ToFunction("GetTopTwoSellingProducts");
             modelBuilder.Entity<CustomerData>().ToView("Customers");
+            modelBuilder.Entity<MapLocationData>().ToView("MapLocations");
         }
     }
 
@@ -520,11 +559,22 @@ protected override async Task SeedAsync(DbContext context)
                 ]
             };
 
+            var location1 = new MapLocation
+            {
+                GpsCoordinates = new ComplexGpsCoordinates(1.0, 2.0),
+            };
+
+            var location2 = new MapLocation
+            {
+                GpsCoordinates = new ComplexGpsCoordinates(1.0, 2.0),
+            };
+
             ((UDFSqlContext)context).Products.AddRange(product1, product2, product3, product4, product5);
             ((UDFSqlContext)context).Addresses.AddRange(
                 address11, address12, address21, address31, address32, address41, address42, address43);
             ((UDFSqlContext)context).Customers.AddRange(customer1, customer2, customer3, customer4);
             ((UDFSqlContext)context).Orders.AddRange(order11, order12, order13, order21, order22, order31);
+            ((UDFSqlContext)context).MapLocations.AddRange(location1, location2);
         }
     }
 
@@ -2182,6 +2232,19 @@ orderby t.FirstName
         }
     }
 
+    [ConditionalFact]
+    public virtual void TVF_backing_entity_type_with_complextype_mapped_to_view()
+    {
+        using (var context = CreateContext())
+        {
+            var locations = (from t in context.Set<MapLocationData>()
+                             orderby t.Id
+                             select t).ToList();
+
+            Assert.Equal(2, locations.Count);
+        }
+    }
+
     [ConditionalFact]
     public virtual void Udf_with_argument_being_comparison_to_null_parameter()
     {

test/EFCore.SqlServer.FunctionalTests/Query/UdfDbFunctionSqlServerTests.cs

@@ -969,6 +969,18 @@ ORDER BY [c].[FirstName]
 """);
     }
 
+    public override void TVF_backing_entity_type_with_complextype_mapped_to_view()
+    {
+        base.TVF_backing_entity_type_with_complextype_mapped_to_view();
+
+        AssertSql(
+            """
+SELECT [m].[Id], [m].[GpsCoordinates_Latitude], [m].[GpsCoordinates_Longitude]
+FROM [MapLocations] AS [m]
+ORDER BY [m].[Id]
+""");
+    }
+
     public override void Udf_with_argument_being_comparison_to_null_parameter()
     {
         base.Udf_with_argument_being_comparison_to_null_parameter();