From 631fef38f8cc7e4373dd79e224772d4f72d9a2f7 Mon Sep 17 00:00:00 2001
From: Tomasz Rybarczyk <paluho@gmail.com>
Date: Wed, 11 Nov 2020 13:04:59 +0100
Subject: [PATCH] Rename `connection` to `client` property in ConnectResult

---
 src/Database/PostgreSQL/Aff.js   | 2 +-
 src/Database/PostgreSQL/Aff.purs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Database/PostgreSQL/Aff.js b/src/Database/PostgreSQL/Aff.js
index 52db2ee..31a06df 100644
--- a/src/Database/PostgreSQL/Aff.js
+++ b/src/Database/PostgreSQL/Aff.js
@@ -20,7 +20,7 @@ exports.ffiConnect = function (config) {
         return function (onError, onSuccess) {
             var p = pool.connect().then(function(client) {
                 onSuccess(config.right({
-                    connection: client,
+                    client: client,
                     done: function() {
                         return client.release();
                     }
diff --git a/src/Database/PostgreSQL/Aff.purs b/src/Database/PostgreSQL/Aff.purs
index cbda9e7..ee05e10 100644
--- a/src/Database/PostgreSQL/Aff.purs
+++ b/src/Database/PostgreSQL/Aff.purs
@@ -23,7 +23,7 @@ import Prelude
 import Control.Monad.Error.Class (catchError, throwError)
 import Data.Array (head)
 import Data.Bifunctor (lmap)
-import Data.Either (Either(..), either, hush)
+import Data.Either (Either(..), either)
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..), maybe)
@@ -70,7 +70,7 @@ withClient p k = bracket (connect p) cleanup run
 
   run (Left err) = k (Left err)
 
-  run (Right { connection }) = k (Right connection)
+  run (Right { client }) = k (Right client)
 
 -- | Trivial helper / shortcut which also wraps
 -- | the connection to provide `Connection`.
@@ -92,7 +92,7 @@ connect =
         }
 
 type ConnectResult
-  = { connection :: Client
+  = { client :: Client
     , done :: Effect Unit
     }
 
@@ -173,7 +173,7 @@ execute ::
   Query i o ->
   i ->
   Aff (Maybe PGError)
-execute conn (Query sql) values = hush <<< either Right Left <$> unsafeQuery conn sql (toSQLRow values)
+execute conn (Query sql) values = either Just (const $ Nothing) <$> unsafeQuery conn sql (toSQLRow values)
 
 -- | Execute a PostgreSQL query and return its results.
 query ::