@@ -1,12 +1,11 @@
1+{-# language BangPatterns #-}
1{-# language BlockArguments #-}
2{-# language BlockArguments #-}
2−{-# language DataKinds #-}
3{-# language DeriveAnyClass #-}
3{-# language DeriveAnyClass #-}
4{-# language DeriveGeneric #-}
4{-# language DeriveGeneric #-}
5{-# language DerivingStrategies #-}
5{-# language DerivingStrategies #-}
6−{-# language DisambiguateRecordFields #-}
7{-# language FlexibleContexts #-}
6{-# language FlexibleContexts #-}
8{-# language FlexibleInstances #-}
7{-# language FlexibleInstances #-}
9−{-# language GADTs #-}
8+{-# language MonoLocalBinds #-}
10{-# language NamedFieldPuns #-}
9{-# language NamedFieldPuns #-}
11{-# language OverloadedStrings #-}
10{-# language OverloadedStrings #-}
12{-# language RecordWildCards #-}
11{-# language RecordWildCards #-}
@@ -14,17 +13,15 @@
14{-# language StandaloneDeriving #-}
13{-# language StandaloneDeriving #-}
15{-# language TypeApplications #-}
14{-# language TypeApplications #-}
17−{-# options_ghc -fno-warn-redundant-constraints #-}
19module Main
16module Main
25−import Control.Applicative ( liftA2, liftA3 )
22+import Control.Applicative ( empty, liftA2, liftA3 )
26−import Control.Monad (void)
23+import Control.Exception ( bracket, throwIO )
27−import Control.Monad.IO.Class ( MonadIO, liftIO )
24+import Control.Monad ( (>=>), void )
28import Data.Bifunctor ( bimap )
25import Data.Bifunctor ( bimap )
29import Data.Foldable ( for_ )
26import Data.Foldable ( for_ )
30import Data.Int ( Int32, Int64 )
27import Data.Int ( Int32, Int64 )
@@ -38,25 +35,27 @@ import GHC.Generics ( Generic )
38import qualified Data.ByteString.Lazy
35import qualified Data.ByteString.Lazy
40-- case-insensitive
37-- case-insensitive
41−import Data.CaseInsensitive (mk)
38+import Data.CaseInsensitive ( mk )
43-- containers
40-- containers
41+import Data.Containers.ListUtils ( nubOrdOn )
44import qualified Data.Map.Strict as Map
42import qualified Data.Map.Strict as Map
47−import Hasql.Connection ( Connection, acquire, release )
45+import Hasql.Connection ( Connection, acquire, release )
48import Hasql.Session ( sql, run )
46import Hasql.Session ( sql, run )
49+import Hasql.Transaction ( Transaction, condemn, statement )
50+import qualified Hasql.Transaction.Sessions as Hasql
50-- hedgehog
52-- hedgehog
51import Hedgehog ( property, (===), forAll, cover, diff, evalM, PropertyT, TestT, test, Gen )
53import Hedgehog ( property, (===), forAll, cover, diff, evalM, PropertyT, TestT, test, Gen )
52import qualified Hedgehog.Gen as Gen
54import qualified Hedgehog.Gen as Gen
53import qualified Hedgehog.Range as Range
55import qualified Hedgehog.Range as Range
55−-- lifted-base
57+-- mmorph
56−import Control.Exception.Lifted ( bracket, throwIO, bracket_ )
58+import Control.Monad.Morph ( hoist )
59−import Control.Monad.Trans.Control ( MonadBaseControl )
62import Rel8 ( Result )
61import Rel8 ( Result )
@@ -72,12 +71,16 @@ import Test.Tasty
72import Test.Tasty.Hedgehog ( testProperty )
71import Test.Tasty.Hedgehog ( testProperty )
75−import Data.Text (Text, pack)
74+import Data.Text ( Text, pack, unpack )
76import qualified Data.Text.Lazy
75import qualified Data.Text.Lazy
76+import Data.Text.Encoding ( decodeUtf8 )
79import Data.Time
79import Data.Time
82+import Control.Monad.Trans.Class ( lift )
81-- tmp-postgres
84-- tmp-postgres
82import qualified Database.Postgres.Temp as TmpPostgres
85import qualified Database.Postgres.Temp as TmpPostgres
@@ -113,14 +116,17 @@ tests =
113 , testCatMaybeTable getTestDatabase
116 , testCatMaybeTable getTestDatabase
114 , testCatMaybe getTestDatabase
117 , testCatMaybe getTestDatabase
115 , testMaybeTable getTestDatabase
118 , testMaybeTable getTestDatabase
119+ , testAggregateMaybeTable getTestDatabase
116 , testNestedTables getTestDatabase
120 , testNestedTables getTestDatabase
117 , testMaybeTableApplicative getTestDatabase
121 , testMaybeTableApplicative getTestDatabase
118 , testLogicalFixities getTestDatabase
122 , testLogicalFixities getTestDatabase
119 , testUpdate getTestDatabase
123 , testUpdate getTestDatabase
120 , testDelete getTestDatabase
124 , testDelete getTestDatabase
125+ , testUpsert getTestDatabase
121 , testSelectNestedPairs getTestDatabase
126 , testSelectNestedPairs getTestDatabase
122 , testSelectArray getTestDatabase
127 , testSelectArray getTestDatabase
123 , testNestedMaybeTable getTestDatabase
128 , testNestedMaybeTable getTestDatabase
129+ , testEvaluate getTestDatabase
@@ -132,25 +138,29 @@ tests =
132 flip run conn do
138 flip run conn do
133 sql "CREATE EXTENSION citext"
139 sql "CREATE EXTENSION citext"
134 sql "CREATE TABLE test_table ( column1 text not null, column2 bool not null )"
140 sql "CREATE TABLE test_table ( column1 text not null, column2 bool not null )"
141+ sql "CREATE TABLE unique_table ( \"key\" text not null unique, \"value\" text not null )"
142+ sql "CREATE SEQUENCE test_seq"
136 return db
144 return db
138 stopTestDatabase = TmpPostgres.stop
146 stopTestDatabase = TmpPostgres.stop
149+connect :: TmpPostgres.DB -> IO Connection
150+connect = acquire . TmpPostgres.toConnectionString >=> either (maybe empty (fail . unpack . decodeUtf8)) pure
141databasePropertyTest
153databasePropertyTest
142 :: TestName
154 :: TestName
143− -> (((Connection -> TestT IO ()) -> PropertyT IO ()) -> PropertyT IO ())
155+ -> ((TestT Transaction () -> PropertyT IO ()) -> PropertyT IO ())
144 -> IO TmpPostgres.DB -> TestTree
156 -> IO TmpPostgres.DB -> TestTree
145databasePropertyTest testName f getTestDatabase =
157databasePropertyTest testName f getTestDatabase =
146− withResource connect release $ \c ->
158+ withResource (connect =<< getTestDatabase) release $ \c ->
147 testProperty testName $ property do
159 testProperty testName $ property do
148− connection <- liftIO c
160+ connection <- lift c
149− f \g -> test $ rollingBack connection $ g connection
161+ f $ test . hoist \m -> do
150−
162+ e <- run (Hasql.transaction Hasql.Serializable Hasql.Write (m <* condemn)) connection
151− where
163+ either throwIO pure e
153− connect = either (error . show) return =<< acquire . TmpPostgres.toConnectionString =<< getTestDatabase
156data TestTable f = TestTable
166data TestTable f = TestTable
@@ -182,18 +192,17 @@ testSelectTestTable :: IO TmpPostgres.DB -> TestTree
182testSelectTestTable = databasePropertyTest "Can SELECT TestTable" \transaction -> do
192testSelectTestTable = databasePropertyTest "Can SELECT TestTable" \transaction -> do
183 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
193 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
185− transaction \connection -> do
195+ transaction do
186− void do
196+ selected <- lift do
187− liftIO $ Rel8.insert connection
197+ statement () $ Rel8.insert Rel8.Insert
188− Rel8.Insert
198+ { into = testTableSchema
189− { into = testTableSchema
199+ , rows = Rel8.values $ map Rel8.lit rows
190− , rows = map (Rel8.toInsert . Rel8.lit) rows
200+ , onConflict = Rel8.DoNothing
191− , onConflict = Rel8.DoNothing
201+ , returning = pure ()
192− , returning = Rel8.NumberOfRowsAffected
202+ }
195− selected <- liftIO $ Rel8.select connection do
204+ statement () $ Rel8.select do
196− Rel8.each testTableSchema
205+ Rel8.each testTableSchema
198 sort selected === sort rows
207 sort selected === sort rows
@@ -210,11 +219,12 @@ testWhere_ = databasePropertyTest "WHERE (Rel8.where_)" \transaction -> do
211 let expected = filter (\t -> testTableColumn2 t == magicBool) rows
220 let expected = filter (\t -> testTableColumn2 t == magicBool) rows
213− transaction \connection -> do
222+ transaction do
214− selected <- liftIO $ Rel8.select connection do
223+ selected <- lift do
215− t <- Rel8.values $ Rel8.lit <$> rows
224+ statement () $ Rel8.select do
216− Rel8.where_ $ testTableColumn2 t Rel8.==. Rel8.lit magicBool
225+ t <- Rel8.values $ Rel8.lit <$> rows
217− return t
226+ Rel8.where_ $ testTableColumn2 t Rel8.==. Rel8.lit magicBool
219 sort selected === sort expected
229 sort selected === sort expected
@@ -227,11 +237,12 @@ testFilter :: IO TmpPostgres.DB -> TestTree
227testFilter = databasePropertyTest "filter" \transaction -> do
237testFilter = databasePropertyTest "filter" \transaction -> do
228 rows <- forAll $ Gen.list (Range.linear 1 10) genTestTable
238 rows <- forAll $ Gen.list (Range.linear 1 10) genTestTable
230− transaction \connection -> do
240+ transaction do
231 let expected = filter testTableColumn2 rows
241 let expected = filter testTableColumn2 rows
233− selected <- liftIO $ Rel8.select connection
243+ selected <- lift do
234− $ Rel8.filter testTableColumn2 =<< Rel8.values (Rel8.lit <$> rows)
244+ statement () $ Rel8.select do
245+ Rel8.filter testTableColumn2 =<< Rel8.values (Rel8.lit <$> rows)
236 sort selected === sort expected
247 sort selected === sort expected
@@ -246,9 +257,10 @@ testLimit = databasePropertyTest "LIMIT (Rel8.limit)" \transaction -> do
247 n <- forAll $ Gen.integral (Range.linear 0 10)
258 n <- forAll $ Gen.integral (Range.linear 0 10)
249− transaction \connection -> do
260+ transaction do
250− selected <- liftIO $ Rel8.select connection do
261+ selected <- lift do
251− Rel8.limit n $ Rel8.values (Rel8.lit <$> rows)
262+ statement () $ Rel8.select do
263+ Rel8.limit n $ Rel8.values (Rel8.lit <$> rows)
253 diff (length selected) (<=) (fromIntegral n)
265 diff (length selected) (<=) (fromIntegral n)
@@ -266,9 +278,10 @@ testUnion = databasePropertyTest "UNION (Rel8.union)" \transaction -> evalM do
266 left <- forAll $ Gen.list (Range.linear 0 10) genTestTable
278 left <- forAll $ Gen.list (Range.linear 0 10) genTestTable
267 right <- forAll $ Gen.list (Range.linear 0 10) genTestTable
279 right <- forAll $ Gen.list (Range.linear 0 10) genTestTable
269− transaction \connection -> do
281+ transaction do
270− selected <- liftIO $ Rel8.select connection do
282+ selected <- lift do
271− Rel8.values (Rel8.lit <$> nub left) `Rel8.union` Rel8.values (Rel8.lit <$> nub right)
283+ statement () $ Rel8.select do
284+ Rel8.values (Rel8.lit <$> nub left) `Rel8.union` Rel8.values (Rel8.lit <$> nub right)
273 sort selected === sort (nub (left ++ right))
286 sort selected === sort (nub (left ++ right))
@@ -277,9 +290,11 @@ testDistinct :: IO TmpPostgres.DB -> TestTree
277testDistinct = databasePropertyTest "DISTINCT (Rel8.distinct)" \transaction -> do
290testDistinct = databasePropertyTest "DISTINCT (Rel8.distinct)" \transaction -> do
278 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
291 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
280− transaction \connection -> do
293+ transaction do
281− selected <- liftIO $ Rel8.select connection $ Rel8.distinct do
294+ selected <- lift do
282− Rel8.values (Rel8.lit <$> rows)
295+ statement () $ Rel8.select do
297+ Rel8.values (Rel8.lit <$> rows)
284 sort selected === nub (sort rows)
299 sort selected === nub (sort rows)
@@ -292,8 +307,10 @@ testExists :: IO TmpPostgres.DB -> TestTree
292testExists = databasePropertyTest "EXISTS (Rel8.exists)" \transaction -> do
307testExists = databasePropertyTest "EXISTS (Rel8.exists)" \transaction -> do
293 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
308 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
295− transaction \connection -> do
310+ transaction do
296− exists <- liftIO $ Rel8.select connection $ Rel8.exists $ Rel8.values $ Rel8.lit <$> rows
311+ exists <- lift do
312+ statement () $ Rel8.select do
313+ Rel8.exists $ Rel8.values $ Rel8.lit <$> rows
298 case rows of
315 case rows of
299 [] -> exists === [False]
316 [] -> exists === [False]
@@ -304,9 +321,10 @@ testOptional :: IO TmpPostgres.DB -> TestTree
304testOptional = databasePropertyTest "Rel8.optional" \transaction -> do
321testOptional = databasePropertyTest "Rel8.optional" \transaction -> do
305 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
322 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
307− transaction \connection -> do
324+ transaction do
308− selected <- liftIO $ Rel8.select connection do
325+ selected <- lift do
309− Rel8.optional $ Rel8.values (Rel8.lit <$> rows)
326+ statement () $ Rel8.select do
327+ Rel8.optional $ Rel8.values (Rel8.lit <$> rows)
311 case rows of
329 case rows of
312 [] -> selected === [Nothing]
330 [] -> selected === [Nothing]
@@ -317,9 +335,10 @@ testAnd :: IO TmpPostgres.DB -> TestTree
317testAnd = databasePropertyTest "AND (&&.)" \transaction -> do
335testAnd = databasePropertyTest "AND (&&.)" \transaction -> do
318 (x, y) <- forAll $ liftA2 (,) Gen.bool Gen.bool
336 (x, y) <- forAll $ liftA2 (,) Gen.bool Gen.bool
320− transaction \connection -> do
338+ transaction do
321− [result] <- liftIO $ Rel8.select connection $ pure $
339+ [result] <- lift do
322− Rel8.lit x Rel8.&&. Rel8.lit y
340+ statement () $ Rel8.select do
341+ pure $ Rel8.lit x Rel8.&&. Rel8.lit y
324 result === (x && y)
343 result === (x && y)
@@ -328,9 +347,10 @@ testOr :: IO TmpPostgres.DB -> TestTree
328testOr = databasePropertyTest "OR (||.)" \transaction -> do
347testOr = databasePropertyTest "OR (||.)" \transaction -> do
329 (x, y) <- forAll $ liftA2 (,) Gen.bool Gen.bool
348 (x, y) <- forAll $ liftA2 (,) Gen.bool Gen.bool
331− transaction \connection -> do
350+ transaction do
332− [result] <- liftIO $ Rel8.select connection $ pure $
351+ [result] <- lift do
333− Rel8.lit x Rel8.||. Rel8.lit y
352+ statement () $ Rel8.select $ pure $
353+ Rel8.lit x Rel8.||. Rel8.lit y
335 result === (x || y)
355 result === (x || y)
@@ -339,9 +359,10 @@ testLogicalFixities :: IO TmpPostgres.DB -> TestTree
339testLogicalFixities = databasePropertyTest "Logical operator fixities" \transaction -> do
359testLogicalFixities = databasePropertyTest "Logical operator fixities" \transaction -> do
340 (u, v, w, x) <- forAll $ (,,,) <$> Gen.bool <*> Gen.bool <*> Gen.bool <*> Gen.bool
360 (u, v, w, x) <- forAll $ (,,,) <$> Gen.bool <*> Gen.bool <*> Gen.bool <*> Gen.bool
342− transaction \connection -> do
362+ transaction do
343− [result] <- liftIO $ Rel8.select connection $ pure $
363+ [result] <- lift do
344− Rel8.lit u Rel8.||. Rel8.lit v Rel8.&&. Rel8.lit w Rel8.==. Rel8.lit x
364+ statement () $ Rel8.select do
365+ pure $ Rel8.lit u Rel8.||. Rel8.lit v Rel8.&&. Rel8.lit w Rel8.==. Rel8.lit x
346 result === (u || v && w == x)
367 result === (u || v && w == x)
@@ -350,9 +371,10 @@ testNot :: IO TmpPostgres.DB -> TestTree
350testNot = databasePropertyTest "NOT (not_)" \transaction -> do
371testNot = databasePropertyTest "NOT (not_)" \transaction -> do
351 x <- forAll Gen.bool
372 x <- forAll Gen.bool
353− transaction \connection -> do
374+ transaction do
354− [result] <- liftIO $ Rel8.select connection $ pure $
375+ [result] <- lift do
355− Rel8.not_ $ Rel8.lit x
376+ statement () $ Rel8.select do
377+ pure $ Rel8.not_ $ Rel8.lit x
357 result === not x
379 result === not x
@@ -361,9 +383,10 @@ testBool :: IO TmpPostgres.DB -> TestTree
361testBool = databasePropertyTest "ifThenElse_" \transaction -> do
383testBool = databasePropertyTest "ifThenElse_" \transaction -> do
362 (x, y, z) <- forAll $ liftA3 (,,) Gen.bool Gen.bool Gen.bool
384 (x, y, z) <- forAll $ liftA3 (,,) Gen.bool Gen.bool Gen.bool
364− transaction \connection -> do
386+ transaction do
365− [result] <- liftIO $ Rel8.select connection $ pure $
387+ [result] <- lift do
366− Rel8.bool (Rel8.lit z) (Rel8.lit y) (Rel8.lit x)
388+ statement () $ Rel8.select do
389+ pure $ Rel8.bool (Rel8.lit z) (Rel8.lit y) (Rel8.lit x)
368 result === if x then y else z
391 result === if x then y else z
@@ -375,9 +398,10 @@ testAp = databasePropertyTest "Cartesian product (<*>)" \transaction -> do
375 (Gen.list (Range.linear 1 10) genTestTable)
398 (Gen.list (Range.linear 1 10) genTestTable)
376 (Gen.list (Range.linear 1 10) genTestTable)
399 (Gen.list (Range.linear 1 10) genTestTable)
378− transaction \connection -> do
401+ transaction do
379− result <- liftIO $ Rel8.select connection $ do
402+ result <- lift do
380− liftA2 (,) (Rel8.values (Rel8.lit <$> rows1)) (Rel8.values (Rel8.lit <$> rows2))
403+ statement () $ Rel8.select do
404+ liftA2 (,) (Rel8.values (Rel8.lit <$> rows1)) (Rel8.values (Rel8.lit <$> rows2))
382 sort result === sort (liftA2 (,) rows1 rows2)
406 sort result === sort (liftA2 (,) rows1 rows2)
@@ -406,21 +430,22 @@ testDBType getTestDatabase = testGroup "DBType instances"
407 dbTypeTest :: (Eq a, Show a, Rel8.DBType a) => TestName -> Gen a -> TestTree
431 dbTypeTest :: (Eq a, Show a, Rel8.DBType a) => TestName -> Gen a -> TestTree
408 dbTypeTest name generator = testGroup name
432 dbTypeTest name generator = testGroup name
409− [ databasePropertyTest name (t (==) generator) getTestDatabase
433+ [ databasePropertyTest name (t generator) getTestDatabase
410− , databasePropertyTest ("Maybe " <> name) (t (==) (Gen.maybe generator)) getTestDatabase
434+ , databasePropertyTest ("Maybe " <> name) (t (Gen.maybe generator)) getTestDatabase
413− t :: forall a b. (Show a, Rel8.Sql Rel8.DBType a)
437+ t :: forall a b. (Eq a, Show a, Rel8.Sql Rel8.DBType a)
414− => (a -> a -> Bool)
438+ => Gen a
415− -> Gen a
439+ -> (TestT Transaction () -> PropertyT IO b)
416− -> ((Connection -> TestT IO ()) -> PropertyT IO b)
417 -> PropertyT IO b
440 -> PropertyT IO b
418− t eq generator transaction = do
441+ t generator transaction = do
419 x <- forAll generator
442 x <- forAll generator
421− transaction \connection -> do
444+ transaction do
422− [res] <- liftIO $ Rel8.select connection $ pure (Rel8.litExpr x)
445+ [res] <- lift do
423− diff res eq x
446+ statement () $ Rel8.select do
447+ pure (Rel8.litExpr x)
425 genDay :: Gen Day
450 genDay :: Gen Day
426 genDay = do
451 genDay = do
@@ -462,39 +487,38 @@ testDBEq getTestDatabase = testGroup "DBEq instances"
463 t :: forall a. (Eq a, Show a, Rel8.Sql Rel8.DBEq a)
488 t :: forall a. (Eq a, Show a, Rel8.Sql Rel8.DBEq a)
465− -> ((Connection -> TestT IO ()) -> PropertyT IO ())
490+ -> (TestT Transaction () -> PropertyT IO ())
466 -> PropertyT IO ()
491 -> PropertyT IO ()
467 t generator transaction = do
492 t generator transaction = do
468 (x, y) <- forAll (liftA2 (,) generator generator)
493 (x, y) <- forAll (liftA2 (,) generator generator)
470− transaction \connection -> do
495+ transaction do
471− [res] <- liftIO $ Rel8.select connection $ pure $ Rel8.litExpr x Rel8.==. Rel8.litExpr y
496+ [res] <- lift do
497+ statement () $ Rel8.select do
498+ pure $ Rel8.litExpr x Rel8.==. Rel8.litExpr y
472 res === (x == y)
499 res === (x == y)
474− cover 1 "Equal" $ x == y
475− cover 1 "Not Equal" $ x /= y
478testTableEquality :: IO TmpPostgres.DB -> TestTree
502testTableEquality :: IO TmpPostgres.DB -> TestTree
479testTableEquality = databasePropertyTest "TestTable equality" \transaction -> do
503testTableEquality = databasePropertyTest "TestTable equality" \transaction -> do
480 (x, y) <- forAll $ liftA2 (,) genTestTable genTestTable
504 (x, y) <- forAll $ liftA2 (,) genTestTable genTestTable
482− transaction \connection -> do
506+ transaction do
483− [eq] <- liftIO $ Rel8.select connection do
507+ [eq] <- lift do
484− pure $ Rel8.lit x Rel8.==: Rel8.lit y
508+ statement () $ Rel8.select do
509+ pure $ Rel8.lit x Rel8.==: Rel8.lit y
486 eq === (x == y)
511 eq === (x == y)
488− cover 1 "Equal" $ x == y
489− cover 1 "Not Equal" $ x /= y
492testFromString :: IO TmpPostgres.DB -> TestTree
514testFromString :: IO TmpPostgres.DB -> TestTree
493testFromString = databasePropertyTest "FromString" \transaction -> do
515testFromString = databasePropertyTest "FromString" \transaction -> do
494 str <- forAll $ Gen.list (Range.linear 0 10) Gen.unicode
516 str <- forAll $ Gen.list (Range.linear 0 10) Gen.unicode
496− transaction \connection -> do
518+ transaction do
497− [result] <- liftIO $ Rel8.select connection $ pure $ fromString str
519+ [result] <- lift do
520+ statement () $ Rel8.select do
521+ pure $ fromString str
498 result === pack str
522 result === pack str
@@ -502,10 +526,11 @@ testCatMaybeTable :: IO TmpPostgres.DB -> TestTree
502testCatMaybeTable = databasePropertyTest "catMaybeTable" \transaction -> do
526testCatMaybeTable = databasePropertyTest "catMaybeTable" \transaction -> do
503 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
527 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
505− transaction \connection -> do
529+ transaction do
506− selected <- liftIO $ Rel8.select connection do
530+ selected <- lift do
507− testTable <- Rel8.values $ Rel8.lit <$> rows
531+ statement () $ Rel8.select do
508− Rel8.catMaybeTable $ Rel8.bool Rel8.nothingTable (pure testTable) (testTableColumn2 testTable)
532+ testTable <- Rel8.values $ Rel8.lit <$> rows
533+ Rel8.catMaybeTable $ Rel8.bool Rel8.nothingTable (pure testTable) (testTableColumn2 testTable)
510 sort selected === sort (filter testTableColumn2 rows)
535 sort selected === sort (filter testTableColumn2 rows)
@@ -514,9 +539,10 @@ testCatMaybe :: IO TmpPostgres.DB -> TestTree
514testCatMaybe = databasePropertyTest "catMaybe" \transaction -> evalM do
539testCatMaybe = databasePropertyTest "catMaybe" \transaction -> evalM do
515 rows <- forAll $ Gen.list (Range.linear 0 10) $ Gen.maybe Gen.bool
540 rows <- forAll $ Gen.list (Range.linear 0 10) $ Gen.maybe Gen.bool
517− transaction \connection -> do
542+ transaction do
518− selected <- evalM $ liftIO $ Rel8.select connection do
543+ selected <- lift do
519− Rel8.catNull =<< Rel8.values (map Rel8.lit rows)
544+ statement () $ Rel8.select do
545+ Rel8.catNull =<< Rel8.values (map Rel8.lit rows)
521 sort selected === sort (catMaybes rows)
547 sort selected === sort (catMaybes rows)
@@ -525,21 +551,44 @@ testMaybeTable :: IO TmpPostgres.DB -> TestTree
525testMaybeTable = databasePropertyTest "maybeTable" \transaction -> evalM do
551testMaybeTable = databasePropertyTest "maybeTable" \transaction -> evalM do
526 (rows, def) <- forAll $ liftA2 (,) (Gen.list (Range.linear 0 10) genTestTable) genTestTable
552 (rows, def) <- forAll $ liftA2 (,) (Gen.list (Range.linear 0 10) genTestTable) genTestTable
528− transaction \connection -> do
554+ transaction do
529− selected <- liftIO $ Rel8.select connection $
555+ selected <- lift do
530− Rel8.maybeTable (Rel8.lit def) id <$> Rel8.optional (Rel8.values (Rel8.lit <$> rows))
556+ statement () $ Rel8.select do
557+ Rel8.maybeTable (Rel8.lit def) id <$> Rel8.optional (Rel8.values (Rel8.lit <$> rows))
532 case rows of
559 case rows of
533 [] -> selected === [def]
560 [] -> selected === [def]
534 _ -> sort selected === sort rows
561 _ -> sort selected === sort rows
564+testAggregateMaybeTable :: IO TmpPostgres.DB -> TestTree
565+testAggregateMaybeTable = databasePropertyTest "aggregateMaybeTable" \transaction -> evalM do
566+ rows <- forAll $ Gen.list (Range.linear 0 10) (Gen.maybe (Gen.int64 (Range.linear 0 10)))
569+ aggregate = go 0 False False
571+ go !n nothing _ (Just a : as) = go (n + a) nothing True as
572+ go n _ just (Nothing : as) = go n True just as
573+ go _ False False [] = []
574+ go _ True False [] = [Nothing]
575+ go n False True [] = [Just n]
576+ go n True True [] = [Nothing, Just n]
580+ statement () $ Rel8.select do
581+ Rel8.aggregate $ Rel8.aggregateMaybeTable Rel8.sum <$> Rel8.values (Rel8.lit <$> rows)
583+ sort selected === aggregate rows
537data TwoTestTables f =
586data TwoTestTables f =
538 TwoTestTables
587 TwoTestTables
539 { testTable1 :: TestTable f
588 { testTable1 :: TestTable f
540 , testTable2 :: TestTable f
589 , testTable2 :: TestTable f
542− deriving stock Generic
591+ deriving stock Generic
543 deriving anyclass Rel8.Rel8able
592 deriving anyclass Rel8.Rel8able
@@ -554,9 +603,10 @@ testNestedTables = databasePropertyTest "Nested TestTables" \transaction -> eval
554 Gen.list (Range.linear 0 10) $
603 Gen.list (Range.linear 0 10) $
555 liftA2 TwoTestTables genTestTable genTestTable
604 liftA2 TwoTestTables genTestTable genTestTable
557− transaction \connection -> do
606+ transaction do
558− selected <- liftIO $ Rel8.select connection do
607+ selected <- lift do
559− Rel8.values (Rel8.lit <$> rows)
608+ statement () $ Rel8.select do
609+ Rel8.values (Rel8.lit <$> rows)
561 sort selected === sort rows
611 sort selected === sort rows
@@ -566,11 +616,12 @@ testMaybeTableApplicative = databasePropertyTest "MaybeTable (<*>)" \transaction
566 rows1 <- genRows
616 rows1 <- genRows
567 rows2 <- genRows
617 rows2 <- genRows
569− transaction \connection -> do
619+ transaction do
570− selected <- liftIO $ Rel8.select connection do
620+ selected <- lift do
571− as <- Rel8.optional (Rel8.values (Rel8.lit <$> rows1))
621+ statement () $ Rel8.select do
572− bs <- Rel8.optional (Rel8.values (Rel8.lit <$> rows2))
622+ as <- Rel8.optional (Rel8.values (Rel8.lit <$> rows1))
573− pure $ liftA2 (,) as bs
623+ bs <- Rel8.optional (Rel8.values (Rel8.lit <$> rows2))
624+ pure $ liftA2 (,) as bs
575 case (rows1, rows2) of
626 case (rows1, rows2) of
576 ([], []) -> selected === [Nothing]
627 ([], []) -> selected === [Nothing]
@@ -582,14 +633,6 @@ testMaybeTableApplicative = databasePropertyTest "MaybeTable (<*>)" \transaction
582 genRows = forAll do
633 genRows = forAll do
583 Gen.list (Range.linear 0 10) $ liftA2 TestTable (Gen.text (Range.linear 0 10) Gen.unicode) (pure True)
634 Gen.list (Range.linear 0 10) $ liftA2 TestTable (Gen.text (Range.linear 0 10) Gen.unicode) (pure True)
586− :: (MonadBaseControl IO m, MonadIO m)
587− => Connection -> m a -> m a
588−rollingBack connection =
590− (liftIO (run (sql "BEGIN") connection))
591− (liftIO (run (sql "ROLLBACK") connection))
594genTestTable :: Gen (TestTable Result)
637genTestTable :: Gen (TestTable Result)
595genTestTable = do
638genTestTable = do
@@ -602,19 +645,19 @@ testUpdate :: IO TmpPostgres.DB -> TestTree
602testUpdate = databasePropertyTest "Can UPDATE TestTable" \transaction -> do
645testUpdate = databasePropertyTest "Can UPDATE TestTable" \transaction -> do
603 rows <- forAll $ Gen.map (Range.linear 0 5) $ liftA2 (,) genTestTable genTestTable
646 rows <- forAll $ Gen.map (Range.linear 0 5) $ liftA2 (,) genTestTable genTestTable
605− transaction \connection -> do
648+ transaction do
606− void $ liftIO $ Rel8.insert connection
649+ selected <- lift do
607− Rel8.Insert
650+ statement () $ Rel8.insert Rel8.Insert
608 { into = testTableSchema
651 { into = testTableSchema
609− , rows = map (Rel8.toInsert . Rel8.lit) $ Map.keys rows
652+ , rows = Rel8.values $ map Rel8.lit $ Map.keys rows
610 , onConflict = Rel8.DoNothing
653 , onConflict = Rel8.DoNothing
611− , returning = Rel8.NumberOfRowsAffected
654+ , returning = pure ()
614− void $ liftIO $ Rel8.update connection
657+ statement () $ Rel8.update Rel8.Update
616 { target = testTableSchema
658 { target = testTableSchema
617− , set = \r ->
659+ , from = pure ()
618 let updates = map (bimap Rel8.lit Rel8.lit) $ Map.toList rows
661 let updates = map (bimap Rel8.lit Rel8.lit) $ Map.toList rows
@@ -628,12 +671,12 @@ testUpdate = databasePropertyTest "Can UPDATE TestTable" \transaction -> do
631− , updateWhere = \_ -> Rel8.lit True
674+ , updateWhere = \_ _ -> Rel8.lit True
632− , returning = Rel8.NumberOfRowsAffected
675+ , returning = pure ()
635− selected <- liftIO $ Rel8.select connection do
678+ statement () $ Rel8.select do
636− Rel8.each testTableSchema
679+ Rel8.each testTableSchema
638 sort selected === sort (Map.elems rows)
681 sort selected === sort (Map.elems rows)
@@ -646,29 +689,96 @@ testDelete :: IO TmpPostgres.DB -> TestTree
646testDelete = databasePropertyTest "Can DELETE TestTable" \transaction -> do
689testDelete = databasePropertyTest "Can DELETE TestTable" \transaction -> do
647 rows <- forAll $ Gen.list (Range.linear 0 5) genTestTable
690 rows <- forAll $ Gen.list (Range.linear 0 5) genTestTable
649− transaction \connection -> do
692+ transaction do
650− void $ liftIO $ Rel8.insert connection
693+ (deleted, selected) <- lift do
651− Rel8.Insert
694+ statement () $ Rel8.insert Rel8.Insert
652 { into = testTableSchema
695 { into = testTableSchema
653− , rows = map (Rel8.toInsert . Rel8.lit) rows
696+ , rows = Rel8.values $ map Rel8.lit rows
654 , onConflict = Rel8.DoNothing
697 , onConflict = Rel8.DoNothing
655− , returning = Rel8.NumberOfRowsAffected
698+ , returning = pure ()
658− deleted <-
701+ deleted <- statement () $ Rel8.delete Rel8.Delete
659− liftIO $ Rel8.delete connection
661 { from = testTableSchema
702 { from = testTableSchema
662− , deleteWhere = testTableColumn2
703+ , using = pure ()
704+ , deleteWhere = const testTableColumn2
663 , returning = Rel8.Projection id
705 , returning = Rel8.Projection id
666− selected <- liftIO $ Rel8.select connection do
708+ selected <- statement () $ Rel8.select do
667− Rel8.each testTableSchema
709+ Rel8.each testTableSchema
711+ pure (deleted, selected)
669 sort (deleted <> selected) === sort rows
713 sort (deleted <> selected) === sort rows
716+data UniqueTable f = UniqueTable
717+ { uniqueTableKey :: Rel8.Column f Text
718+ , uniqueTableValue :: Rel8.Column f Text
720+ deriving stock Generic
721+ deriving anyclass Rel8.Rel8able
724+deriving stock instance Eq (UniqueTable Result)
725+deriving stock instance Ord (UniqueTable Result)
726+deriving stock instance Show (UniqueTable Result)
729+uniqueTableSchema :: Rel8.TableSchema (UniqueTable Rel8.Name)
732+ { name = "unique_table"
734+ , columns = UniqueTable
735+ { uniqueTableKey = "key"
736+ , uniqueTableValue = "value"
741+genUniqueTable :: Gen (UniqueTable Result)
743+ uniqueTableKey <- Gen.text (Range.linear 0 5) Gen.alphaNum
744+ uniqueTableValue <- Gen.text (Range.linear 0 5) Gen.alphaNum
745+ pure UniqueTable {..}
748+testUpsert :: IO TmpPostgres.DB -> TestTree
749+testUpsert = databasePropertyTest "Can UPSERT UniqueTable" \transaction -> do
750+ as <- unique $ forAll $ Gen.list (Range.linear 0 20) genUniqueTable
751+ bs <- unique $ forAll $ Gen.list (Range.linear 0 20) genUniqueTable
755+ statement () $ Rel8.insert Rel8.Insert
756+ { into = uniqueTableSchema
757+ , rows = Rel8.values $ Rel8.lit <$> as
758+ , onConflict = Rel8.DoNothing
759+ , returning = pure ()
762+ statement () $ Rel8.insert Rel8.Insert
763+ { into = uniqueTableSchema
764+ , rows = Rel8.values $ Rel8.lit <$> bs
765+ , onConflict = Rel8.DoUpdate Rel8.Upsert
766+ { index = uniqueTableKey
767+ , set = \UniqueTable {uniqueTableValue} old -> old {uniqueTableValue}
768+ , updateWhere = \_ _ -> Rel8.true
770+ , returning = pure ()
773+ statement () $ Rel8.select do
774+ Rel8.each uniqueTableSchema
776+ fromUniqueTables selected === fromUniqueTables bs <> fromUniqueTables as
778+ unique = fmap (nubOrdOn uniqueTableKey)
779+ fromUniqueTables = Map.fromList . map \(UniqueTable key value) -> (key, value)
672newtype HKNestedPair f = HKNestedPair { pairOne :: (TestTable f, TestTable f) }
782newtype HKNestedPair f = HKNestedPair { pairOne :: (TestTable f, TestTable f) }
673 deriving stock Generic
783 deriving stock Generic
674 deriving anyclass Rel8.Rel8able
784 deriving anyclass Rel8.Rel8able
@@ -682,9 +792,10 @@ testSelectNestedPairs :: IO TmpPostgres.DB -> TestTree
682testSelectNestedPairs = databasePropertyTest "Can SELECT nested pairs" \transaction -> do
792testSelectNestedPairs = databasePropertyTest "Can SELECT nested pairs" \transaction -> do
683 rows <- forAll $ Gen.list (Range.linear 0 10) $ HKNestedPair <$> liftA2 (,) genTestTable genTestTable
793 rows <- forAll $ Gen.list (Range.linear 0 10) $ HKNestedPair <$> liftA2 (,) genTestTable genTestTable
685− transaction \connection -> do
795+ transaction do
686− selected <- liftIO $ Rel8.select connection do
796+ selected <- lift do
687− Rel8.values $ map Rel8.lit rows
797+ statement () $ Rel8.select do
798+ Rel8.values $ map Rel8.lit rows
689 sort selected === sort rows
800 sort selected === sort rows
@@ -693,12 +804,23 @@ testSelectArray :: IO TmpPostgres.DB -> TestTree
693testSelectArray = databasePropertyTest "Can SELECT Arrays (with aggregation)" \transaction -> do
804testSelectArray = databasePropertyTest "Can SELECT Arrays (with aggregation)" \transaction -> do
694 rows <- forAll $ Gen.list (Range.linear 1 10) Gen.bool
805 rows <- forAll $ Gen.list (Range.linear 1 10) Gen.bool
696− transaction \connection -> do
807+ transaction do
697− selected <- liftIO $ Rel8.select connection $ Rel8.aggregate do
808+ selected <- lift do
698− Rel8.listAgg <$> Rel8.values (map Rel8.lit rows)
809+ statement () $ Rel8.select do
810+ Rel8.many $ Rel8.values (map Rel8.lit rows)
700 selected === [foldMap pure rows]
812 selected === [foldMap pure rows]
814+ selected' <- lift do
815+ statement () $ Rel8.select do
816+ a <- Rel8.catListTable =<< do
817+ Rel8.many $ Rel8.values (map Rel8.lit rows)
818+ b <- Rel8.catListTable =<< do
819+ Rel8.many $ Rel8.values (map Rel8.lit rows)
822+ selected' === liftA2 (,) rows rows
703data NestedMaybeTable f = NestedMaybeTable
825data NestedMaybeTable f = NestedMaybeTable
704 { nmt1 :: Rel8.Column f Bool
826 { nmt1 :: Rel8.Column f Bool
@@ -717,9 +839,51 @@ testNestedMaybeTable :: IO TmpPostgres.DB -> TestTree
717testNestedMaybeTable = databasePropertyTest "Can nest MaybeTable within other tables" \transaction -> do
839testNestedMaybeTable = databasePropertyTest "Can nest MaybeTable within other tables" \transaction -> do
718 let example = NestedMaybeTable { nmt1 = True, nmt2 = Just (TestTable "Hi" True) }
840 let example = NestedMaybeTable { nmt1 = True, nmt2 = Just (TestTable "Hi" True) }
720− transaction \connection -> do
842+ transaction do
721− selected <- liftIO $ Rel8.select connection do
843+ selected <- lift do
722− x <- Rel8.values [Rel8.lit example]
844+ statement () $ Rel8.select do
723− pure $ Rel8.maybeTable (Rel8.lit False) (\_ -> Rel8.lit True) (nmt2 x)
845+ x <- Rel8.values [Rel8.lit example]
846+ pure $ Rel8.maybeTable (Rel8.lit False) (\_ -> Rel8.lit True) (nmt2 x)
725 selected === [True]
848 selected === [True]
851+testEvaluate :: IO TmpPostgres.DB -> TestTree
852+testEvaluate = databasePropertyTest "evaluate has the evaluation order we expect" \transaction -> do
856+ statement () $ Rel8.select do
857+ x <- Rel8.values (Rel8.lit <$> ['a', 'b', 'c'])
858+ y <- Rel8.evaluate (Rel8.nextval "test_seq")
861+ normalize selected ===
867+ selected' <- lift do
868+ statement () $ Rel8.select do
869+ x <- Rel8.values (Rel8.lit <$> ['a', 'b', 'c'])
870+ y <- Rel8.values (Rel8.lit <$> ['d', 'e', 'f'])
871+ z <- Rel8.evaluate (Rel8.nextval "test_seq")
872+ pure ((x, y), (z, z))
874+ normalize selected' ===
875+ [ (('a', 'd'), (0, 0))
876+ , (('a', 'e'), (1, 1))
877+ , (('a', 'f'), (2, 2))
878+ , (('b', 'd'), (3, 3))
879+ , (('b', 'e'), (4, 4))
880+ , (('b', 'f'), (5, 5))
881+ , (('c', 'd'), (6, 6))
882+ , (('c', 'e'), (7, 7))
883+ , (('c', 'f'), (8, 8))
887+ normalize :: [(x, (Int64, Int64))] -> [(x, (Int64, Int64))]
889+ normalize xs@((_, (i, _)) : _) = map (fmap (\(a, b) -> (a - i, b - i))) xs