newSuspendedTransaction often doesn't honor TransactionManager.defaul…

…tDatabase changes JetBrains#1342
SchweinchenFuntik · Oct 23, 2021 · 00a8e85 · 00a8e85
1 parent ccb63d6
commit 00a8e85
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 2 deletions.
diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/transactions/TransactionApi.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/transactions/TransactionApi.kt
@@ -56,7 +56,7 @@ interface TransactionManager {
     fun bindTransactionToThread(transaction: Transaction?)
 
     companion object {
-        private val currentDefaultDatabase = AtomicReference<Database>()
+        internal val currentDefaultDatabase = AtomicReference<Database>()
 
         var defaultDatabase: Database?
             get() = currentDefaultDatabase.get() ?: databases.firstOrNull()

diff --git a/...sed-core/src/main/kotlin/org/jetbrains/exposed/sql/transactions/experimental/Suspended.kt b/...sed-core/src/main/kotlin/org/jetbrains/exposed/sql/transactions/experimental/Suspended.kt
@@ -97,7 +97,7 @@ private suspend fun <T> withTransactionScope(
 ): T {
     val currentScope = coroutineContext[TransactionScope]
     suspend fun newScope(_tx: Transaction?): T {
-        val manager = (_tx?.db ?: db)?.transactionManager ?: TransactionManager.manager
+        val manager = (_tx?.db ?: db ?: TransactionManager.currentDefaultDatabase.get())?.transactionManager ?: TransactionManager.manager
 
         val tx = lazy(LazyThreadSafetyMode.NONE) { _tx ?: manager.newTransaction(transactionIsolation ?: manager.defaultIsolationLevel) }
 

diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/h2/MultiDatabaseTest.kt b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/h2/MultiDatabaseTest.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.exposed.sql.tests.h2
 
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.newSingleThreadContext
 import kotlinx.coroutines.runBlocking
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.tests.shared.assertEqualLists
@@ -16,6 +17,7 @@ import org.jetbrains.exposed.sql.transactions.transactionManager
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import java.util.concurrent.Executors
 import kotlin.test.assertEquals
 
 class MultiDatabaseTest {
@@ -225,4 +227,57 @@ class MultiDatabaseTest {
         assertEquals(TransactionManager.defaultDatabase, db2)
         TransactionManager.defaultDatabase = null
     }
+
+    @Test // this test always fails for one reason or another
+    fun `when the default database is changed, coroutines should respect that`(): Unit = runBlocking {
+        assertEquals("jdbc:h2:mem:db1", db1.name) // These two asserts fail sometimes for reasons that escape me
+        assertEquals("jdbc:h2:mem:db2", db2.name) // but if you run just these tests one at a time, they pass.
+        val coroutineDispatcher1 = newSingleThreadContext("first")
+        TransactionManager.defaultDatabase = db1
+        newSuspendedTransaction(coroutineDispatcher1) {
+            assertEquals(db1.name, TransactionManager.current().db.name) // when running all tests together, this one usually fails
+            TransactionManager.current().exec("SELECT 1") { rs ->
+                rs.next()
+                assertEquals(1, rs.getInt(1))
+            }
+        }
+        TransactionManager.defaultDatabase = db2
+        newSuspendedTransaction(coroutineDispatcher1) {
+            assertEquals(db2.name, TransactionManager.current().db.name) // fails??
+            TransactionManager.current().exec("SELECT 1") { rs ->
+                rs.next()
+                assertEquals(1, rs.getInt(1))
+            }
+        }
+        TransactionManager.defaultDatabase = null
+    }
+
+    @Test // If the first two assertions pass, the entire test passes
+    fun `when the default database is changed, threads should respect that`() {
+        assertEquals("jdbc:h2:mem:db1", db1.name)
+        assertEquals("jdbc:h2:mem:db2", db2.name)
+        val threadpool = Executors.newSingleThreadExecutor()
+        TransactionManager.defaultDatabase = db1
+        threadpool.submit {
+            transaction {
+                assertEquals(db1.name, TransactionManager.current().db.name)
+                TransactionManager.current().exec("SELECT 1") { rs ->
+                    rs.next()
+                    assertEquals(1, rs.getInt(1))
+                }
+            }
+        }
+            .get()
+        TransactionManager.defaultDatabase = db2
+        threadpool.submit {
+            transaction {
+                assertEquals(db2.name, TransactionManager.current().db.name)
+                TransactionManager.current().exec("SELECT 1") { rs ->
+                    rs.next()
+                    assertEquals(1, rs.getInt(1))
+                }
+            }
+        }.get()
+        TransactionManager.defaultDatabase = null
+    }
 }