Upgrade to Aff 4.0

Author: justinwoo

bower.json

@@ -26,22 +26,22 @@
     "output"
   ],
   "dependencies": {
-    "purescript-arrays": "^4.0.0",
-    "purescript-either": "^3.0.0",
-    "purescript-foreign": "^4.0.0",
-    "purescript-foldable-traversable": "^3.0.0",
-    "purescript-transformers": "^3.0.0",
-    "purescript-aff": "^3.0.0",
-    "purescript-integers": "^3.0.0",
-    "purescript-datetime": "^3.0.0",
+    "purescript-arrays": "^4.2.1",
+    "purescript-either": "^3.1.0",
+    "purescript-foreign": "^4.0.1",
+    "purescript-foldable-traversable": "^3.6.1",
+    "purescript-transformers": "^3.4.0",
+    "purescript-aff": "^4.0.0",
+    "purescript-integers": "^3.1.0",
+    "purescript-datetime": "^3.4.0",
     "purescript-unsafe-coerce": "^3.0.0",
     "purescript-nullable": "^3.0.0",
-    "purescript-prelude": "^3.0.0",
-    "purescript-foreign-generic": "^4.0.0"
+    "purescript-prelude": "^3.1.0",
+    "purescript-foreign-generic": "^5.0.0"
   },
   "devDependencies": {
-    "purescript-spec": "^1.0.0",
+    "purescript-spec": "git@github.com:justinwoo/purescript-spec.git#3a0ac612af654ff74e9183fd1d46b8ef8b505f8f",
     "purescript-generics": "^4.0.0",
-    "purescript-js-date": "^4.0.0"
+    "purescript-js-date": "^5.1.0"
   }
 }

src/Database/Postgres.purs

@@ -17,20 +17,20 @@ module Database.Postgres
   ) where
 
 import Prelude
+
+import Control.Monad.Aff (Aff, bracket)
 import Control.Monad.Eff (kind Effect, Eff)
-import Data.Either (Either, either)
-import Data.Function.Uncurried (Fn2(), runFn2)
+import Control.Monad.Eff.Class (liftEff)
+import Control.Monad.Eff.Exception (error)
+import Control.Monad.Error.Class (throwError)
+import Control.Monad.Except (runExcept)
 import Data.Array ((!!))
+import Data.Either (Either, either)
 import Data.Foreign (Foreign, MultipleErrors)
 import Data.Foreign.Class (class Decode, decode)
+import Data.Function.Uncurried (Fn2, runFn2)
 import Data.Maybe (Maybe(Just, Nothing), maybe)
-import Control.Monad.Except (runExcept)
-import Control.Monad.Aff (Aff, finally)
-import Control.Monad.Eff.Class (liftEff)
-import Control.Monad.Eff.Exception (error)
-import Control.Monad.Error.Class (throwError)
 import Data.Traversable (sequence)
-
 import Database.Postgres.SqlValue (SqlValue)
 
 newtype Query a = Query String
@@ -118,9 +118,11 @@ withConnection :: forall eff a
   . ConnectionInfo
   -> (Client -> Aff (db :: DB | eff) a)
   -> Aff (db :: DB | eff) a
-withConnection info p = do
-  client <- connect info
-  finally (p client) $ liftEff (end client)
+withConnection info p =
+  bracket
+    (connect info)
+    (liftEff <<< end)
+    p
 
 -- | Takes a Client from the connection pool, runs the given function with
 -- | the client and returns the results.

test/Main.purs

@@ -8,7 +8,6 @@ import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Class (liftEff)
 import Control.Monad.Eff.Console (CONSOLE)
 import Control.Monad.Eff.Exception (error)
-import Control.Monad.Eff.Timer (TIMER)
 import Control.Monad.Error.Class (throwError)
 import Data.Array (length)
 import Data.Date (canonicalDate)
@@ -26,11 +25,10 @@ import Data.Time (Time(..))
 import Database.Postgres (DB, Query(Query), connect, end, execute, execute_, mkConnectionString, query, queryOne_, queryValue_, query_, withClient, withConnection)
 import Database.Postgres.SqlValue (toSql)
 import Database.Postgres.Transaction (withTransaction)
-import Node.Process (PROCESS)
 import Test.Spec (describe, it)
 import Test.Spec.Assertions (fail, shouldEqual)
 import Test.Spec.Reporter.Console (consoleReporter)
-import Test.Spec.Runner (run)
+import Test.Spec.Runner (PROCESS, run)
 import Unsafe.Coerce (unsafeCoerce)
 
 data Artist = Artist
@@ -50,7 +48,6 @@ connectionInfo =
 main :: forall eff.
   Eff
     ( console :: CONSOLE
-    , timer :: TIMER
     , avar :: AVAR
     , process :: PROCESS
     , db :: DB