Adds custom transactor for country and person tables

src/main/scala/doobie/ConnectingToDatabaseSection.scala

@@ -1,6 +1,6 @@
package doobie

import doobie.DoobieUtils._
import doobie.DoobieUtils.CountryTable._
import doobie.imports._
import org.scalaexercises.definitions.Section
import org.scalatest._

src/main/scala/doobie/DoobieUtils.scala

@@ -11,9 +11,7 @@ import scalaz._, Scalaz._

object DoobieUtils {

  // Transactor for single-use in-memory databases pre-populated with test data.
  val xa = new Transactor[Task] {

  class CustomTransactor[B](implicit beforeActions: ConnectionIO[B]) extends Transactor[Task] {
    val driver = "org.h2.Driver"
    def url    = "jdbc:h2:mem:"
    val user   = "sa"
@@ -22,6 +20,11 @@ object DoobieUtils {
    val connect: Task[Connection] =
      Task.delay(Class.forName(driver)) *> FD.getConnection(url, user, pass).trans[Task]

    override val before = super.before <* beforeActions
  }

  object CountryTable {

    val createCountryTable: ConnectionIO[Int] =
      sql"""
          CREATE TABLE IF NOT EXISTS country (
@@ -33,11 +36,28 @@ object DoobieUtils {
       """.update.run

    def insertCountries(countries: List[Country]): ConnectionIO[Int] =
      Update[Country](s"insert into country (code, name, population, gnp) values (?,?,?,?)").updateMany(countries)
      Update[Country]("insert into country (code, name, population, gnp) values (?,?,?,?)")
        .updateMany(countries)

    override val before = 
      super.before <* createCountryTable <* insertCountries(countries)
    implicit val beforeActions = createCountryTable <* insertCountries(countries)

    // Transactor for single-use in-memory databases pre-populated with test data.
    val xa = new CustomTransactor
  }

  object PersonTable {

    val createPersonTable: ConnectionIO[Int] =
      sql"""
          CREATE TABLE IF NOT EXISTS person (
          id   IDENTITY,
          name VARCHAR NOT NULL UNIQUE,
          age  INT
          )
       """.update.run

    implicit val beforeActions = createPersonTable

    val xa = new CustomTransactor
  }
}

src/main/scala/doobie/MultiColumnQueriesSection.scala

@@ -1,6 +1,6 @@
package doobie

import doobie.DoobieUtils._
import doobie.DoobieUtils.CountryTable._
import doobie.Model._
import doobie.imports._
import org.scalaexercises.definitions.Section

src/main/scala/doobie/ParameterizedQueriesSection.scala

@@ -1,6 +1,6 @@
package doobie

import doobie.DoobieUtils._
import doobie.DoobieUtils.CountryTable._
import doobie.Model._
import doobie.ParameterizedQueryHelpers._
import doobie.imports._

src/main/scala/doobie/SelectingDataSection.scala

@@ -1,6 +1,6 @@
package doobie

import doobie.DoobieUtils._
import doobie.DoobieUtils.CountryTable._
import doobie.imports._
import org.scalaexercises.definitions.Section
import org.scalatest.{FlatSpec, Matchers}

src/main/scala/doobie/UpdatesSection.scala

@@ -1,5 +1,6 @@
package doobie

import doobie.DoobieUtils.PersonTable._
import doobie.UpdatesSectionHelpers._
import doobie.imports._
import org.scalaexercises.definitions.Section

src/main/scala/doobie/UpdatesSectionHelpers.scala

@@ -12,29 +12,6 @@ object UpdatesSectionHelpers {

  case class Person(id: Long, name: String, age: Option[Short])

  val xa = new Transactor[Task] {

    val driver = "org.h2.Driver"
    def url    = "jdbc:h2:mem:"
    val user   = "sa"
    val pass   = ""

    val connect: Task[Connection] =
      Task.delay(Class.forName(driver)) *> FD.getConnection(url, user, pass).trans[Task]

    val create: Update0 =
      sql"""
        CREATE TABLE person (
        id   IDENTITY,
        name VARCHAR NOT NULL UNIQUE,
        age  INT)
    """.update

    override val before =
      super.before <* create.run

  }

  def insert1(name: String, age: Option[Int]): Update0 =
    sql"""
        INSERT INTO person (name, age) VALUES ($name, $age)