4a9ac28 · squeal · git.iko.soy

git.iko.soy/squeal

fix doctests

commit4a9ac289d2be2aa61475b966515251606afa4d21 authorEitan Chatav <eitan.chatav@gmail.com> dateTue 20 Mar 2018, 12:48 (9 years ago) parentec51196

2 files changed+18−15

compare with dev

unifiedsplit

squeal-postgresql/src/Squeal/PostgreSQL.hs+1−1 squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+17−14

squeal-postgresql/src/Squeal/PostgreSQL.hs+1−1

@@ -196,7 +196,7 @@

196196-- void . withConnection "host=localhost port=5432 dbname=exampledb" $

197197-- define setup

198198-- & pqThen session

199−-- & thenDefine teardown

199+-- & pqThen (define teardown)

200200-- :}

201201-- [User {userName = "Alice", userEmail = Just "alice@gmail.com"},User {userName = "Bob", userEmail = Nothing},User {userName = "Carole", userEmail = Just "carole@hotmail.com"}]

202202

squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+17−14

@@ -816,7 +816,7 @@ unsafeAggregateDistinct fun x = UnsafeExpression $ mconcat

816816

817817-- | >>> :{

818818-- let

819−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGnumeric]] grouping params (nullity 'PGnumeric)

819+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGnumeric]] ('Grouped bys) params (nullity 'PGnumeric)

820820-- expression = sum_ #col

821821-- in renderExpression expression

822822-- :}

@@ -830,7 +830,7 @@ sum_ = unsafeAggregate "sum"

830830

831831-- | >>> :{

832832-- let

833−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGnumeric]] grouping params (nullity 'PGnumeric)

833+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGnumeric]] (Grouped bys) params (nullity 'PGnumeric)

834834-- expression = sumDistinct #col

835835-- in renderExpression expression

836836-- :}

@@ -861,7 +861,7 @@ instance PGAvg 'PGinterval 'PGinterval

861861

862862-- | >>> :{

863863-- let

864−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGint4]] grouping params (nullity 'PGint4)

864+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGint4]] (Grouped bys) params (nullity 'PGint4)

865865-- expression = bitAnd #col

866866-- in renderExpression expression

867867-- :}

@@ -875,7 +875,7 @@ bitAnd = unsafeAggregate "bit_and"

875875

876876-- | >>> :{

877877-- let

878−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGint4]] grouping params (nullity 'PGint4)

878+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGint4]] (Grouped bys) params (nullity 'PGint4)

879879-- expression = bitOr #col

880880-- in renderExpression expression

881881-- :}

@@ -889,7 +889,7 @@ bitOr = unsafeAggregate "bit_or"

889889

890890-- | >>> :{

891891-- let

892−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGint4]] grouping params (nullity 'PGint4)

892+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGint4]] (Grouped bys) params (nullity 'PGint4)

893893-- expression = bitAndDistinct #col

894894-- in renderExpression expression

895895-- :}

@@ -903,7 +903,7 @@ bitAndDistinct = unsafeAggregateDistinct "bit_and"

903903

904904-- | >>> :{

905905-- let

906−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGint4]] grouping params (nullity 'PGint4)

906+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGint4]] (Grouped bys) params (nullity 'PGint4)

907907-- expression = bitOrDistinct #col

908908-- in renderExpression expression

909909-- :}

@@ -917,7 +917,7 @@ bitOrDistinct = unsafeAggregateDistinct "bit_or"

917917

918918-- | >>> :{

919919-- let

920−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGbool]] grouping params (nullity 'PGbool)

920+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGbool]] (Grouped bys) params (nullity 'PGbool)

921921-- expression = boolAnd #col

922922-- in renderExpression expression

923923-- :}

@@ -930,7 +930,7 @@ boolAnd = unsafeAggregate "bool_and"

930930

931931-- | >>> :{

932932-- let

933−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGbool]] grouping params (nullity 'PGbool)

933+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGbool]] (Grouped bys) params (nullity 'PGbool)

934934-- expression = boolOr #col

935935-- in renderExpression expression

936936-- :}

@@ -943,7 +943,7 @@ boolOr = unsafeAggregate "bool_or"

943943

944944-- | >>> :{

945945-- let

946−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGbool]] grouping params (nullity 'PGbool)

946+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGbool]] (Grouped bys) params (nullity 'PGbool)

947947-- expression = boolAndDistinct #col

948948-- in renderExpression expression

949949-- :}

@@ -956,7 +956,7 @@ boolAndDistinct = unsafeAggregateDistinct "bool_and"

956956

957957-- | >>> :{

958958-- let

959−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGbool]] grouping params (nullity 'PGbool)

959+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGbool]] (Grouped bys) params (nullity 'PGbool)

960960-- expression = boolOrDistinct #col

961961-- in renderExpression expression

962962-- :}

@@ -977,7 +977,7 @@ countStar = UnsafeExpression $ "count(*)"

977977

978978-- | >>> :{

979979-- let

980−-- expression :: Expression [tab ::: ["col" ::: nullity ty]] grouping params (nullity 'PGbool)

980+-- expression :: Expression '[tab ::: '["col" ::: nullity ty]] (Grouped bys) params ('NotNull 'PGint8)

981981-- expression = count #col

982982-- in renderExpression expression

983983-- :}

@@ -990,7 +990,7 @@ count = unsafeAggregate "count"

990990

991991-- | >>> :{

992992-- let

993−-- expression :: Expression [tab ::: ["col" ::: nullity ty]] grouping params (nullity 'PGbool)

993+-- expression :: Expression '[tab ::: '["col" ::: nullity ty]] (Grouped bys) params ('NotNull 'PGint8)

994994-- expression = countDistinct #col

995995-- in renderExpression expression

996996-- :}

@@ -1005,7 +1005,7 @@ countDistinct = unsafeAggregateDistinct "count"

10051005--

10061006-- >>> :{

10071007-- let

1008−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGbool]] grouping params (nullity 'PGbool)

1008+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGbool]] (Grouped bys) params (nullity 'PGbool)

10091009-- expression = every #col

10101010-- in renderExpression expression

10111011-- :}

@@ -1020,7 +1020,7 @@ every = unsafeAggregate "every"

10201020--

10211021-- >>> :{

10221022-- let

1023−-- expression :: Expression [tab ::: ["col" ::: nullity 'PGbool]] grouping params (nullity 'PGbool)

1023+-- expression :: Expression '[tab ::: '["col" ::: nullity 'PGbool]] (Grouped bys) params (nullity 'PGbool)

10241024-- expression = everyDistinct #col

10251025-- in renderExpression expression

10261026-- :}

@@ -1169,6 +1169,9 @@ vararray

11691169 -> TypeExpression ('NoDef :=> 'Null ('PGvararray pg))

11701170vararray ty = UnsafeTypeExpression $ renderTypeExpression ty <> "[]"

11711171-- | fixed length array

1172+--

1173+-- >>> renderTypeExpression (fixarray (Proxy @2) json)

1174+-- "json[2]"

11721175fixarray

11731176 :: KnownNat n

11741177 => proxy n