Skip to content

Give WITH-TRANSACTION a convenience return-value #13

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
tdrhq wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Give WITH-TRANSACTION a convenience return-value #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions sql/transaction.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,17 @@ is called on DATABASE which defaults to *DEFAULT-DATABASE*."
which is *DEFAULT-DATABASE* by default, and executes BODY within
that transaction. If BODY aborts or throws, DATABASE is rolled
back and otherwise the transaction is committed."
(let ((db (gensym "db-")))
`(let ((,db ,database))
(let ((db (gensym "db-"))
(ret (gensym "ret-")))
`(let ((,db ,database)
,ret)
(unwind-protect
(prog2
(database-start-transaction ,db)
(progn
,@body)
(mark-transaction-committed ,db))
(setf ,ret (progn
,@body))
(mark-transaction-committed ,db)
,ret)
(if (eq (transaction-status (transaction ,db)) :committed)
(database-commit-transaction ,db)
(database-abort-transaction ,db))))))
Expand Down Expand Up @@ -149,4 +152,3 @@ Autocommit is turned on by default."
(setf (database-autocommit database) value)
(database-autocommit database)
old-value))