jdbc: fixed usage of multiple different DataSources when there is an …

…active transaction

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Unreleased
 * jdbc: between operator introduced with open and closed ranges, also in and notIn
 * jdbc: @NoTransaction can now be used on jobs
+* jdbc: fixed usage of multiple different DataSources when there is an active transaction
 * json: TSGenerator will now use more type-safe string template types for java.time classes, e.g. `${number}-${number}-${number}` instead of `string`
 
 # 1.6.9

jdbc/src/Transaction.kt

@@ -14,7 +14,7 @@ import kotlin.coroutines.CoroutineContext
 /** Disable transaction for a route or a job. This will most likely leave the connection in auto-commit mode (depending on connection pool settings). */
 @Target(FUNCTION, CLASS) annotation class NoTransaction
 
-class Transaction(private val db: DataSource): AutoCloseable {
+class Transaction(val db: DataSource): AutoCloseable {
   companion object {
     private val log = logger()
     private val threadLocal = ThreadLocal<Transaction>()
@@ -56,7 +56,7 @@ class Transaction(private val db: DataSource): AutoCloseable {
 
 fun <R> DataSource.withConnection(block: Connection.() -> R): R {
   val tx = Transaction.current()
-  return if (tx != null) tx.connection.block()
+  return if (tx?.db == this) tx.connection.block()
          else connection.use(block)
 }