fix: populate CREATEDBY from session user instead of CURRENT_USER() by rjayasinghe · Pull Request #375 · cap-js/change-tracking

rjayasinghe · 2026-09-21T08:22:25Z

Summary

Add getUser() to AbstractChangeTrackingTrigger which reads the user_id session variable set by the CAP runtime, falling back to CURRENT_USER() when it is absent
Replace the inline CURRENT_USER() SQL function in every changelog INSERT with a bind parameter ?, bound to the createdBy variable resolved at trigger runtime
Ensures the recorded CREATEDBY value reflects the authenticated application user rather than the DB connection user

Test plan

Verify changelog entries for insert, update, and delete operations record the application user in CREATEDBY
Verify fallback to CURRENT_USER() when user_id session variable is not set
Run existing H2 integration tests to check for regressions

Add `getUser()` to `AbstractChangeTrackingTrigger` which reads the `user_id` session variable (set by the CAP runtime) and falls back to `CURRENT_USER()`. The H2 codegen now passes `createdBy` as a bind parameter for every changelog INSERT instead of embedding `CURRENT_USER()` directly in the SQL, so the recorded user reflects the authenticated application user rather than the DB connection user.

hyperspace-pr-bot · 2026-09-21T08:23:48Z

Summary

The following content is AI-generated and provides a summary of the pull request:

Fix changelog CREATEDBY to use CAP session user

Bug Fix

🐛 Updated H2 change-tracking trigger generation so changelog entries store the authenticated CAP application user in CREATEDBY instead of always using the database connection user. If no CAP session user is available, the logic falls back to CURRENT_USER().

Changes

lib/h2/java-templates/AbstractChangeTrackingTrigger.java: Added getUser(conn) helper to read the user_id session variable and fallback to SELECT CURRENT_USER() when unavailable.
lib/h2/java-codegen.js: Resolves createdBy once during trigger execution and binds it into changelog INSERT statements.
lib/h2/java-codegen.js: Replaced inline CURRENT_USER() usage in generated changelog SQL with a bind parameter for create, update, and delete tracking entries.
lib/h2/java-codegen.js: Extended generated binding lists to include createdBy for both parent composition and non-composition changelog inserts.

🔄 Regenerate and Update Summary
✏️ Insert as PR Description (deletes this comment)
🗑️ Delete comment

PR Bot Information

Version: 1.31.43

File Content Strategy: Full file content
Output Template: Default Template
Event Trigger: pull_request.opened
Summary Prompt: Default Prompt
Correlation ID: 946d6d70-b595-11f1-9ee2-63706edf22e5
LLM: gpt-5.5

hyperspace-pr-bot

The review has been concluded!

PR Bot Information

Version: 1.31.43

LLM: gpt-5.5
Event Trigger: pull_request.opened
File Content Strategy: Full file content
Correlation ID: 946d6d70-b595-11f1-9ee2-63706edf22e5

with that we can use the session variable already set by default by the cap java runtime.

this is actually not needed here.

rjayasinghe · 2026-09-22T13:57:10Z

@Schmarvinius @swaldmann tests for HANA fail with timeout. I am pretty sure that this is not caused by my change as this is Java only and should not influence any of the generation for HANA.

…DS 9 stack npm i <tgz> in the "Install branch" step re-resolves deps inside perf-bookshop, picking up @cap-js/sqlite@3.x which requires @sap/cds@^10, conflicting with the CDS 9 matrix. Adding an overrides entry forces npm to use ^2 during that install.

…inning CDS 9 stack" This reverts commit e7fbb40.

This reverts commit 9426554.

agoerler

If this trigger runs in the same transaction as the tx that does the changes on H2 the session context variables @applicationuser and @now (the logical transaction timestamp) should always be set. Therefore we should be able just to use @applicationuser and @now in the SQL.

Moreover, we can't use CURRENT_TIMESTAMP() as this determines the timestamp on the DB but we need the logical transaction timestamp. Also we can't use CURRENT_USER() as this would be the user we use to connect to H2. But we need the application user instead.

Co-authored-by: Adrian Görler <adrian.goerler@sap.com>

…rors After `String locale` and `String createdBy` were removed from the fire() method template, two generated-code bugs remained: 1. `_wrapInTryCatch` emitted `stmt.setString(N, locale)` for localized association columns (whose `labelRes.bindings` contains `'locale'`), causing `cannot find symbol: variable locale` at Java compile time. Fix: resolve the `'locale'` binding to `getLocale(conn)` inline. 2. The composition parent INSERT VALUES still used `CURRENT_TIMESTAMP(), ?` for CREATEDAT/CREATEDBY while `'createdBy'` had been dropped from allBindings, causing a PreparedStatement parameter count mismatch. Fix: use `@now, @applicationuser` session variable literals for the composition parent case too, consistent with the non-parent case.

