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.

Sign up for GitHub

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

Jump to bottom

fix: nested ternary in calculated element #981

Merged
merged 3 commits into from
Jan 17, 2025
Merged

fix: nested ternary in calculated element #981

merged 3 commits into from
Jan 17, 2025

Conversation

patricebender
Copy link
Member

calculated elements may reference other calcuated elements and so forth.. that is why we have logic in place which constructs subpaths for such scenarios which enables us to calculate joins deeply built into a given calculated element hierarchy. However, the logic had a flaw for e.g. nested ternary expressions.

For (1 > 0 ? 1 : (book.stock > 10 ? value : 3));

we accidentally constructed subpaths like book.stock.value which led to an error because we tried to create a join for value, where no association prefix is present.

fix cap/issue#17660

@patricebender
fix: nested ternary in calculated element
1930572 
calculated elements may reference other calcuated elements
and so forth.. that is why we have logic in place which
constructs subpaths for such scenarios which enables us
to calculate joins deeply built into a given calculated element
hierarchy. However, the logic had a flaw for e.g. nested ternary
expressions.

For `(1 > 0 ? 1 : (book.stock > 10 ? value : 3));`

we accidentally constructed subpaths like `book.stock.value` which
led to an error because we tried to create a join for `value`, where
no association prefix is present.

fix cap/issue#17660
@patricebender
one more test
6e511f7
@patricebender patricebender marked this pull request as ready for review January 17, 2025 09:39
@patricebender patricebender enabled auto-merge (squash) January 17, 2025 10:56
@patricebender patricebender merged commit 5f4a1fe into main Jan 17, 2025
4 checks passed
@patricebender patricebender deleted the patrice/calc branch January 17, 2025 12:59
@stewsk
Copy link
Contributor

stewsk commented Jan 17, 2025

@patricebender can you please checks whether this works in the compiler?

@cap-bots cap-bots mentioned this pull request Jan 16, 2025
Merged
@patricebender
Copy link
Member Author

@patricebender can you please checks whether this works in the compiler?

I did and it doesn't work. Gute Nase! Opened an internal issue.

@stewsk
Copy link
Contributor

stewsk commented Jan 24, 2025 •
edited
Loading

@patricebender

Opened an internal issue.

can you send me the link?

@patricebender
Copy link
Member Author

@patricebender

Opened an internal issue.

can you send me the link?

Fixed already /cap/cds-compiler/issues/13397

