Skip to content

fix: destroy connections on failed COMMIT/ROLLBACK/BEGIN #1715

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

Open
swaldmann wants to merge 4 commits into
base: main
Choose a base branch
from
+11 −4
Open

fix: destroy connections on failed COMMIT/ROLLBACK/BEGIN #1715

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1c5c86
fix: destroy connections on failed COMMIT/ROLLBACK/BEGIN
swaldmann Aug 26, 2026
9064cc3
remove comments
swaldmann Aug 28, 2026
4fd6707
Merge branch 'main' into destroy-unusable
swaldmann Aug 28, 2026
a4edd56
don't re-throw on rollback
swaldmann Sep 2, 2026
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
15 changes: 11 additions & 4 deletions db-service/lib/common/DatabaseService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class DatabaseService extends cds.Service {
await this.set(new SessionContext(ctx))
await this.send('BEGIN')
} catch (e) {
this.release()
await this.destroy()
throw e
}
return this
Expand All @@ -82,8 +82,13 @@ class DatabaseService extends cds.Service {
*/
async commit() {
if (!this.dbc) return
await this.send('COMMIT')
this.release() // only release on successful commit as otherwise released on rollback
try {
await this.send('COMMIT')
this.release()
} catch (e) {
await this.destroy()
throw e
}
}

/**
Expand All @@ -93,8 +98,10 @@ class DatabaseService extends cds.Service {
if (!this.dbc) return
try {
await this.send('ROLLBACK')
} finally {
this.release()
} catch {
// don't re-throw: rollback() is the error handler in .then(commit, rollback)
await this.destroy()
}
}

Expand Down