the requested changes were applied

rjayasinghe · 2026-10-05T10:34:36Z

@stefanrudi @Schmarvinius I had to make some changes after last proposed changes from @agoerler - can you please re-approve this PR?

rjayasinghe requested a review from a team as a code owner September 21, 2026 08:22

hyperspace-pr-bot Bot reviewed Sep 21, 2026

View reviewed changes

rjayasinghe added 3 commits September 21, 2026 13:45

use applicatino user instead of user_id

8154355

with that we can use the session variable already set by default by the cap java runtime.

ignore IntelliJ Idea artifacts

e9b860c

add changelog entry for the H2 trigger fix

29235f0

Schmarvinius previously approved these changes Sep 22, 2026

View reviewed changes

rjayasinghe enabled auto-merge September 22, 2026 09:06

swaldmann reviewed Sep 22, 2026

View reviewed changes

Comment thread package.json Outdated

removed the plugin property from cds config

19ec27b

this is actually not needed here.

rjayasinghe dismissed Schmarvinius’s stale review via 19ec27b September 22, 2026 09:57

rjayasinghe requested review from Schmarvinius and swaldmann September 22, 2026 10:12

Schmarvinius previously approved these changes Sep 22, 2026

View reviewed changes

swaldmann previously approved these changes Sep 22, 2026

View reviewed changes

rjayasinghe added this pull request to the merge queue Sep 22, 2026

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 22, 2026

trying to fix performance test

9426554

rjayasinghe dismissed stale reviews from swaldmann and Schmarvinius via 9426554 September 23, 2026 07:23

rjayasinghe added 3 commits September 23, 2026 09:43

Revert "fix: add overrides for @cap-js/sqlite in perf-bookshop when p…

e1eb0bc

…inning CDS 9 stack" This reverts commit e7fbb40.

Revert "trying to fix performance test"

7e0a1fa

This reverts commit 9426554.

stefanrudi added the no changelog label Sep 28, 2026

Merge branch 'main' into fix/h2-createdby-from-session-user

f44164d

stefanrudi previously approved these changes Sep 29, 2026

View reviewed changes

Merge branch 'main' into fix/h2-createdby-from-session-user

972482e

Schmarvinius previously approved these changes Sep 29, 2026

View reviewed changes

stefanrudi added this pull request to the merge queue Sep 29, 2026

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 29, 2026

agoerler previously requested changes Sep 30, 2026

View reviewed changes

Comment thread lib/h2/java-codegen.js Outdated

Comment thread lib/h2/java-templates/AbstractChangeTrackingTrigger.java Outdated

Comment thread lib/h2/java-codegen.js Outdated

Apply batched suggestions from code review

a462ac0

Co-authored-by: Adrian Görler <adrian.goerler@sap.com>

rjayasinghe dismissed stale reviews from Schmarvinius and stefanrudi via a462ac0 September 30, 2026 09:41

agoerler added 2 commits September 30, 2026 16:47

Update java-codegen.js

74830ac

Update java-codegen.js

ad93329

rjayasinghe requested a review from agoerler October 5, 2026 07:13

Merge branch 'main' into fix/h2-createdby-from-session-user

a27342a

rjayasinghe enabled auto-merge October 5, 2026 10:22

rjayasinghe requested review from Schmarvinius and stefanrudi October 5, 2026 10:34

stefanrudi approved these changes Oct 5, 2026

View reviewed changes

Schmarvinius approved these changes Oct 5, 2026

View reviewed changes

rjayasinghe added this pull request to the merge queue Oct 5, 2026

Merged via the queue into main with commit e648034 Oct 5, 2026
23 checks passed

rjayasinghe deleted the fix/h2-createdby-from-session-user branch October 5, 2026 12:23

Navigation Menu

Repository navigation

fix: populate CREATEDBY from session user instead of CURRENT_USER() - #375

fix: populate CREATEDBY from session user instead of CURRENT_USER()#375
rjayasinghe merged 16 commits into
mainfrom
fix/h2-createdby-from-session-user

rjayasinghe commented Sep 21, 2026

Uh oh!

hyperspace-pr-bot Bot commented Sep 21, 2026

Uh oh!

hyperspace-pr-bot Bot left a comment

Uh oh!

Uh oh!

Uh oh!

rjayasinghe commented Sep 22, 2026

Uh oh!

Uh oh!

agoerler left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rjayasinghe commented Oct 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

rjayasinghe commented Sep 21, 2026

Summary

Test plan

Uh oh!

hyperspace-pr-bot Bot commented Sep 21, 2026

Summary

Fix changelog CREATEDBY to use CAP session user

Bug Fix

Changes

Uh oh!

hyperspace-pr-bot Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

rjayasinghe commented Sep 22, 2026

Uh oh!

Uh oh!

agoerler left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rjayasinghe commented Oct 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants