git.iko.soy/rel8
on master help sign in
Restore the ability to run doctests
88e6ea5Oliver Charles
Doctest.hs+36−16
compare with master
unifiedsplit
@@ -3,31 +3,51 @@
3
3
4module Main where
4module Main where
5
5
6−import Build_doctests ( flags, pkgs, module_sources )
6+-- base
7import Control.Exception ( bracket, throwIO )
7import Control.Exception ( bracket, throwIO )
8−import Data.ByteString.Char8 ( unpack )
9import Data.Foldable ( traverse_ )
8import Data.Foldable ( traverse_ )
10−import Database.PostgreSQL.Simple ( connectPostgreSQL, close, execute_ )
11−import Database.Postgres.Temp ( toConnectionString, with, withConfig, verboseConfig )
12−import System.Environment ( setEnv )
9+import System.Environment ( lookupEnv, setEnv )
10+
11+-- base-compat
13import System.Environment.Compat ( unsetEnv )
12import System.Environment.Compat ( unsetEnv )
13+
14+-- bytestring
15+import Data.ByteString.Char8 ( unpack )
16+
17+-- doctest
14import Test.DocTest ( doctest )
18import Test.DocTest ( doctest )
15
19
20+-- hasql
21+import Hasql.Connection ( acquire, release )
22+import Hasql.Session ( run, sql )
23+
24+-- rel8
25+import Build_doctests ( flags, module_sources, pkgs )
26+
27+-- tmp-postgres
28+import Database.Postgres.Temp ( toConnectionString, verboseConfig, with, withConfig )
29+
30+
16main :: IO ()
31main :: IO ()
17main = do
32main = do
33+ nixGhcLibdir <- lookupEnv "NIX_GHC_LIBDIR"
18− unsetEnv "GHC_ENVIRONMENT" -- see 'Notes'; you may not need this
34+ unsetEnv "GHC_ENVIRONMENT"
19 either throwIO return =<< with \db -> do
35 either throwIO return =<< with \db -> do
20 setEnv "TEST_DATABASE_URL" (unpack (toConnectionString db))
36 setEnv "TEST_DATABASE_URL" (unpack (toConnectionString db))
21− bracket (connectPostgreSQL (toConnectionString db)) close \conn -> do
37+ bracket (either (error . show) return =<< acquire (toConnectionString db)) release \conn -> do
38+ flip run conn do
22− execute_ conn "create table author ( author_id serial primary key, name text not null, url text )"
39+ sql "create table author ( author_id serial primary key, name text not null, url text )"
23− execute_ conn "create table project ( author_id int not null references author (author_id), name text not null )"
40+ sql "create table project ( author_id int not null references author (author_id), name text not null )"
41+
42+ sql "insert into author ( name, url ) values ( 'Ollie', 'https://ocharles.org.uk' )"
43+ sql "insert into author ( name, url ) values ( 'Bryan O''Sullivan', null )"
44+ sql "insert into author ( name, url ) values ( 'Emily Pillmore', 'https://cohomolo.gy' )"
45+ sql "insert into project ( author_id, name ) values ( 1, 'rel8' )"
46+ sql "insert into project ( author_id, name ) values ( 2, 'aeson' )"
47+ sql "insert into project ( author_id, name ) values ( 2, 'text' )"
24
48
25− execute_ conn "insert into author ( name, url ) values ( 'Ollie', 'https://ocharles.org.uk' )"
49+ doctest (args nixGhcLibdir)
26− execute_ conn "insert into author ( name, url ) values ( 'Bryan O''Sullivan', null )"
27− execute_ conn "insert into project ( author_id, name ) values ( 1, 'rel8' )"
28− execute_ conn "insert into project ( author_id, name ) values ( 2, 'aeson' )"
29
50
30− doctest args
31−
32 where
51 where
52+ args nixGhcLibdir =
33− args = flags ++ pkgs ++ module_sources
53+ flags ++ pkgs ++ foldMap (\x -> ["-package-db" <> x <> "/package.conf.d"]) nixGhcLibdir ++ module_sources