Cosmos: Complex properties Query

src/EFCore.Cosmos/Extensions/Internal/CosmosShapedQueryExpressionExtensions.cs

@@ -167,9 +167,9 @@ public static bool TryExtractArray(
             projectedStructuralTypeShaper = shaper;
             projection = shaper.ValueBufferExpression;
             if (projection is ProjectionBindingExpression { ProjectionMember: { } projectionMember }
-                && select.GetMappedProjection(projectionMember) is EntityProjectionExpression entityProjection)
+                && select.GetMappedProjection(projectionMember) is StructuralTypeProjectionExpression structuralTypeProjection)
             {
-                projection = entityProjection.Object;
+                projection = structuralTypeProjection.Object;
             }
         }
         else

src/EFCore.Cosmos/Query/Internal/CosmosAliasManager.cs

@@ -226,7 +226,7 @@ protected override Expression VisitExtension(Expression node)
                 ScalarReferenceExpression reference when aliasRewritingMap.TryGetValue(reference.Name, out var newAlias)
                     => new ScalarReferenceExpression(newAlias, reference.Type, reference.TypeMapping),
                 ObjectReferenceExpression reference when aliasRewritingMap.TryGetValue(reference.Name, out var newAlias)
-                    => new ObjectReferenceExpression(reference.EntityType, newAlias),
+                    => new ObjectReferenceExpression(reference.StructuralType, newAlias),
 
                 _ => base.VisitExtension(node)
             };

src/EFCore.Cosmos/Query/Internal/CosmosProjectionBindingExpressionVisitor.cs

@@ -133,6 +133,7 @@ public virtual Expression Translate(SelectExpression selectExpression, Expressio
             var translation = _sqlTranslator.Translate(expression);
             if (translation == null)
             {
+                _selectExpression.IndicateClientProjection();
                 return base.Visit(expression);
             }
 
@@ -214,11 +215,11 @@ protected override Expression VisitExtension(Expression extensionExpression)
 
                 if (_clientEval)
                 {
-                    var entityProjection = (EntityProjectionExpression)projection;
+                    var structuralTypeProjection = (StructuralTypeProjectionExpression)projection;
 
                     return entityShaperExpression.Update(
                         new ProjectionBindingExpression(
-                            _selectExpression, _selectExpression.AddToProjection(entityProjection), typeof(ValueBuffer)));
+                            _selectExpression, _selectExpression.AddToProjection(structuralTypeProjection), typeof(ValueBuffer)));
                 }
 
                 _projectionMapping[_projectionMembers.Peek()] = projection;
@@ -303,19 +304,19 @@ protected override Expression VisitMember(MemberExpression memberExpression)
                 return NullSafeUpdate(innerExpression);
         }
 
-        var innerEntityProjection = shaperExpression.ValueBufferExpression switch
+        var innerStructuralTypeProjection = shaperExpression.ValueBufferExpression switch
         {
             ProjectionBindingExpression innerProjectionBindingExpression
-                => (EntityProjectionExpression)_selectExpression.Projection[innerProjectionBindingExpression.Index!.Value].Expression,
+                => (StructuralTypeProjectionExpression)_selectExpression.Projection[innerProjectionBindingExpression.Index!.Value].Expression,
 
-            // Unwrap EntityProjectionExpression when the root entity is not projected
+            // Unwrap StructuralTypeProjectionExpression when the root entity is not projected
             UnaryExpression unaryExpression
-                => (EntityProjectionExpression)((UnaryExpression)unaryExpression.Operand).Operand,
+                => (StructuralTypeProjectionExpression)((UnaryExpression)unaryExpression.Operand).Operand,
 
             _ => throw new InvalidOperationException(CoreStrings.TranslationFailed(memberExpression.Print()))
         };
 
-        var navigationProjection = innerEntityProjection.BindMember(
+        var navigationProjection = innerStructuralTypeProjection.BindMember(
             memberExpression.Member, innerExpression.Type, clientEval: true, out var propertyBase);
 
         if (propertyBase is not INavigation navigation
@@ -326,10 +327,10 @@ UnaryExpression unaryExpression
 
         switch (navigationProjection)
         {
-            case EntityProjectionExpression entityProjection:
+            case StructuralTypeProjectionExpression structuralTypeProjection:
                 return new StructuralTypeShaperExpression(
                     navigation.TargetEntityType,
-                    Expression.Convert(Expression.Convert(entityProjection, typeof(object)), typeof(ValueBuffer)),
+                    Expression.Convert(Expression.Convert(structuralTypeProjection, typeof(object)), typeof(ValueBuffer)),
                     nullable: true);
 
             case ObjectArrayAccessExpression objectArrayProjectionExpression:
@@ -525,16 +526,16 @@ when _collectionShaperMapping.TryGetValue(parameterExpression, out var collectio
                     return QueryCompilationContext.NotTranslatedExpression;
             }
 
-            var innerEntityProjection = shaperExpression.ValueBufferExpression switch
+            var innerStructuralTypeProjection = shaperExpression.ValueBufferExpression switch
             {
-                EntityProjectionExpression entityProjection
-                    => entityProjection,
+                StructuralTypeProjectionExpression structuralTypeProjection
+                    => structuralTypeProjection,
 
                 ProjectionBindingExpression innerProjectionBindingExpression
-                    => (EntityProjectionExpression)_selectExpression.Projection[innerProjectionBindingExpression.Index!.Value].Expression,
+                    => (StructuralTypeProjectionExpression)_selectExpression.Projection[innerProjectionBindingExpression.Index!.Value].Expression,
 
                 UnaryExpression unaryExpression
-                    => (EntityProjectionExpression)((UnaryExpression)unaryExpression.Operand).Operand,
+                    => (StructuralTypeProjectionExpression)((UnaryExpression)unaryExpression.Operand).Operand,
 
                 _ => throw new InvalidOperationException(CoreStrings.TranslationFailed(methodCallExpression.Print()))
             };
@@ -543,7 +544,7 @@ UnaryExpression unaryExpression
             var navigation = _includedNavigations.FirstOrDefault(n => n.Name == memberName);
             if (navigation == null)
             {
-                navigationProjection = innerEntityProjection.BindMember(
+                navigationProjection = innerStructuralTypeProjection.BindMember(
                     memberName, visitedSource.Type, clientEval: true, out var propertyBase);
 
                 if (propertyBase is not INavigation projectedNavigation || !projectedNavigation.IsEmbedded())
@@ -555,7 +556,7 @@ UnaryExpression unaryExpression
             }
             else
             {
-                navigationProjection = innerEntityProjection.BindNavigation(navigation, clientEval: true);
+                navigationProjection = innerStructuralTypeProjection.BindNavigation(navigation, clientEval: true);
             }
 
             switch (navigationProjection)

src/EFCore.Cosmos/Query/Internal/CosmosQuerySqlGenerator.cs

@@ -62,11 +62,11 @@ public virtual CosmosSqlQuery GetSqlQuery(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    protected override Expression VisitEntityProjection(EntityProjectionExpression entityProjectionExpression)
+    protected override Expression VisitStructuralTypeProjection(StructuralTypeProjectionExpression structuralTypeProjectionExpression)
     {
-        Visit(entityProjectionExpression.Object);
+        Visit(structuralTypeProjectionExpression.Object);
 
-        return entityProjectionExpression;
+        return structuralTypeProjectionExpression;
     }
 
     /// <summary>