Fix failing tests

zoriya · zoriya · commit aa7cf4f9c600 · 2023-10-10T23:09:21.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -30,4 +30,4 @@
   </PropertyGroup>
    
 
-</Project>
+</Project>
diff --git a/samples/BasicSample/Program.cs b/samples/BasicSample/Program.cs
@@ -22,7 +22,6 @@ public class User
         private string _FullName => FirstName + " " + LastName;
 
         [Projectable(UseMemberBody = nameof(_TotalSpent))]
-        [NotMapped]
         public double TotalSpent { get; set; }
         private double _TotalSpent => Orders.Sum(x => x.PriceSum);
 
@@ -92,7 +91,7 @@ public static void Main(string[] args)
                 .AddDbContext<ApplicationDbContext>((provider, options) => {
                     options
                         .UseSqlite(dbConnection)
-                        .LogTo(Console.WriteLine)
+                        // .LogTo(Console.WriteLine)
                         .EnableSensitiveDataLogging()
                         .UseProjectables();
                 })
diff --git a/src/EntityFrameworkCore.Projectables/Extensions/ExpressionExtensions.cs b/src/EntityFrameworkCore.Projectables/Extensions/ExpressionExtensions.cs
@@ -18,6 +18,6 @@ public static Expression ExpandQuaryables(this Expression expression)
         /// Replaces all calls to properties and methods that are marked with the <C>Projectable</C> attribute with their respective expression tree
         /// </summary>
         public static Expression ExpandProjectables(this Expression expression)
-            => new ProjectableExpressionReplacer(new ProjectionExpressionResolver()).Visit(expression);
+            => new ProjectableExpressionReplacer(new ProjectionExpressionResolver()).Replace(expression);
     }
 }
diff --git a/src/EntityFrameworkCore.Projectables/Infrastructure/Internal/CustomQueryCompiler.cs b/src/EntityFrameworkCore.Projectables/Infrastructure/Internal/CustomQueryCompiler.cs
@@ -34,6 +34,6 @@ public TResult ExecuteAsync<TResult>(Expression query, CancellationToken cancell
             => _decoratedQueryCompiler.ExecuteAsync<TResult>(Expand(query), cancellationToken);
 
         Expression Expand(Expression expression)
-            => _projectableExpressionReplacer.Visit(expression);
+            => _projectableExpressionReplacer.Replace(expression);
     }
 }
diff --git a/src/EntityFrameworkCore.Projectables/Services/ProjectableExpressionReplacer.cs b/src/EntityFrameworkCore.Projectables/Services/ProjectableExpressionReplacer.cs
@@ -13,15 +13,13 @@ public sealed class ProjectableExpressionReplacer : ExpressionVisitor
     {
         readonly IProjectionExpressionResolver _resolver;
         readonly ExpressionArgumentReplacer _expressionArgumentReplacer = new();
-        readonly QueryRootReplacer _queryRootReplacer;
         readonly Dictionary<MemberInfo, LambdaExpression?> _projectableMemberCache = new();
-        private bool _disableRootRewrite = false;
+        private bool _disableRootRewrite;
         private IEntityType? _entityType;
 
         public ProjectableExpressionReplacer(IProjectionExpressionResolver projectionExpressionResolver)
         {
             _resolver = projectionExpressionResolver;
-            _queryRootReplacer = new(_resolver);
         }
 
         bool TryGetReflectedExpression(MemberInfo memberInfo, [NotNullWhen(true)] out LambdaExpression? reflectedExpression)
@@ -41,19 +39,19 @@ bool TryGetReflectedExpression(MemberInfo memberInfo, [NotNullWhen(true)] out La
         }
 
         [return: NotNullIfNotNull(nameof(node))]
-        public override Expression? Visit(Expression? node)
+        public Expression? Replace(Expression? node)
         {
-            var ret = base.Visit(node);
+            var ret = Visit(node);
 
             if (_disableRootRewrite)
             {
                 return ret;
             }
 
-            switch (node)
+            switch (ret)
             {
                 // Probably a First() or ToList()
-                case MethodCallExpression { Arguments.Count: > 0 } call when _entityType != null:
+                case MethodCallExpression { Arguments.Count: > 0, Object: null } call when _entityType != null:
                 {
                     var self = _AddProjectableSelect(call.Arguments.First(), _entityType);
                     return call.Update(null, call.Arguments.Skip(1).Prepend(self));
@@ -96,7 +94,7 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
                 var updatedBody = _expressionArgumentReplacer.Visit(reflectedExpression.Body);
                 _expressionArgumentReplacer.ParameterArgumentMapping.Clear();
 
-                return Visit(
+                return base.Visit(
                     updatedBody
                 );
             }
@@ -128,13 +126,13 @@ PropertyInfo property when nodeExpression is not null
                     var updatedBody = _expressionArgumentReplacer.Visit(reflectedExpression.Body);
                     _expressionArgumentReplacer.ParameterArgumentMapping.Clear();
 
-                    return Visit(
+                    return base.Visit(
                         updatedBody
                     );
                 }
                 else
                 {
-                    return Visit(
+                    return base.Visit(
                         reflectedExpression.Body
                     );
                 }
@@ -190,20 +188,21 @@ private Expression _AddProjectableSelect(Expression node, IEntityType entityType
                         Expression.New(entityType.ClrType),
                         properties.Select(x => Expression.Bind(x, Expression.MakeMemberAccess(xParam, x)))
                             .Concat(projectableProperties
-                                .Select(x => Expression.Bind(x, _ReplaceParam(_resolver.FindGeneratedExpression(x), xParam)))
+                                .Select(x => Expression.Bind(x, _GetAccessor(x, xParam)))
                             )
                     ),
                     xParam
                 )
             );
         }
 
-        private Expression _ReplaceParam(LambdaExpression lambda, ParameterExpression para)
+        private Expression _GetAccessor(PropertyInfo property, ParameterExpression para)
         {
+            var lambda = _resolver.FindGeneratedExpression(property);
             _expressionArgumentReplacer.ParameterArgumentMapping.Add(lambda.Parameters[0], para);
             var updatedBody = _expressionArgumentReplacer.Visit(lambda.Body);
             _expressionArgumentReplacer.ParameterArgumentMapping.Clear();
-            return updatedBody;
+            return base.Visit(updatedBody);
         }
     }
 }
