version 0.0.0.20: add WITH statement (#28)

biocad · Sep 7, 2019 · 8f9aefe · 8f9aefe
1 parent 5b64e35
commit 8f9aefe
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.0.0.20] - 2019-09-06
+### Added
+- `WITH` statement in DSL.
+
 ## [0.0.0.19] - 2019-07-09
 ### Changed
 - Directed relationship in graph get dsl instead of undirected.

diff --git a/hasbolt-extras.cabal b/hasbolt-extras.cabal
@@ -1,5 +1,5 @@
 name:           hasbolt-extras
-version:        0.0.0.19
+version:        0.0.0.20
 synopsis:       Extras for hasbolt library
 description:    Extras for hasbolt library
 homepage:       https://github.com/biocad/hasbolt-extras#readme

diff --git a/src/Database/Bolt/Extras/DSL/Internal/Executer.hs b/src/Database/Bolt/Extras/DSL/Internal/Executer.hs
@@ -30,6 +30,7 @@ execute (Delete t n)        = executeHelperT "DELETE " t n
 execute (DetachDelete t n)  = executeHelperT "DETACH DELETE " t n
 execute (Remove t n)        = executeHelperT "REMOVE " t n
 execute (Return t n)        = executeHelperT "RETURN " t n
+execute (With t n)          = executeHelperT "WITH " t n
 execute (Text t n)          = tell [t] >> pure n
 
 -- | Helper to translate 'Expr' with something, which can be translated to cypher.

diff --git a/src/Database/Bolt/Extras/DSL/Internal/Language.hs b/src/Database/Bolt/Extras/DSL/Internal/Language.hs
@@ -10,6 +10,7 @@ module Database.Bolt.Extras.DSL.Internal.Language
   , detachDeleteF
   , removeF
   , returnF
+  , withF
   , textF
   ) where
 
@@ -68,6 +69,11 @@ removeF txts = liftF (Remove txts ())
 returnF :: [Text] -> Free Expr ()
 returnF txts = liftF (Return txts ())
 
+-- | Prepare 'WITH' query
+--
+withF :: [Text] -> Free Expr ()
+withF txts = liftF (With txts ())
+
 -- | Prepare query with custom text
 --
 textF :: Text -> Free Expr ()

diff --git a/src/Database/Bolt/Extras/DSL/Internal/Types.hs b/src/Database/Bolt/Extras/DSL/Internal/Types.hs
@@ -105,6 +105,7 @@ data Expr next = Create Selectors next        -- ^ CREATE query
                | DetachDelete [Text] next     -- ^ DETACH DELETE query
                | Remove [Text] next           -- ^ REMOVE query
                | Return [Text] next           -- ^ RETURN query
+               | With [Text] next             -- ^ WITH query
                | Text Text next               -- ^ free text query
   deriving (Show, Eq, Functor)