Merge pull request #1039 from slick/tmp/direct-embedding-actions

Switch Direct Embedding over to the new Action-based API.
slick · Jan 13, 2015 · a22711d · a22711d
2 parents d619c53 + 4ab4a6b
commit a22711d
Show file tree

Hide file tree

Showing 6 changed files with 370 additions and 340 deletions.
diff --git a/slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/StandardTestDBs.scala b/slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/StandardTestDBs.scala
@@ -12,12 +12,16 @@ import scala.slick.jdbc.meta.MTable
 import org.junit.Assert
 
 object StandardTestDBs {
-  lazy val H2Mem = new H2TestDB("h2mem") {
+  lazy val H2Mem = new H2TestDB("h2mem", false) {
     val url = "jdbc:h2:mem:test1"
     override def isPersistent = false
   }
 
-  lazy val H2Disk = new H2TestDB("h2disk") {
+  lazy val H2MemKeepAlive = new H2TestDB("h2mem", true) {
+    val url = "jdbc:h2:mem:test1"
+  }
+
+  lazy val H2Disk = new H2TestDB("h2disk", false) {
     val dbName = "h2-"+confName
     val url = "jdbc:h2:"+TestkitConfig.testDBPath+"/"+dbName
     override def cleanUpBefore() = TestDB.deleteDBFiles(dbName)
@@ -126,10 +130,11 @@ object StandardTestDBs {
   }
 }
 
-abstract class H2TestDB(confName: String) extends InternalJdbcTestDB(confName) {
+abstract class H2TestDB(confName: String, keepAlive: Boolean) extends InternalJdbcTestDB(confName) {
   val driver = H2Driver
   val jdbcDriver = "org.h2.Driver"
   override def capabilities = super.capabilities - TestDB.capabilities.jdbcMetaGetFunctions - TestDB.capabilities.jdbcMetaGetClientInfoProperties
+  override def createDB(): profile.Backend#Database = database.forURL(url, driver = jdbcDriver, keepAliveConnection = keepAlive)
 }
 
 class SQLiteTestDB(dburl: String, confName: String) extends InternalJdbcTestDB(confName) {

diff --git a/slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/TestDB.scala b/slick-testkit/src/main/scala/com/typesafe/slick/testkit/util/TestDB.scala
@@ -171,7 +171,7 @@ abstract class JdbcTestDB(val confName: String) extends SqlTestDB {
   def canGetLocalTables = true
 }
 
-abstract class InternalJdbcTestDB(confName: String) extends JdbcTestDB(confName) {
+abstract class InternalJdbcTestDB(confName: String) extends JdbcTestDB(confName) { self =>
   val url: String
   def createDB(): profile.Backend#Database = database.forURL(url, driver = jdbcDriver)
   override def toString = url