diff --git a/tests/EntityFrameworkCore.Projectables.FunctionalTests/QueryRootTests.UseMemberPropertyQueryRootExpression.verified.txt b/tests/EntityFrameworkCore.Projectables.FunctionalTests/QueryRootTests.UseMemberPropertyQueryRootExpression.verified.txt
@@ -1,2 +1,2 @@
 SELECT [e].[Id], [e].[Id] * 5
-FROM [Entity] AS [e]
+FROM [Entity] AS [e]
diff --git a/tests/EntityFrameworkCore.Projectables.Tests/Services/ProjectableExpressionReplacerTests.cs b/tests/EntityFrameworkCore.Projectables.Tests/Services/ProjectableExpressionReplacerTests.cs
@@ -61,7 +61,7 @@ public void VisitMember_SimpleProperty()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Visit(input);
+            var actual = subject.Replace(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -77,7 +77,7 @@ public void VisitMember_SimpleMethod()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Visit(input);
+            var actual = subject.Replace(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -93,7 +93,7 @@ public void VisitMember_SimpleMethodWithArguments()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Visit(input);
+            var actual = subject.Replace(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -109,7 +109,7 @@ public void VisitMember_SimpleStatefullProperty()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Visit(input);
+            var actual = subject.Replace(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -125,7 +125,7 @@ public void VisitMember_SimpleStatefullMethod()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Visit(input);
+            var actual = subject.Replace(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -141,7 +141,7 @@ public void VisitMember_SimpleStaticMethod()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Visit(input);
+            var actual = subject.Replace(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -157,7 +157,7 @@ public void VisitMember_SimpleStaticMethodWithArguments()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Visit(input);
+            var actual = subject.Replace(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,4 @@`
`30`	`30`	`</PropertyGroup>`
`31`	`31`
`32`	`32`
`33`		`-</Project>`
	`33`	`+</Project>`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ public static Expression ExpandQuaryables(this Expression expression)`
`18`	`18`	`/// Replaces all calls to properties and methods that are marked with the <C>Projectable</C> attribute with their respective expression tree`
`19`	`19`	`/// </summary>`
`20`	`20`	`public static Expression ExpandProjectables(this Expression expression)`
`21`		`- => new ProjectableExpressionReplacer(new ProjectionExpressionResolver()).Visit(expression);`
	`21`	`+ => new ProjectableExpressionReplacer(new ProjectionExpressionResolver()).Replace(expression);`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ public TResult ExecuteAsync<TResult>(Expression query, CancellationToken cancell`
`34`	`34`	`=> _decoratedQueryCompiler.ExecuteAsync<TResult>(Expand(query), cancellationToken);`
`35`	`35`
`36`	`36`	`Expression Expand(Expression expression)`
`37`		`- => _projectableExpressionReplacer.Visit(expression);`
	`37`	`+ => _projectableExpressionReplacer.Replace(expression);`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,13 @@ public sealed class ProjectableExpressionReplacer : ExpressionVisitor`
`13`	`13`	`{`
`14`	`14`	`readonly IProjectionExpressionResolver _resolver;`
`15`	`15`	`readonly ExpressionArgumentReplacer _expressionArgumentReplacer = new();`
`16`		`- readonly QueryRootReplacer _queryRootReplacer;`
`17`	`16`	`readonly Dictionary<MemberInfo, LambdaExpression?> _projectableMemberCache = new();`
`18`		`- private bool _disableRootRewrite = false;`
	`17`	`+ private bool _disableRootRewrite;`
`19`	`18`	`private IEntityType? _entityType;`
`20`	`19`
`21`	`20`	`public ProjectableExpressionReplacer(IProjectionExpressionResolver projectionExpressionResolver)`
`22`	`21`	`{`
`23`	`22`	`_resolver = projectionExpressionResolver;`
`24`		`- _queryRootReplacer = new(_resolver);`
`25`	`23`	`}`
`26`	`24`
`27`	`25`	`bool TryGetReflectedExpression(MemberInfo memberInfo, [NotNullWhen(true)] out LambdaExpression? reflectedExpression)`
`@@ -41,19 +39,19 @@ bool TryGetReflectedExpression(MemberInfo memberInfo, [NotNullWhen(true)] out La`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`[return: NotNullIfNotNull(nameof(node))]`
`44`		`- public override Expression? Visit(Expression? node)`
	`42`	`+ public Expression? Replace(Expression? node)`
`45`	`43`	`{`
`46`		`- var ret = base.Visit(node);`
	`44`	`+ var ret = Visit(node);`
`47`	`45`
`48`	`46`	`if (_disableRootRewrite)`
`49`	`47`	`{`
`50`	`48`	`return ret;`
`51`	`49`	`}`
`52`	`50`
`53`		`- switch (node)`
	`51`	`+ switch (ret)`
`54`	`52`	`{`
`55`	`53`	`// Probably a First() or ToList()`
`56`		`- case MethodCallExpression { Arguments.Count: > 0 } call when _entityType != null:`
	`54`	`+ case MethodCallExpression { Arguments.Count: > 0, Object: null } call when _entityType != null:`
`57`	`55`	`{`
`58`	`56`	`var self = _AddProjectableSelect(call.Arguments.First(), _entityType);`
`59`	`57`	`return call.Update(null, call.Arguments.Skip(1).Prepend(self));`
`@@ -96,7 +94,7 @@ protected override Expression VisitMethodCall(MethodCallExpression node)`
`96`	`94`	`var updatedBody = _expressionArgumentReplacer.Visit(reflectedExpression.Body);`
`97`	`95`	`_expressionArgumentReplacer.ParameterArgumentMapping.Clear();`
`98`	`96`
`99`		`- return Visit(`
	`97`	`+ return base.Visit(`
`100`	`98`	`updatedBody`
`101`	`99`	`);`
`102`	`100`	`}`
`@@ -128,13 +126,13 @@ PropertyInfo property when nodeExpression is not null`
`128`	`126`	`var updatedBody = _expressionArgumentReplacer.Visit(reflectedExpression.Body);`
`129`	`127`	`_expressionArgumentReplacer.ParameterArgumentMapping.Clear();`
`130`	`128`
`131`		`- return Visit(`
	`129`	`+ return base.Visit(`
`132`	`130`	`updatedBody`
`133`	`131`	`);`
`134`	`132`	`}`
`135`	`133`	`else`
`136`	`134`	`{`
`137`		`- return Visit(`
	`135`	`+ return base.Visit(`
`138`	`136`	`reflectedExpression.Body`
`139`	`137`	`);`
`140`	`138`	`}`
`@@ -190,20 +188,21 @@ private Expression _AddProjectableSelect(Expression node, IEntityType entityType`
`190`	`188`	`Expression.New(entityType.ClrType),`
`191`	`189`	`properties.Select(x => Expression.Bind(x, Expression.MakeMemberAccess(xParam, x)))`
`192`	`190`	`.Concat(projectableProperties`
`193`		`- .Select(x => Expression.Bind(x, _ReplaceParam(_resolver.FindGeneratedExpression(x), xParam)))`
	`191`	`+ .Select(x => Expression.Bind(x, _GetAccessor(x, xParam)))`
`194`	`192`	`)`
`195`	`193`	`),`
`196`	`194`	`xParam`
`197`	`195`	`)`
`198`	`196`	`);`
`199`	`197`	`}`
`200`	`198`
`201`		`- private Expression _ReplaceParam(LambdaExpression lambda, ParameterExpression para)`
	`199`	`+ private Expression _GetAccessor(PropertyInfo property, ParameterExpression para)`
`202`	`200`	`{`
	`201`	`+ var lambda = _resolver.FindGeneratedExpression(property);`
`203`	`202`	`_expressionArgumentReplacer.ParameterArgumentMapping.Add(lambda.Parameters[0], para);`
`204`	`203`	`var updatedBody = _expressionArgumentReplacer.Visit(lambda.Body);`
`205`	`204`	`_expressionArgumentReplacer.ParameterArgumentMapping.Clear();`
`206`		`- return updatedBody;`
	`205`	`+ return base.Visit(updatedBody);`
`207`	`206`	`}`
`208`	`207`	`}`
`209`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`SELECT [e].[Id], [e].[Id] * 5`
`2`		`-FROM [Entity] AS [e]`
	`2`	`+FROM [Entity] AS [e]`