From ac73e8d77b6b586106f56f2579e15d5009393fb4 Mon Sep 17 00:00:00 2001
From: Joe Nelson <cred+github@begriffs.com>
Date: Fri, 22 Jan 2016 11:53:47 -0800
Subject: [PATCH] Remove connection pooling in test

---
 test/Main.hs       | 7 ++++---
 test/SpecHelper.hs | 4 ----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/test/Main.hs b/test/Main.hs
index 19fff8523..6256f5d98 100644
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -3,10 +3,11 @@ module Main where
 import Test.Hspec
 import SpecHelper
 
-import Data.Pool
 import qualified Hasql.Session as H
+import qualified Hasql.Connection as H
 
 import PostgREST.DbStructure (getDbStructure)
+import Data.String.Conversions (cs)
 
 import qualified Feature.AuthSpec
 import qualified Feature.CorsSpec
@@ -21,14 +22,14 @@ main :: IO ()
 main = do
   setupDb
 
-  pool <- testPool
-  withResource pool $ \case
+  H.acquire (cs dbString) >>= \case
     Left err -> error $ show err
     Right c -> do
       dbOrErr <- H.run (getDbStructure "test") c
       -- Not using hspec-discover because we want to precompute
       -- the db structure and pass it to specs for speed
       either (error.show) (hspec . specs c) dbOrErr
+      H.release c
 
  where
   specs conn dbStructure = do
diff --git a/test/SpecHelper.hs b/test/SpecHelper.hs
index 11dd12d2a..4d53839c3 100644
--- a/test/SpecHelper.hs
+++ b/test/SpecHelper.hs
@@ -84,7 +84,3 @@ authHeaderBasic u p =
 authHeaderJWT :: String -> Header
 authHeaderJWT token =
   (hAuthorization, cs $ "Bearer " ++ token)
-
-testPool :: IO (Pool (Either H.ConnectionError H.Connection))
-testPool = createPool (H.acquire . cs $ dbString)
-  (either (const $ return ()) H.release) 1 1 1