fix bug #90

Author: vincentlauvlwj

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 allprojects {
     group = "me.liuwj.ktorm"
-    version = "2.6"
+    version = "2.6.1"
 }
 
 subprojects { project ->

ktorm-core/src/main/kotlin/me/liuwj/ktorm/database/Database.kt

@@ -179,19 +179,24 @@ class Database(
         val current = transactionManager.currentTransaction
         val isOuter = current == null
         val transaction = current ?: transactionManager.newTransaction(isolation)
+        var throwable: Throwable? = null
 
         try {
-            val result = func(transaction)
-            if (isOuter) transaction.commit()
-            return result
+            return func(transaction)
         } catch (e: SQLException) {
-            if (isOuter) transaction.rollback()
-            throw exceptionTranslator?.invoke(e) ?: e
+            throwable = exceptionTranslator?.invoke(e) ?: e
+            throw throwable
         } catch (e: Throwable) {
-            if (isOuter) transaction.rollback()
-            throw e
+            throwable = e
+            throw throwable
         } finally {
-            if (isOuter) transaction.close()
+            if (isOuter) {
+                try {
+                    if (throwable == null) transaction.commit() else transaction.rollback()
+                } finally {
+                    transaction.close()
+                }
+            }
         }
     }
 

ktorm-support-postgresql/src/test/kotlin/me/liuwj/ktorm/support/postgresql/PostgreSqlTest.kt

@@ -2,9 +2,8 @@ package me.liuwj.ktorm.support.postgresql
 
 import me.liuwj.ktorm.BaseTest
 import me.liuwj.ktorm.database.Database
-import me.liuwj.ktorm.dsl.eq
-import me.liuwj.ktorm.dsl.plus
-import me.liuwj.ktorm.dsl.update
+import me.liuwj.ktorm.database.useTransaction
+import me.liuwj.ktorm.dsl.*
 import me.liuwj.ktorm.entity.*
 import me.liuwj.ktorm.logging.ConsoleLogger
 import me.liuwj.ktorm.logging.LogLevel
@@ -102,4 +101,19 @@ class PostgreSqlTest : BaseTest() {
         assert(Employees.findById(1)!!.salary == 1000L)
         assert(Employees.findById(5)!!.salary == 1000L)
     }
+
+    @Test
+    fun testReturnInTransactionBlock() {
+        insertTransactional()
+        assert(Departments.count() == 3)
+    }
+
+    private fun insertTransactional(): Int {
+        useTransaction {
+            return Departments.insert {
+                it.name to "dept name"
+                it.location to "dept location"
+            }
+        }
+    }
 }