fix(expand): proper subquery from construction
#1126
Merged
Conversation
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
if a query selects from another query, we need to consider the case where the subquery has path expressions (and therefore joins). The best solution is then to drill down into the innermost query of the from clause, because we do not know the depth. It is also not a good idea to check for the `ref` of the innermost _untransformed_ query, as it is potentially a scoped query (as shown in one of the tests). fix #1112
patricebender
requested review from
danjoa,
johannes-vogel,
stewsk,
BobdenOs,
sjvans and
David-Kunz
as code owners
patricebender
commented
Apr 8, 2025
| expect(JSON.parse(JSON.stringify(res))).to.deep.equal(expected) | ||
| }) | ||
| it('expand via subquery with path expressions nested', () => { | ||
| const q = cds.ql`SELECT from (SELECT from (SELECT from bookshop.Books as inner { author, ID } where author.name = 'King') as Mid { * }) as Outer { |
There was a problem hiding this comment.
btw this revealed another issue, which is not subject to this PR. So I will ship a dedicated fix for #1127 once this is in main
stewsk
approved these changes
Apr 8, 2025
danjoa
approved these changes
Apr 9, 2025
There was a problem hiding this comment.
As discussed: might get obsolete with cds9 but would work with that as well
Thanks @patricebender 👍
Merged
johannes-vogel
added a commit
that referenced
this pull request
Apr 17, 2025
🤖 I have created a release *beep* *boop* --- <details><summary>db-service: 1.20.0</summary> ## [1.20.0](db-service-v1.19.1...db-service-v1.20.0) (2025-04-17) ### Added * Result set streaming ([#702](#702)) ([2fe02ea](2fe02ea)) ### Fixed * **`expand`:** proper subquery `from` construction ([#1126](#1126)) ([e343e79](e343e79)), closes [#1114](#1114) [#1112](#1112) * Improved support for special characters in column names ([#1141](#1141)) ([ba04697](ba04697)) * **infer:** for localized queries, use `localized.<entity>` as `_target` ([#1140](#1140)) ([b08707b](b08707b)) </details> <details><summary>sqlite: 1.11.0</summary> ## [1.11.0](sqlite-v1.10.0...sqlite-v1.11.0) (2025-04-17) ### Added * Result set streaming ([#702](#702)) ([2fe02ea](2fe02ea)) </details> <details><summary>postgres: 1.14.0</summary> ## [1.14.0](postgres-v1.13.0...postgres-v1.14.0) (2025-04-17) ### Added * Result set streaming ([#702](#702)) ([2fe02ea](2fe02ea)) </details> <details><summary>hana: 1.9.0</summary> ## [1.9.0](hana-v1.8.1...hana-v1.9.0) (2025-04-17) ### Added * enable skip hana wrapping ([#1137](#1137)) ([5e6d61f](5e6d61f)) * Result set streaming ([#702](#702)) ([2fe02ea](2fe02ea)) ### Fixed * Improved support for special characters in column names ([#1141](#1141)) ([ba04697](ba04697)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: D045778 <[email protected]>
johannes-vogel
added a commit
that referenced
this pull request
May 19, 2025
) `q._target` will resolve recursively to the innermost entity, with our streamlined `cds.infer` --> no need to do this manually anymore this is a follow up of #1126 @danjoa fyi --------- Co-authored-by: Johannes Vogel <[email protected]>
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.
if a query selects from another query, we need to consider the case where the subquery has path expressions (and therefore joins).
The best solution is then to drill down into the innermost query of the from clause, because we do not know the depth.
It is also not a good idea to check for the
refof the innermost untransformed query, as it is potentially a scoped query (as shown in one of the tests).Moreover, it is not possible to use the
refof the transformed query because it might be replaced by joinargs.replaces #1114
fix #1112