on dev help sign in
35 files changed+987−665
since splitsnapshots
unifiedsplit
README.md+6−6 RELEASE NOTES.md+2−2 squeal-postgresql/exe/Example.hs+2−2 squeal-postgresql/squeal-postgresql.cabal+2−1 squeal-postgresql/src/Squeal/PostgreSQL.hs+2−1 squeal-postgresql/src/Squeal/PostgreSQL/Binary.hs+130−40 squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs+1 squeal-postgresql/src/Squeal/PostgreSQL/Definition/Function.hs+12−12 squeal-postgresql/src/Squeal/PostgreSQL/Definition/Index.hs+1−1 squeal-postgresql/src/Squeal/PostgreSQL/Definition/Schema.hs+1−1 squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table.hs+37−363 squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table/Constraint.hs+339 squeal-postgresql/src/Squeal/PostgreSQL/Definition/Type.hs+1−1 squeal-postgresql/src/Squeal/PostgreSQL/Definition/View.hs+1−1 squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+10−10 squeal-postgresql/src/Squeal/PostgreSQL/Expression/Collection.hs+5−5 squeal-postgresql/src/Squeal/PostgreSQL/Expression/Comparison.hs+6−6 squeal-postgresql/src/Squeal/PostgreSQL/Expression/Json.hs+40−47 squeal-postgresql/src/Squeal/PostgreSQL/Expression/Logic.hs+1−1 squeal-postgresql/src/Squeal/PostgreSQL/Expression/Math.hs+4−6 squeal-postgresql/src/Squeal/PostgreSQL/Expression/Null.hs+4−4 squeal-postgresql/src/Squeal/PostgreSQL/Expression/Range.hs+8−9 squeal-postgresql/src/Squeal/PostgreSQL/Expression/SetOf.hs → squeal-postgresql/src/Squeal/PostgreSQL/Expression/Set.hs+52−40 squeal-postgresql/src/Squeal/PostgreSQL/Expression/Text.hs+3−3 squeal-postgresql/src/Squeal/PostgreSQL/Expression/TextSearch.hs+19−20 squeal-postgresql/src/Squeal/PostgreSQL/Expression/Time.hs+7−12 squeal-postgresql/src/Squeal/PostgreSQL/Expression/Type.hs+101−4 squeal-postgresql/src/Squeal/PostgreSQL/List.hs+11−2 squeal-postgresql/src/Squeal/PostgreSQL/Migration.hs+1 squeal-postgresql/src/Squeal/PostgreSQL/PG.hs+22−12 squeal-postgresql/src/Squeal/PostgreSQL/PQ.hs+41−17 squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+33−25 squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+69−9 squeal-postgresql/test/Property.hs+2−2 squeal-postgresql/test/Spec.hs+11
README.md+6−6
@@ -121,7 +121,7 @@ type Schemas = Public Schema
121121
122122Notice the use of type operators.
123123
124−`:::` is used to pair an alias `GHC.TypeLits.Symbol` with a `SchemumType`,
124+`:::` is used to pair an alias `Symbol` with a `SchemumType`,
125125a `TableConstraint` or a `ColumnType`. It is intended to connote Haskell's `::`
126126operator.
127127
@@ -180,8 +180,8 @@ DROP TABLE "emails";
180180DROP TABLE "users";
181181```
182182
183−We'll need a Haskell type for @User@s. We give the type `Generics.SOP.Generic` and
184−`Generics.SOP.HasDatatypeInfo` instances so that we can encode and decode @User@s.
183+We'll need a Haskell type for `User`s. We give the type `SOP.Generic` and
184+`SOP.HasDatatypeInfo` instances so that we can encode and decode `User`s.
185185
186186```Haskell
187187>>> data User = User { userName :: Text, userEmail :: Maybe Text } deriving (Show, GHC.Generic)
@@ -189,12 +189,12 @@ We'll need a Haskell type for @User@s. We give the type `Generics.SOP.Generic` a
189189>>> instance SOP.HasDatatypeInfo User
190190```
191191
192−Next, we'll write `Manipulation_`s to insert @User@s into our two tables.
192+Next, we'll write `Manipulation_`s to insert `User`s into our two tables.
193193A `Manipulation_` like `insertInto`, `update` or `deleteFrom`
194194has three type parameters, the schemas it refers to, input parameters
195195and an output row. When
196−we insert into the users table, we will need a parameter for the @name@
197−field but not for the @id@ field. Since it's serial, we can use a default
196+we insert into the users table, we will need a parameter for the `name`
197+field but not for the `id` field. Since it's serial, we can use a default
198198value. However, since the emails table refers to the users table, we will
199199need to retrieve the user id that the insert generates and insert it into
200200the emails table. We can do this in a single `Manipulation_` by using a
RELEASE NOTES.md+2−2
@@ -138,11 +138,11 @@ type Expr x
138138 . Expression outer commons grp schemas params from x
139139```
140140
141−There is also a function type `(:-->)`, which is a subtype of the usual Haskell function
141+There is also a function type `(-->)`, which is a subtype of the usual Haskell function
142142type `(->)`.
143143
144144```Haskell
145−type (:-->) x y
145+type (-->) x y
146146 = forall outer commons grp schemas params from
147147 . Expression outer commons grp schemas params from x
148148 -> Expression outer commons grp schemas params from y
squeal-postgresql/exe/Example.hs+2−2
@@ -53,8 +53,8 @@ setup =
5353 >>>
5454 createTable #emails
5555 ( serial `as` #id :*
56− (int & notNullable) `as` #user_id :*
57− (text & nullable) `as` #email )
56+ hask @Int32 `as` #user_id :*
57+ hask @(Maybe Text) `as` #email )
5858 ( primaryKey #id `as` #pk_emails :*
5959 foreignKey #user_id #users #id
6060 OnDeleteCascade OnUpdateCascade `as` #fk_user_id )
squeal-postgresql/squeal-postgresql.cabal+2−1
@@ -28,6 +28,7 @@ library
2828 Squeal.PostgreSQL.Definition.Function
2929 Squeal.PostgreSQL.Definition.Index
3030 Squeal.PostgreSQL.Definition.Table
31+ Squeal.PostgreSQL.Definition.Table.Constraint
3132 Squeal.PostgreSQL.Definition.Type
3233 Squeal.PostgreSQL.Definition.Schema
3334 Squeal.PostgreSQL.Definition.View
@@ -42,7 +43,7 @@ library
4243 Squeal.PostgreSQL.Expression.Null
4344 Squeal.PostgreSQL.Expression.Parameter
4445 Squeal.PostgreSQL.Expression.Range
45− Squeal.PostgreSQL.Expression.SetOf
46+ Squeal.PostgreSQL.Expression.Set
4647 Squeal.PostgreSQL.Expression.Sort
4748 Squeal.PostgreSQL.Expression.Subquery
4849 Squeal.PostgreSQL.Expression.Text
squeal-postgresql/src/Squeal/PostgreSQL.hs+2−1
@@ -199,6 +199,7 @@ import Squeal.PostgreSQL.Definition.Function as X
199199import Squeal.PostgreSQL.Definition.Index as X
200200import Squeal.PostgreSQL.Definition.Schema as X
201201import Squeal.PostgreSQL.Definition.Table as X
202+import Squeal.PostgreSQL.Definition.Table.Constraint as X
202203import Squeal.PostgreSQL.Definition.Type as X
203204import Squeal.PostgreSQL.Definition.View as X
204205import Squeal.PostgreSQL.Expression as X
@@ -212,7 +213,7 @@ import Squeal.PostgreSQL.Expression.Math as X
212213import Squeal.PostgreSQL.Expression.Null as X
213214import Squeal.PostgreSQL.Expression.Parameter as X
214215import Squeal.PostgreSQL.Expression.Range as X
215−import Squeal.PostgreSQL.Expression.SetOf as X
216+import Squeal.PostgreSQL.Expression.Set as X
216217import Squeal.PostgreSQL.Expression.Sort as X
217218import Squeal.PostgreSQL.Expression.Subquery as X
218219import Squeal.PostgreSQL.Expression.Text as X
squeal-postgresql/src/Squeal/PostgreSQL/Binary.hs+130−40
@@ -216,8 +216,9 @@ module Squeal.PostgreSQL.Binary
216216 -- * Only
217217 , Only (..)
218218 -- * Oid
219− , HasOid (..)
220− , HasAliasedOid (..)
219+ , OidOf (..)
220+ , OidOfParam (..)
221+ , OidOfField (..)
221222 ) where
222223
223224import BinaryParser
@@ -231,6 +232,7 @@ import Data.Time
231232import Data.UUID.Types
232233import Data.Vector (Vector)
233234import Data.Word
235+import Foreign.C.Types (CUInt(CUInt))
234236import Generics.SOP
235237import Generics.SOP.Record
236238import GHC.TypeLits
@@ -244,6 +246,7 @@ import qualified Data.Text.Lazy as Lazy (Text)
244246import qualified Data.Text as Strict (Text)
245247import qualified Data.Text as Strict.Text
246248import qualified Data.Vector as Vector
249+import qualified Database.PostgreSQL.LibPQ as LibPQ
247250import qualified GHC.Generics as GHC
248251import qualified PostgreSQL.Binary.Decoding as Decoding
249252import qualified PostgreSQL.Binary.Encoding as Encoding
@@ -309,24 +312,24 @@ instance Aeson.ToJSON x => ToParam (Json x) 'PGjson where
309312instance Aeson.ToJSON x => ToParam (Jsonb x) 'PGjsonb where
310313 toParam = K . Encoding.jsonb_bytes
311314 . Lazy.ByteString.toStrict . Aeson.encode . getJsonb
312−instance (ToNullityParam x ty, ty ~ nullity pg, HasOid pg)
315+instance (ToNullityParam x ty, ty ~ nullity pg, OidOf pg)
313316 => ToParam (VarArray [x]) ('PGvararray ty) where
314317 toParam = K
315318 . Encoding.array_foldable
316319 (getOid (oidOf @pg)) (unK . toNullityParam @x @ty)
317320 . getVarArray
318−instance (ToParam x pg, HasOid pg)
321+instance (ToParam x pg, OidOf pg)
319322 => ToParam (VarArray (Vector x)) ('PGvararray ('NotNull pg)) where
320323 toParam = K
321324 . Encoding.array_vector (getOid (oidOf @pg)) (unK . toParam @x @pg)
322325 . getVarArray
323−instance (ToParam x pg, HasOid pg)
326+instance (ToParam x pg, OidOf pg)
324327 => ToParam (VarArray (Vector (Maybe x))) ('PGvararray ('Null pg)) where
325328 toParam = K
326329 . Encoding.nullableArray_vector
327330 (getOid (oidOf @pg)) (unK . toParam @x @pg)
328331 . getVarArray
329−instance (ToFixArray x dims ty, ty ~ nullity pg, HasOid pg)
332+instance (ToFixArray x dims ty, ty ~ nullity pg, OidOf pg)
330333 => ToParam (FixArray x) ('PGfixarray dims ty) where
331334 toParam = K . Encoding.array (getOid (oidOf @pg))
332335 . unK . unK . toFixArray @x @dims @ty . getFixArray
@@ -353,7 +356,7 @@ instance
353356 ( SListI fields
354357 , IsRecord x xs
355358 , AllZip ToField xs fields
356− , All HasAliasedOid fields
359+ , All OidOfField fields
357360 ) => ToParam (Composite x) ('PGcomposite fields) where
358361 toParam =
359362 let
@@ -361,7 +364,7 @@ instance
361364 encoders = htrans (Proxy @ToField) toField
362365
363366 composite
364− :: All HasAliasedOid row
367+ :: All OidOfField row
365368 => NP (K (Maybe Encoding.Encoding)) row
366369 -> K Encoding.Encoding ('PGcomposite row)
367370 composite fields = K $
@@ -378,18 +381,18 @@ instance
378381 int32BE (fromIntegral (lengthSList (Proxy @xs))) <>
379382 let
380383 each
381− :: HasAliasedOid field
384+ :: OidOfField field
382385 => K (Maybe Encoding.Encoding) field
383386 -> Encoding.Encoding
384387 each (K field :: K (Maybe Encoding.Encoding) field) =
385− word32BE (getOid (aliasedOid @field))
388+ word32BE (getOid (oidOfField @field))
386389 <> case field of
387390 Nothing -> int64BE (-1)
388391 Just value ->
389392 int32BE (fromIntegral (builderLength value))
390393 <> value
391394 in
392− hcfoldMap (Proxy @HasAliasedOid) each fields
395+ hcfoldMap (Proxy @OidOfField) each fields
393396
394397 in
395398 composite . encoders . toRecord . getComposite
@@ -398,35 +401,119 @@ instance
398401--
399402-- >>> :set -XTypeApplications
400403-- >>> oidOf @'PGbool
401−-- Oid {getOid = 16}
402−class HasOid (ty :: PGType) where oidOf :: Oid
403−instance HasOid 'PGbool where oidOf = Oid 16
404−instance HasOid 'PGint2 where oidOf = Oid 21
405−instance HasOid 'PGint4 where oidOf = Oid 23
406−instance HasOid 'PGint8 where oidOf = Oid 20
407−instance HasOid 'PGnumeric where oidOf = Oid 1700
408−instance HasOid 'PGfloat4 where oidOf = Oid 700
409−instance HasOid 'PGfloat8 where oidOf = Oid 701
410−instance HasOid ('PGchar n) where oidOf = Oid 18
411−instance HasOid ('PGvarchar n) where oidOf = Oid 1043
412−instance HasOid 'PGtext where oidOf = Oid 25
413−instance HasOid 'PGbytea where oidOf = Oid 17
414−instance HasOid 'PGtimestamp where oidOf = Oid 1114
415−instance HasOid 'PGtimestamptz where oidOf = Oid 1184
416−instance HasOid 'PGdate where oidOf = Oid 1082
417−instance HasOid 'PGtime where oidOf = Oid 1083
418−instance HasOid 'PGtimetz where oidOf = Oid 1266
419−instance HasOid 'PGinterval where oidOf = Oid 1186
420−instance HasOid 'PGuuid where oidOf = Oid 2950
421−instance HasOid 'PGinet where oidOf = Oid 869
422−instance HasOid 'PGjson where oidOf = Oid 114
423−instance HasOid 'PGjsonb where oidOf = Oid 3802
424−
425−-- | Lifts a `HasOid` constraint to a field.
426−class HasAliasedOid (field :: (Symbol, NullityType)) where
427− aliasedOid :: Oid
428−instance HasOid ty => HasAliasedOid (alias ::: nullity ty) where
429− aliasedOid = oidOf @ty
404+-- Oid 16
405+class OidOf (ty :: PGType) where oidOf :: LibPQ.Oid
406+instance OidOf 'PGbool where oidOf = LibPQ.Oid 16
407+instance OidOf ('PGfixarray ns (null 'PGbool)) where oidOf = LibPQ.Oid 1000
408+instance OidOf ('PGvararray (null 'PGbool)) where oidOf = LibPQ.Oid 1000
409+instance OidOf 'PGint2 where oidOf = LibPQ.Oid 21
410+instance OidOf ('PGfixarray ns (null 'PGint2)) where oidOf = LibPQ.Oid 1005
411+instance OidOf ('PGvararray (null 'PGint2)) where oidOf = LibPQ.Oid 1005
412+instance OidOf 'PGint4 where oidOf = LibPQ.Oid 23
413+instance OidOf ('PGfixarray ns (null 'PGint4)) where oidOf = LibPQ.Oid 1007
414+instance OidOf ('PGvararray (null 'PGint4)) where oidOf = LibPQ.Oid 1007
415+instance OidOf 'PGint8 where oidOf = LibPQ.Oid 20
416+instance OidOf ('PGfixarray ns (null 'PGint8)) where oidOf = LibPQ.Oid 1016
417+instance OidOf ('PGvararray (null 'PGint8)) where oidOf = LibPQ.Oid 1016
418+instance OidOf 'PGnumeric where oidOf = LibPQ.Oid 1700
419+instance OidOf ('PGfixarray ns (null 'PGnumeric)) where oidOf = LibPQ.Oid 1231
420+instance OidOf ('PGvararray (null 'PGnumeric)) where oidOf = LibPQ.Oid 1231
421+instance OidOf 'PGfloat4 where oidOf = LibPQ.Oid 700
422+instance OidOf ('PGfixarray ns (null 'PGfloat4)) where oidOf = LibPQ.Oid 1021
423+instance OidOf ('PGvararray (null 'PGfloat4)) where oidOf = LibPQ.Oid 1021
424+instance OidOf 'PGfloat8 where oidOf = LibPQ.Oid 701
425+instance OidOf ('PGfixarray ns (null 'PGfloat8)) where oidOf = LibPQ.Oid 1022
426+instance OidOf ('PGvararray (null 'PGfloat8)) where oidOf = LibPQ.Oid 1022
427+instance OidOf 'PGmoney where oidOf = LibPQ.Oid 790
428+instance OidOf ('PGfixarray ns (null 'PGmoney)) where oidOf = LibPQ.Oid 791
429+instance OidOf ('PGvararray (null 'PGmoney)) where oidOf = LibPQ.Oid 791
430+instance OidOf ('PGchar n) where oidOf = LibPQ.Oid 18
431+instance OidOf ('PGfixarray ns (null ('PGchar n))) where oidOf = LibPQ.Oid 1002
432+instance OidOf ('PGvararray (null ('PGchar n))) where oidOf = LibPQ.Oid 1002
433+instance OidOf ('PGvarchar n) where oidOf = LibPQ.Oid 1043
434+instance OidOf ('PGfixarray ns (null ('PGvarchar n))) where oidOf = LibPQ.Oid 1015
435+instance OidOf ('PGvararray (null ('PGvarchar n))) where oidOf = LibPQ.Oid 1015
436+instance OidOf 'PGtext where oidOf = LibPQ.Oid 25
437+instance OidOf ('PGfixarray ns (null 'PGtext)) where oidOf = LibPQ.Oid 1009
438+instance OidOf ('PGvararray (null 'PGtext)) where oidOf = LibPQ.Oid 1009
439+instance OidOf 'PGbytea where oidOf = LibPQ.Oid 17
440+instance OidOf ('PGfixarray ns (null 'PGbytea)) where oidOf = LibPQ.Oid 1001
441+instance OidOf ('PGvararray (null 'PGbytea)) where oidOf = LibPQ.Oid 1001
442+instance OidOf 'PGtimestamp where oidOf = LibPQ.Oid 1114
443+instance OidOf ('PGfixarray ns (null 'PGtimestamp)) where oidOf = LibPQ.Oid 1115
444+instance OidOf ('PGvararray (null 'PGtimestamp)) where oidOf = LibPQ.Oid 1115
445+instance OidOf 'PGtimestamptz where oidOf = LibPQ.Oid 1184
446+instance OidOf ('PGfixarray ns (null 'PGtimestamptz)) where oidOf = LibPQ.Oid 1185
447+instance OidOf ('PGvararray (null 'PGtimestamptz)) where oidOf = LibPQ.Oid 1185
448+instance OidOf 'PGdate where oidOf = LibPQ.Oid 1082
449+instance OidOf ('PGfixarray ns (null 'PGdate)) where oidOf = LibPQ.Oid 1182
450+instance OidOf ('PGvararray (null 'PGdate)) where oidOf = LibPQ.Oid 1182
451+instance OidOf 'PGtime where oidOf = LibPQ.Oid 1083
452+instance OidOf ('PGfixarray ns (null 'PGtime)) where oidOf = LibPQ.Oid 1183
453+instance OidOf ('PGvararray (null 'PGtime)) where oidOf = LibPQ.Oid 1183
454+instance OidOf 'PGtimetz where oidOf = LibPQ.Oid 1266
455+instance OidOf ('PGfixarray ns (null 'PGtimetz)) where oidOf = LibPQ.Oid 1270
456+instance OidOf ('PGvararray (null 'PGtimetz)) where oidOf = LibPQ.Oid 1270
457+instance OidOf 'PGinterval where oidOf = LibPQ.Oid 1186
458+instance OidOf ('PGfixarray ns (null 'PGinterval)) where oidOf = LibPQ.Oid 1187
459+instance OidOf ('PGvararray (null 'PGinterval)) where oidOf = LibPQ.Oid 1187
460+instance OidOf 'PGuuid where oidOf = LibPQ.Oid 2950
461+instance OidOf ('PGfixarray ns (null 'PGuuid)) where oidOf = LibPQ.Oid 2951
462+instance OidOf ('PGvararray (null 'PGuuid)) where oidOf = LibPQ.Oid 2951
463+instance OidOf 'PGinet where oidOf = LibPQ.Oid 869
464+instance OidOf ('PGfixarray ns (null 'PGinet)) where oidOf = LibPQ.Oid 1041
465+instance OidOf ('PGvararray (null 'PGinet)) where oidOf = LibPQ.Oid 1041
466+instance OidOf 'PGjson where oidOf = LibPQ.Oid 114
467+instance OidOf ('PGfixarray ns (null 'PGjson)) where oidOf = LibPQ.Oid 199
468+instance OidOf ('PGvararray (null 'PGjson)) where oidOf = LibPQ.Oid 199
469+instance OidOf 'PGjsonb where oidOf = LibPQ.Oid 3802
470+instance OidOf ('PGfixarray ns (null 'PGjsonb)) where oidOf = LibPQ.Oid 3807
471+instance OidOf ('PGvararray (null 'PGjsonb)) where oidOf = LibPQ.Oid 3807
472+instance OidOf 'PGtsvector where oidOf = LibPQ.Oid 3614
473+instance OidOf ('PGfixarray ns (null 'PGtsvector)) where oidOf = LibPQ.Oid 3643
474+instance OidOf ('PGvararray (null 'PGtsvector)) where oidOf = LibPQ.Oid 3643
475+instance OidOf 'PGtsquery where oidOf = LibPQ.Oid 3615
476+instance OidOf ('PGfixarray ns (null 'PGtsquery)) where oidOf = LibPQ.Oid 3645
477+instance OidOf ('PGvararray (null 'PGtsquery)) where oidOf = LibPQ.Oid 3645
478+instance OidOf 'PGoid where oidOf = LibPQ.Oid 26
479+instance OidOf ('PGfixarray ns (null 'PGoid)) where oidOf = LibPQ.Oid 1028
480+instance OidOf ('PGvararray (null 'PGoid)) where oidOf = LibPQ.Oid 1028
481+instance OidOf ('PGrange 'PGint4) where oidOf = LibPQ.Oid 3904
482+instance OidOf ('PGfixarray ns (null ('PGrange 'PGint4))) where oidOf = LibPQ.Oid 3905
483+instance OidOf ('PGvararray (null ('PGrange 'PGint4))) where oidOf = LibPQ.Oid 3905
484+instance OidOf ('PGrange 'PGint8) where oidOf = LibPQ.Oid 3926
485+instance OidOf ('PGfixarray ns (null ('PGrange 'PGint8))) where oidOf = LibPQ.Oid 3927
486+instance OidOf ('PGvararray (null ('PGrange 'PGint8))) where oidOf = LibPQ.Oid 3927
487+instance OidOf ('PGrange 'PGnumeric) where oidOf = LibPQ.Oid 3906
488+instance OidOf ('PGfixarray ns (null ('PGrange 'PGnumeric))) where oidOf = LibPQ.Oid 3907
489+instance OidOf ('PGvararray (null ('PGrange 'PGnumeric))) where oidOf = LibPQ.Oid 3907
490+instance OidOf ('PGrange 'PGtimestamp) where oidOf = LibPQ.Oid 3908
491+instance OidOf ('PGfixarray ns (null ('PGrange 'PGtimestamp))) where oidOf = LibPQ.Oid 3909
492+instance OidOf ('PGvararray (null ('PGrange 'PGtimestamp))) where oidOf = LibPQ.Oid 3909
493+instance OidOf ('PGrange 'PGtimestamptz) where oidOf = LibPQ.Oid 3910
494+instance OidOf ('PGfixarray ns (null ('PGrange 'PGtimestamptz))) where oidOf = LibPQ.Oid 3911
495+instance OidOf ('PGvararray (null ('PGrange 'PGtimestamptz))) where oidOf = LibPQ.Oid 3911
496+instance OidOf ('PGrange 'PGdate) where oidOf = LibPQ.Oid 3912
497+instance OidOf ('PGfixarray ns (null ('PGrange 'PGdate))) where oidOf = LibPQ.Oid 3913
498+instance OidOf ('PGvararray (null ('PGrange 'PGdate))) where oidOf = LibPQ.Oid 3913
499+instance {-# OVERLAPPABLE #-} OidOf ('PGrange ty) where oidOf = LibPQ.invalidOid
500+instance {-# OVERLAPPABLE #-} OidOf ('PGfixarray ns (null ('PGrange ty))) where oidOf = LibPQ.invalidOid
501+instance {-# OVERLAPPABLE #-} OidOf ('PGvararray (null ('PGrange ty))) where oidOf = LibPQ.invalidOid
502+instance {-# OVERLAPPABLE #-} OidOf ('PGcomposite row) where oidOf = LibPQ.invalidOid
503+instance {-# OVERLAPPABLE #-} OidOf ('PGfixarray ns (null ('PGcomposite row))) where oidOf = LibPQ.invalidOid
504+instance {-# OVERLAPPABLE #-} OidOf ('PGvararray (null ('PGcomposite row))) where oidOf = LibPQ.invalidOid
505+instance {-# OVERLAPPABLE #-} OidOf ('PGenum labels) where oidOf = LibPQ.invalidOid
506+instance {-# OVERLAPPABLE #-} OidOf ('PGfixarray ns (null ('PGenum labels))) where oidOf = LibPQ.invalidOid
507+instance {-# OVERLAPPABLE #-} OidOf ('PGvararray (null ('PGenum labels))) where oidOf = LibPQ.invalidOid
508+
509+class OidOfParam (ty :: NullityType) where oidOfParam :: Oid
510+instance OidOf ty => OidOfParam (null ty) where oidOfParam = oidOf @ty
511+
512+-- | Lifts a `OidOf` constraint to a field.
513+class OidOfField (field :: (Symbol, NullityType)) where
514+ oidOfField :: Oid
515+instance OidOf ty => OidOfField (alias ::: nullity ty) where
516+ oidOfField = oidOf @ty
430517
431518-- | A `ToNullityParam` constraint gives an encoding of a Haskell `Type` into
432519-- into the binary format of a PostgreSQL `NullityType`.
@@ -756,3 +843,6 @@ replicateMN
756843 => m x -> m (NP I xs)
757844replicateMN mx = hsequence' $
758845 hcpure (Proxy :: Proxy ((~) x)) (Comp (I <$> mx))
846+
847+getOid :: LibPQ.Oid -> Word32
848+getOid (LibPQ.Oid (CUInt oid)) = oid
squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs+1
@@ -27,6 +27,7 @@ Squeal data definition language.
2727 , TypeInType
2828 , TypeOperators
2929 , UndecidableSuperClasses
30+ , UndecidableInstances
3031#-}
3132
3233module Squeal.PostgreSQL.Definition
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Function.hs+12−12
@@ -54,7 +54,7 @@ import qualified Generics.SOP as SOP
5454import qualified GHC.Generics as GHC
5555
5656import Squeal.PostgreSQL.Alias
57−import Squeal.PostgreSQL.Definition (Definition (..))
57+import Squeal.PostgreSQL.Definition
5858import Squeal.PostgreSQL.Expression
5959import Squeal.PostgreSQL.Expression.Type
6060import Squeal.PostgreSQL.List
@@ -73,7 +73,7 @@ createFunction
7373 -> NP (TypeExpression schemas) args
7474 -> TypeExpression schemas ret
7575 -> FunctionDefinition schemas args ('Returns ret)
76− -> Definition schemas (Alter sch (Create fun ('Function (args '::--> 'Returns ret)) schema) schemas)
76+ -> Definition schemas (Alter sch (Create fun ('Function (args :=> 'Returns ret)) schema) schemas)
7777createFunction fun args ret fundef = UnsafeDefinition $
7878 "CREATE" <+> "FUNCTION" <+> renderSQL fun
7979 <+> parenthesized (renderCommaSeparated renderSQL args)
@@ -87,7 +87,7 @@ createOrReplaceFunction
8787 -> NP (TypeExpression schemas) args
8888 -> TypeExpression schemas ret
8989 -> FunctionDefinition schemas args ('Returns ret)
90− -> Definition schemas (Alter sch (CreateOrReplace fun ('Function (args '::--> 'Returns ret)) schema) schemas)
90+ -> Definition schemas (Alter sch (CreateOrReplace fun ('Function (args :=> 'Returns ret)) schema) schemas)
9191createOrReplaceFunction fun args ret fundef = UnsafeDefinition $
9292 "CREATE" <+> "OR" <+> "REPLACE" <+> "FUNCTION" <+> renderSQL fun
9393 <+> parenthesized (renderCommaSeparated renderSQL args)
@@ -115,7 +115,7 @@ createSetFunction
115115 -> NP (TypeExpression schemas) args
116116 -> NP (Aliased (TypeExpression schemas)) rets
117117 -> FunctionDefinition schemas args ('ReturnsTable rets)
118− -> Definition schemas (Alter sch (Create fun ('Function (args '::--> 'ReturnsTable rets)) schema) schemas)
118+ -> Definition schemas (Alter sch (Create fun ('Function (args :=> 'ReturnsTable rets)) schema) schemas)
119119createSetFunction fun args rets fundef = UnsafeDefinition $
120120 "CREATE" <+> "FUNCTION" <+> renderSQL fun
121121 <+> parenthesized (renderCommaSeparated renderSQL args)
@@ -128,14 +128,14 @@ createSetFunction fun args rets fundef = UnsafeDefinition $
128128
129129createOrReplaceSetFunction
130130 :: ( Has sch schemas schema
131− , Has fun schema ('Function (args0 '::--> ret0))
131+ , KnownSymbol fun
132132 , SOP.SListI args
133133 , SOP.SListI rets )
134134 => QualifiedAlias sch fun
135135 -> NP (TypeExpression schemas) args
136136 -> NP (Aliased (TypeExpression schemas)) rets
137137 -> FunctionDefinition schemas args ('ReturnsTable rets)
138− -> Definition schemas (Alter sch (CreateOrReplace fun ('Function (args '::--> 'ReturnsTable rets)) schema) schemas)
138+ -> Definition schemas (Alter sch (CreateOrReplace fun ('Function (args :=> 'ReturnsTable rets)) schema) schemas)
139139createOrReplaceSetFunction fun args rets fundef = UnsafeDefinition $
140140 "CREATE" <+> "OR" <+> "REPLACE" <+> "FUNCTION" <+> renderSQL fun
141141 <+> parenthesized (renderCommaSeparated renderSQL args)
@@ -149,9 +149,9 @@ createOrReplaceSetFunction fun args rets fundef = UnsafeDefinition $
149149createBinaryOp
150150 :: forall op fun sch schemas schema x y z.
151151 ( Has sch schemas schema
152− , Has fun schema ('Function ('[x,y] '::--> 'Returns z))
152+ , Has fun schema ('Function ('[x,y] :=> 'Returns z))
153153 , KnownSymbol op )
154− => Alias fun
154+ => QualifiedAlias sch fun
155155 -> TypeExpression schemas x
156156 -> TypeExpression schemas y
157157 -> Definition schemas
@@ -168,9 +168,9 @@ createBinaryOp fun x y = UnsafeDefinition $
168168createLeftOp
169169 :: forall op fun sch schemas schema x y.
170170 ( Has sch schemas schema
171− , Has fun schema ('Function ('[x] '::--> 'Returns y))
171+ , Has fun schema ('Function ('[x] :=> 'Returns y))
172172 , KnownSymbol op )
173− => Alias fun
173+ => QualifiedAlias sch fun
174174 -> TypeExpression schemas x
175175 -> Definition schemas
176176 (Alter sch (Create op ('Operator ('LeftOp x y)) schema) schemas)
@@ -185,9 +185,9 @@ createLeftOp fun x = UnsafeDefinition $
185185createRightOp
186186 :: forall op fun sch schemas schema x y.
187187 ( Has sch schemas schema
188− , Has fun schema ('Function ('[x] '::--> 'Returns y))
188+ , Has fun schema ('Function ('[x] :=> 'Returns y))
189189 , KnownSymbol op )
190− => Alias fun
190+ => QualifiedAlias sch fun
191191 -> TypeExpression schemas x
192192 -> Definition schemas
193193 (Alter sch (Create op ('Operator ('RightOp x y)) schema) schemas)
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Index.hs+1−1
@@ -49,7 +49,7 @@ import GHC.TypeLits
4949import qualified GHC.Generics as GHC
5050
5151import Squeal.PostgreSQL.Alias
52−import Squeal.PostgreSQL.Definition (Definition (..))
52+import Squeal.PostgreSQL.Definition
5353import Squeal.PostgreSQL.Expression.Sort
5454import Squeal.PostgreSQL.Render
5555import Squeal.PostgreSQL.Schema
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Schema.hs+1−1
@@ -39,7 +39,7 @@ module Squeal.PostgreSQL.Definition.Schema
3939import GHC.TypeLits
4040
4141import Squeal.PostgreSQL.Alias
42−import Squeal.PostgreSQL.Definition (Definition (..))
42+import Squeal.PostgreSQL.Definition
4343import Squeal.PostgreSQL.Render
4444import Squeal.PostgreSQL.Schema
4545
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table.hs+37−363
@@ -34,16 +34,10 @@ module Squeal.PostgreSQL.Definition.Table
3434 , createTableIfNotExists
3535 , dropTable
3636 , dropTableIfExists
37− , TableConstraintExpression (..)
38− , check
39− , unique
40− , primaryKey
41− , foreignKey
42− , ForeignKeyed
43− , OnDeleteClause (..)
44− , OnUpdateClause (..)
4537 , alterTable
38+ , alterTableIfExists
4639 , alterTableRename
40+ , alterTableIfExistsRename
4741 , AlterTable (..)
4842 , addConstraint
4943 , dropConstraint
@@ -57,17 +51,6 @@ module Squeal.PostgreSQL.Definition.Table
5751 , setNotNull
5852 , dropNotNull
5953 , alterType
60− -- * Columns
61− , ColumnTypeExpression (..)
62− , nullable
63− , notNullable
64− , default_
65− , serial2
66− , smallserial
67− , serial4
68− , serial
69− , serial8
70− , bigserial
7154 ) where
7255
7356import Control.DeepSeq
@@ -78,9 +61,9 @@ import qualified Generics.SOP as SOP
7861import qualified GHC.Generics as GHC
7962
8063import Squeal.PostgreSQL.Alias
81−import Squeal.PostgreSQL.Definition (Definition (..))
64+import Squeal.PostgreSQL.Definition
65+import Squeal.PostgreSQL.Definition.Table.Constraint
8266import Squeal.PostgreSQL.Expression
83−import Squeal.PostgreSQL.Expression.Logic
8467import Squeal.PostgreSQL.Expression.Type
8568import Squeal.PostgreSQL.List
8669import Squeal.PostgreSQL.Render
@@ -195,288 +178,6 @@ renderCreation tab columns constraints = renderSQL tab
195178 renderConstraint (constraint `As` alias) =
196179 "CONSTRAINT" <+> renderSQL alias <+> renderSQL constraint
197180
198−-- | Data types are a way to limit the kind of data that can be stored in a
199−-- table. For many applications, however, the constraint they provide is
200−-- too coarse. For example, a column containing a product price should
201−-- probably only accept positive values. But there is no standard data type
202−-- that accepts only positive numbers. Another issue is that you might want
203−-- to constrain column data with respect to other columns or rows.
204−-- For example, in a table containing product information,
205−-- there should be only one row for each product number.
206−-- `TableConstraint`s give you as much control over the data in your tables
207−-- as you wish. If a user attempts to store data in a column that would
208−-- violate a constraint, an error is raised. This applies
209−-- even if the value came from the default value definition.
210−newtype TableConstraintExpression
211− (sch :: Symbol)
212− (tab :: Symbol)
213− (schemas :: SchemasType)
214− (constraint :: TableConstraint)
215− = UnsafeTableConstraintExpression
216− { renderTableConstraintExpression :: ByteString }
217− deriving (GHC.Generic,Show,Eq,Ord,NFData)
218−instance RenderSQL
219− (TableConstraintExpression sch tab schemas constraint) where
220− renderSQL = renderTableConstraintExpression
221−
222−{-| A `check` constraint is the most generic `TableConstraint` type.
223−It allows you to specify that the value in a certain column must satisfy
224−a Boolean (truth-value) expression.
225−
226−>>> :{
227−type Schema = '[
228− "tab" ::: 'Table ('[ "inequality" ::: 'Check '["a","b"]] :=> '[
229− "a" ::: 'NoDef :=> 'NotNull 'PGint4,
230− "b" ::: 'NoDef :=> 'NotNull 'PGint4
231− ])]
232−:}
233−
234−>>> :{
235−let
236− definition :: Definition (Public '[]) (Public Schema)
237− definition = createTable #tab
238− ( (int & notNullable) `as` #a :*
239− (int & notNullable) `as` #b )
240− ( check (#a :* #b) (#a .> #b) `as` #inequality )
241−:}
242−
243−>>> printSQL definition
244−CREATE TABLE "tab" ("a" int NOT NULL, "b" int NOT NULL, CONSTRAINT "inequality" CHECK (("a" > "b")));
245−-}
246−check
247− :: ( Has sch schemas schema
248− , Has tab schema ('Table table)
249− , HasAll aliases (TableToRow table) subcolumns )
250− => NP Alias aliases
251− -- ^ specify the subcolumns which are getting checked
252− -> (forall t. Condition '[] '[] 'Ungrouped schemas '[] '[t ::: subcolumns])
253− -- ^ a closed `Condition` on those subcolumns
254− -> TableConstraintExpression sch tab schemas ('Check aliases)
255−check _cols condition = UnsafeTableConstraintExpression $
256− "CHECK" <+> parenthesized (renderSQL condition)
257−
258−{-| A `unique` constraint ensure that the data contained in a column,
259−or a group of columns, is unique among all the rows in the table.
260−
261−>>> :{
262−type Schema = '[
263− "tab" ::: 'Table( '[ "uq_a_b" ::: 'Unique '["a","b"]] :=> '[
264− "a" ::: 'NoDef :=> 'Null 'PGint4,
265− "b" ::: 'NoDef :=> 'Null 'PGint4
266− ])]
267−:}
268−
269−>>> :{
270−let
271− definition :: Definition (Public '[]) (Public Schema)
272− definition = createTable #tab
273− ( (int & nullable) `as` #a :*
274− (int & nullable) `as` #b )
275− ( unique (#a :* #b) `as` #uq_a_b )
276−:}
277−
278−>>> printSQL definition
279−CREATE TABLE "tab" ("a" int NULL, "b" int NULL, CONSTRAINT "uq_a_b" UNIQUE ("a", "b"));
280−-}
281−unique
282− :: ( Has sch schemas schema
283− , Has tab schema('Table table)
284− , HasAll aliases (TableToRow table) subcolumns )
285− => NP Alias aliases
286− -- ^ specify subcolumns which together are unique for each row
287− -> TableConstraintExpression sch tab schemas ('Unique aliases)
288−unique columns = UnsafeTableConstraintExpression $
289− "UNIQUE" <+> parenthesized (renderSQL columns)
290−
291−{-| A `primaryKey` constraint indicates that a column, or group of columns,
292−can be used as a unique identifier for rows in the table.
293−This requires that the values be both unique and not null.
294−
295−>>> :{
296−type Schema = '[
297− "tab" ::: 'Table ('[ "pk_id" ::: 'PrimaryKey '["id"]] :=> '[
298− "id" ::: 'Def :=> 'NotNull 'PGint4,
299− "name" ::: 'NoDef :=> 'NotNull 'PGtext
300− ])]
301−:}
302−
303−>>> :{
304−let
305− definition :: Definition (Public '[]) (Public Schema)
306− definition = createTable #tab
307− ( serial `as` #id :*
308− (text & notNullable) `as` #name )
309− ( primaryKey #id `as` #pk_id )
310−:}
311−
312−>>> printSQL definition
313−CREATE TABLE "tab" ("id" serial, "name" text NOT NULL, CONSTRAINT "pk_id" PRIMARY KEY ("id"));
314−-}
315−primaryKey
316− :: ( Has sch schemas schema
317− , Has tab schema ('Table table)
318− , HasAll aliases (TableToColumns table) subcolumns
319− , AllNotNull subcolumns )
320− => NP Alias aliases
321− -- ^ specify the subcolumns which together form a primary key.
322− -> TableConstraintExpression sch tab schemas ('PrimaryKey aliases)
323−primaryKey columns = UnsafeTableConstraintExpression $
324− "PRIMARY KEY" <+> parenthesized (renderSQL columns)
325−
326−{-| A `foreignKey` specifies that the values in a column
327−(or a group of columns) must match the values appearing in some row of
328−another table. We say this maintains the referential integrity
329−between two related tables.
330−
331−>>> :{
332−type Schema =
333− '[ "users" ::: 'Table (
334− '[ "pk_users" ::: 'PrimaryKey '["id"] ] :=>
335− '[ "id" ::: 'Def :=> 'NotNull 'PGint4
336− , "name" ::: 'NoDef :=> 'NotNull 'PGtext
337− ])
338− , "emails" ::: 'Table (
339− '[ "pk_emails" ::: 'PrimaryKey '["id"]
340− , "fk_user_id" ::: 'ForeignKey '["user_id"] "users" '["id"]
341− ] :=>
342− '[ "id" ::: 'Def :=> 'NotNull 'PGint4
343− , "user_id" ::: 'NoDef :=> 'NotNull 'PGint4
344− , "email" ::: 'NoDef :=> 'Null 'PGtext
345− ])
346− ]
347−:}
348−
349−>>> :{
350−let
351− setup :: Definition (Public '[]) (Public Schema)
352− setup =
353− createTable #users
354− ( serial `as` #id :*
355− (text & notNullable) `as` #name )
356− ( primaryKey #id `as` #pk_users ) >>>
357− createTable #emails
358− ( serial `as` #id :*
359− (int & notNullable) `as` #user_id :*
360− (text & nullable) `as` #email )
361− ( primaryKey #id `as` #pk_emails :*
362− foreignKey #user_id #users #id
363− OnDeleteCascade OnUpdateCascade `as` #fk_user_id )
364−in printSQL setup
365−:}
366−CREATE TABLE "users" ("id" serial, "name" text NOT NULL, CONSTRAINT "pk_users" PRIMARY KEY ("id"));
367−CREATE TABLE "emails" ("id" serial, "user_id" int NOT NULL, "email" text NULL, CONSTRAINT "pk_emails" PRIMARY KEY ("id"), CONSTRAINT "fk_user_id" FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE CASCADE ON UPDATE CASCADE);
368−
369−A `foreignKey` can even be a table self-reference.
370−
371−>>> :{
372−type Schema =
373− '[ "employees" ::: 'Table (
374− '[ "employees_pk" ::: 'PrimaryKey '["id"]
375− , "employees_employer_fk" ::: 'ForeignKey '["employer_id"] "employees" '["id"]
376− ] :=>
377− '[ "id" ::: 'Def :=> 'NotNull 'PGint4
378− , "name" ::: 'NoDef :=> 'NotNull 'PGtext
379− , "employer_id" ::: 'NoDef :=> 'Null 'PGint4
380− ])
381− ]
382−:}
383−
384−>>> :{
385−let
386− setup :: Definition (Public '[]) (Public Schema)
387− setup =
388− createTable #employees
389− ( serial `as` #id :*
390− (text & notNullable) `as` #name :*
391− (integer & nullable) `as` #employer_id )
392− ( primaryKey #id `as` #employees_pk :*
393− foreignKey #employer_id #employees #id
394− OnDeleteCascade OnUpdateCascade `as` #employees_employer_fk )
395−in printSQL setup
396−:}
397−CREATE TABLE "employees" ("id" serial, "name" text NOT NULL, "employer_id" integer NULL, CONSTRAINT "employees_pk" PRIMARY KEY ("id"), CONSTRAINT "employees_employer_fk" FOREIGN KEY ("employer_id") REFERENCES "employees" ("id") ON DELETE CASCADE ON UPDATE CASCADE);
398−-}
399−foreignKey
400− :: (ForeignKeyed schemas sch schema child parent
401− table reftable
402− columns refcolumns
403− constraints cols
404− reftys tys )
405− => NP Alias columns
406− -- ^ column or columns in the table
407− -> Alias parent
408− -- ^ reference table
409− -> NP Alias refcolumns
410− -- ^ reference column or columns in the reference table
411− -> OnDeleteClause
412− -- ^ what to do when reference is deleted
413− -> OnUpdateClause
414− -- ^ what to do when reference is updated
415− -> TableConstraintExpression sch child schemas
416− ('ForeignKey columns parent refcolumns)
417−foreignKey keys parent refs ondel onupd = UnsafeTableConstraintExpression $
418− "FOREIGN KEY" <+> parenthesized (renderSQL keys)
419− <+> "REFERENCES" <+> renderSQL parent
420− <+> parenthesized (renderSQL refs)
421− <+> renderSQL ondel
422− <+> renderSQL onupd
423−
424−-- | A constraint synonym between types involved in a foreign key constraint.
425−type ForeignKeyed schemas
426− sch
427− schema
428− child parent
429− table reftable
430− columns refcolumns
431− constraints cols
432− reftys tys =
433− ( Has sch schemas schema
434− , Has child schema ('Table table)
435− , Has parent schema ('Table reftable)
436− , HasAll columns (TableToColumns table) tys
437− , reftable ~ (constraints :=> cols)
438− , HasAll refcolumns cols reftys
439− , SOP.AllZip SamePGType tys reftys
440− , Uniquely refcolumns constraints )
441−
442−-- | `OnDeleteClause` indicates what to do with rows that reference a deleted row.
443−data OnDeleteClause
444− = OnDeleteNoAction
445− -- ^ if any referencing rows still exist when the constraint is checked,
446− -- an error is raised
447− | OnDeleteRestrict -- ^ prevents deletion of a referenced row
448− | OnDeleteCascade
449− -- ^ specifies that when a referenced row is deleted,
450− -- row(s) referencing it should be automatically deleted as well
451− deriving (GHC.Generic,Show,Eq,Ord)
452−instance NFData OnDeleteClause
453−-- | Render `OnDeleteClause`.
454−instance RenderSQL OnDeleteClause where
455− renderSQL = \case
456− OnDeleteNoAction -> "ON DELETE NO ACTION"
457− OnDeleteRestrict -> "ON DELETE RESTRICT"
458− OnDeleteCascade -> "ON DELETE CASCADE"
459−
460−-- | Analagous to `OnDeleteClause` there is also `OnUpdateClause` which is invoked
461−-- when a referenced column is changed (updated).
462−data OnUpdateClause
463− = OnUpdateNoAction
464− -- ^ if any referencing rows has not changed when the constraint is checked,
465− -- an error is raised
466− | OnUpdateRestrict -- ^ prevents update of a referenced row
467− | OnUpdateCascade
468− -- ^ the updated values of the referenced column(s) should be copied
469− -- into the referencing row(s)
470− deriving (GHC.Generic,Show,Eq,Ord)
471−instance NFData OnUpdateClause
472−
473−-- | Render `OnUpdateClause`.
474−instance RenderSQL OnUpdateClause where
475− renderSQL = \case
476− OnUpdateNoAction -> "ON UPDATE NO ACTION"
477− OnUpdateRestrict -> "ON UPDATE RESTRICT"
478− OnUpdateCascade -> "ON UPDATE CASCADE"
479−
480181-- | `dropTable` removes a table from the schema.
481182--
482183-- >>> :{
@@ -496,35 +197,56 @@ dropTable tab = UnsafeDefinition $ "DROP TABLE" <+> renderSQL tab <> ";"
496197
497198dropTableIfExists
498199 :: ( Has sch schemas schema
499− , Has tab schema ('Table table))
200+ , KnownSymbol tab)
500201 => QualifiedAlias sch tab -- ^ table to remove
501− -> Definition schemas (Alter sch (DropIfExists tab schema) schemas)
202+ -> Definition schemas (Alter sch (DropSchemumIfExists tab 'Table schema) schemas)
502203dropTableIfExists tab = UnsafeDefinition $ "DROP TABLE IF EXISTS" <+> renderSQL tab <> ";"
503204
504205-- | `alterTable` changes the definition of a table from the schema.
505206alterTable
506− :: (Has sch schemas schema, Has tab schema ('Table table0))
207+ :: (Has sch schemas schema, KnownSymbol tab)
507208 => QualifiedAlias sch tab -- ^ table to alter
508− -> AlterTable sch tab schemas table1 -- ^ alteration to perform
509− -> Definition schemas (Alter sch (Alter tab ('Table table1) schema) schemas)
209+ -> AlterTable sch tab schemas table -- ^ alteration to perform
210+ -> Definition schemas (Alter sch (Alter tab ('Table table) schema) schemas)
510211alterTable tab alteration = UnsafeDefinition $
511212 "ALTER TABLE"
512213 <+> renderSQL tab
513214 <+> renderAlterTable alteration
514215 <> ";"
515216
217+-- | `alterTable` changes the definition of a table from the schema.
218+alterTableIfExists
219+ :: (Has sch schemas schema, KnownSymbol tab)
220+ => QualifiedAlias sch tab -- ^ table to alter
221+ -> AlterTable sch tab schemas table -- ^ alteration to perform
222+ -> Definition schemas (Alter sch (AlterIfExists tab ('Table table) schema) schemas)
223+alterTableIfExists tab alteration = UnsafeDefinition $
224+ "ALTER TABLE IF EXISTS"
225+ <+> renderSQL tab
226+ <+> renderAlterTable alteration
227+ <> ";"
228+
516229-- | `alterTableRename` changes the name of a table from the schema.
517230--
518231-- >>> printSQL $ alterTableRename #foo #bar
519232-- ALTER TABLE "foo" RENAME TO "bar";
520233alterTableRename
521− :: (KnownSymbol table0, KnownSymbol table1)
522− => Alias table0 -- ^ table to rename
523− -> Alias table1 -- ^ what to rename it
524− -> Definition schema (Rename table0 table1 schema)
525−alterTableRename table0 table1 = UnsafeDefinition $
526− "ALTER TABLE" <+> renderSQL table0
527− <+> "RENAME TO" <+> renderSQL table1 <> ";"
234+ :: (KnownSymbol tab0, KnownSymbol tab1)
235+ => Alias tab0 -- ^ table to rename
236+ -> Alias tab1 -- ^ what to rename it
237+ -> Definition schema (Rename tab0 tab1 schema)
238+alterTableRename tab0 tab1 = UnsafeDefinition $
239+ "ALTER TABLE" <+> renderSQL tab0
240+ <+> "RENAME TO" <+> renderSQL tab1 <> ";"
241+
242+alterTableIfExistsRename
243+ :: (KnownSymbol tab0, KnownSymbol tab1)
244+ => Alias tab0 -- ^ table to rename
245+ -> Alias tab1 -- ^ what to rename it
246+ -> Definition schema (RenameIfExists tab0 tab1 schema)
247+alterTableIfExistsRename tab0 tab1 = UnsafeDefinition $
248+ "ALTER TABLE IF EXISTS" <+> renderSQL tab0
249+ <+> "RENAME TO" <+> renderSQL tab1 <> ";"
528250
529251-- | An `AlterTable` describes the alteration to perform on the columns
530252-- of a table.
@@ -776,51 +498,3 @@ dropNotNull = UnsafeAlterColumn $ "DROP NOT NULL"
776498-- ALTER TABLE "tab" ALTER COLUMN "col" TYPE numeric NOT NULL;
777499alterType :: ColumnTypeExpression schemas ty -> AlterColumn schemas ty0 ty
778500alterType ty = UnsafeAlterColumn $ "TYPE" <+> renderColumnTypeExpression ty
779−
780−-- | `ColumnTypeExpression`s are used in `createTable` commands.
781−newtype ColumnTypeExpression (schemas :: SchemasType) (ty :: ColumnType)
782− = UnsafeColumnTypeExpression { renderColumnTypeExpression :: ByteString }
783− deriving (GHC.Generic,Show,Eq,Ord,NFData)
784−instance RenderSQL (ColumnTypeExpression schemas ty) where
785− renderSQL = renderColumnTypeExpression
786−
787−-- | used in `createTable` commands as a column constraint to note that
788−-- @NULL@ may be present in a column
789−nullable
790− :: TypeExpression schemas (nullity ty)
791− -> ColumnTypeExpression schemas ('NoDef :=> 'Null ty)
792−nullable ty = UnsafeColumnTypeExpression $ renderSQL ty <+> "NULL"
793−
794−-- | used in `createTable` commands as a column constraint to ensure
795−-- @NULL@ is not present in a column
796−notNullable
797− :: TypeExpression schemas (nullity ty)
798− -> ColumnTypeExpression schemas ('NoDef :=> 'NotNull ty)
799−notNullable ty = UnsafeColumnTypeExpression $ renderSQL ty <+> "NOT NULL"
800−
801−-- | used in `createTable` commands as a column constraint to give a default
802−default_
803− :: Expression '[] '[] 'Ungrouped schemas '[] '[] ty
804− -> ColumnTypeExpression schemas ('NoDef :=> ty)
805− -> ColumnTypeExpression schemas ('Def :=> ty)
806−default_ x ty = UnsafeColumnTypeExpression $
807− renderSQL ty <+> "DEFAULT" <+> renderExpression x
808−
809−-- | not a true type, but merely a notational convenience for creating
810−-- unique identifier columns with type `PGint2`
811−serial2, smallserial
812− :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint2)
813−serial2 = UnsafeColumnTypeExpression "serial2"
814−smallserial = UnsafeColumnTypeExpression "smallserial"
815−-- | not a true type, but merely a notational convenience for creating
816−-- unique identifier columns with type `PGint4`
817−serial4, serial
818− :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint4)
819−serial4 = UnsafeColumnTypeExpression "serial4"
820−serial = UnsafeColumnTypeExpression "serial"
821−-- | not a true type, but merely a notational convenience for creating
822−-- unique identifier columns with type `PGint8`
823−serial8, bigserial
824− :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint8)
825−serial8 = UnsafeColumnTypeExpression "serial8"
826−bigserial = UnsafeColumnTypeExpression "bigserial"
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table/Constraint.hsnew file+339
@@ -0,0 +1,339 @@
1+{-|
2+Module: Squeal.PostgreSQL.Definition.Table.Constraint
3+Description: Table constraint expressions
4+Copyright: (c) Eitan Chatav, 2017
5+Maintainer: eitan@morphism.tech
6+Stability: experimental
7+
8+Table constraint expressions.
9+-}
10+
11+{-# LANGUAGE
12+ AllowAmbiguousTypes
13+ , ConstraintKinds
14+ , DeriveAnyClass
15+ , DeriveGeneric
16+ , DerivingStrategies
17+ , FlexibleContexts
18+ , FlexibleInstances
19+ , GADTs
20+ , LambdaCase
21+ , MultiParamTypeClasses
22+ , OverloadedLabels
23+ , OverloadedStrings
24+ , RankNTypes
25+ , ScopedTypeVariables
26+ , TypeApplications
27+ , TypeInType
28+ , TypeOperators
29+ , UndecidableSuperClasses
30+#-}
31+
32+module Squeal.PostgreSQL.Definition.Table.Constraint
33+ ( TableConstraintExpression (..)
34+ , check
35+ , unique
36+ , primaryKey
37+ , foreignKey
38+ , ForeignKeyed
39+ , OnDeleteClause (..)
40+ , OnUpdateClause (..)
41+ ) where
42+
43+import Control.DeepSeq
44+import Data.ByteString
45+import GHC.TypeLits
46+
47+import qualified Generics.SOP as SOP
48+import qualified GHC.Generics as GHC
49+
50+import Squeal.PostgreSQL.Alias
51+import Squeal.PostgreSQL.Expression.Logic
52+import Squeal.PostgreSQL.List
53+import Squeal.PostgreSQL.Render
54+import Squeal.PostgreSQL.Schema
55+
56+-- $setup
57+-- >>> import Squeal.PostgreSQL
58+
59+-- | Data types are a way to limit the kind of data that can be stored in a
60+-- table. For many applications, however, the constraint they provide is
61+-- too coarse. For example, a column containing a product price should
62+-- probably only accept positive values. But there is no standard data type
63+-- that accepts only positive numbers. Another issue is that you might want
64+-- to constrain column data with respect to other columns or rows.
65+-- For example, in a table containing product information,
66+-- there should be only one row for each product number.
67+-- `TableConstraint`s give you as much control over the data in your tables
68+-- as you wish. If a user attempts to store data in a column that would
69+-- violate a constraint, an error is raised. This applies
70+-- even if the value came from the default value definition.
71+newtype TableConstraintExpression
72+ (sch :: Symbol)
73+ (tab :: Symbol)
74+ (schemas :: SchemasType)
75+ (constraint :: TableConstraint)
76+ = UnsafeTableConstraintExpression
77+ { renderTableConstraintExpression :: ByteString }
78+ deriving (GHC.Generic,Show,Eq,Ord,NFData)
79+instance RenderSQL
80+ (TableConstraintExpression sch tab schemas constraint) where
81+ renderSQL = renderTableConstraintExpression
82+
83+{-| A `check` constraint is the most generic `TableConstraint` type.
84+It allows you to specify that the value in a certain column must satisfy
85+a Boolean (truth-value) expression.
86+
87+>>> :{
88+type Schema = '[
89+ "tab" ::: 'Table ('[ "inequality" ::: 'Check '["a","b"]] :=> '[
90+ "a" ::: 'NoDef :=> 'NotNull 'PGint4,
91+ "b" ::: 'NoDef :=> 'NotNull 'PGint4
92+ ])]
93+:}
94+
95+>>> :{
96+let
97+ definition :: Definition (Public '[]) (Public Schema)
98+ definition = createTable #tab
99+ ( (int & notNullable) `as` #a :*
100+ (int & notNullable) `as` #b )
101+ ( check (#a :* #b) (#a .> #b) `as` #inequality )
102+:}
103+
104+>>> printSQL definition
105+CREATE TABLE "tab" ("a" int NOT NULL, "b" int NOT NULL, CONSTRAINT "inequality" CHECK (("a" > "b")));
106+-}
107+check
108+ :: ( Has sch schemas schema
109+ , Has tab schema ('Table table)
110+ , HasAll aliases (TableToRow table) subcolumns )
111+ => NP Alias aliases
112+ -- ^ specify the subcolumns which are getting checked
113+ -> (forall t. Condition '[] '[] 'Ungrouped schemas '[] '[t ::: subcolumns])
114+ -- ^ a closed `Condition` on those subcolumns
115+ -> TableConstraintExpression sch tab schemas ('Check aliases)
116+check _cols condition = UnsafeTableConstraintExpression $
117+ "CHECK" <+> parenthesized (renderSQL condition)
118+
119+{-| A `unique` constraint ensure that the data contained in a column,
120+or a group of columns, is unique among all the rows in the table.
121+
122+>>> :{
123+type Schema = '[
124+ "tab" ::: 'Table( '[ "uq_a_b" ::: 'Unique '["a","b"]] :=> '[
125+ "a" ::: 'NoDef :=> 'Null 'PGint4,
126+ "b" ::: 'NoDef :=> 'Null 'PGint4
127+ ])]
128+:}
129+
130+>>> :{
131+let
132+ definition :: Definition (Public '[]) (Public Schema)
133+ definition = createTable #tab
134+ ( (int & nullable) `as` #a :*
135+ (int & nullable) `as` #b )
136+ ( unique (#a :* #b) `as` #uq_a_b )
137+:}
138+
139+>>> printSQL definition
140+CREATE TABLE "tab" ("a" int NULL, "b" int NULL, CONSTRAINT "uq_a_b" UNIQUE ("a", "b"));
141+-}
142+unique
143+ :: ( Has sch schemas schema
144+ , Has tab schema('Table table)
145+ , HasAll aliases (TableToRow table) subcolumns )
146+ => NP Alias aliases
147+ -- ^ specify subcolumns which together are unique for each row
148+ -> TableConstraintExpression sch tab schemas ('Unique aliases)
149+unique columns = UnsafeTableConstraintExpression $
150+ "UNIQUE" <+> parenthesized (renderSQL columns)
151+
152+{-| A `primaryKey` constraint indicates that a column, or group of columns,
153+can be used as a unique identifier for rows in the table.
154+This requires that the values be both unique and not null.
155+
156+>>> :{
157+type Schema = '[
158+ "tab" ::: 'Table ('[ "pk_id" ::: 'PrimaryKey '["id"]] :=> '[
159+ "id" ::: 'Def :=> 'NotNull 'PGint4,
160+ "name" ::: 'NoDef :=> 'NotNull 'PGtext
161+ ])]
162+:}
163+
164+>>> :{
165+let
166+ definition :: Definition (Public '[]) (Public Schema)
167+ definition = createTable #tab
168+ ( serial `as` #id :*
169+ (text & notNullable) `as` #name )
170+ ( primaryKey #id `as` #pk_id )
171+:}
172+
173+>>> printSQL definition
174+CREATE TABLE "tab" ("id" serial, "name" text NOT NULL, CONSTRAINT "pk_id" PRIMARY KEY ("id"));
175+-}
176+primaryKey
177+ :: ( Has sch schemas schema
178+ , Has tab schema ('Table table)
179+ , HasAll aliases (TableToColumns table) subcolumns
180+ , AllNotNull subcolumns )
181+ => NP Alias aliases
182+ -- ^ specify the subcolumns which together form a primary key.
183+ -> TableConstraintExpression sch tab schemas ('PrimaryKey aliases)
184+primaryKey columns = UnsafeTableConstraintExpression $
185+ "PRIMARY KEY" <+> parenthesized (renderSQL columns)
186+
187+{-| A `foreignKey` specifies that the values in a column
188+(or a group of columns) must match the values appearing in some row of
189+another table. We say this maintains the referential integrity
190+between two related tables.
191+
192+>>> :{
193+type Schema =
194+ '[ "users" ::: 'Table (
195+ '[ "pk_users" ::: 'PrimaryKey '["id"] ] :=>
196+ '[ "id" ::: 'Def :=> 'NotNull 'PGint4
197+ , "name" ::: 'NoDef :=> 'NotNull 'PGtext
198+ ])
199+ , "emails" ::: 'Table (
200+ '[ "pk_emails" ::: 'PrimaryKey '["id"]
201+ , "fk_user_id" ::: 'ForeignKey '["user_id"] "users" '["id"]
202+ ] :=>
203+ '[ "id" ::: 'Def :=> 'NotNull 'PGint4
204+ , "user_id" ::: 'NoDef :=> 'NotNull 'PGint4
205+ , "email" ::: 'NoDef :=> 'Null 'PGtext
206+ ])
207+ ]
208+:}
209+
210+>>> :{
211+let
212+ setup :: Definition (Public '[]) (Public Schema)
213+ setup =
214+ createTable #users
215+ ( serial `as` #id :*
216+ (text & notNullable) `as` #name )
217+ ( primaryKey #id `as` #pk_users ) >>>
218+ createTable #emails
219+ ( serial `as` #id :*
220+ (int & notNullable) `as` #user_id :*
221+ (text & nullable) `as` #email )
222+ ( primaryKey #id `as` #pk_emails :*
223+ foreignKey #user_id #users #id
224+ OnDeleteCascade OnUpdateCascade `as` #fk_user_id )
225+in printSQL setup
226+:}
227+CREATE TABLE "users" ("id" serial, "name" text NOT NULL, CONSTRAINT "pk_users" PRIMARY KEY ("id"));
228+CREATE TABLE "emails" ("id" serial, "user_id" int NOT NULL, "email" text NULL, CONSTRAINT "pk_emails" PRIMARY KEY ("id"), CONSTRAINT "fk_user_id" FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE CASCADE ON UPDATE CASCADE);
229+
230+A `foreignKey` can even be a table self-reference.
231+
232+>>> :{
233+type Schema =
234+ '[ "employees" ::: 'Table (
235+ '[ "employees_pk" ::: 'PrimaryKey '["id"]
236+ , "employees_employer_fk" ::: 'ForeignKey '["employer_id"] "employees" '["id"]
237+ ] :=>
238+ '[ "id" ::: 'Def :=> 'NotNull 'PGint4
239+ , "name" ::: 'NoDef :=> 'NotNull 'PGtext
240+ , "employer_id" ::: 'NoDef :=> 'Null 'PGint4
241+ ])
242+ ]
243+:}
244+
245+>>> :{
246+let
247+ setup :: Definition (Public '[]) (Public Schema)
248+ setup =
249+ createTable #employees
250+ ( serial `as` #id :*
251+ (text & notNullable) `as` #name :*
252+ (integer & nullable) `as` #employer_id )
253+ ( primaryKey #id `as` #employees_pk :*
254+ foreignKey #employer_id #employees #id
255+ OnDeleteCascade OnUpdateCascade `as` #employees_employer_fk )
256+in printSQL setup
257+:}
258+CREATE TABLE "employees" ("id" serial, "name" text NOT NULL, "employer_id" integer NULL, CONSTRAINT "employees_pk" PRIMARY KEY ("id"), CONSTRAINT "employees_employer_fk" FOREIGN KEY ("employer_id") REFERENCES "employees" ("id") ON DELETE CASCADE ON UPDATE CASCADE);
259+-}
260+foreignKey
261+ :: (ForeignKeyed schemas sch schema child parent
262+ table reftable
263+ columns refcolumns
264+ constraints cols
265+ reftys tys )
266+ => NP Alias columns
267+ -- ^ column or columns in the table
268+ -> Alias parent
269+ -- ^ reference table
270+ -> NP Alias refcolumns
271+ -- ^ reference column or columns in the reference table
272+ -> OnDeleteClause
273+ -- ^ what to do when reference is deleted
274+ -> OnUpdateClause
275+ -- ^ what to do when reference is updated
276+ -> TableConstraintExpression sch child schemas
277+ ('ForeignKey columns parent refcolumns)
278+foreignKey keys parent refs ondel onupd = UnsafeTableConstraintExpression $
279+ "FOREIGN KEY" <+> parenthesized (renderSQL keys)
280+ <+> "REFERENCES" <+> renderSQL parent
281+ <+> parenthesized (renderSQL refs)
282+ <+> renderSQL ondel
283+ <+> renderSQL onupd
284+
285+-- | A constraint synonym between types involved in a foreign key constraint.
286+type ForeignKeyed schemas
287+ sch
288+ schema
289+ child parent
290+ table reftable
291+ columns refcolumns
292+ constraints cols
293+ reftys tys =
294+ ( Has sch schemas schema
295+ , Has child schema ('Table table)
296+ , Has parent schema ('Table reftable)
297+ , HasAll columns (TableToColumns table) tys
298+ , reftable ~ (constraints :=> cols)
299+ , HasAll refcolumns cols reftys
300+ , SOP.AllZip SamePGType tys reftys
301+ , Uniquely refcolumns constraints )
302+
303+-- | `OnDeleteClause` indicates what to do with rows that reference a deleted row.
304+data OnDeleteClause
305+ = OnDeleteNoAction
306+ -- ^ if any referencing rows still exist when the constraint is checked,
307+ -- an error is raised
308+ | OnDeleteRestrict -- ^ prevents deletion of a referenced row
309+ | OnDeleteCascade
310+ -- ^ specifies that when a referenced row is deleted,
311+ -- row(s) referencing it should be automatically deleted as well
312+ deriving (GHC.Generic,Show,Eq,Ord)
313+instance NFData OnDeleteClause
314+-- | Render `OnDeleteClause`.
315+instance RenderSQL OnDeleteClause where
316+ renderSQL = \case
317+ OnDeleteNoAction -> "ON DELETE NO ACTION"
318+ OnDeleteRestrict -> "ON DELETE RESTRICT"
319+ OnDeleteCascade -> "ON DELETE CASCADE"
320+
321+-- | Analagous to `OnDeleteClause` there is also `OnUpdateClause` which is invoked
322+-- when a referenced column is changed (updated).
323+data OnUpdateClause
324+ = OnUpdateNoAction
325+ -- ^ if any referencing rows has not changed when the constraint is checked,
326+ -- an error is raised
327+ | OnUpdateRestrict -- ^ prevents update of a referenced row
328+ | OnUpdateCascade
329+ -- ^ the updated values of the referenced column(s) should be copied
330+ -- into the referencing row(s)
331+ deriving (GHC.Generic,Show,Eq,Ord)
332+instance NFData OnUpdateClause
333+
334+-- | Render `OnUpdateClause`.
335+instance RenderSQL OnUpdateClause where
336+ renderSQL = \case
337+ OnUpdateNoAction -> "ON UPDATE NO ACTION"
338+ OnUpdateRestrict -> "ON UPDATE RESTRICT"
339+ OnUpdateCascade -> "ON UPDATE CASCADE"
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Type.hs+1−1
@@ -50,7 +50,7 @@ import qualified Generics.SOP as SOP
5050import Squeal.PostgreSQL.Alias
5151import Squeal.PostgreSQL.Expression.Logic
5252import Squeal.PostgreSQL.Expression.Type
53−import Squeal.PostgreSQL.Definition (Definition (..))
53+import Squeal.PostgreSQL.Definition
5454import Squeal.PostgreSQL.List
5555import Squeal.PostgreSQL.PG
5656import Squeal.PostgreSQL.Render
squeal-postgresql/src/Squeal/PostgreSQL/Definition/View.hs+1−1
@@ -39,7 +39,7 @@ module Squeal.PostgreSQL.Definition.View
3939import GHC.TypeLits
4040
4141import Squeal.PostgreSQL.Alias
42−import Squeal.PostgreSQL.Definition (Definition (..))
42+import Squeal.PostgreSQL.Definition
4343import Squeal.PostgreSQL.Query
4444import Squeal.PostgreSQL.Render
4545import Squeal.PostgreSQL.Schema
squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+10−10
@@ -34,7 +34,7 @@ module Squeal.PostgreSQL.Expression
3434 ( -- * Expression
3535 Expression (..)
3636 , Expr
37− , (:-->)
37+ , type (-->)
3838 , FunctionDB
3939 , unsafeFunction
4040 , function
@@ -48,7 +48,7 @@ module Squeal.PostgreSQL.Expression
4848 , binaryOp
4949 , FunctionVar
5050 , unsafeFunctionVar
51− , FunctionN
51+ , type (--->)
5252 , FunctionNDB
5353 , unsafeFunctionN
5454 , functionN
@@ -159,7 +159,7 @@ type OperatorDB schemas x1 x2 y
159159-- This is a subtype of the usual Haskell function type `Prelude.->`,
160160-- indeed a subcategory as it is closed under the usual
161161-- `Prelude..` and `Prelude.id`.
162−type (:-->) x y
162+type (-->) x y
163163 = forall outer commons grp schemas params from
164164 . Expression outer commons grp schemas params from x
165165 -- ^ input
@@ -179,7 +179,7 @@ Use the `*:` operator to end your argument lists, like so.
179179>>> printSQL (unsafeFunctionN "fun" (true :* false :* localTime *: true))
180180fun(TRUE, FALSE, LOCALTIME, TRUE)
181181-}
182−type FunctionN xs y
182+type (--->) xs y
183183 = forall outer commons grp schemas params from
184184 . NP (Expression outer commons grp schemas params from) xs
185185 -- ^ inputs
@@ -327,7 +327,7 @@ binaryOp = unsafeBinaryOp $ renderSymbol @op
327327
328328-- | >>> printSQL $ unsafeLeftOp "NOT" true
329329-- (NOT TRUE)
330−unsafeLeftOp :: ByteString -> x :--> y
330+unsafeLeftOp :: ByteString -> x --> y
331331unsafeLeftOp op x = UnsafeExpression $ parenthesized $ op <+> renderSQL x
332332
333333leftOp
@@ -339,7 +339,7 @@ leftOp = unsafeLeftOp $ renderSymbol @op
339339
340340-- | >>> printSQL $ true & unsafeRightOp "IS NOT TRUE"
341341-- (TRUE IS NOT TRUE)
342−unsafeRightOp :: ByteString -> x :--> y
342+unsafeRightOp :: ByteString -> x --> y
343343unsafeRightOp op x = UnsafeExpression $ parenthesized $ renderSQL x <+> op
344344
345345rightOp
@@ -351,25 +351,25 @@ rightOp = unsafeRightOp $ renderSymbol @op
351351
352352-- | >>> printSQL $ unsafeFunction "f" true
353353-- f(TRUE)
354−unsafeFunction :: ByteString -> x :--> y
354+unsafeFunction :: ByteString -> x --> y
355355unsafeFunction fun x = UnsafeExpression $
356356 fun <> parenthesized (renderSQL x)
357357
358358function
359− :: (Has sch schemas schema, Has fun schema ('Function ('[x] '::--> 'Returns y)))
359+ :: (Has sch schemas schema, Has fun schema ('Function ('[x] :=> 'Returns y)))
360360 => QualifiedAlias sch fun
361361 -> FunctionDB schemas x y
362362function = unsafeFunction . renderSQL
363363
364364-- | >>> printSQL $ unsafeFunctionN "f" (currentTime :* localTimestamp :* false *: literal 'a')
365365-- f(CURRENT_TIME, LOCALTIMESTAMP, FALSE, E'a')
366−unsafeFunctionN :: SListI xs => ByteString -> FunctionN xs y
366+unsafeFunctionN :: SListI xs => ByteString -> xs ---> y
367367unsafeFunctionN fun xs = UnsafeExpression $
368368 fun <> parenthesized (renderCommaSeparated renderSQL xs)
369369
370370functionN
371371 :: ( Has sch schemas schema
372− , Has fun schema ('Function (xs '::--> 'Returns y))
372+ , Has fun schema ('Function (xs :=> 'Returns y))
373373 , SListI xs )
374374 => QualifiedAlias sch fun
375375 -> FunctionNDB schemas xs y
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Collection.hs+5−5
@@ -42,7 +42,7 @@ import qualified Generics.SOP as SOP
4242
4343import Squeal.PostgreSQL.Alias
4444import Squeal.PostgreSQL.Expression
45−import Squeal.PostgreSQL.Expression.SetOf
45+import Squeal.PostgreSQL.Expression.Set
4646import Squeal.PostgreSQL.List
4747import Squeal.PostgreSQL.Render
4848import Squeal.PostgreSQL.Schema
@@ -111,20 +111,20 @@ array2 xss = UnsafeExpression $ "ARRAY" <>
111111
112112-- | >>> printSQL $ cardinality (array [null_, false, true])
113113-- cardinality(ARRAY[NULL, FALSE, TRUE])
114−cardinality :: null ('PGvararray ty) :--> null 'PGint8
114+cardinality :: null ('PGvararray ty) --> null 'PGint8
115115cardinality = unsafeFunction "cardinality"
116116
117117-- | >>> printSQL $ array [null_, false, true] & index 2
118118-- (ARRAY[NULL, FALSE, TRUE])[2]
119119index
120120 :: Word64 -- ^ index
121− -> null ('PGvararray ty) :--> NullifyType ty
121+ -> null ('PGvararray ty) --> NullifyType ty
122122index n expr = UnsafeExpression $
123123 parenthesized (renderSQL expr) <> "[" <> fromString (show n) <> "]"
124124
125125-- | Expand an array to a set of rows
126−unnest :: SetOfFunction "unnest" (null ('PGvararray ty)) '["unnest" ::: ty]
127−unnest = unsafeSetOfFunction
126+unnest :: SetFunction "unnest" (null ('PGvararray ty)) '["unnest" ::: ty]
127+unnest = unsafeSetFunction
128128
129129-- | A row constructor is an expression that builds a row value
130130-- (also called a composite value) using values for its member fields.
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Comparison.hs+6−6
@@ -162,7 +162,7 @@ isNotDistinctFrom = unsafeBinaryOp "IS NOT DISTINCT FROM"
162162>>> printSQL $ true & isTrue
163163(TRUE IS TRUE)
164164-}
165−isTrue :: null0 'PGbool :--> null1 'PGbool
165+isTrue :: null0 'PGbool --> null1 'PGbool
166166isTrue = unsafeRightOp "IS TRUE"
167167
168168{- | is false or unknown
@@ -170,7 +170,7 @@ isTrue = unsafeRightOp "IS TRUE"
170170>>> printSQL $ true & isNotTrue
171171(TRUE IS NOT TRUE)
172172-}
173−isNotTrue :: null0 'PGbool :--> null1 'PGbool
173+isNotTrue :: null0 'PGbool --> null1 'PGbool
174174isNotTrue = unsafeRightOp "IS NOT TRUE"
175175
176176{- | is false
@@ -178,7 +178,7 @@ isNotTrue = unsafeRightOp "IS NOT TRUE"
178178>>> printSQL $ true & isFalse
179179(TRUE IS FALSE)
180180-}
181−isFalse :: null0 'PGbool :--> null1 'PGbool
181+isFalse :: null0 'PGbool --> null1 'PGbool
182182isFalse = unsafeRightOp "IS FALSE"
183183
184184{- | is true or unknown
@@ -186,7 +186,7 @@ isFalse = unsafeRightOp "IS FALSE"
186186>>> printSQL $ true & isNotFalse
187187(TRUE IS NOT FALSE)
188188-}
189−isNotFalse :: null0 'PGbool :--> null1 'PGbool
189+isNotFalse :: null0 'PGbool --> null1 'PGbool
190190isNotFalse = unsafeRightOp "IS NOT FALSE"
191191
192192{- | is unknown
@@ -194,7 +194,7 @@ isNotFalse = unsafeRightOp "IS NOT FALSE"
194194>>> printSQL $ true & isUnknown
195195(TRUE IS UNKNOWN)
196196-}
197−isUnknown :: null0 'PGbool :--> null1 'PGbool
197+isUnknown :: null0 'PGbool --> null1 'PGbool
198198isUnknown = unsafeRightOp "IS UNKNOWN"
199199
200200{- | is true or false
@@ -202,5 +202,5 @@ isUnknown = unsafeRightOp "IS UNKNOWN"
202202>>> printSQL $ true & isNotUnknown
203203(TRUE IS NOT UNKNOWN)
204204-}
205−isNotUnknown :: null0 'PGbool :--> null1 'PGbool
205+isNotUnknown :: null0 'PGbool --> null1 'PGbool
206206isNotUnknown = unsafeRightOp "IS NOT UNKNOWN"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Json.hs+40−47
@@ -81,7 +81,7 @@ import GHC.TypeLits
8181
8282import Squeal.PostgreSQL.Alias
8383import Squeal.PostgreSQL.Expression
84−import Squeal.PostgreSQL.Expression.SetOf
84+import Squeal.PostgreSQL.Expression.Set
8585import Squeal.PostgreSQL.Expression.Type
8686import Squeal.PostgreSQL.List
8787import Squeal.PostgreSQL.Query
@@ -188,7 +188,7 @@ Table 9.45: JSON creation functions
188188-- otherwise, a scalar value is produced. For any scalar type other than a
189189-- number, a Boolean, or a null value, the text representation will be used, in
190190-- such a fashion that it is a valid json value.
191−toJson :: null ty :--> null 'PGjson
191+toJson :: null ty --> null 'PGjson
192192toJson = unsafeFunction "to_json"
193193
194194-- | Returns the value as jsonb. Arrays and composites are converted
@@ -197,26 +197,26 @@ toJson = unsafeFunction "to_json"
197197-- otherwise, a scalar value is produced. For any scalar type other than a
198198-- number, a Boolean, or a null value, the text representation will be used, in
199199-- such a fashion that it is a valid jsonb value.
200−toJsonb :: null ty :--> null 'PGjsonb
200+toJsonb :: null ty --> null 'PGjsonb
201201toJsonb = unsafeFunction "to_jsonb"
202202
203203-- | Returns the array as a JSON array. A PostgreSQL multidimensional array
204204-- becomes a JSON array of arrays.
205−arrayToJson :: null ('PGvararray ty) :--> null 'PGjson
205+arrayToJson :: null ('PGvararray ty) --> null 'PGjson
206206arrayToJson = unsafeFunction "array_to_json"
207207
208208-- | Returns the row as a JSON object.
209−rowToJson :: null ('PGcomposite ty) :--> null 'PGjson
209+rowToJson :: null ('PGcomposite ty) --> null 'PGjson
210210rowToJson = unsafeFunction "row_to_json"
211211
212212-- | Builds a possibly-heterogeneously-typed JSON array out of a variadic
213213-- argument list.
214−jsonBuildArray :: SOP.SListI tuple => FunctionN tuple (null 'PGjson)
214+jsonBuildArray :: SOP.SListI tuple => tuple ---> null 'PGjson
215215jsonBuildArray = unsafeFunctionN "json_build_array"
216216
217217-- | Builds a possibly-heterogeneously-typed (binary) JSON array out of a
218218-- variadic argument list.
219−jsonbBuildArray :: SOP.SListI tuple => FunctionN tuple (null 'PGjsonb)
219+jsonbBuildArray :: SOP.SListI tuple => tuple ---> null 'PGjsonb
220220jsonbBuildArray = unsafeFunctionN "jsonb_build_array"
221221
222222-- | Builds a possibly-heterogeneously-typed JSON object out of a variadic
@@ -224,10 +224,10 @@ jsonbBuildArray = unsafeFunctionN "jsonb_build_array"
224224-- and values.
225225class SOP.SListI tys => JsonBuildObject tys where
226226
227− jsonBuildObject :: FunctionN tys (null 'PGjson)
227+ jsonBuildObject :: tys ---> null 'PGjson
228228 jsonBuildObject = unsafeFunctionN "json_build_object"
229229
230− jsonbBuildObject :: FunctionN tys (null 'PGjsonb)
230+ jsonbBuildObject :: tys ---> null 'PGjsonb
231231 jsonbBuildObject = unsafeFunctionN "jsonb_build_object"
232232
233233instance JsonBuildObject '[]
@@ -240,7 +240,7 @@ instance (JsonBuildObject tys, key `In` PGJsonKey)
240240-- which are taken as a key/value pair.
241241jsonObject
242242 :: null ('PGfixarray '[n,2] ('NotNull 'PGtext))
243− :--> null 'PGjson
243+ --> null 'PGjson
244244jsonObject = unsafeFunction "json_object"
245245
246246-- | Builds a binary JSON object out of a text array.
@@ -249,24 +249,24 @@ jsonObject = unsafeFunction "json_object"
249249-- which are taken as a key/value pair.
250250jsonbObject
251251 :: null ('PGfixarray '[n,2] ('NotNull 'PGtext))
252− :--> null 'PGjsonb
252+ --> null 'PGjsonb
253253jsonbObject = unsafeFunction "jsonb_object"
254254
255255-- | This is an alternate form of 'jsonObject' that takes two arrays; one for
256256-- keys and one for values, that are zipped pairwise to create a JSON object.
257−jsonZipObject :: FunctionN
257+jsonZipObject ::
258258 '[ null ('PGvararray ('NotNull 'PGtext))
259259 , null ('PGvararray ('NotNull 'PGtext)) ]
260− ( null 'PGjson )
260+ ---> null 'PGjson
261261jsonZipObject = unsafeFunctionN "json_object"
262262
263263-- | This is an alternate form of 'jsonbObject' that takes two arrays; one for
264264-- keys and one for values, that are zipped pairwise to create a binary JSON
265265-- object.
266−jsonbZipObject :: FunctionN
266+jsonbZipObject ::
267267 '[ null ('PGvararray ('NotNull 'PGtext))
268268 , null ('PGvararray ('NotNull 'PGtext)) ]
269− ( null 'PGjsonb )
269+ ---> null 'PGjsonb
270270jsonbZipObject = unsafeFunctionN "jsonb_object"
271271
272272{-----------------------------------------
@@ -274,31 +274,31 @@ Table 9.46: JSON processing functions
274274-----------------------------------------}
275275
276276-- | Returns the number of elements in the outermost JSON array.
277−jsonArrayLength :: null 'PGjson :--> null 'PGint4
277+jsonArrayLength :: null 'PGjson --> null 'PGint4
278278jsonArrayLength = unsafeFunction "json_array_length"
279279
280280-- | Returns the number of elements in the outermost binary JSON array.
281−jsonbArrayLength :: null 'PGjsonb :--> null 'PGint4
281+jsonbArrayLength :: null 'PGjsonb --> null 'PGint4
282282jsonbArrayLength = unsafeFunction "jsonb_array_length"
283283
284284-- | Returns the type of the outermost JSON value as a text string. Possible
285285-- types are object, array, string, number, boolean, and null.
286−jsonTypeof :: null 'PGjson :--> null 'PGtext
286+jsonTypeof :: null 'PGjson --> null 'PGtext
287287jsonTypeof = unsafeFunction "json_typeof"
288288
289289-- | Returns the type of the outermost binary JSON value as a text string.
290290-- Possible types are object, array, string, number, boolean, and null.
291−jsonbTypeof :: null 'PGjsonb :--> null 'PGtext
291+jsonbTypeof :: null 'PGjsonb --> null 'PGtext
292292jsonbTypeof = unsafeFunction "jsonb_typeof"
293293
294294-- | Returns its argument with all object fields that have null values omitted.
295295-- Other null values are untouched.
296−jsonStripNulls :: null 'PGjson :--> null 'PGjson
296+jsonStripNulls :: null 'PGjson --> null 'PGjson
297297jsonStripNulls = unsafeFunction "json_strip_nulls"
298298
299299-- | Returns its argument with all object fields that have null values omitted.
300300-- Other null values are untouched.
301−jsonbStripNulls :: null 'PGjsonb :--> null 'PGjsonb
301+jsonbStripNulls :: null 'PGjsonb --> null 'PGjsonb
302302jsonbStripNulls = unsafeFunction "jsonb_strip_nulls"
303303
304304-- | @ jsonbSet target path new_value create_missing @
@@ -309,12 +309,9 @@ jsonbStripNulls = unsafeFunction "jsonb_strip_nulls"
309309-- item designated by path does not exist. As with the path orientated
310310-- operators, negative integers that appear in path count from the end of JSON
311311-- arrays.
312−jsonbSet
313− :: FunctionN
314− '[ null 'PGjsonb
315− , null ('PGvararray ('NotNull 'PGtext))
316− , null 'PGjsonb
317− , null 'PGbool ] (null 'PGjsonb)
312+jsonbSet ::
313+ '[ null 'PGjsonb, null ('PGvararray ('NotNull 'PGtext))
314+ , null 'PGjsonb, null 'PGbool ] ---> null 'PGjsonb
318315jsonbSet = unsafeFunctionN "jsonbSet"
319316
320317-- | @ jsonbInsert target path new_value insert_after @
@@ -326,27 +323,23 @@ jsonbSet = unsafeFunctionN "jsonbSet"
326323-- path is in JSONB object, @new_value@ will be inserted only if target does not
327324-- exist. As with the path orientated operators, negative integers that appear
328325-- in path count from the end of JSON arrays.
329−jsonbInsert
330− :: FunctionN
331− '[ null 'PGjsonb
332− , null ('PGvararray ('NotNull 'PGtext))
333− , null 'PGjsonb
334− , null 'PGbool ] (null 'PGjsonb)
326+jsonbInsert ::
327+ '[ null 'PGjsonb, null ('PGvararray ('NotNull 'PGtext))
328+ , null 'PGjsonb, null 'PGbool ] ---> null 'PGjsonb
335329jsonbInsert = unsafeFunctionN "jsonb_insert"
336330
337331-- | Returns its argument as indented JSON text.
338−jsonbPretty :: null 'PGjsonb :--> null 'PGtext
332+jsonbPretty :: null 'PGjsonb --> null 'PGtext
339333jsonbPretty = unsafeFunction "jsonb_pretty"
340334
341−
342335{- | Expands the outermost JSON object into a set of key/value pairs.
343336
344337>>> printSQL (select Star (from (jsonEach (literal (Json (object ["a" .= "foo", "b" .= "bar"]))))))
345338SELECT * FROM json_each(('{"a":"foo","b":"bar"}' :: json))
346339-}
347−jsonEach :: SetOfFunction "json_each" (null 'PGjson)
340+jsonEach :: SetFunction "json_each" (null 'PGjson)
348341 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGjson]
349−jsonEach = unsafeSetOfFunction
342+jsonEach = unsafeSetFunction
350343
351344{- | Expands the outermost binary JSON object into a set of key/value pairs.
352345
@@ -354,9 +347,9 @@ jsonEach = unsafeSetOfFunction
354347SELECT * FROM jsonb_each(('{"a":"foo","b":"bar"}' :: jsonb))
355348-}
356349jsonbEach
357− :: SetOfFunction "jsonb_each" (nullity 'PGjsonb)
350+ :: SetFunction "jsonb_each" (nullity 'PGjsonb)
358351 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGjson]
359−jsonbEach = unsafeSetOfFunction
352+jsonbEach = unsafeSetFunction
360353
361354{- | Expands the outermost JSON object into a set of key/value pairs.
362355
@@ -364,9 +357,9 @@ jsonbEach = unsafeSetOfFunction
364357SELECT * FROM json_each_text(('{"a":"foo","b":"bar"}' :: json))
365358-}
366359jsonEachText
367− :: SetOfFunction "json_each_text" (null 'PGjson)
360+ :: SetFunction "json_each_text" (null 'PGjson)
368361 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGtext]
369−jsonEachText = unsafeSetOfFunction
362+jsonEachText = unsafeSetFunction
370363
371364{- | Expands the outermost binary JSON object into a set of key/value pairs.
372365
@@ -374,9 +367,9 @@ jsonEachText = unsafeSetOfFunction
374367SELECT * FROM jsonb_each_text(('{"a":"foo","b":"bar"}' :: jsonb))
375368-}
376369jsonbEachText
377− :: SetOfFunction "jsonb_each_text" (null 'PGjsonb)
370+ :: SetFunction "jsonb_each_text" (null 'PGjsonb)
378371 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGtext]
379−jsonbEachText = unsafeSetOfFunction
372+jsonbEachText = unsafeSetFunction
380373
381374{- | Returns set of keys in the outermost JSON object.
382375
@@ -384,9 +377,9 @@ jsonbEachText = unsafeSetOfFunction
384377json_object_keys(('{"a":"foo","b":"bar"}' :: json))
385378-}
386379jsonObjectKeys
387− :: SetOfFunction "json_object_keys" (nullity 'PGjson)
380+ :: SetFunction "json_object_keys" (nullity 'PGjson)
388381 '["json_object_keys" ::: 'NotNull 'PGtext]
389−jsonObjectKeys = unsafeSetOfFunction
382+jsonObjectKeys = unsafeSetFunction
390383
391384{- | Returns set of keys in the outermost JSON object.
392385
@@ -394,9 +387,9 @@ jsonObjectKeys = unsafeSetOfFunction
394387jsonb_object_keys(('{"a":"foo","b":"bar"}' :: jsonb))
395388-}
396389jsonbObjectKeys
397− :: SetOfFunction "jsonb_object_keys" (null 'PGjsonb)
390+ :: SetFunction "jsonb_object_keys" (null 'PGjsonb)
398391 '["jsonb_object_keys" ::: 'NotNull 'PGtext]
399−jsonbObjectKeys = unsafeSetOfFunction
392+jsonbObjectKeys = unsafeSetFunction
400393
401394-- | Build rows from Json types.
402395type JsonPopulateFunction fun json
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Logic.hs+1−1
@@ -47,7 +47,7 @@ false = UnsafeExpression "FALSE"
4747
4848-- | >>> printSQL $ not_ true
4949-- (NOT TRUE)
50−not_ :: null 'PGbool :--> null 'PGbool
50+not_ :: null 'PGbool --> null 'PGbool
5151not_ = unsafeLeftOp "NOT"
5252
5353-- | >>> printSQL $ true .&& false
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Math.hs+4−6
@@ -37,9 +37,7 @@ import Squeal.PostgreSQL.Schema
3737-- in printSQL expression
3838-- :}
3939-- atan2(pi(), 2)
40−atan2_
41− :: float `In` PGFloating
42− => FunctionN '[ null float, null float] (null float)
40+atan2_ :: float `In` PGFloating => '[ null float, null float] ---> null float
4341atan2_ = unsafeFunctionN "atan2"
4442
4543
@@ -78,7 +76,7 @@ rem_ = unsafeBinaryOp "%"
7876-- in printSQL expression
7977-- :}
8078-- trunc(pi())
81−trunc :: frac `In` PGFloating => null frac :--> null frac
79+trunc :: frac `In` PGFloating => null frac --> null frac
8280trunc = unsafeFunction "trunc"
8381
8482-- | >>> :{
@@ -88,7 +86,7 @@ trunc = unsafeFunction "trunc"
8886-- in printSQL expression
8987-- :}
9088-- round(pi())
91−round_ :: frac `In` PGFloating => null frac :--> null frac
89+round_ :: frac `In` PGFloating => null frac --> null frac
9290round_ = unsafeFunction "round"
9391
9492-- | >>> :{
@@ -98,5 +96,5 @@ round_ = unsafeFunction "round"
9896-- in printSQL expression
9997-- :}
10098-- ceiling(pi())
101−ceiling_ :: frac `In` PGFloating => null frac :--> null frac
99+ceiling_ :: frac `In` PGFloating => null frac --> null frac
102100ceiling_ = unsafeFunction "ceiling"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Null.hs+4−4
@@ -44,7 +44,7 @@ null_ = UnsafeExpression "NULL"
4444--
4545-- >>> printSQL $ notNull true
4646-- TRUE
47−notNull :: 'NotNull ty :--> 'Null ty
47+notNull :: 'NotNull ty --> 'Null ty
4848notNull = UnsafeExpression . renderSQL
4949
5050-- | return the leftmost value which is not NULL
@@ -69,12 +69,12 @@ fromNull notNullx nullx = coalesce [nullx] notNullx
6969
7070-- | >>> printSQL $ null_ & isNull
7171-- NULL IS NULL
72−isNull :: 'Null ty :--> null 'PGbool
72+isNull :: 'Null ty --> null 'PGbool
7373isNull x = UnsafeExpression $ renderSQL x <+> "IS NULL"
7474
7575-- | >>> printSQL $ null_ & isNotNull
7676-- NULL IS NOT NULL
77−isNotNull :: 'Null ty :--> null 'PGbool
77+isNotNull :: 'Null ty --> null 'PGbool
7878isNotNull x = UnsafeExpression $ renderSQL x <+> "IS NOT NULL"
7979
8080-- | analagous to `maybe` using @IS NULL@
@@ -100,5 +100,5 @@ matchNull y f x = ifThenElse (isNull x) y
100100>>> printSQL expr
101101NULLIF(FALSE, ($1 :: bool))
102102-}
103−nullIf :: FunctionN '[ 'NotNull ty, 'NotNull ty] ('Null ty)
103+nullIf :: '[ 'NotNull ty, 'NotNull ty] ---> 'Null ty
104104nullIf = unsafeFunctionN "NULLIF"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Range.hs+8−9
@@ -205,27 +205,26 @@ whole = NonEmpty Infinite Infinite
205205(@-) :: Operator (null ('PGrange ty)) (null ('PGrange ty)) (null ('PGrange ty))
206206(@-) = unsafeBinaryOp "-"
207207
208−lowerBound :: null ('PGrange ty) :--> 'Null ty
208+lowerBound :: null ('PGrange ty) --> 'Null ty
209209lowerBound = unsafeFunction "lower"
210210
211−upperBound :: null ('PGrange ty) :--> 'Null ty
211+upperBound :: null ('PGrange ty) --> 'Null ty
212212upperBound = unsafeFunction "upper"
213213
214−isEmpty :: null ('PGrange ty) :--> 'Null 'PGbool
214+isEmpty :: null ('PGrange ty) --> 'Null 'PGbool
215215isEmpty = unsafeFunction "isempty"
216216
217−lowerInc :: null ('PGrange ty) :--> 'Null 'PGbool
217+lowerInc :: null ('PGrange ty) --> 'Null 'PGbool
218218lowerInc = unsafeFunction "lower_inc"
219219
220−lowerInf :: null ('PGrange ty) :--> 'Null 'PGbool
220+lowerInf :: null ('PGrange ty) --> 'Null 'PGbool
221221lowerInf = unsafeFunction "lower_inf"
222222
223−upperInc :: null ('PGrange ty) :--> 'Null 'PGbool
223+upperInc :: null ('PGrange ty) --> 'Null 'PGbool
224224upperInc = unsafeFunction "upper_inc"
225225
226−upperInf :: null ('PGrange ty) :--> 'Null 'PGbool
226+upperInf :: null ('PGrange ty) --> 'Null 'PGbool
227227upperInf = unsafeFunction "upper_inf"
228228
229−rangeMerge :: FunctionN
230− '[ null ('PGrange ty), null ('PGrange ty)] (null ('PGrange ty))
229+rangeMerge :: '[null ('PGrange ty), null ('PGrange ty)] ---> null ('PGrange ty)
231230rangeMerge = unsafeFunctionN "range_merge"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/SetOf.hs → squeal-postgresql/src/Squeal/PostgreSQL/Expression/Set.hsrenamed+52−40
@@ -1,5 +1,5 @@
11{-|
2−Module: Squeal.PostgreSQL.Expression.SetOf
2+Module: Squeal.PostgreSQL.Expression.Set
33Description: Set returning functions
44Copyright: (c) Eitan Chatav, 2019
55Maintainer: eitan@morphism.tech
@@ -20,16 +20,18 @@ Set returning functions
2020 , TypeOperators
2121#-}
2222
23−module Squeal.PostgreSQL.Expression.SetOf
23+module Squeal.PostgreSQL.Expression.Set
2424 ( generateSeries
2525 , generateSeriesStep
2626 , generateSeriesTimestamp
27− , SetOfFunction
28− , unsafeSetOfFunction
29− , setOfFunction
30− , SetOfFunctionN
31− , unsafeSetOfFunctionN
32− , setOfFunctionN
27+ , SetFunction
28+ , unsafeSetFunction
29+ , SetFunctionDB
30+ , setFunction
31+ , SetFunctionN
32+ , unsafeSetFunctionN
33+ , SetFunctionNDB
34+ , setFunctionN
3335 ) where
3436
3537import GHC.TypeLits
@@ -46,55 +48,65 @@ import Squeal.PostgreSQL.Schema
4648{- |
4749A @RankNType@ for set returning functions with 1 argument.
4850-}
49−type SetOfFunction fun ty setof
51+type SetFunction fun ty row
5052 = forall outer commons schemas params
5153 . Expression outer commons 'Ungrouped schemas params '[] ty
5254 -- ^ input
53− -> FromClause outer commons schemas params '[fun ::: setof]
55+ -> FromClause outer commons schemas params '[fun ::: row]
56+ -- ^ output
57+
58+type SetFunctionDB fun schemas ty row
59+ = forall outer commons params
60+ . Expression outer commons 'Ungrouped schemas params '[] ty
61+ -- ^ input
62+ -> FromClause outer commons schemas params '[fun ::: row]
5463 -- ^ output
5564
5665-- | Escape hatch for a set returning function with 1 argument.
57−unsafeSetOfFunction
58− :: forall fun ty setof. KnownSymbol fun
59− => SetOfFunction fun ty setof -- ^ set returning function
60−unsafeSetOfFunction x = UnsafeFromClause $
66+unsafeSetFunction
67+ :: forall fun ty row. KnownSymbol fun
68+ => SetFunction fun ty row -- ^ set returning function
69+unsafeSetFunction x = UnsafeFromClause $
6170 renderSymbol @fun <> parenthesized (renderSQL x)
6271
63−setOfFunction
72+setFunction
6473 :: ( Has sch schemas schema
65− , Has fun schema ('Function ('[ty] '::--> 'ReturnsTable setof)) )
66− => Alias fun
67− -> ( forall outer commons params
68− . Expression outer commons 'Ungrouped schemas params '[] ty
69− -> FromClause outer commons schemas params '[fun ::: setof] )
70−setOfFunction _ = unsafeSetOfFunction
74+ , Has fun schema ('Function ('[ty] :=> 'ReturnsTable row)) )
75+ => QualifiedAlias sch fun
76+ -> SetFunctionDB fun schemas ty row
77+setFunction _ = unsafeSetFunction
7178
7279{- |
7380A @RankNType@ for set returning functions with multiple argument.
7481-}
75−type SetOfFunctionN fun tys setof
82+type SetFunctionN fun tys row
7683 = forall outer commons schemas params
7784 . NP (Expression outer commons 'Ungrouped schemas params '[]) tys
7885 -- ^ inputs
79− -> FromClause outer commons schemas params '[fun ::: setof]
86+ -> FromClause outer commons schemas params '[fun ::: row]
8087 -- ^ output
8188
8289-- | Escape hatch for a set returning function with multiple argument.
83−unsafeSetOfFunctionN
84− :: forall fun tys setof. (SOP.SListI tys, KnownSymbol fun)
85− => SetOfFunctionN fun tys setof -- ^ set returning function
86−unsafeSetOfFunctionN xs = UnsafeFromClause $
90+unsafeSetFunctionN
91+ :: forall fun tys row. (SOP.SListI tys, KnownSymbol fun)
92+ => SetFunctionN fun tys row -- ^ set returning function
93+unsafeSetFunctionN xs = UnsafeFromClause $
8794 renderSymbol @fun <> parenthesized (renderCommaSeparated renderSQL xs)
8895
89−setOfFunctionN
96+type SetFunctionNDB fun schemas tys row
97+ = forall outer commons params
98+ . NP (Expression outer commons 'Ungrouped schemas params '[]) tys
99+ -- ^ inputs
100+ -> FromClause outer commons schemas params '[fun ::: row]
101+ -- ^ output
102+
103+setFunctionN
90104 :: ( Has sch schemas schema
91− , Has fun schema ('Function (tys '::--> 'ReturnsTable setof))
105+ , Has fun schema ('Function (tys :=> 'ReturnsTable row))
92106 , SOP.SListI tys )
93− => Alias fun
94− -> ( forall outer commons params
95− . NP (Expression outer commons 'Ungrouped schemas params '[]) tys
96− -> FromClause outer commons schemas params '[fun ::: setof] )
97−setOfFunctionN _ = unsafeSetOfFunctionN
107+ => QualifiedAlias sch fun
108+ -> SetFunctionNDB fun schemas tys row
109+setFunctionN _ = unsafeSetFunctionN
98110
99111{- | @generateSeries (start *: stop)@
100112
@@ -102,9 +114,9 @@ Generate a series of values, from @start@ to @stop@ with a step size of one
102114-}
103115generateSeries
104116 :: ty `In` '[ 'PGint4, 'PGint8, 'PGnumeric]
105− => SetOfFunctionN "generate_series" '[ null ty, null ty]
117+ => SetFunctionN "generate_series" '[ null ty, null ty]
106118 '["generate_series" ::: null ty] -- ^ set returning function
107−generateSeries = unsafeSetOfFunctionN
119+generateSeries = unsafeSetFunctionN
108120
109121{- | @generateSeries (start :* stop *: step)@
110122
@@ -112,9 +124,9 @@ Generate a series of values, from @start@ to @stop@ with a step size of @step@
112124-}
113125generateSeriesStep
114126 :: ty `In` '[ 'PGint4, 'PGint8, 'PGnumeric]
115− => SetOfFunctionN "generate_series" '[null ty, null ty, null ty]
127+ => SetFunctionN "generate_series" '[null ty, null ty, null ty]
116128 '["generate_series" ::: null ty] -- ^ set returning function
117−generateSeriesStep = unsafeSetOfFunctionN
129+generateSeriesStep = unsafeSetFunctionN
118130
119131{- | @generateSeries (start :* stop *: step)@
120132
@@ -122,6 +134,6 @@ Generate a series of values, from @start@ to @stop@ with a step size of @step@
122134-}
123135generateSeriesTimestamp
124136 :: ty `In` '[ 'PGtimestamp, 'PGtimestamptz]
125− => SetOfFunctionN "generate_series" '[null ty, null ty, null 'PGinterval]
137+ => SetFunctionN "generate_series" '[null ty, null ty, null 'PGinterval]
126138 '["generate_series" ::: null ty] -- ^ set returning function
127−generateSeriesTimestamp = unsafeSetOfFunctionN
139+generateSeriesTimestamp = unsafeSetFunctionN
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Text.hs+3−3
@@ -30,17 +30,17 @@ import Squeal.PostgreSQL.Schema
3030
3131-- | >>> printSQL $ lower "ARRRGGG"
3232-- lower(E'ARRRGGG')
33−lower :: null 'PGtext :--> null 'PGtext
33+lower :: null 'PGtext --> null 'PGtext
3434lower = unsafeFunction "lower"
3535
3636-- | >>> printSQL $ upper "eeee"
3737-- upper(E'eeee')
38−upper :: null 'PGtext :--> null 'PGtext
38+upper :: null 'PGtext --> null 'PGtext
3939upper = unsafeFunction "upper"
4040
4141-- | >>> printSQL $ charLength "four"
4242-- char_length(E'four')
43−charLength :: null 'PGtext :--> null 'PGint4
43+charLength :: null 'PGtext --> null 'PGint4
4444charLength = unsafeFunction "char_length"
4545
4646-- | The `like` expression returns true if the @string@ matches
squeal-postgresql/src/Squeal/PostgreSQL/Expression/TextSearch.hs+19−20
@@ -55,7 +55,7 @@ import Squeal.PostgreSQL.Schema
5555(.|) = unsafeBinaryOp "||"
5656
5757-- | negate a `Squeal.PostgreSQL.Expression.Type.tsquery`
58−(.!) :: null 'PGtsquery :--> null 'PGtsquery
58+(.!) :: null 'PGtsquery --> null 'PGtsquery
5959(.!) = unsafeLeftOp "!!"
6060
6161-- | `Squeal.PostgreSQL.Expression.Type.tsquery` followed by
@@ -66,51 +66,50 @@ import Squeal.PostgreSQL.Schema
6666-- | convert array of lexemes to `Squeal.PostgreSQL.Expression.Type.tsvector`
6767arrayToTSvector
6868 :: null ('PGvararray ('NotNull 'PGtext))
69− :--> null 'PGtsvector
69+ --> null 'PGtsvector
7070arrayToTSvector = unsafeFunction "array_to_tsvector"
7171
7272-- | number of lexemes in `Squeal.PostgreSQL.Expression.Type.tsvector`
73−tsvectorLength :: null 'PGtsvector :--> null 'PGint4
73+tsvectorLength :: null 'PGtsvector --> null 'PGint4
7474tsvectorLength = unsafeFunction "length"
7575
7676-- | number of lexemes plus operators in `Squeal.PostgreSQL.Expression.Type.tsquery`
77−numnode :: null 'PGtsquery :--> null 'PGint4
77+numnode :: null 'PGtsquery --> null 'PGint4
7878numnode = unsafeFunction "numnode"
7979
8080-- | produce `Squeal.PostgreSQL.Expression.Type.tsquery` ignoring punctuation
81−plainToTSquery :: null 'PGtext :--> null 'PGtsquery
81+plainToTSquery :: null 'PGtext --> null 'PGtsquery
8282plainToTSquery = unsafeFunction "plainto_tsquery"
8383
8484-- | produce `Squeal.PostgreSQL.Expression.Type.tsquery` that searches for a phrase,
8585-- ignoring punctuation
86−phraseToTSquery :: null 'PGtext :--> null 'PGtsquery
86+phraseToTSquery :: null 'PGtext --> null 'PGtsquery
8787phraseToTSquery = unsafeFunction "phraseto_tsquery"
8888
8989-- | produce `Squeal.PostgreSQL.Expression.Type.tsquery` from a web search style query
90−websearchToTSquery :: null 'PGtext :--> null 'PGtsquery
90+websearchToTSquery :: null 'PGtext --> null 'PGtsquery
9191websearchToTSquery = unsafeFunction "websearch_to_tsquery"
9292
9393-- | get indexable part of a `Squeal.PostgreSQL.Expression.Type.tsquery`
94−queryTree :: null 'PGtsquery :--> null 'PGtext
94+queryTree :: null 'PGtsquery --> null 'PGtext
9595queryTree = unsafeFunction "query_tree"
9696
9797-- | normalize words and convert to `Squeal.PostgreSQL.Expression.Type.tsquery`
98−toTSquery :: null 'PGtext :--> null 'PGtsquery
98+toTSquery :: null 'PGtext --> null 'PGtsquery
9999toTSquery = unsafeFunction "to_tsquery"
100100
101101-- | reduce document text to `Squeal.PostgreSQL.Expression.Type.tsvector`
102102toTSvector
103103 :: ty `In` '[ 'PGtext, 'PGjson, 'PGjsonb]
104− => null ty :--> null 'PGtsvector
104+ => null ty --> null 'PGtsvector
105105toTSvector = unsafeFunction "to_tsvector"
106106
107107-- | assign weight to each element of `Squeal.PostgreSQL.Expression.Type.tsvector`
108−setWeight
109− :: FunctionN '[null 'PGtsvector, null ('PGchar 1)] (null 'PGtsvector)
108+setWeight :: '[null 'PGtsvector, null ('PGchar 1)] ---> null 'PGtsvector
110109setWeight = unsafeFunctionN "set_weight"
111110
112111-- | remove positions and weights from `Squeal.PostgreSQL.Expression.Type.tsvector`
113−strip :: null 'PGtsvector :--> null 'PGtsvector
112+strip :: null 'PGtsvector --> null 'PGtsvector
114113strip = unsafeFunction "strip"
115114
116115-- | @jsonToTSvector (document *: filter)@
@@ -123,7 +122,7 @@ strip = unsafeFunction "strip"
123122-- "boolean" (to include all Boolean values in the string format "true"/"false"),
124123-- "key" (to include all keys) or "all" (to include all above).
125124-- These values can be combined together to include, e.g. all string and numeric values.
126−jsonToTSvector :: FunctionN '[null 'PGjson, null 'PGjson] (null 'PGtsvector)
125+jsonToTSvector :: '[null 'PGjson, null 'PGjson] ---> null 'PGtsvector
127126jsonToTSvector = unsafeFunctionN "json_to_tsvector"
128127
129128-- | @jsonbToTSvector (document *: filter)@
@@ -136,23 +135,23 @@ jsonToTSvector = unsafeFunctionN "json_to_tsvector"
136135-- "boolean" (to include all Boolean values in the string format "true"/"false"),
137136-- "key" (to include all keys) or "all" (to include all above).
138137-- These values can be combined together to include, e.g. all string and numeric values.
139−jsonbToTSvector :: FunctionN '[null 'PGjsonb, null 'PGjsonb] (null 'PGtsvector)
138+jsonbToTSvector :: '[null 'PGjsonb, null 'PGjsonb] ---> null 'PGtsvector
140139jsonbToTSvector = unsafeFunctionN "jsonb_to_tsvector"
141140
142141-- | remove given lexeme from `Squeal.PostgreSQL.Expression.Type.tsvector`
143−tsDelete :: FunctionN
142+tsDelete ::
144143 '[null 'PGtsvector, null ('PGvararray ('NotNull 'PGtext))]
145− (null 'PGtsvector)
144+ ---> null 'PGtsvector
146145tsDelete = unsafeFunctionN "ts_delete"
147146
148147-- | select only elements with given weights from `Squeal.PostgreSQL.Expression.Type.tsvector`
149−tsFilter :: FunctionN
148+tsFilter ::
150149 '[null 'PGtsvector, null ('PGvararray ('NotNull ('PGchar 1)))]
151− (null 'PGtsvector)
150+ ---> null 'PGtsvector
152151tsFilter = unsafeFunctionN "ts_filter"
153152
154153-- | display a `Squeal.PostgreSQL.Expression.Type.tsquery` match
155154tsHeadline
156155 :: document `In` '[ 'PGtext, 'PGjson, 'PGjsonb]
157− => FunctionN '[null document, null 'PGtsquery] (null 'PGtext)
156+ => '[null document, null 'PGtsquery] ---> null 'PGtext
158157tsHeadline = unsafeFunctionN "ts_headline"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Time.hs+7−12
@@ -17,6 +17,7 @@ Date/Time functions and operators
1717 , OverloadedStrings
1818 , PolyKinds
1919 , RankNTypes
20+ , TypeOperators
2021#-}
2122
2223module Squeal.PostgreSQL.Expression.Time
@@ -85,9 +86,7 @@ Create date from year, month and day fields
8586>>> printSQL (makeDate (1984 :* 7 *: 3))
8687make_date(1984, 7, 3)
8788-}
88−makeDate :: FunctionN
89− '[ null 'PGint4, null 'PGint4, null 'PGint4 ]
90− ( null 'PGdate )
89+makeDate :: '[ null 'PGint4, null 'PGint4, null 'PGint4 ] ---> null 'PGdate
9190makeDate = unsafeFunctionN "make_date"
9291
9392{-|
@@ -96,9 +95,7 @@ Create time from hour, minute and seconds fields
9695>>> printSQL (makeTime (8 :* 15 *: 23.5))
9796make_time(8, 15, 23.5)
9897-}
99−makeTime :: FunctionN
100− '[ null 'PGint4, null 'PGint4, null 'PGfloat8 ]
101− ( null 'PGtime )
98+makeTime :: '[ null 'PGint4, null 'PGint4, null 'PGfloat8 ] ---> null 'PGtime
10299makeTime = unsafeFunctionN "make_time"
103100
104101{-|
@@ -107,10 +104,9 @@ Create timestamp from year, month, day, hour, minute and seconds fields
107104>>> printSQL (makeTimestamp (2013 :* 7 :* 15 :* 8 :* 15 *: 23.5))
108105make_timestamp(2013, 7, 15, 8, 15, 23.5)
109106-}
110−makeTimestamp :: FunctionN
107+makeTimestamp ::
111108 '[ null 'PGint4, null 'PGint4, null 'PGint4
112− , null 'PGint4, null 'PGint4, null 'PGfloat8 ]
113− ( null 'PGtimestamp )
109+ , null 'PGint4, null 'PGint4, null 'PGfloat8 ] ---> null 'PGtimestamp
114110makeTimestamp = unsafeFunctionN "make_timestamp"
115111
116112{-|
@@ -121,10 +117,9 @@ the current time zone is used
121117>>> printSQL (makeTimestamptz (2013 :* 7 :* 15 :* 8 :* 15 *: 23.5))
122118make_timestamptz(2013, 7, 15, 8, 15, 23.5)
123119-}
124−makeTimestamptz :: FunctionN
120+makeTimestamptz ::
125121 '[ null 'PGint4, null 'PGint4, null 'PGint4
126− , null 'PGint4, null 'PGint4, null 'PGfloat8 ]
127− ( null 'PGtimestamptz )
122+ , null 'PGint4, null 'PGint4, null 'PGfloat8 ] ---> null 'PGtimestamptz
128123makeTimestamptz = unsafeFunctionN "make_timestamptz"
129124
130125{-|
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Type.hs+101−4
@@ -23,15 +23,16 @@ Type expressions.
2323 , ScopedTypeVariables
2424 , TypeApplications
2525 , TypeOperators
26+ , UndecidableInstances
2627#-}
2728
2829module Squeal.PostgreSQL.Expression.Type
29− ( TypeExpression (..)
30− , cast
30+ ( -- * type casting
31+ cast
3132 , astype
3233 , inferredtype
33− , PGTyped (..)
34− , FieldTyped (..)
34+ -- * type expressions
35+ , TypeExpression (..)
3536 , typedef
3637 , typetable
3738 , typeview
@@ -78,6 +79,22 @@ module Squeal.PostgreSQL.Expression.Type
7879 , tsrange
7980 , tstzrange
8081 , daterange
82+ -- * column type definitions
83+ , ColumnTypeExpression (..)
84+ , nullable
85+ , notNullable
86+ , default_
87+ , serial2
88+ , smallserial
89+ , serial4
90+ , serial
91+ , serial8
92+ , bigserial
93+ , hask
94+ -- * type inference
95+ , PGTyped (..)
96+ , PGNullityTyped (..)
97+ , FieldTyped (..)
8198 ) where
8299
83100import Control.DeepSeq
@@ -91,6 +108,7 @@ import qualified Generics.SOP as SOP
91108
92109import Squeal.PostgreSQL.Alias
93110import Squeal.PostgreSQL.Expression
111+import Squeal.PostgreSQL.PG
94112import Squeal.PostgreSQL.Render
95113import Squeal.PostgreSQL.Schema
96114
@@ -132,6 +150,7 @@ astype = cast
132150inferredtype
133151 :: PGTyped schemas ty
134152 => Expression outer common grp schemas params from ty
153+ -- ^ value
135154 -> Expression outer common grp schemas params from ty
136155inferredtype = astype pgtype
137156
@@ -151,6 +170,7 @@ instance RenderSQL (TypeExpression schemas ty) where
151170typedef
152171 :: (Has sch schemas schema, Has td schema ('Typedef ty))
153172 => QualifiedAlias sch td
173+ -- ^ type alias
154174 -> TypeExpression schemas (null ty)
155175typedef = UnsafeTypeExpression . renderSQL
156176
@@ -159,6 +179,7 @@ typedef = UnsafeTypeExpression . renderSQL
159179typetable
160180 :: (Has sch schemas schema, Has tab schema ('Table table))
161181 => QualifiedAlias sch tab
182+ -- ^ table alias
162183 -> TypeExpression schemas (null ('PGcomposite (TableToRow table)))
163184typetable = UnsafeTypeExpression . renderSQL
164185
@@ -167,6 +188,7 @@ typetable = UnsafeTypeExpression . renderSQL
167188typeview
168189 :: (Has sch schemas schema, Has vw schema ('View view))
169190 => QualifiedAlias sch vw
191+ -- ^ view alias
170192 -> TypeExpression schemas (null ('PGcomposite view))
171193typeview = UnsafeTypeExpression . renderSQL
172194
@@ -340,6 +362,12 @@ instance (SOP.All KnownNat dims, PGTyped schemas ty)
340362instance PGTyped schemas (null 'PGtsvector) where pgtype = tsvector
341363instance PGTyped schemas (null 'PGtsquery) where pgtype = tsquery
342364instance PGTyped schemas (null 'PGoid) where pgtype = oid
365+instance PGTyped schemas (null ('PGrange 'PGint4)) where pgtype = int4range
366+instance PGTyped schemas (null ('PGrange 'PGint8)) where pgtype = int8range
367+instance PGTyped schemas (null ('PGrange 'PGnumeric)) where pgtype = numrange
368+instance PGTyped schemas (null ('PGrange 'PGtimestamp)) where pgtype = tsrange
369+instance PGTyped schemas (null ('PGrange 'PGtimestamptz)) where pgtype = tstzrange
370+instance PGTyped schemas (null ('PGrange 'PGdate)) where pgtype = daterange
343371
344372-- | Lift `PGTyped` to a field
345373class FieldTyped schemas ty where
@@ -347,3 +375,72 @@ class FieldTyped schemas ty where
347375instance (KnownSymbol alias, PGTyped schemas ty)
348376 => FieldTyped schemas (alias ::: ty) where
349377 fieldtype = pgtype `As` Alias
378+
379+-- | `ColumnTypeExpression`s are used in `createTable` commands.
380+newtype ColumnTypeExpression (schemas :: SchemasType) (ty :: ColumnType)
381+ = UnsafeColumnTypeExpression { renderColumnTypeExpression :: ByteString }
382+ deriving (GHC.Generic,Show,Eq,Ord,NFData)
383+instance RenderSQL (ColumnTypeExpression schemas ty) where
384+ renderSQL = renderColumnTypeExpression
385+
386+-- | used in `createTable` commands as a column constraint to note that
387+-- @NULL@ may be present in a column
388+nullable
389+ :: TypeExpression schemas (nullity ty)
390+ -> ColumnTypeExpression schemas ('NoDef :=> 'Null ty)
391+nullable ty = UnsafeColumnTypeExpression $ renderSQL ty <+> "NULL"
392+
393+-- | used in `createTable` commands as a column constraint to ensure
394+-- @NULL@ is not present in a column
395+notNullable
396+ :: TypeExpression schemas (nullity ty)
397+ -> ColumnTypeExpression schemas ('NoDef :=> 'NotNull ty)
398+notNullable ty = UnsafeColumnTypeExpression $ renderSQL ty <+> "NOT NULL"
399+
400+-- | used in `createTable` commands as a column constraint to give a default
401+default_
402+ :: Expression '[] '[] 'Ungrouped schemas '[] '[] ty
403+ -> ColumnTypeExpression schemas ('NoDef :=> ty)
404+ -> ColumnTypeExpression schemas ('Def :=> ty)
405+default_ x ty = UnsafeColumnTypeExpression $
406+ renderSQL ty <+> "DEFAULT" <+> renderExpression x
407+
408+-- | not a true type, but merely a notational convenience for creating
409+-- unique identifier columns with type `PGint2`
410+serial2, smallserial
411+ :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint2)
412+serial2 = UnsafeColumnTypeExpression "serial2"
413+smallserial = UnsafeColumnTypeExpression "smallserial"
414+-- | not a true type, but merely a notational convenience for creating
415+-- unique identifier columns with type `PGint4`
416+serial4, serial
417+ :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint4)
418+serial4 = UnsafeColumnTypeExpression "serial4"
419+serial = UnsafeColumnTypeExpression "serial"
420+-- | not a true type, but merely a notational convenience for creating
421+-- unique identifier columns with type `PGint8`
422+serial8, bigserial
423+ :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint8)
424+serial8 = UnsafeColumnTypeExpression "serial8"
425+bigserial = UnsafeColumnTypeExpression "bigserial"
426+
427+-- | Like @PGTyped@ but also accounts for nullity.
428+class PGNullityTyped schemas (nullty :: NullityType) where
429+ pgNullityType :: ColumnTypeExpression schemas ('NoDef :=> nullty)
430+
431+instance PGTyped schemas ('Null ty) => PGNullityTyped schemas ('Null ty) where
432+ pgNullityType = nullable (pgtype @_ @('Null ty))
433+
434+instance PGTyped schemas ('NotNull ty) => PGNullityTyped schemas ('NotNull ty) where
435+ pgNullityType = notNullable (pgtype @_ @('NotNull ty))
436+
437+-- | Allow you to specify pg column types in relation to haskell types.
438+-- >>> printSQL $ hask @(Maybe String)
439+-- text NULL
440+--
441+-- >>> printSQL $ hask @Double
442+-- float8 NOT NULL
443+hask
444+ :: forall hask schemas. PGNullityTyped schemas (NullPG hask)
445+ => ColumnTypeExpression schemas ('NoDef :=> NullPG hask)
446+hask = pgNullityType
squeal-postgresql/src/Squeal/PostgreSQL/List.hs+11−2
@@ -84,7 +84,12 @@ infixl 9 *:
8484-- | @Elem@ is a promoted `Data.List.elem`.
8585type family Elem x xs where
8686 Elem x '[] = 'False
87− Elem x (x ': xs) = 'True
87+ Elem x (x ': _) = 'True
88+ Elem x (_ ': x ': _) = 'True
89+ Elem x (_ ': _ ': x ': _) = 'True
90+ Elem x (_ ': _ ': _ ': x ': _) = 'True
91+ Elem x (_ ': _ ': _ ': _ ': x ': _) = 'True
92+ Elem x (_ ': _ ': _ ': _ ': _ ': x ': _) = 'True
8893 Elem x (_ ': xs) = Elem x xs
8994
9095-- | @In x xs@ is a constraint that proves that @x@ is in @xs@.
@@ -99,5 +104,9 @@ Length '[Char,String,Bool,Double] :: Nat
99104= 4
100105-}
101106type family Length (xs :: [k]) :: Nat where
102− Length (x : xs) = 1 + Length xs
107+ Length (_ ': _ ': _ ': _ ': _ : xs) = 5 + Length xs
108+ Length (_ ': _ ': _ ': _ : xs) = 4 + Length xs
109+ Length (_ ': _ ': _ : xs) = 3 + Length xs
110+ Length (_ ': _ : xs) = 2 + Length xs
111+ Length (_ : xs) = 1 + Length xs
103112 Length '[] = 0
squeal-postgresql/src/Squeal/PostgreSQL/Migration.hs+1
@@ -168,6 +168,7 @@ import Squeal.PostgreSQL.Alias
168168import Squeal.PostgreSQL.Binary
169169import Squeal.PostgreSQL.Definition
170170import Squeal.PostgreSQL.Definition.Table
171+import Squeal.PostgreSQL.Definition.Table.Constraint
171172import Squeal.PostgreSQL.Expression.Comparison
172173import Squeal.PostgreSQL.Expression.Parameter
173174import Squeal.PostgreSQL.Expression.Time
squeal-postgresql/src/Squeal/PostgreSQL/PG.hs+22−12
@@ -47,7 +47,7 @@ module Squeal.PostgreSQL.PG
4747 , Enumerated (..)
4848 , VarArray (..)
4949 , FixArray (..)
50− , Oid (..)
50+ , LibPQ.Oid (..)
5151 -- * Type families
5252 , LabelsPG
5353 , DimPG
@@ -66,7 +66,6 @@ import Data.Int (Int16, Int32, Int64)
6666import Data.Scientific (Scientific)
6767import Data.Time (Day, DiffTime, LocalTime, TimeOfDay, TimeZone, UTCTime)
6868import Data.Vector (Vector)
69−import Data.Word (Word32)
7069import Data.UUID.Types (UUID)
7170import GHC.TypeLits
7271import Network.IP.Addr (NetAddr, IP)
@@ -75,6 +74,7 @@ import qualified Data.ByteString.Lazy as Lazy (ByteString)
7574import qualified Data.ByteString as Strict (ByteString)
7675import qualified Data.Text.Lazy as Lazy (Text)
7776import qualified Data.Text as Strict (Text)
77+import qualified Database.PostgreSQL.LibPQ as LibPQ
7878import qualified GHC.Generics as GHC
7979import qualified Generics.SOP as SOP
8080import qualified Generics.SOP.Record as SOP
@@ -108,7 +108,7 @@ type instance PG Int32 = 'PGint4
108108-- | `PGint8`
109109type instance PG Int64 = 'PGint8
110110-- | `PGint2`
111−type instance PG Oid = 'PGoid
111+type instance PG LibPQ.Oid = 'PGoid
112112-- | `PGnumeric`
113113type instance PG Scientific = 'PGnumeric
114114-- | `PGfloat4`
@@ -178,8 +178,16 @@ type family RowPG (hask :: Type) :: RowType where
178178
179179-- | `RowOf` applies `NullPG` to the fields of a list.
180180type family RowOf (record :: [(Symbol, Type)]) :: RowType where
181− RowOf '[] = '[]
181+ RowOf (col ::: ty ': col1 ::: ty1 ': col2 ::: ty2 ': col3 ::: ty3 ': col4 ::: ty4 ': record) =
182+ col ::: NullPG ty ': col1 ::: NullPG ty1 ': col2 ::: NullPG ty2 ': col3 ::: NullPG ty3 ': col4 ::: NullPG ty4 ': RowOf record
183+ RowOf (col ::: ty ': col1 ::: ty1 ': col2 ::: ty2 ': col3 ::: ty3 ': record) =
184+ col ::: NullPG ty ': col1 ::: NullPG ty1 ': col2 ::: NullPG ty2 ': col3 ::: NullPG ty3 ': RowOf record
185+ RowOf (col ::: ty ': col1 ::: ty1 ': col2 ::: ty2 ': record) =
186+ col ::: NullPG ty ': col1 ::: NullPG ty1 ': col2 ::: NullPG ty2 ': RowOf record
187+ RowOf (col ::: ty ': col1 ::: ty1 ': record) =
188+ col ::: NullPG ty ': col1::: NullPG ty1 ': RowOf record
182189 RowOf (col ::: ty ': record) = col ::: NullPG ty ': RowOf record
190+ RowOf '[] = '[]
183191
184192{- | `NullPG` turns a Haskell type into a `NullityType`.
185193
@@ -206,8 +214,17 @@ type family TuplePG (hask :: Type) :: [NullityType] where
206214
207215-- | `TupleOf` turns a list of Haskell `Type`s into a list of `NullityType`s.
208216type family TupleOf (tuple :: [Type]) :: [NullityType] where
209− TupleOf '[] = '[]
217+ TupleOf (hask ': hask1 ': hask2 ': hask3 ': hask4 ': hask5 ': tuple) =
218+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': NullPG hask3 ': NullPG hask4 ': NullPG hask5 ': TupleOf tuple
219+ TupleOf (hask ': hask1 ': hask2 ': hask3 ': hask4 ': tuple) =
220+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': NullPG hask3 ': NullPG hask4 ': TupleOf tuple
221+ TupleOf (hask ': hask1 ': hask2 ': hask3 ': tuple) =
222+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': NullPG hask3 ': TupleOf tuple
223+ TupleOf (hask ': hask1 ': hask2 ': tuple) =
224+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': TupleOf tuple
225+ TupleOf (hask ': hask1 ': tuple) = NullPG hask ': NullPG hask1 ': TupleOf tuple
210226 TupleOf (hask ': tuple) = NullPG hask ': TupleOf tuple
227+ TupleOf '[] = '[]
211228
212229-- | `TupleCodeOf` takes the `SOP.Code` of a haskell `Type`
213230-- and if it's a simple product returns it, otherwise giving a `TypeError`.
@@ -369,10 +386,3 @@ newtype FixArray arr = FixArray {getFixArray :: arr}
369386 deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)
370387-- | `PGfixarray` @(@`DimPG` @hask) (@`FixPG` @hask)@
371388type instance PG (FixArray hask) = 'PGfixarray (DimPG hask) (FixPG hask)
372−
373−{- | Object identifiers (`Oid`s) are used internally by PostgreSQL
374−as primary keys for various system tables.
375−-}
376−newtype Oid = Oid { getOid :: Word32 }
377− deriving stock (Eq, Ord, Show, Read, GHC.Generic)
378− deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)
squeal-postgresql/src/Squeal/PostgreSQL/PQ.hs+41−17
@@ -78,6 +78,7 @@ import UnliftIO (MonadUnliftIO (..), bracket, catch, handle, try)
7878import Data.ByteString (ByteString)
7979import Data.Foldable
8080import Data.Function ((&))
81+import Data.Functor ((<&>))
8182import Data.Kind
8283import Data.Text (pack, Text)
8384import Data.Traversable
@@ -86,6 +87,7 @@ import PostgreSQL.Binary.Encoding (encodingBytes)
8687
8788import qualified Control.Monad.Fail as Fail
8889import qualified Database.PostgreSQL.LibPQ as LibPQ
90+import qualified PostgreSQL.Binary.Encoding as Encoding
8991
9092import Squeal.PostgreSQL.Binary
9193import Squeal.PostgreSQL.Definition
@@ -315,13 +317,13 @@ a default instance.
315317-}
316318class Monad pq => MonadPQ schemas pq | pq -> schemas where
317319 manipulateParams
318− :: ToParams x params
320+ :: (ToParams x params, All OidOfParam params)
319321 => Manipulation '[] schemas params ys
320322 -- ^ `insertInto`, `update` or `deleteFrom`
321323 -> x -> pq (K LibPQ.Result ys)
322324 default manipulateParams
323325 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)
324− => ToParams x params
326+ => (ToParams x params, All OidOfParam params)
325327 => Manipulation '[] schemas params ys
326328 -- ^ `insertInto`, `update` or `deleteFrom`
327329 -> x -> pq (K LibPQ.Result ys)
@@ -329,7 +331,7 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where
329331 manipulateParams manipulation params
330332
331333 manipulateParams_
332− :: ToParams x params
334+ :: (ToParams x params, All OidOfParam params)
333335 => Manipulation '[] schemas params '[]
334336 -- ^ `insertInto`, `update` or `deleteFrom`
335337 -> x -> pq ()
@@ -342,7 +344,7 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where
342344 manipulate_ = void . manipulate
343345
344346 runQueryParams
345− :: ToParams x params
347+ :: (ToParams x params, All OidOfParam params)
346348 => Query '[] '[] schemas params ys
347349 -- ^ `select` and friends
348350 -> x -> pq (K LibPQ.Result ys)
@@ -355,19 +357,19 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where
355357 runQuery q = runQueryParams q ()
356358
357359 traversePrepared
358− :: (ToParams x params, Traversable list)
360+ :: (ToParams x params, Traversable list, All OidOfParam params)
359361 => Manipulation '[] schemas params ys
360362 -- ^ `insertInto`, `update`, or `deleteFrom`, and friends
361363 -> list x -> pq (list (K LibPQ.Result ys))
362364 default traversePrepared
363365 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)
364− => (ToParams x params, Traversable list)
366+ => (ToParams x params, Traversable list, All OidOfParam params)
365367 => Manipulation '[] schemas params ys -> list x -> pq (list (K LibPQ.Result ys))
366368 traversePrepared manipulation params = lift $
367369 traversePrepared manipulation params
368370
369371 forPrepared
370− :: (ToParams x params, Traversable list)
372+ :: (ToParams x params, Traversable list, All OidOfParam params)
371373 => list x
372374 -> Manipulation '[] schemas params ys
373375 -- ^ `insertInto`, `update` or `deleteFrom`
@@ -375,13 +377,13 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where
375377 forPrepared = flip traversePrepared
376378
377379 traversePrepared_
378− :: (ToParams x params, Foldable list)
380+ :: (ToParams x params, Foldable list, All OidOfParam params)
379381 => Manipulation '[] schemas params '[]
380382 -- ^ `insertInto`, `update` or `deleteFrom`
381383 -> list x -> pq ()
382384 default traversePrepared_
383385 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)
384− => (ToParams x params, Foldable list)
386+ => (ToParams x params, Foldable list, All OidOfParam params)
385387 => Manipulation '[] schemas params '[]
386388 -- ^ `insertInto`, `update` or `deleteFrom`
387389 -> list x -> pq ()
@@ -389,7 +391,7 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where
389391 traversePrepared_ manipulation params
390392
391393 forPrepared_
392− :: (ToParams x params, Foldable list)
394+ :: (ToParams x params, Foldable list, All OidOfParam params)
393395 => list x
394396 -> Manipulation '[] schemas params '[]
395397 -- ^ `insertInto`, `update` or `deleteFrom`
@@ -409,9 +411,17 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)
409411 (UnsafeManipulation q :: Manipulation '[] schemas ps ys) (params :: x) =
410412 PQ $ \ (K conn) -> do
411413 let
412− toParam' encoding =
413− (LibPQ.invalidOid, encodingBytes encoding, LibPQ.Binary)
414− params' = fmap (fmap toParam') (hcollapse (toParams @x @ps params))
414+ paramSet
415+ :: forall param. OidOfParam param
416+ => K (Maybe Encoding.Encoding) param
417+ -> K (Maybe (LibPQ.Oid, ByteString, LibPQ.Format)) param
418+ paramSet (K maybeEncoding) = K $
419+ maybeEncoding <&> \encoding ->
420+ (oidOfParam @param, encodingBytes encoding, LibPQ.Binary)
421+ params'
422+ = hcollapse
423+ . hcmap (Proxy @OidOfParam) paramSet
424+ $ toParams @x @ps params
415425 q' = q <> ";"
416426 resultMaybe <- liftIO $ LibPQ.execParams conn q' params' LibPQ.Binary
417427 case resultMaybe of
@@ -424,8 +434,15 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)
424434 traversePrepared
425435 (UnsafeManipulation q :: Manipulation '[] schemas xs ys) (list :: list x) =
426436 PQ $ \ (K conn) -> liftIO $ do
427− let temp = "temporary_statement"
428− prepResultMaybe <- LibPQ.prepare conn temp q Nothing
437+ let
438+ temp = "temporary_statement"
439+ paramOid :: forall p. OidOfParam p => K LibPQ.Oid p
440+ paramOid = K (oidOfParam @p)
441+ paramOids :: NP (K LibPQ.Oid) xs
442+ paramOids = hcpure (Proxy @OidOfParam) paramOid
443+ paramOids' :: [LibPQ.Oid]
444+ paramOids' = hcollapse paramOids
445+ prepResultMaybe <- LibPQ.prepare conn temp q (Just paramOids')
429446 case prepResultMaybe of
430447 Nothing -> throw $ ResultException
431448 "traversePrepared: LibPQ.prepare returned no results"
@@ -451,8 +468,15 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)
451468 traversePrepared_
452469 (UnsafeManipulation q :: Manipulation '[] schemas xs '[]) (list :: list x) =
453470 PQ $ \ (K conn) -> liftIO $ do
454− let temp = "temporary_statement"
455− prepResultMaybe <- LibPQ.prepare conn temp q Nothing
471+ let
472+ temp = "temporary_statement"
473+ paramOid :: forall p. OidOfParam p => K LibPQ.Oid p
474+ paramOid = K (oidOfParam @p)
475+ paramOids :: NP (K LibPQ.Oid) xs
476+ paramOids = hcpure (Proxy @OidOfParam) paramOid
477+ paramOids' :: [LibPQ.Oid]
478+ paramOids' = hcollapse paramOids
479+ prepResultMaybe <- LibPQ.prepare conn temp q (Just paramOids')
456480 case prepResultMaybe of
457481 Nothing -> throw $ ResultException
458482 "traversePrepared_: LibPQ.prepare returned no results"
squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+33−25
@@ -554,9 +554,9 @@ select_ = select . List
554554-- be subject to the elimination of duplicate rows using `selectDistinct`.
555555selectDistinct
556556 :: (SListI columns, columns ~ (col ': cols))
557− => Selection outer commons 'Ungrouped schemas params from columns
557+ => Selection outer commons grp schemas params from columns
558558 -- ^ selection
559− -> TableExpression outer commons 'Ungrouped schemas params from
559+ -> TableExpression outer commons grp schemas params from
560560 -- ^ intermediate virtual table
561561 -> Query outer commons schemas params columns
562562selectDistinct selection tabexpr = UnsafeQuery $
@@ -568,9 +568,9 @@ selectDistinct selection tabexpr = UnsafeQuery $
568568-- of a general `Selection`.
569569selectDistinct_
570570 :: (SListI columns, columns ~ (col ': cols))
571− => NP (Aliased (Expression outer commons 'Ungrouped schemas params from)) columns
571+ => NP (Aliased (Expression outer commons grp schemas params from)) columns
572572 -- ^ select list
573− -> TableExpression outer commons 'Ungrouped schemas params from
573+ -> TableExpression outer commons grp schemas params from
574574 -- ^ intermediate virtual table
575575 -> Query outer commons schemas params columns
576576selectDistinct_ = selectDistinct . List
@@ -580,14 +580,21 @@ selectDistinct_ = selectDistinct . List
580580the given expressions evaluate to equal. The DISTINCT ON expressions are
581581interpreted using the same rules as for ORDER BY. ORDER BY is used to
582582ensure that the desired row appears first.
583+
584+The DISTINCT ON expression(s) must match the leftmost ORDER BY expression(s).
585+The ORDER BY clause will normally contain additional expression(s) that
586+determine the desired precedence of rows within each DISTINCT ON group.
587+
588+In order to guarantee they match and reduce redundancy, this function
589+will prepend the The DISTINCT ON expressions to the ORDER BY clause.
583590-}
584591selectDistinctOn
585592 :: (SListI columns, columns ~ (col ': cols))
586− => [SortExpression outer commons 'Ungrouped schemas params from]
587− -- ^ distinct on and return the first row in ordering
588− -> Selection outer commons 'Ungrouped schemas params from columns
593+ => [SortExpression outer commons grp schemas params from]
594+ -- ^ DISTINCT ON expression(s) and prepended to ORDER BY clause
595+ -> Selection outer commons grp schemas params from columns
589596 -- ^ selection
590− -> TableExpression outer commons 'Ungrouped schemas params from
597+ -> TableExpression outer commons grp schemas params from
591598 -- ^ intermediate virtual table
592599 -> Query outer commons schemas params columns
593600selectDistinctOn distincts selection tab = UnsafeQuery $
@@ -608,11 +615,11 @@ selectDistinctOn distincts selection tab = UnsafeQuery $
608615-- of a general `Selection`.
609616selectDistinctOn_
610617 :: (SListI columns, columns ~ (col ': cols))
611− => [SortExpression outer commons 'Ungrouped schemas params from]
618+ => [SortExpression outer commons grp schemas params from]
612619 -- ^ distinct on and return the first row in ordering
613− -> NP (Aliased (Expression outer commons 'Ungrouped schemas params from)) columns
620+ -> NP (Aliased (Expression outer commons grp schemas params from)) columns
614621 -- ^ selection
615− -> TableExpression outer commons 'Ungrouped schemas params from
622+ -> TableExpression outer commons grp schemas params from
616623 -- ^ intermediate virtual table
617624 -> Query outer commons schemas params columns
618625selectDistinctOn_ distincts = selectDistinctOn distincts . List
@@ -750,7 +757,7 @@ instance RenderSQL (TableExpression outer commons grp schemas params from) where
750757from
751758 :: FromClause outer commons schemas params from -- ^ table reference
752759 -> TableExpression outer commons 'Ungrouped schemas params from
753−from tab = TableExpression tab [] NoGroups NoHaving [] [] []
760+from tab = TableExpression tab [] noGroups NoHaving [] [] []
754761
755762-- | A `where_` is an endomorphism of `TableExpression`s which adds a
756763-- search condition to the `whereClause`.
@@ -771,7 +778,7 @@ groupBy
771778groupBy bys rels = TableExpression
772779 { fromClause = fromClause rels
773780 , whereClause = whereClause rels
774− , groupByClause = Group bys
781+ , groupByClause = group bys
775782 , havingClause = Having []
776783 , orderByClause = []
777784 , limitClause = limitClause rels
@@ -985,19 +992,20 @@ instance (Has rel rels cols, Has col cols ty, bys ~ '[ '(rel, col)])
985992-- done on @NoGroups@ while all output `Expression`s must be aggregated
986993-- in @Group Nil@. In general, all output `Expression`s in the
987994-- complement of @bys@ must be aggregated in @Group bys@.
988−data GroupByClause grp from where
989− NoGroups :: GroupByClause 'Ungrouped from
990− Group
991− :: SListI bys
992− => NP (By from) bys
993− -> GroupByClause ('Grouped bys) from
994−
995−-- | Renders a `GroupByClause`.
995+newtype GroupByClause grp from = UnsafeGroupByClause
996+ { renderGroupByClause :: ByteString }
997+ deriving (GHC.Generic,Show,Eq,Ord,NFData)
996998instance RenderSQL (GroupByClause grp from) where
997− renderSQL = \case
998− NoGroups -> ""
999− Group Nil -> ""
1000− Group bys -> " GROUP BY" <+> renderCommaSeparated renderSQL bys
999+ renderSQL = renderGroupByClause
1000+noGroups :: GroupByClause 'Ungrouped from
1001+noGroups = UnsafeGroupByClause ""
1002+group
1003+ :: SListI bys
1004+ => NP (By from) bys
1005+ -> GroupByClause ('Grouped bys) from
1006+group bys = UnsafeGroupByClause $ case bys of
1007+ Nil -> ""
1008+ bys' -> " GROUP BY" <+> renderCommaSeparated renderSQL bys'
10011009
10021010-- | A `HavingClause` is used to eliminate groups that are not of interest.
10031011-- An `Ungrouped` `TableExpression` may only use `NoHaving` while a `Grouped`
squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+69−9
@@ -45,7 +45,7 @@ module Squeal.PostgreSQL.Schema
4545 , TableType
4646 , SchemumType (..)
4747 , IndexType (..)
48− , FunctionType (..)
48+ , FunctionType
4949 , OperatorType (..)
5050 , ReturnsType (..)
5151 , SchemaType
@@ -69,7 +69,9 @@ module Squeal.PostgreSQL.Schema
6969 , DropIfExists
7070 , DropSchemumIfExists
7171 , Alter
72+ , AlterIfExists
7273 , Rename
74+ , RenameIfExists
7375 , ConstraintInvolves
7476 , DropIfConstraintsInvolve
7577 , IsNotElem
@@ -258,9 +260,19 @@ type FromType = [(Symbol,RowType)]
258260
259261-- | `ColumnsToRow` removes column constraints.
260262type family ColumnsToRow (columns :: ColumnsType) :: RowType where
261− ColumnsToRow '[] = '[]
262− ColumnsToRow (column ::: constraint :=> ty ': columns) =
263+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': column3 ::: _ :=> ty3 ': column4 ::: _ :=> ty4 ': column5 ::: _ :=> ty5 ': columns) =
264+ column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': column5 ::: ty5 ': ColumnsToRow columns
265+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': column3 ::: _ :=> ty3 ': column4 ::: _ :=> ty4 ': columns) =
266+ column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': ColumnsToRow columns
267+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': column3 ::: _ :=> ty3 ': columns) =
268+ column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': ColumnsToRow columns
269+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': columns) =
270+ column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': ColumnsToRow columns
271+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': columns) =
272+ column ::: ty ': column1 ::: ty1 ': ColumnsToRow columns
273+ ColumnsToRow (column ::: _ :=> ty ': columns) =
263274 column ::: ty ': ColumnsToRow columns
275+ ColumnsToRow '[] = '[]
264276
265277-- | `TableToColumns` removes table constraints.
266278type family TableToColumns (table :: TableType) :: ColumnsType where
@@ -293,14 +305,24 @@ instance ty0 ~ ty1 => SamePGType
293305
294306-- | `AllNotNull` is a constraint that proves a `ColumnsType` has no @NULL@s.
295307type family AllNotNull (columns :: ColumnsType) :: Constraint where
308+ AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns
309+ AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns
310+ AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns
311+ AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns
312+ AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns
313+ AllNotNull (_ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns
296314 AllNotNull '[] = ()
297− AllNotNull (column ::: def :=> 'NotNull ty ': columns) = AllNotNull columns
298315
299316-- | `NotAllNull` is a constraint that proves a `ColumnsType` has some
300317-- @NOT NULL@.
301318type family NotAllNull (columns :: ColumnsType) :: Constraint where
302− NotAllNull (column ::: def :=> 'NotNull ty ': columns) = ()
303− NotAllNull (column ::: def :=> 'Null ty ': columns) = NotAllNull columns
319+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()
320+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()
321+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()
322+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()
323+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()
324+ NotAllNull (_ ::: _ :=> 'NotNull _ ': _) = ()
325+ NotAllNull (_ ::: _ :=> 'Null _ ': columns) = NotAllNull columns
304326
305327-- | `NullifyType` is an idempotent that nullifies a `NullityType`.
306328type family NullifyType (ty :: NullityType) :: NullityType where
@@ -309,17 +331,37 @@ type family NullifyType (ty :: NullityType) :: NullityType where
309331
310332-- | `NullifyRow` is an idempotent that nullifies a `RowType`.
311333type family NullifyRow (columns :: RowType) :: RowType where
312− NullifyRow '[] = '[]
334+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': column5 ::: ty5 ': columns) =
335+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': column4 ::: NullifyType ty4 ': column5 ::: NullifyType ty5 ': NullifyRow columns
336+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': columns) =
337+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': column4 ::: NullifyType ty4 ': NullifyRow columns
338+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': columns) =
339+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': NullifyRow columns
340+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': columns) =
341+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': NullifyRow columns
342+ NullifyRow (column ::: ty ': column1 ::: ty1 ': columns) =
343+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': NullifyRow columns
313344 NullifyRow (column ::: ty ': columns) =
314345 column ::: NullifyType ty ': NullifyRow columns
346+ NullifyRow '[] = '[]
315347
316348-- | `NullifyFrom` is an idempotent that nullifies a `FromType`
317349-- used to nullify the left or right hand side of an outer join
318350-- in a `Squeal.PostgreSQL.Query.FromClause`.
319351type family NullifyFrom (tables :: FromType) :: FromType where
320− NullifyFrom '[] = '[]
352+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': table4 ::: columns4 ': table5 ::: columns5 ': tables) =
353+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': table4 ::: NullifyRow columns5 ': table5 ::: NullifyRow columns4 ': NullifyFrom tables
354+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': table4 ::: columns4 ': tables) =
355+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': table4 ::: NullifyRow columns4 ': NullifyFrom tables
356+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': tables) =
357+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': NullifyFrom tables
358+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': tables) =
359+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': NullifyFrom tables
360+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': tables) =
361+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': NullifyFrom tables
321362 NullifyFrom (table ::: columns ': tables) =
322363 table ::: NullifyRow columns ': NullifyFrom tables
364+ NullifyFrom '[] = '[]
323365
324366-- | @Create alias x xs@ adds @alias ::: x@ to the end of @xs@ and is used in
325367-- `Squeal.PostgreSQL.Definition.createTable` statements and in @ALTER TABLE@
@@ -396,16 +438,34 @@ type family DropSchemumIfExists alias sch xs where
396438-- with the type @x@ and is used in `Squeal.PostgreSQL.Definition.alterTable`
397439-- and `Squeal.PostgreSQL.Definition.alterColumn`.
398440type family Alter alias x xs where
441+ Alter alias x '[] = TypeError
442+ ('Text "Alter: alias "
443+ ':<>: 'ShowType alias
444+ ':<>: 'Text " does not exist" )
399445 Alter alias x1 (alias ::: x0 ': xs) = alias ::: x1 ': xs
400446 Alter alias x1 (x0 ': xs) = x0 ': Alter alias x1 xs
401447
448+type family AlterIfExists alias x xs where
449+ AlterIfExists alias x '[] = '[]
450+ AlterIfExists alias x1 (alias ::: x0 ': xs) = alias ::: x1 ': xs
451+ AlterIfExists alias x1 (x0 ': xs) = x0 ': AlterIfExists alias x1 xs
452+
402453-- | @Rename alias0 alias1 xs@ replaces the alias @alias0@ by @alias1@ in @xs@
403454-- and is used in `Squeal.PostgreSQL.Definition.alterTableRename` and
404455-- `Squeal.PostgreSQL.Definition.renameColumn`.
405456type family Rename alias0 alias1 xs where
457+ Rename alias0 alias1 '[] = TypeError
458+ ('Text "Rename: alias "
459+ ':<>: 'ShowType alias0
460+ ':<>: 'Text " does not exist" )
406461 Rename alias0 alias1 ((alias0 ::: x0) ': xs) = (alias1 ::: x0) ': xs
407462 Rename alias0 alias1 (x ': xs) = x ': Rename alias0 alias1 xs
408463
464+type family RenameIfExists alias0 alias1 xs where
465+ RenameIfExists alias x '[] = '[]
466+ RenameIfExists alias0 alias1 ((alias0 ::: x0) ': xs) = (alias1 ::: x0) ': xs
467+ RenameIfExists alias0 alias1 (x ': xs) = x ': RenameIfExists alias0 alias1 xs
468+
409469-- | Check if a `TableConstraint` involves a column
410470type family ConstraintInvolves column constraint where
411471 ConstraintInvolves column ('Check columns) = column `Elem` columns
@@ -433,7 +493,7 @@ data SchemumType
433493 | Operator OperatorType
434494 | UnsafeSchemum Symbol
435495
436−data FunctionType = (::-->) [NullityType] ReturnsType
496+type FunctionType = ([NullityType], ReturnsType)
437497
438498data IndexType
439499 = Btree
squeal-postgresql/test/Property.hs+2−2
@@ -92,14 +92,14 @@ roundtrips = Group "roundtrips"
9292 -- genTimeWithZone = (,) <$> genTimeOfDay <*> genTimeZone
9393
9494roundtrip
95− :: (ToParam x ty, FromValue ty x, Show x, Eq x)
95+ :: (OidOf ty, ToParam x ty, FromValue ty x, Show x, Eq x)
9696 => TypeExpression schemas ('NotNull ty)
9797 -> Gen x
9898 -> (PropertyName, Property)
9999roundtrip = roundtripOn id
100100
101101roundtripOn
102− :: (ToParam x ty, FromValue ty x, Show x, Eq x)
102+ :: (OidOf ty, ToParam x ty, FromValue ty x, Show x, Eq x)
103103 => (x -> x)
104104 -> TypeExpression schemas ('NotNull ty)
105105 -> Gen x
squeal-postgresql/test/Spec.hs+11
@@ -123,3 +123,14 @@ spec = before_ setupDB . after_ dropDB $ do
123123 getRows =<< runQuery query
124124 (fromOnly <$> rangesOut :: [Range Int32]) `shouldBe`
125125 [ atLeast 3, 3 <=..< 5, Empty, whole ]
126+
127+ describe "Parameters" $ do
128+
129+ it "should run queries that don't reference all their parameters" $ do
130+
131+ out <- withConnection connectionString $ do
132+ let
133+ query :: Query_ (Public '[]) (Char,Int32) (Only Int32)
134+ query = values_ (param @2 `as` #fromOnly)
135+ firstRow =<< runQueryParams query ('a', 3 :: Int32)
136+ (fromOnly <$> out :: Maybe Int32) `shouldBe` Just 3