Merge pull request #605 from rlazoti/add-connection-pool

Add Connection Pool
This commit is contained in:
shimamoto
2015-02-14 22:56:00 +09:00
10 changed files with 70 additions and 55 deletions

View File

@@ -3,6 +3,7 @@ package service
import model.Profile._
import profile.simple._
import util.ControlUtil._
import util.DatabaseConfig
import java.sql.DriverManager
import org.apache.commons.io.FileUtils
import scala.util.Random
@@ -12,7 +13,7 @@ trait ServiceSpecBase {
def withTestDB[A](action: (Session) => A): A = {
util.FileUtil.withTmpDir(new File(FileUtils.getTempDirectory(), Random.alphanumeric.take(10).mkString)){ dir =>
val (url, user, pass) = (s"jdbc:h2:${dir}", "sa", "sa")
val (url, user, pass) = (DatabaseConfig.url(Some(dir.toString)), DatabaseConfig.user, DatabaseConfig.password)
org.h2.Driver.load()
using(DriverManager.getConnection(url, user, pass)){ conn =>
servlet.AutoUpdate.versions.reverse.foreach(_.update(conn))