Merge branch 'release/0.4.0'

core/src/main/scala/scalikejdbc/async/AsyncDB.scala

@@ -18,6 +18,7 @@ package scalikejdbc.async
 import scala.concurrent._
 import scala.util.{ Failure, Success }
 import scalikejdbc.async.ShortenedNames._
+import scalikejdbc.async.internal.AsyncConnectionCommonImpl
 
 /**
  * Basic Database Accessor
@@ -54,14 +55,22 @@ object AsyncDB {
  AsyncConnectionPool().borrow().toNonSharedConnection().map { nonSharedConnection =>
  TxAsyncDBSession(nonSharedConnection)
  }.flatMap { tx =>
- tx.begin().flatMap { _ =>
- op.apply(tx).andThen {
- case Success(_) => tx.commit()
- case Failure(e) => tx.rollback()
- }.andThen {
- case _ => tx.release()
- }
+ val p = Promise[A]()
+ val connection = tx.connection.asInstanceOf[AsyncConnectionCommonImpl].underlying
+
+ connection.inTransaction(_ => op.apply(tx)).onComplete {
+ case Success(result) =>
+ tx.commit()
+ tx.release()
+ p.success(result)
+ case Failure(e) =>
+ tx.rollback()
+ // As documentation recommends - close connection after rollback
+ connection.disconnect
+ tx.release()
+ p.failure(e)
  }
+ p.future
  }
  }
 

project/Build.scala

@@ -4,11 +4,11 @@ import play.Project._
 
 object ScalikeJDBCAsyncProject extends Build {
 
- lazy val _version = "0.4.0-RC"
- lazy val scalikejdbcVersion = "2.0.0-RC3"
+ lazy val _version = "0.4.0"
+ lazy val scalikejdbcVersion = "2.0.1"
  // TODO Scala 2.11 https://github.com/mauricio/postgresql-async/pull/87
  lazy val mauricioVersion = "0.2.13"
- lazy val defaultPlayVersion = "2.2.3"
+ lazy val defaultPlayVersion = "2.3.0"
 
  lazy val core = Project(
  id = "core",