haskell-neo4j-client 0.3.0.3 → 0.3.0.4

raw patch · 3 files changed

+14/−18 lines, 3 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• haskell-neo4j-client.cabal +1/−1
• src/Database/Neo4j/Transactional/Cypher.hs +11/−16
• src/Database/Neo4j/Types.hs +2/−1

@@ -1,5 +1,5 @@ name:                haskell-neo4j-client-version:             0.3.0.3+version:             0.3.0.4 synopsis:            A Haskell neo4j client description:              Library to interact with Neo4j databases. 

@@ -1,5 +1,4 @@ {-# LANGUAGE OverloadedStrings  #-}-{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE FlexibleInstances  #-} @@ -12,7 +11,7 @@ -- > withConnection host port $ do -- >    ... -- >    res <- TC.runTransaction $ do--- >            -- Queries return a result with columns, rows, a list of graphs and stats with entities created and so+-- >            -- Queries return a result with columns, rows, a list of graphs and stats -- >            result <- T.cypher "CREATE (pere: PERSON {age: {age}}) CREATE (pau: PERSON {props}) \ -- >                              \CREATE p1 = (pere)-[:KNOWS]->(pau) RETURN pere, pau, p1, pere.age" $ -- >                                M.fromList [("age", TC.newparam (78 :: Int64)),@@ -25,7 +24,7 @@ -- >            return (result, result2) module Database.Neo4j.Transactional.Cypher (     -- * Types-    Result(..), Stats(..), ParamValue(..), Params, newparam, emptyStats,+    Result(..), Stats(..), ParamValue(..), Params, newparam, emptyStats, TransError,     -- * Sending queries     loneQuery,  runTransaction, cypher, rollback, commit, keepalive, commitWith,     -- * Aux functions@@ -40,7 +39,6 @@ import Data.Aeson ((.=), (.:)) import Data.List (find) import Data.Maybe (fromMaybe)-import Data.Typeable (Typeable) import Text.Read (readMaybe)  import qualified Control.Exception as Exc@@ -154,14 +152,11 @@ transAPI :: S.ByteString transAPI = "/db/data/transaction" +-- | Error code and message for a transaction error type TransError = (T.Text, T.Text)  type TransactionId = S.ByteString --- | Rollback exception-data TransactionException = TransactionEndedExc deriving (Show, Typeable, Eq)-instance Exc.Exception TransactionException- -- | Different transaction states data TransState = TransInit | TransStarted R.ReleaseKey TransactionId | TransDone @@ -199,8 +194,8 @@ transactionReq :: S.ByteString -> T.Text -> Params -> Neo4j (Either TransError Result) transactionReq path cmd params = Neo4j $ \conn -> runResponse <$> httpCreate conn path (queryBody cmd params) --- | Run a transaction and get its final result, has an implicit commit request (or rollback if an exception occurred)--- | This implicit commit/rollback will only be executed if it hasn't before because of an explicit one+-- | Run a transaction and get its final result, has an implicit commit request (or rollback if an exception occurred).+-- This implicit commit/rollback will only be executed if it hasn't before because of an explicit one runTransaction :: Transaction a -> Neo4j (Either TransError a) runTransaction t = Neo4j $ \conn ->                      R.runResourceT (fst <$> runStateT (runReaderT (runExceptT $ catchErrors t) conn) TransInit)@@ -231,8 +226,8 @@     where reqNewTrans conn = acquireTrans conn $ httpCreateWithHeaders conn transAPI (queryBody cmd params)           reqTransCreated conn path = httpCreate conn path (queryBody cmd params) --- | Rollback a transaction---  after this, executing rollback, commit, keepalive, cypher in the transaction will result in an exception+-- | Rollback a transaction.+--  After this, executing rollback, commit, keepalive, cypher in the transaction will result in an exception rollback :: Transaction () rollback = do     conn <- ask@@ -245,8 +240,8 @@                         lift $ put TransDone         TransDone -> liftIO $ Exc.throw TransactionEndedExc --- | Commit a transaction---  after this, executing rollback, commit, keepalive, cypher in the transaction will result in an exception+-- | Commit a transaction.+--  After this, executing rollback, commit, keepalive, cypher in the transaction will result in an exception commit :: Transaction () commit = do     conn <- ask@@ -259,8 +254,8 @@             lift $ put TransDone         TransDone -> liftIO $ Exc.throw TransactionEndedExc --- | Send a cypher query and commit at the same time, if an error occurs the transaction will be rolled back---  after this, executing rollback, commit, keepalive, cypher in the transaction will result in an exception+-- | Send a cypher query and commit at the same time, if an error occurs the transaction will be rolled back.+--  After this, executing rollback, commit, keepalive, cypher in the transaction will result in an exception commitWith :: T.Text -> Params -> Transaction Result commitWith cmd params = do       conn <- ask

@@ -309,7 +309,8 @@                       Neo4jUnexpectedResponseException HT.Status |                       Neo4jNoSuchProperty T.Text |                       Neo4jBatchException L.ByteString |-                      Neo4jParseException String deriving (Show, Typeable, Eq)+                      Neo4jParseException String |+                      TransactionEndedExc deriving (Show, Typeable, Eq) instance Exception Neo4jException  -- | Type for a connection