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

[wip] always rewrite to path expression on new db #131

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
The format is based on [Keep a Changelog](http://keepachangelog.com/).

## Version 0.8.3 - tbd
sjvans marked this conversation as resolved.
Show resolved Hide resolved

### Fixed

- Rewrite subselects to use path expressions on @cap-js databases

## Version 0.8.2 - 2024-11-27

### Fixed
Expand Down
8 changes: 4 additions & 4 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,13 @@ const _buildSubSelect = (model, { entity, relative, element, next }, row, previo

let w = relative._relations[element.name].join(targetAlias, relativeAlias)

// REVISIT: rewrite to path expression, if alias for relative is already used in subselect to avoid sql error
if (previousCqn?._aliases.has(relativeAlias)) {
// rewrite to path expression on new databases
if (cds.env.requires.db.impl?.startsWith('@cap-js')) {
let t
for (const a in entity.associations) if (entity.associations[a].target === relative.name) t = entity.associations[a]
for (const a in entity.associations)
if (a !== 'SiblingEntity' && entity.associations[a].target === relative.name) t = entity.associations[a]
if (t && w[0]?.xpr) for (const ele of w[0].xpr) if (ele.ref?.[0] === relativeAlias) ele.ref.splice(0, 1, as, t.name)
}
childCqn._aliases = new Set(previousCqn ? [...previousCqn._aliases.values(), as] : [as])

childCqn.where(w)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cap-js/audit-logging",
"version": "0.8.2",
"version": "0.8.3",
"description": "CDS plugin providing integration to the SAP Audit Log service as well as out-of-the-box personal data-related audit logging based on annotations.",
"repository": "cap-js/audit-logging",
"author": "SAP SE (https://www.sap.com)",
Expand Down
Loading