thunderstrike/purescript-postgresql-client
thunderstrike/purescript-postgresql-client
2
0
Fork 0
generated from tpl/purs
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Throw Eff exception instead of Partial exception when row structure does not match

Browse Source
This commit is contained in:
rightfold 2017-03-17 14:56:50 +01:00
parent 2979eeb17f
commit 57ca84c05b
No known key found for this signature in database
GPG Key ID: 199D0373AC917A8F
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bower.json
View File

@ -6,7 +6,6 @@
"purescript-transformers": "^2.0.2", "purescript-transformers": "^2.0.2",
"purescript-lists": "^3.2.1", "purescript-lists": "^3.2.1",
"purescript-foreign": "^3.0.1", "purescript-foreign": "^3.0.1",
"purescript-partial": "^1.1.2",
"purescript-tuples": "^3.0.0", "purescript-tuples": "^3.0.0",
"purescript-aff": "^2.0.2", "purescript-aff": "^2.0.2",
"purescript-either": "^2.0.0", "purescript-either": "^2.0.0",

8
src/Database/PostgreSQL.purs
View File

@ -21,6 +21,7 @@ module Database.PostgreSQL
) where ) where
import Control.Monad.Aff (Aff) import Control.Monad.Aff (Aff)
import Control.Monad.Eff.Exception (error)
import Control.Monad.Error.Class (catchError, throwError) import Control.Monad.Error.Class (catchError, throwError)
import Control.Monad.Except (runExcept) import Control.Monad.Except (runExcept)
import Data.Array (head) import Data.Array (head)
@ -31,12 +32,11 @@ import Data.Foreign (Foreign, isNull, readArray, readChar, readInt, readString,
import Data.Foreign.Null (writeNull) import Data.Foreign.Null (writeNull)
import Data.List (List) import Data.List (List)
import Data.List as List import Data.List as List
import Data.Maybe (fromJust, Maybe(..)) import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype) import Data.Newtype (class Newtype)
import Data.Traversable (traverse) import Data.Traversable (traverse)
import Data.Tuple (fst, Tuple) import Data.Tuple (fst, Tuple)
import Data.Tuple.Nested ((/\), tuple1, tuple2, tuple3, tuple4, tuple5) import Data.Tuple.Nested ((/\), tuple1, tuple2, tuple3, tuple4, tuple5)
import Partial.Unsafe (unsafePartial)
import Prelude import Prelude
foreign import data POSTGRESQL :: ! foreign import data POSTGRESQL :: !
@ -208,7 +208,9 @@ query
-> Aff (postgreSQL :: POSTGRESQL | eff) (Array o) -> Aff (postgreSQL :: POSTGRESQL | eff) (Array o)
query conn (Query sql) values = query conn (Query sql) values =
_query conn sql (toSQLRow values) _query conn sql (toSQLRow values)
<#> map (unsafePartial fromJust <<< fromSQLRow) >>= traverse (fromSQLRow >>> case _ of
Just row -> pure row
Nothing -> throwError (error "incompatible row structure"))
scalar scalar
:: ∀ i o eff :: ∀ i o eff