Include transaction specs for both MySQL and PostgreSQL

Author: mauricio

.gitignore

@@ -1,3 +1,4 @@
+databases/*
 out/*
 generate_bundles.rb
 .cache

Procfile

@@ -1,2 +1,2 @@
-postgresql: postgres -D /Users/mauricio/databases/postgresql
+postgresql: postgres -D databases/postgresql
 mysql: mysqld --log-warnings --console

mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/TransactionSpec.scala

@@ -1,14 +1,28 @@
 package com.github.mauricio.async.db.mysql
 
+import java.util.UUID
+import java.util.concurrent.TimeUnit
+
 import org.specs2.mutable.Specification
 import com.github.mauricio.async.db.util.FutureUtils.awaitFuture
 import com.github.mauricio.async.db.mysql.exceptions.MySQLException
 import com.github.mauricio.async.db.Connection
 
+import scala.concurrent.duration.Duration
+import scala.concurrent.{Await, Future}
+import scala.util.{Success, Failure}
+
+object TransactionSpec {
+
+ val BrokenInsert = """INSERT INTO users (id, name) VALUES (1, 'Maurício Aragão')"""
+ val InsertUser = """INSERT INTO users (name) VALUES (?)"""
+ val TransactionInsert = "insert into transaction_test (id) values (?)"
+
+}
+
 class TransactionSpec extends Specification with ConnectionHelper {
 
- val brokenInsert = """INSERT INTO users (id, name) VALUES (1, 'Maurício Aragão')"""
- val insertUser = """INSERT INTO users (name) VALUES (?)"""
+ import TransactionSpec._
 
  "connection in transaction" should {
 
@@ -42,7 +56,7 @@ class TransactionSpec extends Specification with ConnectionHelper {
 
  val future = connection.inTransaction {
  c =>
- c.sendQuery(this.insert).flatMap(r => c.sendQuery(brokenInsert))
+ c.sendQuery(this.insert).flatMap(r => c.sendQuery(BrokenInsert))
  }
 
  try {
@@ -77,7 +91,7 @@ class TransactionSpec extends Specification with ConnectionHelper {
  val future = pool.inTransaction {
  c =>
  connection = c
- c.sendQuery(this.brokenInsert)
+ c.sendQuery(BrokenInsert)
  }
 
  try {
@@ -97,6 +111,38 @@ class TransactionSpec extends Specification with ConnectionHelper {
 
  }
 
+ "runs commands for a transaction in a single connection" in {
+
+ val id = UUID.randomUUID().toString
+
+ withPool {
+ pool =>
+ val operations = pool.inTransaction {
+ connection =>
+ connection.sendPreparedStatement(TransactionInsert, List(id)).flatMap {
+ result =>
+ connection.sendPreparedStatement(TransactionInsert, List(id)).map {
+ failure =>
+ List(result, failure)
+ }
+ }
+ }
+
+ Await.ready(operations, Duration(5, TimeUnit.SECONDS))
+
+ operations.value.get match {
+ case Success(e) => failure("should not have executed")
+ case Failure(e) => {
+ e.asInstanceOf[MySQLException].errorMessage.errorCode === 1062
+ executePreparedStatement(pool, "select * from transaction_test where id = ?", id).rows.get.size === 0
+ success("ok")
+ }
+ }
+
+ }
+
+ }
+
  }
 
 }

postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/pool/ConnectionPoolSpec.scala

@@ -16,12 +16,20 @@
 
 package com.github.mauricio.async.db.postgresql.pool
 
+import java.util.UUID
+
 import com.github.mauricio.async.db.pool.{ConnectionPool, PoolConfiguration}
 import com.github.mauricio.async.db.postgresql.{PostgreSQLConnection, DatabaseTestHelper}
 import org.specs2.mutable.Specification
 
+object ConnectionPoolSpec {
+ val Insert = "insert into transaction_test (id) values (?)"
+}
+
 class ConnectionPoolSpec extends Specification with DatabaseTestHelper {
 
+ import ConnectionPoolSpec.Insert
+
  "pool" should {
 
  "give you a connection when sending statements" in {
@@ -51,6 +59,30 @@ class ConnectionPoolSpec extends Specification with DatabaseTestHelper {
  }
  }
 
+ "runs commands for a transaction in a single connection" in {
+
+ val id = UUID.randomUUID().toString
+
+ withPool {
+ pool =>
+ val operations = pool.inTransaction {
+ connection =>
+ connection.sendPreparedStatement(Insert, List(id)).flatMap {
+ result =>
+ connection.sendPreparedStatement(Insert, List(id)).map {
+ failure =>
+ List(result, failure)
+ }
+ }
+ }
+
+ val resultSets = await(operations)
+
+ resultSets.size mustEqual(2)
+ }
+
+ }
+
  }
 
  def withPool[R]( fn : (ConnectionPool[PostgreSQLConnection]) => R ) : R = {

script/prepare_build.sh

@@ -2,6 +2,7 @@
 
 echo "Preparing MySQL configs"
 mysql -u root -e 'create database mysql_async_tests;'
+mysql -u root -e "create table mysql_async_tests.transaction_test (id varchar(255) not null, primary key (id))"
 mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'mysql_async'@'localhost' IDENTIFIED BY 'root' WITH GRANT OPTION";
 mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'mysql_async_old'@'localhost' WITH GRANT OPTION";
 mysql -u root -e "UPDATE mysql.user SET Password = OLD_PASSWORD('do_not_use_this'), plugin = 'mysql_old_password' where User = 'mysql_async_old'; flush privileges;";
@@ -12,10 +13,11 @@ echo "preparing postgresql configs"
 psql -c 'create database netty_driver_test;' -U postgres
 psql -c 'create database netty_driver_time_test;' -U postgres
 psql -c "alter database netty_driver_time_test set timezone to 'GMT'" -U postgres
+psql -c "create table transaction_test ( id varchar(255) not null, constraint id_unique primary key (id))" -U postgres netty_driver_test
 psql -c "CREATE USER postgres_md5 WITH PASSWORD 'postgres_md5'; GRANT ALL PRIVILEGES ON DATABASE netty_driver_test to postgres_md5;" -U postgres
 psql -c "CREATE USER postgres_cleartext WITH PASSWORD 'postgres_cleartext'; GRANT ALL PRIVILEGES ON DATABASE netty_driver_test to postgres_cleartext;" -U postgres
 psql -c "CREATE USER postgres_kerberos WITH PASSWORD 'postgres_kerberos'; GRANT ALL PRIVILEGES ON DATABASE netty_driver_test to postgres_kerberos;" -U postgres
-psql -d "netty_driver_test" -c "CREATE TYPE example_mood AS ENUM ('sad', 'ok', 'happy');"
+psql -d "netty_driver_test" -c "CREATE TYPE example_mood AS ENUM ('sad', 'ok', 'happy');" -U postgres
 
 sudo chmod 777 /etc/postgresql/9.1/main/pg_hba.conf