Skip to content
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

[release/7.0] Fix for #30266 and #30565 - projecting json entity/reference as well as regular entity collection #30600

Merged
merged 1 commit into from
Apr 5, 2023

Commits on Apr 3, 2023

  1. Fix for #30266 and #30565 - projecting json entity/reference as well …

    …as regular entity collection
    
    #30266
    
    Problem was that when we projection collection of entities we use result coordinator and generate different pattern in shaper code. Json entity shaper code is generated inside `resultContext.Values == null` block and all the products should be referred to via resultContext.Values array access.
    We were not doing that for json, so in the final projection code we would refer to parameters (storing the actual json entities) that were out of scope.
    Fix is to use the correct result coordinator pattern, just like we do for non-json entities.
    
    #30565
    
    When we project entity collection, the shaper uses result coordinator and generates different shaper. However we process this scenario as if "regular" code path was being executed. Basically, we would generate code for collection projection outside of `resultContext.Values == null` block (this needs to happen for regular collections due to result coordination). For JSON it's not needed, because entire object is loaded from a single row. So we can move the processing into the block and then just refer to it's product in the final projection. We also need to shuffle around the order in which we build the block. We should build expressions and json entities first, then populate resultContext and then build includes (which depend on values in the context). Before we were populating result values before we generated json entities, (which didn't matter because we were not using that info) but now is necessary.
    
    Fixes #30266
    Fixes #30565
    maumar committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    432bed3 View commit details
    Browse the repository at this point in the history