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