johannes-vogel added a commit that referenced this pull request Jan 28, 2025
@cap-bots @johannes-vogel
chore: release main (#961)
0b1b533 
🤖 I have created a release *beep* *boop*
---


<details><summary>db-service: 1.17.0</summary>

##
[1.17.0](db-service-v1.16.2...db-service-v1.17.0)
(2025-01-27)


### Added

* support for cds.Map
([#889](#889))
([cde7514](cde7514))


### Fixed

* **`UPDATE`:** no assocs in list which matches subquery results
([4bcb88a](4bcb88a))
* **`UPDATE`:** only perform subselect matching if necessary
([#989](#989))
([4bcb88a](4bcb88a))
* contains not evaluting to bool
([#980](#980))
([760484b](760484b))
* nested ternary in calculated element
([#981](#981))
([5f4a1fe](5f4a1fe))
* reject virtual elements in all expressions
([#972](#972))
([d0c949d](d0c949d))
* starts endswith for null values
([#975](#975))
([f0330bc](f0330bc))
* use "$$value$$" as internal column name for UPSERT
([#976](#976))
([8c86b86](8c86b86))
</details>

<details><summary>sqlite: 1.8.0</summary>

##
[1.8.0](sqlite-v1.7.8...sqlite-v1.8.0)
(2025-01-27)


### Added

* support for cds.Map
([#889](#889))
([cde7514](cde7514))
</details>

<details><summary>postgres: 1.11.0</summary>

##
[1.11.0](postgres-v1.10.5...postgres-v1.11.0)
(2025-01-27)


### Added

* support for cds.Map
([#889](#889))
([cde7514](cde7514))


### Fixed

* starts endswith for null values
([#975](#975))
([f0330bc](f0330bc))
</details>

<details><summary>hana: 1.6.0</summary>

##
[1.6.0](hana-v1.5.2...hana-v1.6.0)
(2025-01-27)


### Added

* support driver self-wrapping (for Dynatrace)
([#974](#974))
([5346bc4](5346bc4))
* support for cds.Map
([#889](#889))
([cde7514](cde7514))


### Fixed

* Fix expand aliasing
([#959](#959))
([f39097c](f39097c))
* groupby path expression with overlapping identifier
([#992](#992))
([b579da8](b579da8))
* multi raw SQL queries
([#973](#973))
([b953480](b953480))
* Remove `orderBy` ref check for `sql_simple_queries`
([#964](#964))
([1b77725](1b77725))
</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: Johannes Vogel <[email protected]>
This was referenced Jan 28, 2025
Closed
Merged
johannes-vogel added a commit that referenced this pull request Jan 28, 2025
@cap-bots @johannes-vogel
chore: release main (#999)
c8284d1 
🤖 I have created a release *beep* *boop*
---


<details><summary>db-service: 1.17.0</summary>

##
[1.17.0](db-service-v1.16.2...db-service-v1.17.0)
(2025-01-28)


### Added

* support for cds.Map
([#889](#889))
([cde7514](cde7514))


### Fixed

* **`UPDATE`:** no assocs in list which matches subquery results
([4bcb88a](4bcb88a))
* **`UPDATE`:** only perform subselect matching if necessary
([#989](#989))
([4bcb88a](4bcb88a))
* contains not evaluting to bool
([#980](#980))
([760484b](760484b))
* nested ternary in calculated element
([#981](#981))
([5f4a1fe](5f4a1fe))
* reject virtual elements in all expressions
([#972](#972))
([d0c949d](d0c949d))
* starts endswith for null values
([#975](#975))
([f0330bc](f0330bc))
* use "$$value$$" as internal column name for UPSERT
([#976](#976))
([8c86b86](8c86b86))
</details>

<details><summary>sqlite: 1.8.0</summary>

##
[1.8.0](sqlite-v1.7.8...sqlite-v1.8.0)
(2025-01-28)


### Added

* support for cds.Map
([#889](#889))
([cde7514](cde7514))
</details>

<details><summary>postgres: 1.11.0</summary>

##
[1.11.0](postgres-v1.10.5...postgres-v1.11.0)
(2025-01-28)


### Added

* support for cds.Map
([#889](#889))
([cde7514](cde7514))


### Fixed

* starts endswith for null values
([#975](#975))
([f0330bc](f0330bc))
</details>

<details><summary>hana: 1.6.0</summary>

##
[1.6.0](hana-v1.5.2...hana-v1.6.0)
(2025-01-28)


### Added

* support driver self-wrapping (for Dynatrace)
([#974](#974))
([5346bc4](5346bc4))
* support for cds.Map
([#889](#889))
([cde7514](cde7514))


### Fixed

* Fix expand aliasing
([#959](#959))
([f39097c](f39097c))
* groupby path expression with overlapping identifier
([#992](#992))
([b579da8](b579da8))
* multi raw SQL queries
([#973](#973))
([b953480](b953480))
* Remove `orderBy` ref check for `sql_simple_queries`
([#964](#964))
([1b77725](1b77725))
</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: Johannes Vogel <[email protected]>
This was referenced Jan 28, 2025
Closed
Merged
johannes-vogel added a commit that referenced this pull request Jan 28, 2025
@cap-bots @johannes-vogel
chore: release main (#1001)
6c4b539 
🤖 I have created a release *beep* *boop*
---


<details><summary>db-service: 1.17.0</summary>

##
[1.17.0](db-service-v1.16.2...db-service-v1.17.0)
(2025-01-28)


### Added

* support for cds.Map
([#889](#889))
([cde7514](cde7514))


### Fixed

* **`UPDATE`:** no assocs in list which matches subquery results
([4bcb88a](4bcb88a))
* **`UPDATE`:** only perform subselect matching if necessary
([#989](#989))
([4bcb88a](4bcb88a))
* contains not evaluting to bool
([#980](#980))
([760484b](760484b))
* nested ternary in calculated element
([#981](#981))
([5f4a1fe](5f4a1fe))
* reject virtual elements in all expressions
([#972](#972))
([d0c949d](d0c949d))
* starts endswith for null values
([#975](#975))
([f0330bc](f0330bc))
* use "$$value$$" as internal column name for UPSERT
([#976](#976))
([8c86b86](8c86b86))
</details>

<details><summary>sqlite: 1.8.0</summary>

##
[1.8.0](sqlite-v1.7.8...sqlite-v1.8.0)
(2025-01-28)


### Added

* support for cds.Map
([#889](#889))
([cde7514](cde7514))
</details>

<details><summary>postgres: 1.11.0</summary>

##
[1.11.0](postgres-v1.10.5...postgres-v1.11.0)
(2025-01-28)


### Added

* support for cds.Map
([#889](#889))
([cde7514](cde7514))


### Fixed

* starts endswith for null values
([#975](#975))
([f0330bc](f0330bc))
</details>

<details><summary>hana: 1.6.0</summary>

##
[1.6.0](hana-v1.5.2...hana-v1.6.0)
(2025-01-28)


### Added

* support driver self-wrapping (for Dynatrace)
([#974](#974))
([5346bc4](5346bc4))
* support for cds.Map
([#889](#889))
([cde7514](cde7514))


### Fixed

* Fix expand aliasing
([#959](#959))
([f39097c](f39097c))
* groupby path expression with overlapping identifier
([#992](#992))
([b579da8](b579da8))
* multi raw SQL queries
([#973](#973))
([b953480](b953480))
* Remove `orderBy` ref check for `sql_simple_queries`
([#964](#964))
([1b77725](1b77725))
</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: Johannes Vogel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stewsk stewsk stewsk approved these changes

@danjoa danjoa Awaiting requested review from danjoa danjoa is a code owner

@johannes-vogel johannes-vogel Awaiting requested review from johannes-vogel johannes-vogel is a code owner

@BobdenOs BobdenOs Awaiting requested review from BobdenOs BobdenOs is a code owner

@sjvans sjvans Awaiting requested review from sjvans sjvans is a code owner

@David-Kunz David-Kunz Awaiting requested review from David-Kunz David-Kunz is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@patricebender @stewsk