all tests should pass now

Author: Kushagra Gupta

beam-postgres/Database/Beam/Postgres/PgSpecific.hs

@@ -530,35 +530,30 @@ arraySample_ (QExpr arr) (QExpr n) =
 -- | Postgres array_to_string(array, delimiter) function.
 -- Converts each element to text and joins with the delimiter. NULLs are omitted.
 arrayToString_
-  :: BeamSqlBackendIsString Postgres text
-  => QGenExpr ctxt Postgres s (V.Vector a)
+  :: QGenExpr ctxt Postgres s (V.Vector a)
   -> QGenExpr ctxt Postgres s text
   -> QGenExpr ctxt Postgres s text
 arrayToString_ (QExpr arr) (QExpr delim) =
-  QExpr (PgExpressionSyntax . mappend (emit "array_to_string") . pgParens . mconcat <$> sequenceA
-    [ fromPgExpression <$> arr
-    , pure (emit ", ")
-    , fromPgExpression <$> delim
-    ])
+  QExpr (PgExpressionSyntax <$> do
+    arrExpr <- fromPgExpression <$> arr
+    delimExpr <- fromPgExpression <$> delim
+    pure $ emit "array_to_string" <> pgParens (arrExpr <> emit ", " <> delimExpr))
 
 -- | Postgres array_to_string(array, delimiter, null_string) function.
 -- Converts each element to text and joins with the delimiter. NULLs are
 -- represented by the provided @null_string@.
 arrayToStringWithNull_
-  :: BeamSqlBackendIsString Postgres text
-  => QGenExpr ctxt Postgres s (V.Vector a)
+  :: QGenExpr ctxt Postgres s (V.Vector a)
   -> QGenExpr ctxt Postgres s text
   -> QGenExpr ctxt Postgres s text
   -> QGenExpr ctxt Postgres s text
 arrayToStringWithNull_ (QExpr arr) (QExpr delim) (QExpr nullStr) =
-  QExpr (PgExpressionSyntax . mappend (emit "array_to_string") . pgParens . mconcat <$> sequenceA
-    [ fromPgExpression <$> arr
-    , pure (emit ", ")
-    , fromPgExpression <$> delim
-    , pure (emit ", ")
-    , fromPgExpression <$> nullStr
-    ])
-
+  QExpr (PgExpressionSyntax <$> do
+    arrExpr <- fromPgExpression <$> arr
+    delimExpr <- fromPgExpression <$> delim
+    nullStrExpr <- fromPgExpression <$> nullStr
+    pure $ emit "array_to_string" <>
+      pgParens (mconcat [arrExpr, emit ", ", delimExpr, emit ", ", nullStrExpr]))
 -- ** Array expressions
 
 -- | An expression context that determines which types of expressions can be put

beam-postgres/test/Database/Beam/Postgres/Test/Select.hs

@@ -100,18 +100,18 @@ testArraySample getConn = testFunction getConn "array_sample" $ \conn -> do
     _ -> assertFailure "unexpected result"
 
 testArrayToStringBasic :: IO ByteString -> TestTree
-testArrayToStringBasic getConn = testFunction getConn "array_to_string basic" $ \conn -> do
+testArrayToStringBasic getConn = testFunction getConn "array_to_string_basic" $ \conn -> do
   let arr = V.fromList [1::Int32,2,3]
   res <- runBeamPostgres conn $ runSelectReturningList $ select $ do
-    pure $ arrayToString_ (val_ arr) (val_ ("," :: T.Text))
+    pure $ arrayToString_ (val_ arr) (val_ ",")
   assertEqual "join" ["1,2,3" :: T.Text] res
 
 testArrayToStringWithNull :: IO ByteString -> TestTree
-testArrayToStringWithNull getConn = testFunction getConn "array_to_string with null" $ \conn -> do
+testArrayToStringWithNull getConn = testFunction getConn "array_to_string_with_null" $ \conn -> do
   let arr :: V.Vector (Maybe T.Text)
       arr = V.fromList [Just "a", Nothing, Just "b"]
   res <- runBeamPostgres conn $ runSelectReturningList $ select $ do
-    pure $ arrayToStringWithNull_ (val_ arr) (val_ ("-" :: T.Text)) (val_ ("*" :: T.Text))
+    pure $ arrayToStringWithNull_ (val_ arr) (val_ "-") (val_ "*")
   assertEqual "join with null" ["a-*-b" :: T.Text] res
 
 testArrayAppend :: IO ByteString -> TestTree