WIP: share server code between tests and program

- Share server code in Main
- Switch to hasql-pool
- Use pool in tests
- DRY up test runner

test/Main.hs

@@ -3,10 +3,10 @@ module Main where
 import Test.Hspec
 import SpecHelper
 
-import qualified Hasql.Session as H
-import qualified Hasql.Connection as H
+import qualified Hasql.Pool as P
 
 import PostgREST.DbStructure (getDbStructure)
+import PostgREST.Main (postgrest)
 import Data.String.Conversions (cs)
 
 import qualified Feature.AuthSpec
@@ -23,23 +23,23 @@ main :: IO ()
 main = do
   setupDb
 
-  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
+  pool <- P.acquire (10, 10, cs dbString)
+
+  result <- P.use pool $ getDbStructure "test"
+  let dbStructure = either (error.show) id result
+      withApp = ($ postgrest cfgDefault dbStructure pool)
+
+  hspec . sequence_ . map (around withApp) $ specs
 
  where
-  specs conn dbStructure = do
-    describe "Feature.AuthSpec" $ Feature.AuthSpec.spec dbStructure conn
-    describe "Feature.ConcurrentSpec" $ Feature.ConcurrentSpec.spec dbStructure conn
-    describe "Feature.CorsSpec" $ Feature.CorsSpec.spec dbStructure conn
-    describe "Feature.DeleteSpec" $ Feature.DeleteSpec.spec dbStructure conn
-    describe "Feature.InsertSpec" $ Feature.InsertSpec.spec dbStructure conn
-    describe "Feature.QueryLimitedSpec" $ Feature.QueryLimitedSpec.spec dbStructure conn
-    describe "Feature.QuerySpec" $ Feature.QuerySpec.spec dbStructure conn
-    describe "Feature.RangeSpec" $ Feature.RangeSpec.spec dbStructure conn
-    describe "Feature.StructureSpec" $ Feature.StructureSpec.spec dbStructure conn
+  specs = map (uncurry describe) [
+      ("Feature.AuthSpec"         , Feature.AuthSpec.spec)
+    , ("Feature.ConcurrentSpec"   , Feature.ConcurrentSpec.spec)
+    , ("Feature.CorsSpec"         , Feature.CorsSpec.spec)
+    , ("Feature.DeleteSpec"       , Feature.DeleteSpec.spec)
+    , ("Feature.InsertSpec"       , Feature.InsertSpec.spec)
+    , ("Feature.QueryLimitedSpec" , Feature.QueryLimitedSpec.spec)
+    , ("Feature.QuerySpec"        , Feature.QuerySpec.spec)
+    , ("Feature.RangeSpec"        , Feature.RangeSpec.spec)
+    , ("Feature.StructureSpec"    , Feature.StructureSpec.spec)
+    ]