From e4d18db495882ea45e86b76e9fd2884694c60cdf Mon Sep 17 00:00:00 2001 From: Richard Romanowski <8516475+rsromanowski@users.noreply.github.com> Date: Sat, 16 Jul 2022 13:19:56 -0400 Subject: [PATCH] Add Transaction to lifecycle hooks for #1530 (#1531) Co-authored-by: Richard Romanowski --- .../main/kotlin/org/jetbrains/exposed/sql/Transaction.kt | 8 ++++---- .../exposed/sql/statements/StatementInterceptor.kt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/Transaction.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/Transaction.kt index c23791fba0..2fad9fcf00 100644 --- a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/Transaction.kt +++ b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/Transaction.kt @@ -72,8 +72,8 @@ open class Transaction(private val transactionImpl: TransactionInterface) : User } transactionImpl.commit() userdata.clear() - globalInterceptors.forEach { it.afterCommit() } - interceptors.forEach { it.afterCommit() } + globalInterceptors.forEach { it.afterCommit(this) } + interceptors.forEach { it.afterCommit(this) } userdata.putAll(dataToStore) } @@ -81,8 +81,8 @@ open class Transaction(private val transactionImpl: TransactionInterface) : User globalInterceptors.forEach { it.beforeRollback(this) } interceptors.forEach { it.beforeRollback(this) } transactionImpl.rollback() - globalInterceptors.forEach { it.afterRollback() } - interceptors.forEach { it.afterRollback() } + globalInterceptors.forEach { it.afterRollback(this) } + interceptors.forEach { it.afterRollback(this) } userdata.clear() } diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/StatementInterceptor.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/StatementInterceptor.kt index 5ff5738f5f..9dbcdd7dea 100644 --- a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/StatementInterceptor.kt +++ b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/StatementInterceptor.kt @@ -9,10 +9,10 @@ interface StatementInterceptor { fun afterExecution(transaction: Transaction, contexts: List, executedStatement: PreparedStatementApi) {} fun beforeCommit(transaction: Transaction) {} - fun afterCommit() {} + fun afterCommit(transaction: Transaction) {} fun beforeRollback(transaction: Transaction) {} - fun afterRollback() {} + fun afterRollback(transaction: Transaction) {} fun keepUserDataInTransactionStoreOnCommit(userData: Map, Any?>): Map, Any?> = emptyMap() }