Fix duplicate JOIN statements when expanding an IQueryable that already has a join #1040
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ElizabethOkerio
requested review from
KenitoInc,
habbes,
gathogojr and
xuzhg
ElizabethOkerio
changed the title
xuzhg
requested changes
Sep 5, 2023
src/Microsoft.AspNetCore.OData/Query/Expressions/SelectExpandBinder.cs
Outdated
Show resolved
Hide resolved
| } | ||
| else if (isSourceNullable) | ||
| { | ||
| object defaultValue = prop.PropertyType.IsValueType ? Activator.CreateInstance(prop.PropertyType) : null; |
There was a problem hiding this comment.
what about if the property type doesn't have the default constructor?
There was a problem hiding this comment.
All value types have a default constructor. So I don't think there will ever be a case where the property type does not have a default constructor. https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-specification/types#833-default-constructors
src/Microsoft.AspNetCore.OData/Query/Expressions/SelectExpandBinder.cs
Outdated
Show resolved
Hide resolved
test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/SelectExpandBinderTest.cs
Show resolved
Hide resolved
ElizabethOkerio
force-pushed
the
fix/expand_with_null_navigation_properties
branch
from
3409e83
to
425c828
Compare
xuzhg
reviewed
Sep 6, 2023
| foreach (var sp in structuralProperties) | ||
| { | ||
| if (prop.CanWrite && model.GetClrPropertyName(sp) == prop.Name) | ||
| { | ||
| MemberExpression propertyExpression = Expression.Property(source, prop); | ||
| bindings.Add(Expression.Bind(prop, propertyExpression)); | ||
| Expression propertyValue = Expression.Property(source, prop); |
There was a problem hiding this comment.
can we create a test case to test a big schema, for example, more than 1k properties for an entity type?
There was a problem hiding this comment.
Is it possible to have an entity type with more than 1k properties?
ElizabethOkerio
force-pushed
the
fix/expand_with_null_navigation_properties
branch
from
da83272
to
d504172
Compare
ElizabethOkerio
changed the title
ElizabethOkerio
changed the title
wachugamaina
reviewed
Mar 8, 2024
| Orders = new List<QueryOrder>() | ||
| }; | ||
|
|
||
| QueryOrder order1 = new QueryOrder { Id = 42, Title = "The order", Customer = customer1 }; |
There was a problem hiding this comment.
Let us stick to var for consistency.
wachugamaina
reviewed
Mar 8, 2024
| @@ -82,7 +84,19 @@ public SelectExpandBinderTest() | |||
| QueryOrder order = new QueryOrder { Id = 42, Title = "The order", Customer = customer }; | |||
| customer.Orders.Add(order); | |||
|
|
|||
| QueryCustomer customer1 = new QueryCustomer | |||
There was a problem hiding this comment.
Let us stick to var for consistency.
wachugamaina
reviewed
Mar 8, 2024
| // as observed here: https://github.com/OData/AspNetCoreOData/issues/497 | ||
|
|
||
| Expression updatedExpression = null; | ||
| if (IsEfQueryProvider(context)) |
There was a problem hiding this comment.
var updatedExpression = source;
if (IsEfQueryProvider(context))
{
updatedExpression = RemoveNonStructuralProperties(context, source, structuredType);
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1035
In this fix #993 we added a fix to remove duplicate joins from the generated sql. This involved making updates to the Instance property of the expression to be created and only including structural properties.
The changes led to this being generated:
Instead of this:
These changes did not take into consideration query settings. I've added checks for nullability and handling null propagation and creating a conditional expression.