Add new line to Cypher queries (#54)

Author: Gmihtt

.github/workflows/haskell-ci.yml

@@ -164,7 +164,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
           cabal-plan --version
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: source
       - name: initial cabal.project for sdist
@@ -199,8 +199,8 @@ jobs:
         run: |
           $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
           cabal-plan
-      - name: cache
-        uses: actions/cache@v2
+      - name: restore cache
+        uses: actions/cache/restore@v3
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store
@@ -225,3 +225,9 @@ jobs:
         run: |
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
+      - name: save cache
+        uses: actions/cache/save@v3
+        if: always()
+        with:
+          key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
+          path: ~/.cabal/store

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.0.2.1] - 2023-01-24
+### Added
+- Add newline for Cyper queries.
 ## [0.0.2.0] - 2023-01-24
 ### Added
 - `BoltGeneric` wrapper for `DerivingVia` to derive `IsValue` and `RecordValue` for Haskell types.

hasbolt-extras.cabal

@@ -1,5 +1,5 @@
 name:           hasbolt-extras
-version:        0.0.2.0
+version:        0.0.2.1
 synopsis:       Extras for hasbolt library
 description:    Extras for hasbolt library
 homepage:       https://github.com/biocad/hasbolt-extras#readme

src/Database/Bolt/Extras/DSL/Internal/Executer.hs

@@ -35,12 +35,12 @@ execute (Text t n)          = tell [t] >> pure n
 -- | Helper to translate 'Expr' with something, which can be translated to cypher.
 --
 executeHelperC :: ToCypher a => Text -> a -> b -> Writer [Text] b
-executeHelperC txt s n = tell [txt <> toCypher s] >> pure n
+executeHelperC txt s n = tell [txt <> toCypher s <> "\n"] >> pure n
 
 -- | Helper to translate 'Expr' with 'Text's.
 --
 executeHelperT :: Text -> [Text] -> b -> Writer [Text] b
-executeHelperT txt t n = tell [txt <> intercalate ", " t] >> pure n
+executeHelperT txt t n = tell [txt <> intercalate ", " t <> "\n"] >> pure n
 
 formQueryW :: Free Expr () -> Writer [Text] ()
 formQueryW = foldFree execute

src/Database/Bolt/Extras/DSL/Typed.hs

@@ -154,7 +154,11 @@ toCypherQ $ do
      ]
    returnF ["lib"]
 :}
-MERGE (name:Name{name:"CT42"}) MERGE (user:User{user:"123-456"}) CREATE (lib:BinderLibrary:Library), (name)-[:NAME_OF]->(lib), (user)-[:USER_CREATED{timestamp:1572340394000}]->(lib) RETURN lib
+MERGE (name:Name{name:"CT42"})
+ MERGE (user:User{user:"123-456"})
+ CREATE (lib:BinderLibrary:Library), (name)-[:NAME_OF]->(lib), (user)-[:USER_CREATED{timestamp:1572340394000}]->(lib)
+ RETURN lib
+...
 
 ==== Dropping types