-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Cosmos: Complex properties Query #37577
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
JoasE
wants to merge
30
commits into
dotnet:main
Choose a base branch
from
JoasE:feature/complex-properties-query
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
d352388
WIP: Add some tests
JoasE 6490d7b
Copy over files: Use StructuralType where needed in query translation…
JoasE d9d91d2
Add some more tests
JoasE 003383d
Rewrite some baselines
JoasE 7f7b564
Fix async tests
JoasE 1b4b5cd
WIP: distinct, contains and null
JoasE bbc3477
Fix test do not explicitly set int ids in base test but use value gen…
JoasE de6328f
Improve object retrieval for null comparison
JoasE 607a921
Distinct detection
JoasE 0457143
WIP some docs for question
JoasE 5ac80e0
WIP: Match code structure of relational where possible
JoasE a682368
Merge branch 'main' of https://github.com/dotnet/efcore into feature/…
JoasE 753f31e
Cleanup
JoasE 88c84b6
Rename TypeBase to StructuralType
JoasE 19c1de1
Cleanup and add todo
JoasE 3396b9a
Merge branch 'main' of https://github.com/dotnet/efcore into feature/…
JoasE a5a8bd4
Implement test
JoasE 3b21620
Remove old unused class
JoasE 7127586
Remove skip on fixed tests
JoasE 82e9b15
Rename test class
JoasE dd4b3f0
Fix null check structural comparison
JoasE 8126941
Rename field
JoasE 2a96a9b
WIP: Use direct comparison
JoasE dbd1d17
Use CollectionResultExpression for complex collections
JoasE ee66c0a
Regenerate test
JoasE c258b9c
Add test and fix
JoasE d248623
Add docs
JoasE b3d68eb
Use property clr type
JoasE 3a19515
Remove bom
JoasE ddcba7e
Make internal
JoasE File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
96 changes: 96 additions & 0 deletions
96
src/EFCore.Cosmos/Query/Internal/CosmosSerializationUtilities.cs
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Collections; | ||
| using Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal; | ||
| using Microsoft.EntityFrameworkCore.Update.Internal; | ||
| using Newtonsoft.Json.Linq; | ||
|
|
||
| namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Internal; | ||
|
|
||
| /// <summary> | ||
| /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to | ||
| /// the same compatibility standards as public APIs. It may be changed or removed without notice in | ||
| /// 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> | ||
| public static class CosmosSerializationUtilities | ||
| { | ||
| /// <summary> | ||
| /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to | ||
| /// the same compatibility standards as public APIs. It may be changed or removed without notice in | ||
| /// 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> | ||
| public static readonly MethodInfo SerializeObjectToComplexPropertyMethod | ||
| = typeof(CosmosSerializationUtilities).GetMethod(nameof(SerializeObjectToComplexProperty)) ?? throw new UnreachableException(); | ||
|
|
||
| /// <summary> | ||
| /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to | ||
| /// the same compatibility standards as public APIs. It may be changed or removed without notice in | ||
| /// 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> | ||
| public static JToken SerializeObjectToComplexProperty(IComplexType type, object? value, bool collection) // #34567 | ||
| { | ||
| if (value == null) | ||
| { | ||
| return JValue.CreateNull(); | ||
| } | ||
|
|
||
| if (collection) | ||
| { | ||
| var array = new JArray(); | ||
| foreach (var element in (IEnumerable)value) | ||
| { | ||
| array.Add(SerializeObjectToComplexProperty(type, element, false)); | ||
| } | ||
| return array; | ||
| } | ||
|
|
||
| var obj = new JObject(); | ||
| foreach (var property in type.GetProperties()) | ||
| { | ||
| var jsonPropertyName = property.GetJsonPropertyName(); | ||
|
|
||
| var propertyValue = property.GetGetter().GetClrValue(value); | ||
| #pragma warning disable EF1001 // Internal EF Core API usage. | ||
| var providerValue = property.ConvertToProviderValue(propertyValue); | ||
| #pragma warning restore EF1001 // Internal EF Core API usage. | ||
| if (providerValue is null) | ||
| { | ||
| if (!property.IsNullable) | ||
| { | ||
| throw new InvalidOperationException(CoreStrings.PropertyConceptualNull(property.Name, type.DisplayName())); | ||
| } | ||
|
|
||
| obj[jsonPropertyName] = null; | ||
| } | ||
| else | ||
| { | ||
| obj[jsonPropertyName] = JToken.FromObject(providerValue, CosmosClientWrapper.Serializer); | ||
| } | ||
| } | ||
|
|
||
| foreach (var complexProperty in type.GetComplexProperties()) | ||
| { | ||
| var jsonPropertyName = complexProperty.Name; | ||
| var propertyValue = complexProperty.GetGetter().GetClrValue(value); | ||
| if (propertyValue is null) | ||
| { | ||
| if (!complexProperty.IsNullable) | ||
| { | ||
| throw new InvalidOperationException(CoreStrings.PropertyConceptualNull(complexProperty.Name, type.DisplayName())); | ||
| } | ||
|
|
||
| obj[jsonPropertyName] = null; | ||
| } | ||
| else | ||
| { | ||
| obj[jsonPropertyName] = SerializeObjectToComplexProperty(complexProperty.ComplexType, propertyValue, complexProperty.IsCollection); | ||
| } | ||
| } | ||
|
|
||
| return obj; | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.