update changes

OData · Jul 25, 2023 · 0d923e2 · 0d923e2
1 parent e02a385
commit 0d923e2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml
@@ -9597,6 +9597,11 @@
             Basically for $compute in $select and $expand
             </summary>
         </member>
+        <member name="P:Microsoft.AspNetCore.OData.Query.Expressions.QueryBinderContext.QueryProvider">
+            <summary>
+            Gets or sets the query provider.
+            </summary>
+        </member>
         <member name="M:Microsoft.AspNetCore.OData.Query.Expressions.QueryBinderContext.GetParameter(System.String)">
             <summary>
             Gets the parameter using parameter name.

diff --git a/src/Microsoft.AspNetCore.OData/Query/Expressions/BinderExtensions.cs b/src/Microsoft.AspNetCore.OData/Query/Expressions/BinderExtensions.cs
@@ -275,6 +275,8 @@ public static IQueryable ApplyBind(this ISelectExpandBinder binder, IQueryable s
                 throw Error.ArgumentNull(nameof(context));
             }
 
+            context.QueryProvider = source.Provider.GetType().Namespace;
+
             Type elementType = context.ElementClrType;
 
             LambdaExpression projectionLambda = binder.BindSelectExpand(selectExpandClause, context) as LambdaExpression;

diff --git a/src/Microsoft.AspNetCore.OData/Query/Expressions/QueryBinderContext.cs b/src/Microsoft.AspNetCore.OData/Query/Expressions/QueryBinderContext.cs
@@ -168,6 +168,11 @@ public QueryBinderContext(QueryBinderContext context, ODataQuerySettings querySe
         /// </summary>
         public Expression Source { get;set; }
 
+        /// <summary>
+        /// Gets or sets the query provider.
+        /// </summary>
+        internal string QueryProvider { get; set; }
+
         /// <summary>
         /// Gets the parameter using parameter name.
         /// </summary>

diff --git a/src/Microsoft.AspNetCore.OData/Query/Expressions/SelectExpandBinder.cs b/src/Microsoft.AspNetCore.OData/Query/Expressions/SelectExpandBinder.cs
@@ -59,6 +59,8 @@ internal SelectExpandBinder()
         /// </summary>
         public IOrderByBinder OrderByBinder { get; }
 
+        internal string QueryProvider { get; set; }
+
         /// <summary>
         /// Translate an OData $select or $expand tree represented by <see cref="SelectExpandClause"/> to an <see cref="Expression"/>.
         /// </summary>
@@ -81,6 +83,8 @@ public virtual Expression BindSelectExpand(SelectExpandClause selectExpandClause
             IEdmNavigationSource navigationSource = context.NavigationSource;
             ParameterExpression source = context.CurrentParameter;
 
+            QueryProvider = context.QueryProvider;
+
             // expression looks like -> new Wrapper { Instance = source , Properties = "...", Container = new PropertyContainer { ... } }
             Expression projectionExpression = ProjectElement(context, source, selectExpandClause, structuredType, navigationSource);
 
@@ -370,11 +374,23 @@ internal Expression ProjectElement(QueryBinderContext context, Expression source
             bool isSelectedAll = IsSelectAll(selectExpandClause);
             if (isSelectedAll)
             {
-                Expression updatedExpression = UpdateMemberInitExpression(source, structuredType);
+                Expression sourceExpression = null;
+
+                if (QueryProvider != null && 
+                    QueryProvider == HandleNullPropagationOptionHelper.EntityFrameworkQueryProviderNamespace ||
+                    QueryProvider == HandleNullPropagationOptionHelper.ObjectContextQueryProviderNamespaceEF5 ||
+                    QueryProvider == HandleNullPropagationOptionHelper.ObjectContextQueryProviderNamespaceEFCore2)
+                {
+                    sourceExpression = UpdateMemberInitExpression(source, structuredType);
+                }
+                else 
+                {
+                    sourceExpression = source;
+                }
 
                 // Initialize property 'Instance' on the wrapper class
                 wrapperProperty = wrapperType.GetProperty("Instance");
-                wrapperTypeMemberAssignments.Add(Expression.Bind(wrapperProperty, updatedExpression));
+                wrapperTypeMemberAssignments.Add(Expression.Bind(wrapperProperty, sourceExpression));
 
                 wrapperProperty = wrapperType.GetProperty("UseInstanceForProperties");
                 wrapperTypeMemberAssignments.Add(Expression.Bind(wrapperProperty, Expression.Constant(true)));