dev..e3cc556 · squeal · git.iko.soy

README.md+6−6

since splitsnapshots

unifiedsplit

@@ -121,7 +121,7 @@ type Schemas = Public Schema

121

122Notice the use of type operators.

123

124−`:::` is used to pair an alias `Symbol` with a `SchemumType`,

124+`:::` is used to pair an alias `GHC.TypeLits.Symbol` with a `SchemumType`,

125a `TableConstraint` or a `ColumnType`. It is intended to connote Haskell's `::`

126operator.

127

@@ -180,8 +180,8 @@ DROP TABLE "emails";

180DROP TABLE "users";

181```

182

183−We'll need a Haskell type for `User`s. We give the type `SOP.Generic` and

183+We'll need a Haskell type for @User@s. We give the type `Generics.SOP.Generic` and

184−`SOP.HasDatatypeInfo` instances so that we can encode and decode `User`s.

184+`Generics.SOP.HasDatatypeInfo` instances so that we can encode and decode @User@s.

185

186```Haskell

187>>> 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 `SOP.Generic` and

189>>> instance SOP.HasDatatypeInfo User

190```

191

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.

193A `Manipulation_` like `insertInto`, `update` or `deleteFrom`

194has three type parameters, the schemas it refers to, input parameters

195and an output row. When

196−we insert into the users table, we will need a parameter for the `name`

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

197+field but not for the @id@ field. Since it's serial, we can use a default

198value. However, since the emails table refers to the users table, we will

199need to retrieve the user id that the insert generates and insert it into

200the 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

138 . Expression outer commons grp schemas params from x

139```

140

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

142type `(->)`.

143

144```Haskell

145−type (-->) x y

145+type (:-->) x y

146 = forall outer commons grp schemas params from

147 . Expression outer commons grp schemas params from x

148 -> Expression outer commons grp schemas params from y

squeal-postgresql/exe/Example.hs+2−2

@@ -53,8 +53,8 @@ setup =

53 >>>

54 createTable #emails

55 ( serial `as` #id :*

56− hask @Int32 `as` #user_id :*

56+ (int & notNullable) `as` #user_id :*

57− hask @(Maybe Text) `as` #email )

57+ (text & nullable) `as` #email )

58 ( primaryKey #id `as` #pk_emails :*

59 foreignKey #user_id #users #id

60 OnDeleteCascade OnUpdateCascade `as` #fk_user_id )

squeal-postgresql/squeal-postgresql.cabal+1−2

@@ -28,7 +28,6 @@ library

28 Squeal.PostgreSQL.Definition.Function

29 Squeal.PostgreSQL.Definition.Index

30 Squeal.PostgreSQL.Definition.Table

31− Squeal.PostgreSQL.Definition.Table.Constraint

32 Squeal.PostgreSQL.Definition.Type

31 Squeal.PostgreSQL.Definition.Type

33 Squeal.PostgreSQL.Definition.Schema

32 Squeal.PostgreSQL.Definition.Schema

34 Squeal.PostgreSQL.Definition.View

33 Squeal.PostgreSQL.Definition.View

@@ -43,7 +42,7 @@ library

43 Squeal.PostgreSQL.Expression.Null

42 Squeal.PostgreSQL.Expression.Null

44 Squeal.PostgreSQL.Expression.Parameter

43 Squeal.PostgreSQL.Expression.Parameter

45 Squeal.PostgreSQL.Expression.Range

44 Squeal.PostgreSQL.Expression.Range

46− Squeal.PostgreSQL.Expression.Set

45+ Squeal.PostgreSQL.Expression.SetOf

47 Squeal.PostgreSQL.Expression.Sort

46 Squeal.PostgreSQL.Expression.Sort

48 Squeal.PostgreSQL.Expression.Subquery

47 Squeal.PostgreSQL.Expression.Subquery

49 Squeal.PostgreSQL.Expression.Text

48 Squeal.PostgreSQL.Expression.Text

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

@@ -199,7 +199,6 @@ import Squeal.PostgreSQL.Definition.Function as X

199import Squeal.PostgreSQL.Definition.Index as X

200import Squeal.PostgreSQL.Definition.Schema as X

201import Squeal.PostgreSQL.Definition.Table as X

202−import Squeal.PostgreSQL.Definition.Table.Constraint as X

203import Squeal.PostgreSQL.Definition.Type as X

202import Squeal.PostgreSQL.Definition.Type as X

204import Squeal.PostgreSQL.Definition.View as X

203import Squeal.PostgreSQL.Definition.View as X

205import Squeal.PostgreSQL.Expression as X

204import Squeal.PostgreSQL.Expression as X

@@ -213,7 +212,7 @@ import Squeal.PostgreSQL.Expression.Math as X

213import Squeal.PostgreSQL.Expression.Null as X

212import Squeal.PostgreSQL.Expression.Null as X

214import Squeal.PostgreSQL.Expression.Parameter as X

213import Squeal.PostgreSQL.Expression.Parameter as X

215import Squeal.PostgreSQL.Expression.Range as X

214import Squeal.PostgreSQL.Expression.Range as X

216−import Squeal.PostgreSQL.Expression.Set as X

215+import Squeal.PostgreSQL.Expression.SetOf as X

217import Squeal.PostgreSQL.Expression.Sort as X

216import Squeal.PostgreSQL.Expression.Sort as X

218import Squeal.PostgreSQL.Expression.Subquery as X

217import Squeal.PostgreSQL.Expression.Subquery as X

219import Squeal.PostgreSQL.Expression.Text as X

218import Squeal.PostgreSQL.Expression.Text as X

squeal-postgresql/src/Squeal/PostgreSQL/Binary.hs+40−130

@@ -216,9 +216,8 @@ module Squeal.PostgreSQL.Binary

216 -- * Only

217 , Only (..)

218 -- * Oid

219− , OidOf (..)

219+ , HasOid (..)

220− , OidOfParam (..)

220+ , HasAliasedOid (..)

221− , OidOfField (..)

222 ) where

221 ) where

223

222

224import BinaryParser

223import BinaryParser

@@ -232,7 +231,6 @@ import Data.Time

232import Data.UUID.Types

231import Data.UUID.Types

233import Data.Vector (Vector)

232import Data.Vector (Vector)

234import Data.Word

233import Data.Word

235−import Foreign.C.Types (CUInt(CUInt))

236import Generics.SOP

234import Generics.SOP

237import Generics.SOP.Record

235import Generics.SOP.Record

238import GHC.TypeLits

236import GHC.TypeLits

@@ -246,7 +244,6 @@ import qualified Data.Text.Lazy as Lazy (Text)

246import qualified Data.Text as Strict (Text)

244import qualified Data.Text as Strict (Text)

247import qualified Data.Text as Strict.Text

245import qualified Data.Text as Strict.Text

248import qualified Data.Vector as Vector

246import qualified Data.Vector as Vector

249−import qualified Database.PostgreSQL.LibPQ as LibPQ

250import qualified GHC.Generics as GHC

247import qualified GHC.Generics as GHC

251import qualified PostgreSQL.Binary.Decoding as Decoding

248import qualified PostgreSQL.Binary.Decoding as Decoding

252import qualified PostgreSQL.Binary.Encoding as Encoding

249import qualified PostgreSQL.Binary.Encoding as Encoding

@@ -312,24 +309,24 @@ instance Aeson.ToJSON x => ToParam (Json x) 'PGjson where

312instance Aeson.ToJSON x => ToParam (Jsonb x) 'PGjsonb where

309instance Aeson.ToJSON x => ToParam (Jsonb x) 'PGjsonb where

313 toParam = K . Encoding.jsonb_bytes

310 toParam = K . Encoding.jsonb_bytes

314 . Lazy.ByteString.toStrict . Aeson.encode . getJsonb

311 . Lazy.ByteString.toStrict . Aeson.encode . getJsonb

315−instance (ToNullityParam x ty, ty ~ nullity pg, OidOf pg)

312+instance (ToNullityParam x ty, ty ~ nullity pg, HasOid pg)

316 => ToParam (VarArray [x]) ('PGvararray ty) where

313 => ToParam (VarArray [x]) ('PGvararray ty) where

317 toParam = K

314 toParam = K

318 . Encoding.array_foldable

315 . Encoding.array_foldable

319 (getOid (oidOf @pg)) (unK . toNullityParam @x @ty)

316 (getOid (oidOf @pg)) (unK . toNullityParam @x @ty)

320 . getVarArray

317 . getVarArray

321−instance (ToParam x pg, OidOf pg)

318+instance (ToParam x pg, HasOid pg)

322 => ToParam (VarArray (Vector x)) ('PGvararray ('NotNull pg)) where

319 => ToParam (VarArray (Vector x)) ('PGvararray ('NotNull pg)) where

323 toParam = K

320 toParam = K

324 . Encoding.array_vector (getOid (oidOf @pg)) (unK . toParam @x @pg)

321 . Encoding.array_vector (getOid (oidOf @pg)) (unK . toParam @x @pg)

325 . getVarArray

322 . getVarArray

326−instance (ToParam x pg, OidOf pg)

323+instance (ToParam x pg, HasOid pg)

327 => ToParam (VarArray (Vector (Maybe x))) ('PGvararray ('Null pg)) where

324 => ToParam (VarArray (Vector (Maybe x))) ('PGvararray ('Null pg)) where

328 toParam = K

325 toParam = K

329 . Encoding.nullableArray_vector

326 . Encoding.nullableArray_vector

330 (getOid (oidOf @pg)) (unK . toParam @x @pg)

327 (getOid (oidOf @pg)) (unK . toParam @x @pg)

331 . getVarArray

328 . getVarArray

332−instance (ToFixArray x dims ty, ty ~ nullity pg, OidOf pg)

329+instance (ToFixArray x dims ty, ty ~ nullity pg, HasOid pg)

333 => ToParam (FixArray x) ('PGfixarray dims ty) where

330 => ToParam (FixArray x) ('PGfixarray dims ty) where

334 toParam = K . Encoding.array (getOid (oidOf @pg))

331 toParam = K . Encoding.array (getOid (oidOf @pg))

335 . unK . unK . toFixArray @x @dims @ty . getFixArray

332 . unK . unK . toFixArray @x @dims @ty . getFixArray

@@ -356,7 +353,7 @@ instance

356 ( SListI fields

353 ( SListI fields

357 , IsRecord x xs

354 , IsRecord x xs

358 , AllZip ToField xs fields

355 , AllZip ToField xs fields

359− , All OidOfField fields

356+ , All HasAliasedOid fields

360 ) => ToParam (Composite x) ('PGcomposite fields) where

357 ) => ToParam (Composite x) ('PGcomposite fields) where

361 toParam =

358 toParam =

362 let

359 let

@@ -364,7 +361,7 @@ instance

364 encoders = htrans (Proxy @ToField) toField

361 encoders = htrans (Proxy @ToField) toField

365

362

366 composite

363 composite

367− :: All OidOfField row

364+ :: All HasAliasedOid row

368 => NP (K (Maybe Encoding.Encoding)) row

365 => NP (K (Maybe Encoding.Encoding)) row

369 -> K Encoding.Encoding ('PGcomposite row)

366 -> K Encoding.Encoding ('PGcomposite row)

370 composite fields = K $

367 composite fields = K $

@@ -381,18 +378,18 @@ instance

381 int32BE (fromIntegral (lengthSList (Proxy @xs))) <>

378 int32BE (fromIntegral (lengthSList (Proxy @xs))) <>

382 let

379 let

383 each

380 each

384− :: OidOfField field

381+ :: HasAliasedOid field

385 => K (Maybe Encoding.Encoding) field

382 => K (Maybe Encoding.Encoding) field

386 -> Encoding.Encoding

383 -> Encoding.Encoding

387 each (K field :: K (Maybe Encoding.Encoding) field) =

384 each (K field :: K (Maybe Encoding.Encoding) field) =

388− word32BE (getOid (oidOfField @field))

385+ word32BE (getOid (aliasedOid @field))

389 <> case field of

386 <> case field of

390 Nothing -> int64BE (-1)

387 Nothing -> int64BE (-1)

391 Just value ->

388 Just value ->

392 int32BE (fromIntegral (builderLength value))

389 int32BE (fromIntegral (builderLength value))

393 <> value

390 <> value

394 in

391 in

395− hcfoldMap (Proxy @OidOfField) each fields

392+ hcfoldMap (Proxy @HasAliasedOid) each fields

396

393

397 in

394 in

398 composite . encoders . toRecord . getComposite

395 composite . encoders . toRecord . getComposite

@@ -401,119 +398,35 @@ instance

401--

398--

402-- >>> :set -XTypeApplications

399-- >>> :set -XTypeApplications

403-- >>> oidOf @'PGbool

400-- >>> oidOf @'PGbool

404−-- Oid 16

401+-- Oid {getOid = 16}

405−class OidOf (ty :: PGType) where oidOf :: LibPQ.Oid

402+class HasOid (ty :: PGType) where oidOf :: Oid

406−instance OidOf 'PGbool where oidOf = LibPQ.Oid 16

403+instance HasOid 'PGbool where oidOf = 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

404+instance HasOid 'PGint2 where oidOf = 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

405+instance HasOid 'PGint4 where oidOf = 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

406+instance HasOid 'PGint8 where oidOf = 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

407+instance HasOid 'PGnumeric where oidOf = 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

408+instance HasOid 'PGfloat4 where oidOf = 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

409+instance HasOid 'PGfloat8 where oidOf = 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

410+instance HasOid ('PGchar n) where oidOf = 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

411+instance HasOid ('PGvarchar n) where oidOf = 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

412+instance HasOid 'PGtext where oidOf = 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

413+instance HasOid 'PGbytea where oidOf = 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

414+instance HasOid 'PGtimestamp where oidOf = 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

415+instance HasOid 'PGtimestamptz where oidOf = 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

416+instance HasOid 'PGdate where oidOf = 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

417+instance HasOid 'PGtime where oidOf = 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

418+instance HasOid 'PGtimetz where oidOf = 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

419+instance HasOid 'PGinterval where oidOf = 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

420+instance HasOid 'PGuuid where oidOf = 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

421+instance HasOid 'PGinet where oidOf = 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

422+instance HasOid 'PGjson where oidOf = 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

423+instance HasOid 'PGjsonb where oidOf = Oid 3802

470−instance OidOf ('PGfixarray ns (null 'PGjsonb)) where oidOf = LibPQ.Oid 3807

424+

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.

425+-- | Lifts a `HasOid` constraint to a field.

513−class OidOfField (field :: (Symbol, NullityType)) where

426+class HasAliasedOid (field :: (Symbol, NullityType)) where

514− oidOfField :: Oid

427+ aliasedOid :: Oid

515−instance OidOf ty => OidOfField (alias ::: nullity ty) where

428+instance HasOid ty => HasAliasedOid (alias ::: nullity ty) where

516− oidOfField = oidOf @ty

429+ aliasedOid = oidOf @ty

517

430

518-- | A `ToNullityParam` constraint gives an encoding of a Haskell `Type` into

431-- | A `ToNullityParam` constraint gives an encoding of a Haskell `Type` into

519-- into the binary format of a PostgreSQL `NullityType`.

432-- into the binary format of a PostgreSQL `NullityType`.

@@ -843,6 +756,3 @@ replicateMN

843 => m x -> m (NP I xs)

756 => m x -> m (NP I xs)

844replicateMN mx = hsequence' $

757replicateMN mx = hsequence' $

845 hcpure (Proxy :: Proxy ((~) x)) (Comp (I <$> mx))

758 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,7 +27,6 @@ Squeal data definition language.

27 , TypeInType

28 , TypeOperators

29 , UndecidableSuperClasses

30− , UndecidableInstances

31#-}

30#-}

32

31

33module Squeal.PostgreSQL.Definition

32module Squeal.PostgreSQL.Definition

squeal-postgresql/src/Squeal/PostgreSQL/Definition/Function.hs+12−12

@@ -54,7 +54,7 @@ import qualified Generics.SOP as SOP

54import qualified GHC.Generics as GHC

55

56import Squeal.PostgreSQL.Alias

57−import Squeal.PostgreSQL.Definition

57+import Squeal.PostgreSQL.Definition (Definition (..))

58import Squeal.PostgreSQL.Expression

59import Squeal.PostgreSQL.Expression.Type

60import Squeal.PostgreSQL.List

@@ -73,7 +73,7 @@ createFunction

73 -> NP (TypeExpression schemas) args

74 -> TypeExpression schemas ret

75 -> 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)

77createFunction fun args ret fundef = UnsafeDefinition $

78 "CREATE" <+> "FUNCTION" <+> renderSQL fun

79 <+> parenthesized (renderCommaSeparated renderSQL args)

@@ -87,7 +87,7 @@ createOrReplaceFunction

87 -> NP (TypeExpression schemas) args

88 -> TypeExpression schemas ret

89 -> 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)

91createOrReplaceFunction fun args ret fundef = UnsafeDefinition $

92 "CREATE" <+> "OR" <+> "REPLACE" <+> "FUNCTION" <+> renderSQL fun

93 <+> parenthesized (renderCommaSeparated renderSQL args)

@@ -115,7 +115,7 @@ createSetFunction

115 -> NP (TypeExpression schemas) args

116 -> NP (Aliased (TypeExpression schemas)) rets

117 -> 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)

119createSetFunction fun args rets fundef = UnsafeDefinition $

120 "CREATE" <+> "FUNCTION" <+> renderSQL fun

121 <+> parenthesized (renderCommaSeparated renderSQL args)

@@ -128,14 +128,14 @@ createSetFunction fun args rets fundef = UnsafeDefinition $

128

129createOrReplaceSetFunction

130 :: ( Has sch schemas schema

131− , KnownSymbol fun

131+ , Has fun schema ('Function (args0 '::--> ret0))

132 , SOP.SListI args

133 , SOP.SListI rets )

134 => QualifiedAlias sch fun

135 -> NP (TypeExpression schemas) args

136 -> NP (Aliased (TypeExpression schemas)) rets

137 -> 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)

139createOrReplaceSetFunction fun args rets fundef = UnsafeDefinition $

140 "CREATE" <+> "OR" <+> "REPLACE" <+> "FUNCTION" <+> renderSQL fun

141 <+> parenthesized (renderCommaSeparated renderSQL args)

@@ -149,9 +149,9 @@ createOrReplaceSetFunction fun args rets fundef = UnsafeDefinition $

149createBinaryOp

150 :: forall op fun sch schemas schema x y z.

151 ( Has sch schemas schema

152− , Has fun schema ('Function ('[x,y] :=> 'Returns z))

152+ , Has fun schema ('Function ('[x,y] '::--> 'Returns z))

153 , KnownSymbol op )

154− => QualifiedAlias sch fun

154+ => Alias fun

155 -> TypeExpression schemas x

156 -> TypeExpression schemas y

157 -> Definition schemas

@@ -168,9 +168,9 @@ createBinaryOp fun x y = UnsafeDefinition $

168createLeftOp

169 :: forall op fun sch schemas schema x y.

170 ( Has sch schemas schema

171− , Has fun schema ('Function ('[x] :=> 'Returns y))

171+ , Has fun schema ('Function ('[x] '::--> 'Returns y))

172 , KnownSymbol op )

173− => QualifiedAlias sch fun

173+ => Alias fun

174 -> TypeExpression schemas x

175 -> Definition schemas

176 (Alter sch (Create op ('Operator ('LeftOp x y)) schema) schemas)

@@ -185,9 +185,9 @@ createLeftOp fun x = UnsafeDefinition $

185createRightOp

186 :: forall op fun sch schemas schema x y.

187 ( Has sch schemas schema

188− , Has fun schema ('Function ('[x] :=> 'Returns y))

188+ , Has fun schema ('Function ('[x] '::--> 'Returns y))

189 , KnownSymbol op )

190− => QualifiedAlias sch fun

190+ => Alias fun

191 -> TypeExpression schemas x

192 -> Definition schemas

193 (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

49import qualified GHC.Generics as GHC

50

51import Squeal.PostgreSQL.Alias

52−import Squeal.PostgreSQL.Definition

52+import Squeal.PostgreSQL.Definition (Definition (..))

53import Squeal.PostgreSQL.Expression.Sort

54import Squeal.PostgreSQL.Render

55import Squeal.PostgreSQL.Schema

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

@@ -39,7 +39,7 @@ module Squeal.PostgreSQL.Definition.Schema

39import GHC.TypeLits

40

41import Squeal.PostgreSQL.Alias

42−import Squeal.PostgreSQL.Definition

42+import Squeal.PostgreSQL.Definition (Definition (..))

43import Squeal.PostgreSQL.Render

44import Squeal.PostgreSQL.Schema

45

squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table.hs+363−37

@@ -34,10 +34,16 @@ module Squeal.PostgreSQL.Definition.Table

34 , createTableIfNotExists

35 , dropTable

36 , dropTableIfExists

37+ , TableConstraintExpression (..)

38+ , check

39+ , unique

40+ , primaryKey

41+ , foreignKey

42+ , ForeignKeyed

43+ , OnDeleteClause (..)

44+ , OnUpdateClause (..)

37 , alterTable

45 , alterTable

38− , alterTableIfExists

39 , alterTableRename

46 , alterTableRename

40− , alterTableIfExistsRename

41 , AlterTable (..)

47 , AlterTable (..)

42 , addConstraint

48 , addConstraint

43 , dropConstraint

49 , dropConstraint

@@ -51,6 +57,17 @@ module Squeal.PostgreSQL.Definition.Table

51 , setNotNull

57 , setNotNull

52 , dropNotNull

58 , dropNotNull

53 , alterType

59 , alterType

60+ -- * Columns

61+ , ColumnTypeExpression (..)

62+ , nullable

63+ , notNullable

64+ , default_

65+ , serial2

66+ , smallserial

67+ , serial4

68+ , serial

69+ , serial8

70+ , bigserial

54 ) where

71 ) where

55

72

56import Control.DeepSeq

73import Control.DeepSeq

@@ -61,9 +78,9 @@ import qualified Generics.SOP as SOP

61import qualified GHC.Generics as GHC

78import qualified GHC.Generics as GHC

62

79

63import Squeal.PostgreSQL.Alias

80import Squeal.PostgreSQL.Alias

64−import Squeal.PostgreSQL.Definition

81+import Squeal.PostgreSQL.Definition (Definition (..))

65−import Squeal.PostgreSQL.Definition.Table.Constraint

66import Squeal.PostgreSQL.Expression

82import Squeal.PostgreSQL.Expression

83+import Squeal.PostgreSQL.Expression.Logic

67import Squeal.PostgreSQL.Expression.Type

84import Squeal.PostgreSQL.Expression.Type

68import Squeal.PostgreSQL.List

85import Squeal.PostgreSQL.List

69import Squeal.PostgreSQL.Render

86import Squeal.PostgreSQL.Render

@@ -178,6 +195,288 @@ renderCreation tab columns constraints = renderSQL tab

178 renderConstraint (constraint `As` alias) =

195 renderConstraint (constraint `As` alias) =

179 "CONSTRAINT" <+> renderSQL alias <+> renderSQL constraint

196 "CONSTRAINT" <+> renderSQL alias <+> renderSQL constraint

180

197

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+

181-- | `dropTable` removes a table from the schema.

480-- | `dropTable` removes a table from the schema.

182--

481--

183-- >>> :{

482-- >>> :{

@@ -197,56 +496,35 @@ dropTable tab = UnsafeDefinition $ "DROP TABLE" <+> renderSQL tab <> ";"

197

496

198dropTableIfExists

497dropTableIfExists

199 :: ( Has sch schemas schema

498 :: ( Has sch schemas schema

200− , KnownSymbol tab)

499+ , Has tab schema ('Table table))

201 => QualifiedAlias sch tab -- ^ table to remove

500 => QualifiedAlias sch tab -- ^ table to remove

202− -> Definition schemas (Alter sch (DropSchemumIfExists tab 'Table schema) schemas)

501+ -> Definition schemas (Alter sch (DropIfExists tab schema) schemas)

203dropTableIfExists tab = UnsafeDefinition $ "DROP TABLE IF EXISTS" <+> renderSQL tab <> ";"

502dropTableIfExists tab = UnsafeDefinition $ "DROP TABLE IF EXISTS" <+> renderSQL tab <> ";"

204

503

205-- | `alterTable` changes the definition of a table from the schema.

504-- | `alterTable` changes the definition of a table from the schema.

206alterTable

505alterTable

207− :: (Has sch schemas schema, KnownSymbol tab)

506+ :: (Has sch schemas schema, Has tab schema ('Table table0))

208 => QualifiedAlias sch tab -- ^ table to alter

507 => QualifiedAlias sch tab -- ^ table to alter

209− -> AlterTable sch tab schemas table -- ^ alteration to perform

508+ -> AlterTable sch tab schemas table1 -- ^ alteration to perform

210− -> Definition schemas (Alter sch (Alter tab ('Table table) schema) schemas)

509+ -> Definition schemas (Alter sch (Alter tab ('Table table1) schema) schemas)

211alterTable tab alteration = UnsafeDefinition $

510alterTable tab alteration = UnsafeDefinition $

212 "ALTER TABLE"

511 "ALTER TABLE"

213 <+> renderSQL tab

512 <+> renderSQL tab

214 <+> renderAlterTable alteration

513 <+> renderAlterTable alteration

215 <> ";"

514 <> ";"

216

515

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−

229-- | `alterTableRename` changes the name of a table from the schema.

516-- | `alterTableRename` changes the name of a table from the schema.

230--

517--

231-- >>> printSQL $ alterTableRename #foo #bar

518-- >>> printSQL $ alterTableRename #foo #bar

232-- ALTER TABLE "foo" RENAME TO "bar";

519-- ALTER TABLE "foo" RENAME TO "bar";

233alterTableRename

520alterTableRename

234− :: (KnownSymbol tab0, KnownSymbol tab1)

521+ :: (KnownSymbol table0, KnownSymbol table1)

235− => Alias tab0 -- ^ table to rename

522+ => Alias table0 -- ^ table to rename

236− -> Alias tab1 -- ^ what to rename it

523+ -> Alias table1 -- ^ what to rename it

237− -> Definition schema (Rename tab0 tab1 schema)

524+ -> Definition schema (Rename table0 table1 schema)

238−alterTableRename tab0 tab1 = UnsafeDefinition $

525+alterTableRename table0 table1 = UnsafeDefinition $

239− "ALTER TABLE" <+> renderSQL tab0

526+ "ALTER TABLE" <+> renderSQL table0

240− <+> "RENAME TO" <+> renderSQL tab1 <> ";"

527+ <+> "RENAME TO" <+> renderSQL table1 <> ";"

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 <> ";"

250

528

251-- | An `AlterTable` describes the alteration to perform on the columns

529-- | An `AlterTable` describes the alteration to perform on the columns

252-- of a table.

530-- of a table.

@@ -498,3 +776,51 @@ dropNotNull = UnsafeAlterColumn $ "DROP NOT NULL"

498-- ALTER TABLE "tab" ALTER COLUMN "col" TYPE numeric NOT NULL;

776-- ALTER TABLE "tab" ALTER COLUMN "col" TYPE numeric NOT NULL;

499alterType :: ColumnTypeExpression schemas ty -> AlterColumn schemas ty0 ty

777alterType :: ColumnTypeExpression schemas ty -> AlterColumn schemas ty0 ty

500alterType ty = UnsafeAlterColumn $ "TYPE" <+> renderColumnTypeExpression ty

778alterType 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.hsdeleted−339

@@ -1,339 +0,0 @@

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

50import Squeal.PostgreSQL.Alias

51import Squeal.PostgreSQL.Expression.Logic

52import Squeal.PostgreSQL.Expression.Type

53−import Squeal.PostgreSQL.Definition

53+import Squeal.PostgreSQL.Definition (Definition (..))

54import Squeal.PostgreSQL.List

55import Squeal.PostgreSQL.PG

56import Squeal.PostgreSQL.Render

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

@@ -39,7 +39,7 @@ module Squeal.PostgreSQL.Definition.View

39import GHC.TypeLits

40

41import Squeal.PostgreSQL.Alias

42−import Squeal.PostgreSQL.Definition

42+import Squeal.PostgreSQL.Definition (Definition (..))

43import Squeal.PostgreSQL.Query

44import Squeal.PostgreSQL.Render

45import Squeal.PostgreSQL.Schema

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

@@ -34,7 +34,7 @@ module Squeal.PostgreSQL.Expression

34 ( -- * Expression

35 Expression (..)

36 , Expr

37− , type (-->)

37+ , (:-->)

38 , FunctionDB

39 , unsafeFunction

40 , function

@@ -48,7 +48,7 @@ module Squeal.PostgreSQL.Expression

48 , binaryOp

49 , FunctionVar

50 , unsafeFunctionVar

51− , type (--->)

51+ , FunctionN

52 , FunctionNDB

53 , unsafeFunctionN

54 , functionN

@@ -159,7 +159,7 @@ type OperatorDB schemas x1 x2 y

159-- This is a subtype of the usual Haskell function type `Prelude.->`,

160-- indeed a subcategory as it is closed under the usual

161-- `Prelude..` and `Prelude.id`.

162−type (-->) x y

162+type (:-->) x y

163 = forall outer commons grp schemas params from

164 . Expression outer commons grp schemas params from x

165 -- ^ input

@@ -179,7 +179,7 @@ Use the `*:` operator to end your argument lists, like so.

179>>> printSQL (unsafeFunctionN "fun" (true :* false :* localTime *: true))

180fun(TRUE, FALSE, LOCALTIME, TRUE)

181-}

182−type (--->) xs y

182+type FunctionN xs y

183 = forall outer commons grp schemas params from

184 . NP (Expression outer commons grp schemas params from) xs

185 -- ^ inputs

@@ -327,7 +327,7 @@ binaryOp = unsafeBinaryOp $ renderSymbol @op

327

328-- | >>> printSQL $ unsafeLeftOp "NOT" true

329-- (NOT TRUE)

330−unsafeLeftOp :: ByteString -> x --> y

330+unsafeLeftOp :: ByteString -> x :--> y

331unsafeLeftOp op x = UnsafeExpression $ parenthesized $ op <+> renderSQL x

332

333leftOp

@@ -339,7 +339,7 @@ leftOp = unsafeLeftOp $ renderSymbol @op

339

340-- | >>> printSQL $ true & unsafeRightOp "IS NOT TRUE"

341-- (TRUE IS NOT TRUE)

342−unsafeRightOp :: ByteString -> x --> y

342+unsafeRightOp :: ByteString -> x :--> y

343unsafeRightOp op x = UnsafeExpression $ parenthesized $ renderSQL x <+> op

344

345rightOp

@@ -351,25 +351,25 @@ rightOp = unsafeRightOp $ renderSymbol @op

351

352-- | >>> printSQL $ unsafeFunction "f" true

353-- f(TRUE)

354−unsafeFunction :: ByteString -> x --> y

354+unsafeFunction :: ByteString -> x :--> y

355unsafeFunction fun x = UnsafeExpression $

356 fun <> parenthesized (renderSQL x)

357

358function

359− :: (Has sch schemas schema, Has fun schema ('Function ('[x] :=> 'Returns y)))

359+ :: (Has sch schemas schema, Has fun schema ('Function ('[x] '::--> 'Returns y)))

360 => QualifiedAlias sch fun

361 -> FunctionDB schemas x y

362function = unsafeFunction . renderSQL

363

364-- | >>> printSQL $ unsafeFunctionN "f" (currentTime :* localTimestamp :* false *: literal 'a')

365-- f(CURRENT_TIME, LOCALTIMESTAMP, FALSE, E'a')

366−unsafeFunctionN :: SListI xs => ByteString -> xs ---> y

366+unsafeFunctionN :: SListI xs => ByteString -> FunctionN xs y

367unsafeFunctionN fun xs = UnsafeExpression $

368 fun <> parenthesized (renderCommaSeparated renderSQL xs)

369

370functionN

371 :: ( Has sch schemas schema

372− , Has fun schema ('Function (xs :=> 'Returns y))

372+ , Has fun schema ('Function (xs '::--> 'Returns y))

373 , SListI xs )

374 => QualifiedAlias sch fun

375 -> FunctionNDB schemas xs y

squeal-postgresql/src/Squeal/PostgreSQL/Expression/Collection.hs+5−5

@@ -42,7 +42,7 @@ import qualified Generics.SOP as SOP

42

43import Squeal.PostgreSQL.Alias

44import Squeal.PostgreSQL.Expression

45−import Squeal.PostgreSQL.Expression.Set

45+import Squeal.PostgreSQL.Expression.SetOf

46import Squeal.PostgreSQL.List

47import Squeal.PostgreSQL.Render

48import Squeal.PostgreSQL.Schema

@@ -111,20 +111,20 @@ array2 xss = UnsafeExpression $ "ARRAY" <>

111

112-- | >>> printSQL $ cardinality (array [null_, false, true])

113-- cardinality(ARRAY[NULL, FALSE, TRUE])

114−cardinality :: null ('PGvararray ty) --> null 'PGint8

114+cardinality :: null ('PGvararray ty) :--> null 'PGint8

115cardinality = unsafeFunction "cardinality"

116

117-- | >>> printSQL $ array [null_, false, true] & index 2

118-- (ARRAY[NULL, FALSE, TRUE])[2]

119index

120 :: Word64 -- ^ index

121− -> null ('PGvararray ty) --> NullifyType ty

121+ -> null ('PGvararray ty) :--> NullifyType ty

122index n expr = UnsafeExpression $

123 parenthesized (renderSQL expr) <> "[" <> fromString (show n) <> "]"

124

125-- | Expand an array to a set of rows

126−unnest :: SetFunction "unnest" (null ('PGvararray ty)) '["unnest" ::: ty]

126+unnest :: SetOfFunction "unnest" (null ('PGvararray ty)) '["unnest" ::: ty]

127−unnest = unsafeSetFunction

127+unnest = unsafeSetOfFunction

128

129-- | A row constructor is an expression that builds a row value

130-- (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"

162>>> printSQL $ true & isTrue

163(TRUE IS TRUE)

164-}

165−isTrue :: null0 'PGbool --> null1 'PGbool

165+isTrue :: null0 'PGbool :--> null1 'PGbool

166isTrue = unsafeRightOp "IS TRUE"

167

168{- | is false or unknown

@@ -170,7 +170,7 @@ isTrue = unsafeRightOp "IS TRUE"

170>>> printSQL $ true & isNotTrue

171(TRUE IS NOT TRUE)

172-}

173−isNotTrue :: null0 'PGbool --> null1 'PGbool

173+isNotTrue :: null0 'PGbool :--> null1 'PGbool

174isNotTrue = unsafeRightOp "IS NOT TRUE"

175

176{- | is false

@@ -178,7 +178,7 @@ isNotTrue = unsafeRightOp "IS NOT TRUE"

178>>> printSQL $ true & isFalse

179(TRUE IS FALSE)

180-}

181−isFalse :: null0 'PGbool --> null1 'PGbool

181+isFalse :: null0 'PGbool :--> null1 'PGbool

182isFalse = unsafeRightOp "IS FALSE"

183

184{- | is true or unknown

@@ -186,7 +186,7 @@ isFalse = unsafeRightOp "IS FALSE"

186>>> printSQL $ true & isNotFalse

187(TRUE IS NOT FALSE)

188-}

189−isNotFalse :: null0 'PGbool --> null1 'PGbool

189+isNotFalse :: null0 'PGbool :--> null1 'PGbool

190isNotFalse = unsafeRightOp "IS NOT FALSE"

191

192{- | is unknown

@@ -194,7 +194,7 @@ isNotFalse = unsafeRightOp "IS NOT FALSE"

194>>> printSQL $ true & isUnknown

195(TRUE IS UNKNOWN)

196-}

197−isUnknown :: null0 'PGbool --> null1 'PGbool

197+isUnknown :: null0 'PGbool :--> null1 'PGbool

198isUnknown = unsafeRightOp "IS UNKNOWN"

199

200{- | is true or false

@@ -202,5 +202,5 @@ isUnknown = unsafeRightOp "IS UNKNOWN"

202>>> printSQL $ true & isNotUnknown

203(TRUE IS NOT UNKNOWN)

204-}

205−isNotUnknown :: null0 'PGbool --> null1 'PGbool

205+isNotUnknown :: null0 'PGbool :--> null1 'PGbool

206isNotUnknown = unsafeRightOp "IS NOT UNKNOWN"

squeal-postgresql/src/Squeal/PostgreSQL/Expression/Json.hs+47−40

@@ -81,7 +81,7 @@ import GHC.TypeLits

81

82import Squeal.PostgreSQL.Alias

83import Squeal.PostgreSQL.Expression

84−import Squeal.PostgreSQL.Expression.Set

84+import Squeal.PostgreSQL.Expression.SetOf

85import Squeal.PostgreSQL.Expression.Type

86import Squeal.PostgreSQL.List

87import Squeal.PostgreSQL.Query

@@ -188,7 +188,7 @@ Table 9.45: JSON creation functions

188-- otherwise, a scalar value is produced. For any scalar type other than a

189-- number, a Boolean, or a null value, the text representation will be used, in

190-- such a fashion that it is a valid json value.

191−toJson :: null ty --> null 'PGjson

191+toJson :: null ty :--> null 'PGjson

192toJson = unsafeFunction "to_json"

193

194-- | Returns the value as jsonb. Arrays and composites are converted

@@ -197,26 +197,26 @@ toJson = unsafeFunction "to_json"

197-- otherwise, a scalar value is produced. For any scalar type other than a

198-- number, a Boolean, or a null value, the text representation will be used, in

199-- such a fashion that it is a valid jsonb value.

200−toJsonb :: null ty --> null 'PGjsonb

200+toJsonb :: null ty :--> null 'PGjsonb

201toJsonb = unsafeFunction "to_jsonb"

202

203-- | Returns the array as a JSON array. A PostgreSQL multidimensional array

204-- becomes a JSON array of arrays.

205−arrayToJson :: null ('PGvararray ty) --> null 'PGjson

205+arrayToJson :: null ('PGvararray ty) :--> null 'PGjson

206arrayToJson = unsafeFunction "array_to_json"

207

208-- | Returns the row as a JSON object.

209−rowToJson :: null ('PGcomposite ty) --> null 'PGjson

209+rowToJson :: null ('PGcomposite ty) :--> null 'PGjson

210rowToJson = unsafeFunction "row_to_json"

211

212-- | Builds a possibly-heterogeneously-typed JSON array out of a variadic

213-- argument list.

214−jsonBuildArray :: SOP.SListI tuple => tuple ---> null 'PGjson

214+jsonBuildArray :: SOP.SListI tuple => FunctionN tuple (null 'PGjson)

215jsonBuildArray = unsafeFunctionN "json_build_array"

216

217-- | Builds a possibly-heterogeneously-typed (binary) JSON array out of a

218-- variadic argument list.

219−jsonbBuildArray :: SOP.SListI tuple => tuple ---> null 'PGjsonb

219+jsonbBuildArray :: SOP.SListI tuple => FunctionN tuple (null 'PGjsonb)

220jsonbBuildArray = unsafeFunctionN "jsonb_build_array"

221

222-- | Builds a possibly-heterogeneously-typed JSON object out of a variadic

@@ -224,10 +224,10 @@ jsonbBuildArray = unsafeFunctionN "jsonb_build_array"

224-- and values.

225class SOP.SListI tys => JsonBuildObject tys where

226

227− jsonBuildObject :: tys ---> null 'PGjson

227+ jsonBuildObject :: FunctionN tys (null 'PGjson)

228 jsonBuildObject = unsafeFunctionN "json_build_object"

229

230− jsonbBuildObject :: tys ---> null 'PGjsonb

230+ jsonbBuildObject :: FunctionN tys (null 'PGjsonb)

231 jsonbBuildObject = unsafeFunctionN "jsonb_build_object"

232

233instance JsonBuildObject '[]

@@ -240,7 +240,7 @@ instance (JsonBuildObject tys, key `In` PGJsonKey)

240-- which are taken as a key/value pair.

241jsonObject

242 :: null ('PGfixarray '[n,2] ('NotNull 'PGtext))

243− --> null 'PGjson

243+ :--> null 'PGjson

244jsonObject = unsafeFunction "json_object"

245

246-- | Builds a binary JSON object out of a text array.

@@ -249,24 +249,24 @@ jsonObject = unsafeFunction "json_object"

249-- which are taken as a key/value pair.

250jsonbObject

251 :: null ('PGfixarray '[n,2] ('NotNull 'PGtext))

252− --> null 'PGjsonb

252+ :--> null 'PGjsonb

253jsonbObject = unsafeFunction "jsonb_object"

254

255-- | This is an alternate form of 'jsonObject' that takes two arrays; one for

256-- keys and one for values, that are zipped pairwise to create a JSON object.

257−jsonZipObject ::

257+jsonZipObject :: FunctionN

258 '[ null ('PGvararray ('NotNull 'PGtext))

259 , null ('PGvararray ('NotNull 'PGtext)) ]

260− ---> null 'PGjson

260+ ( null 'PGjson )

261jsonZipObject = unsafeFunctionN "json_object"

262

263-- | This is an alternate form of 'jsonbObject' that takes two arrays; one for

264-- keys and one for values, that are zipped pairwise to create a binary JSON

265-- object.

266−jsonbZipObject ::

266+jsonbZipObject :: FunctionN

267 '[ null ('PGvararray ('NotNull 'PGtext))

268 , null ('PGvararray ('NotNull 'PGtext)) ]

269− ---> null 'PGjsonb

269+ ( null 'PGjsonb )

270jsonbZipObject = unsafeFunctionN "jsonb_object"

271

272{-----------------------------------------

@@ -274,31 +274,31 @@ Table 9.46: JSON processing functions

274-----------------------------------------}

275

276-- | Returns the number of elements in the outermost JSON array.

277−jsonArrayLength :: null 'PGjson --> null 'PGint4

277+jsonArrayLength :: null 'PGjson :--> null 'PGint4

278jsonArrayLength = unsafeFunction "json_array_length"

279

280-- | Returns the number of elements in the outermost binary JSON array.

281−jsonbArrayLength :: null 'PGjsonb --> null 'PGint4

281+jsonbArrayLength :: null 'PGjsonb :--> null 'PGint4

282jsonbArrayLength = unsafeFunction "jsonb_array_length"

283

284-- | Returns the type of the outermost JSON value as a text string. Possible

285-- types are object, array, string, number, boolean, and null.

286−jsonTypeof :: null 'PGjson --> null 'PGtext

286+jsonTypeof :: null 'PGjson :--> null 'PGtext

287jsonTypeof = unsafeFunction "json_typeof"

288

289-- | Returns the type of the outermost binary JSON value as a text string.

290-- Possible types are object, array, string, number, boolean, and null.

291−jsonbTypeof :: null 'PGjsonb --> null 'PGtext

291+jsonbTypeof :: null 'PGjsonb :--> null 'PGtext

292jsonbTypeof = unsafeFunction "jsonb_typeof"

293

294-- | Returns its argument with all object fields that have null values omitted.

295-- Other null values are untouched.

296−jsonStripNulls :: null 'PGjson --> null 'PGjson

296+jsonStripNulls :: null 'PGjson :--> null 'PGjson

297jsonStripNulls = unsafeFunction "json_strip_nulls"

298

299-- | Returns its argument with all object fields that have null values omitted.

300-- Other null values are untouched.

301−jsonbStripNulls :: null 'PGjsonb --> null 'PGjsonb

301+jsonbStripNulls :: null 'PGjsonb :--> null 'PGjsonb

302jsonbStripNulls = unsafeFunction "jsonb_strip_nulls"

303

304-- | @ jsonbSet target path new_value create_missing @

@@ -309,9 +309,12 @@ jsonbStripNulls = unsafeFunction "jsonb_strip_nulls"

309-- item designated by path does not exist. As with the path orientated

310-- operators, negative integers that appear in path count from the end of JSON

311-- arrays.

312−jsonbSet ::

312+jsonbSet

313+ :: FunctionN

314+ '[ null 'PGjsonb

313− '[ null 'PGjsonb, null ('PGvararray ('NotNull 'PGtext))

315+ , null ('PGvararray ('NotNull 'PGtext))

316+ , null 'PGjsonb

314− , null 'PGjsonb, null 'PGbool ] ---> null 'PGjsonb

317+ , null 'PGbool ] (null 'PGjsonb)

315jsonbSet = unsafeFunctionN "jsonbSet"

318jsonbSet = unsafeFunctionN "jsonbSet"

316

319

317-- | @ jsonbInsert target path new_value insert_after @

320-- | @ jsonbInsert target path new_value insert_after @

@@ -323,23 +326,27 @@ jsonbSet = unsafeFunctionN "jsonbSet"

323-- path is in JSONB object, @new_value@ will be inserted only if target does not

326-- path is in JSONB object, @new_value@ will be inserted only if target does not

324-- exist. As with the path orientated operators, negative integers that appear

327-- exist. As with the path orientated operators, negative integers that appear

325-- in path count from the end of JSON arrays.

328-- in path count from the end of JSON arrays.

326−jsonbInsert ::

329+jsonbInsert

330+ :: FunctionN

331+ '[ null 'PGjsonb

327− '[ null 'PGjsonb, null ('PGvararray ('NotNull 'PGtext))

332+ , null ('PGvararray ('NotNull 'PGtext))

333+ , null 'PGjsonb

328− , null 'PGjsonb, null 'PGbool ] ---> null 'PGjsonb

334+ , null 'PGbool ] (null 'PGjsonb)

329jsonbInsert = unsafeFunctionN "jsonb_insert"

335jsonbInsert = unsafeFunctionN "jsonb_insert"

330

336

331-- | Returns its argument as indented JSON text.

337-- | Returns its argument as indented JSON text.

332−jsonbPretty :: null 'PGjsonb --> null 'PGtext

338+jsonbPretty :: null 'PGjsonb :--> null 'PGtext

333jsonbPretty = unsafeFunction "jsonb_pretty"

339jsonbPretty = unsafeFunction "jsonb_pretty"

334

340

341+

335{- | Expands the outermost JSON object into a set of key/value pairs.

342{- | Expands the outermost JSON object into a set of key/value pairs.

336

343

337>>> printSQL (select Star (from (jsonEach (literal (Json (object ["a" .= "foo", "b" .= "bar"]))))))

344>>> printSQL (select Star (from (jsonEach (literal (Json (object ["a" .= "foo", "b" .= "bar"]))))))

338SELECT * FROM json_each(('{"a":"foo","b":"bar"}' :: json))

345SELECT * FROM json_each(('{"a":"foo","b":"bar"}' :: json))

339-}

346-}

340−jsonEach :: SetFunction "json_each" (null 'PGjson)

347+jsonEach :: SetOfFunction "json_each" (null 'PGjson)

341 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGjson]

348 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGjson]

342−jsonEach = unsafeSetFunction

349+jsonEach = unsafeSetOfFunction

343

350

344{- | Expands the outermost binary JSON object into a set of key/value pairs.

351{- | Expands the outermost binary JSON object into a set of key/value pairs.

345

352

@@ -347,9 +354,9 @@ jsonEach = unsafeSetFunction

347SELECT * FROM jsonb_each(('{"a":"foo","b":"bar"}' :: jsonb))

354SELECT * FROM jsonb_each(('{"a":"foo","b":"bar"}' :: jsonb))

348-}

355-}

349jsonbEach

356jsonbEach

350− :: SetFunction "jsonb_each" (nullity 'PGjsonb)

357+ :: SetOfFunction "jsonb_each" (nullity 'PGjsonb)

351 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGjson]

358 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGjson]

352−jsonbEach = unsafeSetFunction

359+jsonbEach = unsafeSetOfFunction

353

360

354{- | Expands the outermost JSON object into a set of key/value pairs.

361{- | Expands the outermost JSON object into a set of key/value pairs.

355

362

@@ -357,9 +364,9 @@ jsonbEach = unsafeSetFunction

357SELECT * FROM json_each_text(('{"a":"foo","b":"bar"}' :: json))

364SELECT * FROM json_each_text(('{"a":"foo","b":"bar"}' :: json))

358-}

365-}

359jsonEachText

366jsonEachText

360− :: SetFunction "json_each_text" (null 'PGjson)

367+ :: SetOfFunction "json_each_text" (null 'PGjson)

361 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGtext]

368 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGtext]

362−jsonEachText = unsafeSetFunction

369+jsonEachText = unsafeSetOfFunction

363

370

364{- | Expands the outermost binary JSON object into a set of key/value pairs.

371{- | Expands the outermost binary JSON object into a set of key/value pairs.

365

372

@@ -367,9 +374,9 @@ jsonEachText = unsafeSetFunction

367SELECT * FROM jsonb_each_text(('{"a":"foo","b":"bar"}' :: jsonb))

374SELECT * FROM jsonb_each_text(('{"a":"foo","b":"bar"}' :: jsonb))

368-}

375-}

369jsonbEachText

376jsonbEachText

370− :: SetFunction "jsonb_each_text" (null 'PGjsonb)

377+ :: SetOfFunction "jsonb_each_text" (null 'PGjsonb)

371 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGtext]

378 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGtext]

372−jsonbEachText = unsafeSetFunction

379+jsonbEachText = unsafeSetOfFunction

373

380

374{- | Returns set of keys in the outermost JSON object.

381{- | Returns set of keys in the outermost JSON object.

375

382

@@ -377,9 +384,9 @@ jsonbEachText = unsafeSetFunction

377json_object_keys(('{"a":"foo","b":"bar"}' :: json))

384json_object_keys(('{"a":"foo","b":"bar"}' :: json))

378-}

385-}

379jsonObjectKeys

386jsonObjectKeys

380− :: SetFunction "json_object_keys" (nullity 'PGjson)

387+ :: SetOfFunction "json_object_keys" (nullity 'PGjson)

381 '["json_object_keys" ::: 'NotNull 'PGtext]

388 '["json_object_keys" ::: 'NotNull 'PGtext]

382−jsonObjectKeys = unsafeSetFunction

389+jsonObjectKeys = unsafeSetOfFunction

383

390

384{- | Returns set of keys in the outermost JSON object.

391{- | Returns set of keys in the outermost JSON object.

385

392

@@ -387,9 +394,9 @@ jsonObjectKeys = unsafeSetFunction

387jsonb_object_keys(('{"a":"foo","b":"bar"}' :: jsonb))

394jsonb_object_keys(('{"a":"foo","b":"bar"}' :: jsonb))

388-}

395-}

389jsonbObjectKeys

396jsonbObjectKeys

390− :: SetFunction "jsonb_object_keys" (null 'PGjsonb)

397+ :: SetOfFunction "jsonb_object_keys" (null 'PGjsonb)

391 '["jsonb_object_keys" ::: 'NotNull 'PGtext]

398 '["jsonb_object_keys" ::: 'NotNull 'PGtext]

392−jsonbObjectKeys = unsafeSetFunction

399+jsonbObjectKeys = unsafeSetOfFunction

393

400

394-- | Build rows from Json types.

401-- | Build rows from Json types.

395type JsonPopulateFunction fun json

402type JsonPopulateFunction fun json

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

@@ -47,7 +47,7 @@ false = UnsafeExpression "FALSE"

47

48-- | >>> printSQL $ not_ true

49-- (NOT TRUE)

50−not_ :: null 'PGbool --> null 'PGbool

50+not_ :: null 'PGbool :--> null 'PGbool

51not_ = unsafeLeftOp "NOT"

52

53-- | >>> printSQL $ true .&& false

squeal-postgresql/src/Squeal/PostgreSQL/Expression/Math.hs+6−4

@@ -37,7 +37,9 @@ import Squeal.PostgreSQL.Schema

37-- in printSQL expression

38-- :}

39-- atan2(pi(), 2)

40+atan2_

41+ :: float `In` PGFloating

40−atan2_ :: float `In` PGFloating => '[ null float, null float] ---> null float

42+ => FunctionN '[ null float, null float] (null float)

41atan2_ = unsafeFunctionN "atan2"

43atan2_ = unsafeFunctionN "atan2"

42

44

43

45

@@ -76,7 +78,7 @@ rem_ = unsafeBinaryOp "%"

76-- in printSQL expression

78-- in printSQL expression

77-- :}

79-- :}

78-- trunc(pi())

80-- trunc(pi())

79−trunc :: frac `In` PGFloating => null frac --> null frac

81+trunc :: frac `In` PGFloating => null frac :--> null frac

80trunc = unsafeFunction "trunc"

82trunc = unsafeFunction "trunc"

81

83

82-- | >>> :{

84-- | >>> :{

@@ -86,7 +88,7 @@ trunc = unsafeFunction "trunc"

86-- in printSQL expression

88-- in printSQL expression

87-- :}

89-- :}

88-- round(pi())

90-- round(pi())

89−round_ :: frac `In` PGFloating => null frac --> null frac

91+round_ :: frac `In` PGFloating => null frac :--> null frac

90round_ = unsafeFunction "round"

92round_ = unsafeFunction "round"

91

93

92-- | >>> :{

94-- | >>> :{

@@ -96,5 +98,5 @@ round_ = unsafeFunction "round"

96-- in printSQL expression

98-- in printSQL expression

97-- :}

99-- :}

98-- ceiling(pi())

100-- ceiling(pi())

99−ceiling_ :: frac `In` PGFloating => null frac --> null frac

101+ceiling_ :: frac `In` PGFloating => null frac :--> null frac

100ceiling_ = unsafeFunction "ceiling"

102ceiling_ = unsafeFunction "ceiling"

squeal-postgresql/src/Squeal/PostgreSQL/Expression/Null.hs+4−4

@@ -44,7 +44,7 @@ null_ = UnsafeExpression "NULL"

44--

45-- >>> printSQL $ notNull true

46-- TRUE

47−notNull :: 'NotNull ty --> 'Null ty

47+notNull :: 'NotNull ty :--> 'Null ty

48notNull = UnsafeExpression . renderSQL

49

50-- | return the leftmost value which is not NULL

@@ -69,12 +69,12 @@ fromNull notNullx nullx = coalesce [nullx] notNullx

69

70-- | >>> printSQL $ null_ & isNull

71-- NULL IS NULL

72−isNull :: 'Null ty --> null 'PGbool

72+isNull :: 'Null ty :--> null 'PGbool

73isNull x = UnsafeExpression $ renderSQL x <+> "IS NULL"

74

75-- | >>> printSQL $ null_ & isNotNull

76-- NULL IS NOT NULL

77−isNotNull :: 'Null ty --> null 'PGbool

77+isNotNull :: 'Null ty :--> null 'PGbool

78isNotNull x = UnsafeExpression $ renderSQL x <+> "IS NOT NULL"

79

80-- | analagous to `maybe` using @IS NULL@

@@ -100,5 +100,5 @@ matchNull y f x = ifThenElse (isNull x) y

100>>> printSQL expr

101NULLIF(FALSE, ($1 :: bool))

102-}

103−nullIf :: '[ 'NotNull ty, 'NotNull ty] ---> 'Null ty

103+nullIf :: FunctionN '[ 'NotNull ty, 'NotNull ty] ('Null ty)

104nullIf = unsafeFunctionN "NULLIF"

squeal-postgresql/src/Squeal/PostgreSQL/Expression/Range.hs+9−8

@@ -205,26 +205,27 @@ whole = NonEmpty Infinite Infinite

205(@-) :: Operator (null ('PGrange ty)) (null ('PGrange ty)) (null ('PGrange ty))

206(@-) = unsafeBinaryOp "-"

207

208−lowerBound :: null ('PGrange ty) --> 'Null ty

208+lowerBound :: null ('PGrange ty) :--> 'Null ty

209lowerBound = unsafeFunction "lower"

210

211−upperBound :: null ('PGrange ty) --> 'Null ty

211+upperBound :: null ('PGrange ty) :--> 'Null ty

212upperBound = unsafeFunction "upper"

213

214−isEmpty :: null ('PGrange ty) --> 'Null 'PGbool

214+isEmpty :: null ('PGrange ty) :--> 'Null 'PGbool

215isEmpty = unsafeFunction "isempty"

216

217−lowerInc :: null ('PGrange ty) --> 'Null 'PGbool

217+lowerInc :: null ('PGrange ty) :--> 'Null 'PGbool

218lowerInc = unsafeFunction "lower_inc"

219

220−lowerInf :: null ('PGrange ty) --> 'Null 'PGbool

220+lowerInf :: null ('PGrange ty) :--> 'Null 'PGbool

221lowerInf = unsafeFunction "lower_inf"

222

223−upperInc :: null ('PGrange ty) --> 'Null 'PGbool

223+upperInc :: null ('PGrange ty) :--> 'Null 'PGbool

224upperInc = unsafeFunction "upper_inc"

225

226−upperInf :: null ('PGrange ty) --> 'Null 'PGbool

226+upperInf :: null ('PGrange ty) :--> 'Null 'PGbool

227upperInf = unsafeFunction "upper_inf"

228

229+rangeMerge :: FunctionN

229−rangeMerge :: '[null ('PGrange ty), null ('PGrange ty)] ---> null ('PGrange ty)

230+ '[ null ('PGrange ty), null ('PGrange ty)] (null ('PGrange ty))

230rangeMerge = unsafeFunctionN "range_merge"

231rangeMerge = unsafeFunctionN "range_merge"

squeal-postgresql/src/Squeal/PostgreSQL/Expression/Set.hs → squeal-postgresql/src/Squeal/PostgreSQL/Expression/SetOf.hsrenamed+40−52

@@ -1,5 +1,5 @@

1{-|

2−Module: Squeal.PostgreSQL.Expression.Set

2+Module: Squeal.PostgreSQL.Expression.SetOf

3Description: Set returning functions

4Copyright: (c) Eitan Chatav, 2019

5Maintainer: eitan@morphism.tech

@@ -20,18 +20,16 @@ Set returning functions

20 , TypeOperators

21#-}

22

23−module Squeal.PostgreSQL.Expression.Set

23+module Squeal.PostgreSQL.Expression.SetOf

24 ( generateSeries

25 , generateSeriesStep

26 , generateSeriesTimestamp

27− , SetFunction

27+ , SetOfFunction

28− , unsafeSetFunction

28+ , unsafeSetOfFunction

29− , SetFunctionDB

29+ , setOfFunction

30− , setFunction

30+ , SetOfFunctionN

31− , SetFunctionN

31+ , unsafeSetOfFunctionN

32− , unsafeSetFunctionN

32+ , setOfFunctionN

33− , SetFunctionNDB

34− , setFunctionN

35 ) where

33 ) where

36

34

37import GHC.TypeLits

35import GHC.TypeLits

@@ -48,65 +46,55 @@ import Squeal.PostgreSQL.Schema

48{- |

46{- |

49A @RankNType@ for set returning functions with 1 argument.

47A @RankNType@ for set returning functions with 1 argument.

50-}

48-}

51−type SetFunction fun ty row

49+type SetOfFunction fun ty setof

52 = forall outer commons schemas params

50 = forall outer commons schemas params

53 . Expression outer commons 'Ungrouped schemas params '[] ty

51 . Expression outer commons 'Ungrouped schemas params '[] ty

54 -- ^ input

52 -- ^ input

55− -> FromClause outer commons schemas params '[fun ::: row]

53+ -> FromClause outer commons schemas params '[fun ::: setof]

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]

63 -- ^ output

54 -- ^ output

64

55

65-- | Escape hatch for a set returning function with 1 argument.

56-- | Escape hatch for a set returning function with 1 argument.

66−unsafeSetFunction

57+unsafeSetOfFunction

67− :: forall fun ty row. KnownSymbol fun

58+ :: forall fun ty setof. KnownSymbol fun

68− => SetFunction fun ty row -- ^ set returning function

59+ => SetOfFunction fun ty setof -- ^ set returning function

69−unsafeSetFunction x = UnsafeFromClause $

60+unsafeSetOfFunction x = UnsafeFromClause $

70 renderSymbol @fun <> parenthesized (renderSQL x)

61 renderSymbol @fun <> parenthesized (renderSQL x)

71

62

72−setFunction

63+setOfFunction

73 :: ( Has sch schemas schema

64 :: ( Has sch schemas schema

74− , Has fun schema ('Function ('[ty] :=> 'ReturnsTable row)) )

65+ , Has fun schema ('Function ('[ty] '::--> 'ReturnsTable setof)) )

75− => QualifiedAlias sch fun

66+ => Alias fun

76− -> SetFunctionDB fun schemas ty row

67+ -> ( forall outer commons params

77−setFunction _ = unsafeSetFunction

68+ . Expression outer commons 'Ungrouped schemas params '[] ty

69+ -> FromClause outer commons schemas params '[fun ::: setof] )

70+setOfFunction _ = unsafeSetOfFunction

78

71

79{- |

72{- |

80A @RankNType@ for set returning functions with multiple argument.

73A @RankNType@ for set returning functions with multiple argument.

81-}

74-}

82−type SetFunctionN fun tys row

75+type SetOfFunctionN fun tys setof

83 = forall outer commons schemas params

76 = forall outer commons schemas params

84 . NP (Expression outer commons 'Ungrouped schemas params '[]) tys

77 . NP (Expression outer commons 'Ungrouped schemas params '[]) tys

85 -- ^ inputs

78 -- ^ inputs

86− -> FromClause outer commons schemas params '[fun ::: row]

79+ -> FromClause outer commons schemas params '[fun ::: setof]

87 -- ^ output

80 -- ^ output

88

81

89-- | Escape hatch for a set returning function with multiple argument.

82-- | Escape hatch for a set returning function with multiple argument.

90−unsafeSetFunctionN

83+unsafeSetOfFunctionN

91− :: forall fun tys row. (SOP.SListI tys, KnownSymbol fun)

84+ :: forall fun tys setof. (SOP.SListI tys, KnownSymbol fun)

92− => SetFunctionN fun tys row -- ^ set returning function

85+ => SetOfFunctionN fun tys setof -- ^ set returning function

93−unsafeSetFunctionN xs = UnsafeFromClause $

86+unsafeSetOfFunctionN xs = UnsafeFromClause $

94 renderSymbol @fun <> parenthesized (renderCommaSeparated renderSQL xs)

87 renderSymbol @fun <> parenthesized (renderCommaSeparated renderSQL xs)

95

88

96−type SetFunctionNDB fun schemas tys row

89+setOfFunctionN

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

104 :: ( Has sch schemas schema

90 :: ( Has sch schemas schema

105− , Has fun schema ('Function (tys :=> 'ReturnsTable row))

91+ , Has fun schema ('Function (tys '::--> 'ReturnsTable setof))

106 , SOP.SListI tys )

92 , SOP.SListI tys )

107− => QualifiedAlias sch fun

93+ => Alias fun

108− -> SetFunctionNDB fun schemas tys row

94+ -> ( forall outer commons params

109−setFunctionN _ = unsafeSetFunctionN

95+ . NP (Expression outer commons 'Ungrouped schemas params '[]) tys

96+ -> FromClause outer commons schemas params '[fun ::: setof] )

97+setOfFunctionN _ = unsafeSetOfFunctionN

110

98

111{- | @generateSeries (start *: stop)@

99{- | @generateSeries (start *: stop)@

112

100

@@ -114,9 +102,9 @@ Generate a series of values, from @start@ to @stop@ with a step size of one

114-}

102-}

115generateSeries

103generateSeries

116 :: ty `In` '[ 'PGint4, 'PGint8, 'PGnumeric]

104 :: ty `In` '[ 'PGint4, 'PGint8, 'PGnumeric]

117− => SetFunctionN "generate_series" '[ null ty, null ty]

105+ => SetOfFunctionN "generate_series" '[ null ty, null ty]

118 '["generate_series" ::: null ty] -- ^ set returning function

106 '["generate_series" ::: null ty] -- ^ set returning function

119−generateSeries = unsafeSetFunctionN

107+generateSeries = unsafeSetOfFunctionN

120

108

121{- | @generateSeries (start :* stop *: step)@

109{- | @generateSeries (start :* stop *: step)@

122

110

@@ -124,9 +112,9 @@ Generate a series of values, from @start@ to @stop@ with a step size of @step@

124-}

112-}

125generateSeriesStep

113generateSeriesStep

126 :: ty `In` '[ 'PGint4, 'PGint8, 'PGnumeric]

114 :: ty `In` '[ 'PGint4, 'PGint8, 'PGnumeric]

127− => SetFunctionN "generate_series" '[null ty, null ty, null ty]

115+ => SetOfFunctionN "generate_series" '[null ty, null ty, null ty]

128 '["generate_series" ::: null ty] -- ^ set returning function

116 '["generate_series" ::: null ty] -- ^ set returning function

129−generateSeriesStep = unsafeSetFunctionN

117+generateSeriesStep = unsafeSetOfFunctionN

130

118

131{- | @generateSeries (start :* stop *: step)@

119{- | @generateSeries (start :* stop *: step)@

132

120

@@ -134,6 +122,6 @@ Generate a series of values, from @start@ to @stop@ with a step size of @step@

134-}

122-}

135generateSeriesTimestamp

123generateSeriesTimestamp

136 :: ty `In` '[ 'PGtimestamp, 'PGtimestamptz]

124 :: ty `In` '[ 'PGtimestamp, 'PGtimestamptz]

137− => SetFunctionN "generate_series" '[null ty, null ty, null 'PGinterval]

125+ => SetOfFunctionN "generate_series" '[null ty, null ty, null 'PGinterval]

138 '["generate_series" ::: null ty] -- ^ set returning function

126 '["generate_series" ::: null ty] -- ^ set returning function

139−generateSeriesTimestamp = unsafeSetFunctionN

127+generateSeriesTimestamp = unsafeSetOfFunctionN

squeal-postgresql/src/Squeal/PostgreSQL/Expression/Text.hs+3−3

@@ -30,17 +30,17 @@ import Squeal.PostgreSQL.Schema

30

31-- | >>> printSQL $ lower "ARRRGGG"

32-- lower(E'ARRRGGG')

33−lower :: null 'PGtext --> null 'PGtext

33+lower :: null 'PGtext :--> null 'PGtext

34lower = unsafeFunction "lower"

35

36-- | >>> printSQL $ upper "eeee"

37-- upper(E'eeee')

38−upper :: null 'PGtext --> null 'PGtext

38+upper :: null 'PGtext :--> null 'PGtext

39upper = unsafeFunction "upper"

40

41-- | >>> printSQL $ charLength "four"

42-- char_length(E'four')

43−charLength :: null 'PGtext --> null 'PGint4

43+charLength :: null 'PGtext :--> null 'PGint4

44charLength = unsafeFunction "char_length"

45

46-- | The `like` expression returns true if the @string@ matches

squeal-postgresql/src/Squeal/PostgreSQL/Expression/TextSearch.hs+20−19

@@ -55,7 +55,7 @@ import Squeal.PostgreSQL.Schema

55(.|) = unsafeBinaryOp "||"

56

57-- | negate a `Squeal.PostgreSQL.Expression.Type.tsquery`

58−(.!) :: null 'PGtsquery --> null 'PGtsquery

58+(.!) :: null 'PGtsquery :--> null 'PGtsquery

59(.!) = unsafeLeftOp "!!"

60

61-- | `Squeal.PostgreSQL.Expression.Type.tsquery` followed by

@@ -66,50 +66,51 @@ import Squeal.PostgreSQL.Schema

66-- | convert array of lexemes to `Squeal.PostgreSQL.Expression.Type.tsvector`

67arrayToTSvector

68 :: null ('PGvararray ('NotNull 'PGtext))

69− --> null 'PGtsvector

69+ :--> null 'PGtsvector

70arrayToTSvector = unsafeFunction "array_to_tsvector"

71

72-- | number of lexemes in `Squeal.PostgreSQL.Expression.Type.tsvector`

73−tsvectorLength :: null 'PGtsvector --> null 'PGint4

73+tsvectorLength :: null 'PGtsvector :--> null 'PGint4

74tsvectorLength = unsafeFunction "length"

75

76-- | number of lexemes plus operators in `Squeal.PostgreSQL.Expression.Type.tsquery`

77−numnode :: null 'PGtsquery --> null 'PGint4

77+numnode :: null 'PGtsquery :--> null 'PGint4

78numnode = unsafeFunction "numnode"

79

80-- | produce `Squeal.PostgreSQL.Expression.Type.tsquery` ignoring punctuation

81−plainToTSquery :: null 'PGtext --> null 'PGtsquery

81+plainToTSquery :: null 'PGtext :--> null 'PGtsquery

82plainToTSquery = unsafeFunction "plainto_tsquery"

83

84-- | produce `Squeal.PostgreSQL.Expression.Type.tsquery` that searches for a phrase,

85-- ignoring punctuation

86−phraseToTSquery :: null 'PGtext --> null 'PGtsquery

86+phraseToTSquery :: null 'PGtext :--> null 'PGtsquery

87phraseToTSquery = unsafeFunction "phraseto_tsquery"

88

89-- | produce `Squeal.PostgreSQL.Expression.Type.tsquery` from a web search style query

90−websearchToTSquery :: null 'PGtext --> null 'PGtsquery

90+websearchToTSquery :: null 'PGtext :--> null 'PGtsquery

91websearchToTSquery = unsafeFunction "websearch_to_tsquery"

92

93-- | get indexable part of a `Squeal.PostgreSQL.Expression.Type.tsquery`

94−queryTree :: null 'PGtsquery --> null 'PGtext

94+queryTree :: null 'PGtsquery :--> null 'PGtext

95queryTree = unsafeFunction "query_tree"

96

97-- | normalize words and convert to `Squeal.PostgreSQL.Expression.Type.tsquery`

98−toTSquery :: null 'PGtext --> null 'PGtsquery

98+toTSquery :: null 'PGtext :--> null 'PGtsquery

99toTSquery = unsafeFunction "to_tsquery"

100

101-- | reduce document text to `Squeal.PostgreSQL.Expression.Type.tsvector`

102toTSvector

103 :: ty `In` '[ 'PGtext, 'PGjson, 'PGjsonb]

104− => null ty --> null 'PGtsvector

104+ => null ty :--> null 'PGtsvector

105toTSvector = unsafeFunction "to_tsvector"

106

107-- | assign weight to each element of `Squeal.PostgreSQL.Expression.Type.tsvector`

108+setWeight

108−setWeight :: '[null 'PGtsvector, null ('PGchar 1)] ---> null 'PGtsvector

109+ :: FunctionN '[null 'PGtsvector, null ('PGchar 1)] (null 'PGtsvector)

109setWeight = unsafeFunctionN "set_weight"

110setWeight = unsafeFunctionN "set_weight"

110

111

111-- | remove positions and weights from `Squeal.PostgreSQL.Expression.Type.tsvector`

112-- | remove positions and weights from `Squeal.PostgreSQL.Expression.Type.tsvector`

112−strip :: null 'PGtsvector --> null 'PGtsvector

113+strip :: null 'PGtsvector :--> null 'PGtsvector

113strip = unsafeFunction "strip"

114strip = unsafeFunction "strip"

114

115

115-- | @jsonToTSvector (document *: filter)@

116-- | @jsonToTSvector (document *: filter)@

@@ -122,7 +123,7 @@ strip = unsafeFunction "strip"

122-- "boolean" (to include all Boolean values in the string format "true"/"false"),

123-- "boolean" (to include all Boolean values in the string format "true"/"false"),

123-- "key" (to include all keys) or "all" (to include all above).

124-- "key" (to include all keys) or "all" (to include all above).

124-- These values can be combined together to include, e.g. all string and numeric values.

125-- These values can be combined together to include, e.g. all string and numeric values.

125−jsonToTSvector :: '[null 'PGjson, null 'PGjson] ---> null 'PGtsvector

126+jsonToTSvector :: FunctionN '[null 'PGjson, null 'PGjson] (null 'PGtsvector)

126jsonToTSvector = unsafeFunctionN "json_to_tsvector"

127jsonToTSvector = unsafeFunctionN "json_to_tsvector"

127

128

128-- | @jsonbToTSvector (document *: filter)@

129-- | @jsonbToTSvector (document *: filter)@

@@ -135,23 +136,23 @@ jsonToTSvector = unsafeFunctionN "json_to_tsvector"

135-- "boolean" (to include all Boolean values in the string format "true"/"false"),

136-- "boolean" (to include all Boolean values in the string format "true"/"false"),

136-- "key" (to include all keys) or "all" (to include all above).

137-- "key" (to include all keys) or "all" (to include all above).

137-- These values can be combined together to include, e.g. all string and numeric values.

138-- These values can be combined together to include, e.g. all string and numeric values.

138−jsonbToTSvector :: '[null 'PGjsonb, null 'PGjsonb] ---> null 'PGtsvector

139+jsonbToTSvector :: FunctionN '[null 'PGjsonb, null 'PGjsonb] (null 'PGtsvector)

139jsonbToTSvector = unsafeFunctionN "jsonb_to_tsvector"

140jsonbToTSvector = unsafeFunctionN "jsonb_to_tsvector"

140

141

141-- | remove given lexeme from `Squeal.PostgreSQL.Expression.Type.tsvector`

142-- | remove given lexeme from `Squeal.PostgreSQL.Expression.Type.tsvector`

142−tsDelete ::

143+tsDelete :: FunctionN

143 '[null 'PGtsvector, null ('PGvararray ('NotNull 'PGtext))]

144 '[null 'PGtsvector, null ('PGvararray ('NotNull 'PGtext))]

144− ---> null 'PGtsvector

145+ (null 'PGtsvector)

145tsDelete = unsafeFunctionN "ts_delete"

146tsDelete = unsafeFunctionN "ts_delete"

146

147

147-- | select only elements with given weights from `Squeal.PostgreSQL.Expression.Type.tsvector`

148-- | select only elements with given weights from `Squeal.PostgreSQL.Expression.Type.tsvector`

148−tsFilter ::

149+tsFilter :: FunctionN

149 '[null 'PGtsvector, null ('PGvararray ('NotNull ('PGchar 1)))]

150 '[null 'PGtsvector, null ('PGvararray ('NotNull ('PGchar 1)))]

150− ---> null 'PGtsvector

151+ (null 'PGtsvector)

151tsFilter = unsafeFunctionN "ts_filter"

152tsFilter = unsafeFunctionN "ts_filter"

152

153

153-- | display a `Squeal.PostgreSQL.Expression.Type.tsquery` match

154-- | display a `Squeal.PostgreSQL.Expression.Type.tsquery` match

154tsHeadline

155tsHeadline

155 :: document `In` '[ 'PGtext, 'PGjson, 'PGjsonb]

156 :: document `In` '[ 'PGtext, 'PGjson, 'PGjsonb]

156− => '[null document, null 'PGtsquery] ---> null 'PGtext

157+ => FunctionN '[null document, null 'PGtsquery] (null 'PGtext)

157tsHeadline = unsafeFunctionN "ts_headline"

158tsHeadline = unsafeFunctionN "ts_headline"

squeal-postgresql/src/Squeal/PostgreSQL/Expression/Time.hs+12−7

@@ -17,7 +17,6 @@ Date/Time functions and operators

17 , OverloadedStrings

18 , PolyKinds

19 , RankNTypes

20− , TypeOperators

21#-}

20#-}

22

21

23module Squeal.PostgreSQL.Expression.Time

22module Squeal.PostgreSQL.Expression.Time

@@ -86,7 +85,9 @@ Create date from year, month and day fields

86>>> printSQL (makeDate (1984 :* 7 *: 3))

85>>> printSQL (makeDate (1984 :* 7 *: 3))

87make_date(1984, 7, 3)

86make_date(1984, 7, 3)

88-}

87-}

88+makeDate :: FunctionN

89−makeDate :: '[ null 'PGint4, null 'PGint4, null 'PGint4 ] ---> null 'PGdate

89+ '[ null 'PGint4, null 'PGint4, null 'PGint4 ]

90+ ( null 'PGdate )

90makeDate = unsafeFunctionN "make_date"

91makeDate = unsafeFunctionN "make_date"

91

92

92{-|

93{-|

@@ -95,7 +96,9 @@ Create time from hour, minute and seconds fields

95>>> printSQL (makeTime (8 :* 15 *: 23.5))

96>>> printSQL (makeTime (8 :* 15 *: 23.5))

96make_time(8, 15, 23.5)

97make_time(8, 15, 23.5)

97-}

98-}

99+makeTime :: FunctionN

98−makeTime :: '[ null 'PGint4, null 'PGint4, null 'PGfloat8 ] ---> null 'PGtime

100+ '[ null 'PGint4, null 'PGint4, null 'PGfloat8 ]

101+ ( null 'PGtime )

99makeTime = unsafeFunctionN "make_time"

102makeTime = unsafeFunctionN "make_time"

100

103

101{-|

104{-|

@@ -104,9 +107,10 @@ Create timestamp from year, month, day, hour, minute and seconds fields

104>>> printSQL (makeTimestamp (2013 :* 7 :* 15 :* 8 :* 15 *: 23.5))

107>>> printSQL (makeTimestamp (2013 :* 7 :* 15 :* 8 :* 15 *: 23.5))

105make_timestamp(2013, 7, 15, 8, 15, 23.5)

108make_timestamp(2013, 7, 15, 8, 15, 23.5)

106-}

109-}

107−makeTimestamp ::

110+makeTimestamp :: FunctionN

108 '[ null 'PGint4, null 'PGint4, null 'PGint4

111 '[ null 'PGint4, null 'PGint4, null 'PGint4

109− , null 'PGint4, null 'PGint4, null 'PGfloat8 ] ---> null 'PGtimestamp

112+ , null 'PGint4, null 'PGint4, null 'PGfloat8 ]

113+ ( null 'PGtimestamp )

110makeTimestamp = unsafeFunctionN "make_timestamp"

114makeTimestamp = unsafeFunctionN "make_timestamp"

111

115

112{-|

116{-|

@@ -117,9 +121,10 @@ the current time zone is used

117>>> printSQL (makeTimestamptz (2013 :* 7 :* 15 :* 8 :* 15 *: 23.5))

121>>> printSQL (makeTimestamptz (2013 :* 7 :* 15 :* 8 :* 15 *: 23.5))

118make_timestamptz(2013, 7, 15, 8, 15, 23.5)

122make_timestamptz(2013, 7, 15, 8, 15, 23.5)

119-}

123-}

120−makeTimestamptz ::

124+makeTimestamptz :: FunctionN

121 '[ null 'PGint4, null 'PGint4, null 'PGint4

125 '[ null 'PGint4, null 'PGint4, null 'PGint4

122− , null 'PGint4, null 'PGint4, null 'PGfloat8 ] ---> null 'PGtimestamptz

126+ , null 'PGint4, null 'PGint4, null 'PGfloat8 ]

127+ ( null 'PGtimestamptz )

123makeTimestamptz = unsafeFunctionN "make_timestamptz"

128makeTimestamptz = unsafeFunctionN "make_timestamptz"

124

129

125{-|

130{-|

squeal-postgresql/src/Squeal/PostgreSQL/Expression/Type.hs+4−101

@@ -23,16 +23,15 @@ Type expressions.

23 , ScopedTypeVariables

24 , TypeApplications

25 , TypeOperators

26− , UndecidableInstances

27#-}

26#-}

28

27

29module Squeal.PostgreSQL.Expression.Type

28module Squeal.PostgreSQL.Expression.Type

30− ( -- * type casting

29+ ( TypeExpression (..)

31− cast

30+ , cast

32 , astype

31 , astype

33 , inferredtype

32 , inferredtype

34− -- * type expressions

33+ , PGTyped (..)

35− , TypeExpression (..)

34+ , FieldTyped (..)

36 , typedef

35 , typedef

37 , typetable

36 , typetable

38 , typeview

37 , typeview

@@ -79,22 +78,6 @@ module Squeal.PostgreSQL.Expression.Type

79 , tsrange

78 , tsrange

80 , tstzrange

79 , tstzrange

81 , daterange

80 , 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 (..)

98 ) where

81 ) where

99

82

100import Control.DeepSeq

83import Control.DeepSeq

@@ -108,7 +91,6 @@ import qualified Generics.SOP as SOP

108

91

109import Squeal.PostgreSQL.Alias

92import Squeal.PostgreSQL.Alias

110import Squeal.PostgreSQL.Expression

93import Squeal.PostgreSQL.Expression

111−import Squeal.PostgreSQL.PG

112import Squeal.PostgreSQL.Render

94import Squeal.PostgreSQL.Render

113import Squeal.PostgreSQL.Schema

95import Squeal.PostgreSQL.Schema

114

96

@@ -150,7 +132,6 @@ astype = cast

150inferredtype

132inferredtype

151 :: PGTyped schemas ty

133 :: PGTyped schemas ty

152 => Expression outer common grp schemas params from ty

134 => Expression outer common grp schemas params from ty

153− -- ^ value

154 -> Expression outer common grp schemas params from ty

135 -> Expression outer common grp schemas params from ty

155inferredtype = astype pgtype

136inferredtype = astype pgtype

156

137

@@ -170,7 +151,6 @@ instance RenderSQL (TypeExpression schemas ty) where

170typedef

151typedef

171 :: (Has sch schemas schema, Has td schema ('Typedef ty))

152 :: (Has sch schemas schema, Has td schema ('Typedef ty))

172 => QualifiedAlias sch td

153 => QualifiedAlias sch td

173− -- ^ type alias

174 -> TypeExpression schemas (null ty)

154 -> TypeExpression schemas (null ty)

175typedef = UnsafeTypeExpression . renderSQL

155typedef = UnsafeTypeExpression . renderSQL

176

156

@@ -179,7 +159,6 @@ typedef = UnsafeTypeExpression . renderSQL

179typetable

159typetable

180 :: (Has sch schemas schema, Has tab schema ('Table table))

160 :: (Has sch schemas schema, Has tab schema ('Table table))

181 => QualifiedAlias sch tab

161 => QualifiedAlias sch tab

182− -- ^ table alias

183 -> TypeExpression schemas (null ('PGcomposite (TableToRow table)))

162 -> TypeExpression schemas (null ('PGcomposite (TableToRow table)))

184typetable = UnsafeTypeExpression . renderSQL

163typetable = UnsafeTypeExpression . renderSQL

185

164

@@ -188,7 +167,6 @@ typetable = UnsafeTypeExpression . renderSQL

188typeview

167typeview

189 :: (Has sch schemas schema, Has vw schema ('View view))

168 :: (Has sch schemas schema, Has vw schema ('View view))

190 => QualifiedAlias sch vw

169 => QualifiedAlias sch vw

191− -- ^ view alias

192 -> TypeExpression schemas (null ('PGcomposite view))

170 -> TypeExpression schemas (null ('PGcomposite view))

193typeview = UnsafeTypeExpression . renderSQL

171typeview = UnsafeTypeExpression . renderSQL

194

172

@@ -362,12 +340,6 @@ instance (SOP.All KnownNat dims, PGTyped schemas ty)

362instance PGTyped schemas (null 'PGtsvector) where pgtype = tsvector

340instance PGTyped schemas (null 'PGtsvector) where pgtype = tsvector

363instance PGTyped schemas (null 'PGtsquery) where pgtype = tsquery

341instance PGTyped schemas (null 'PGtsquery) where pgtype = tsquery

364instance PGTyped schemas (null 'PGoid) where pgtype = oid

342instance 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

371

343

372-- | Lift `PGTyped` to a field

344-- | Lift `PGTyped` to a field

373class FieldTyped schemas ty where

345class FieldTyped schemas ty where

@@ -375,72 +347,3 @@ class FieldTyped schemas ty where

375instance (KnownSymbol alias, PGTyped schemas ty)

347instance (KnownSymbol alias, PGTyped schemas ty)

376 => FieldTyped schemas (alias ::: ty) where

348 => FieldTyped schemas (alias ::: ty) where

377 fieldtype = pgtype `As` Alias

349 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+2−11

@@ -84,12 +84,7 @@ infixl 9 *:

84-- | @Elem@ is a promoted `Data.List.elem`.

85type family Elem x xs where

86 Elem x '[] = 'False

87− Elem x (x ': _) = 'True

87+ Elem x (x ': xs) = '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

93 Elem x (_ ': xs) = Elem x xs

88 Elem x (_ ': xs) = Elem x xs

94

89

95-- | @In x xs@ is a constraint that proves that @x@ is in @xs@.

90-- | @In x xs@ is a constraint that proves that @x@ is in @xs@.

@@ -104,9 +99,5 @@ Length '[Char,String,Bool,Double] :: Nat

104= 4

99= 4

105-}

100-}

106type family Length (xs :: [k]) :: Nat where

101type family Length (xs :: [k]) :: Nat where

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

102+ Length (x : xs) = 1 + Length xs

112 Length '[] = 0

103 Length '[] = 0

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

@@ -168,7 +168,6 @@ import Squeal.PostgreSQL.Alias

168import Squeal.PostgreSQL.Binary

169import Squeal.PostgreSQL.Definition

170import Squeal.PostgreSQL.Definition.Table

171−import Squeal.PostgreSQL.Definition.Table.Constraint

172import Squeal.PostgreSQL.Expression.Comparison

171import Squeal.PostgreSQL.Expression.Comparison

173import Squeal.PostgreSQL.Expression.Parameter

172import Squeal.PostgreSQL.Expression.Parameter

174import Squeal.PostgreSQL.Expression.Time

173import Squeal.PostgreSQL.Expression.Time

squeal-postgresql/src/Squeal/PostgreSQL/PG.hs+12−22

@@ -47,7 +47,7 @@ module Squeal.PostgreSQL.PG

47 , Enumerated (..)

48 , VarArray (..)

49 , FixArray (..)

50− , LibPQ.Oid (..)

50+ , Oid (..)

51 -- * Type families

52 , LabelsPG

53 , DimPG

@@ -66,6 +66,7 @@ import Data.Int (Int16, Int32, Int64)

66import Data.Scientific (Scientific)

67import Data.Time (Day, DiffTime, LocalTime, TimeOfDay, TimeZone, UTCTime)

68import Data.Vector (Vector)

69+import Data.Word (Word32)

69import Data.UUID.Types (UUID)

70import Data.UUID.Types (UUID)

70import GHC.TypeLits

71import GHC.TypeLits

71import Network.IP.Addr (NetAddr, IP)

72import Network.IP.Addr (NetAddr, IP)

@@ -74,7 +75,6 @@ import qualified Data.ByteString.Lazy as Lazy (ByteString)

74import qualified Data.ByteString as Strict (ByteString)

75import qualified Data.ByteString as Strict (ByteString)

75import qualified Data.Text.Lazy as Lazy (Text)

76import qualified Data.Text.Lazy as Lazy (Text)

76import qualified Data.Text as Strict (Text)

77import qualified Data.Text as Strict (Text)

77−import qualified Database.PostgreSQL.LibPQ as LibPQ

78import qualified GHC.Generics as GHC

79import qualified Generics.SOP as SOP

80import qualified Generics.SOP.Record as SOP

@@ -108,7 +108,7 @@ type instance PG Int32 = 'PGint4

108-- | `PGint8`

109type instance PG Int64 = 'PGint8

110-- | `PGint2`

111−type instance PG LibPQ.Oid = 'PGoid

111+type instance PG Oid = 'PGoid

112-- | `PGnumeric`

113type instance PG Scientific = 'PGnumeric

114-- | `PGfloat4`

@@ -178,16 +178,8 @@ type family RowPG (hask :: Type) :: RowType where

178

179-- | `RowOf` applies `NullPG` to the fields of a list.

180type family RowOf (record :: [(Symbol, Type)]) :: RowType where

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

189− RowOf (col ::: ty ': record) = col ::: NullPG ty ': RowOf record

190 RowOf '[] = '[]

181 RowOf '[] = '[]

182+ RowOf (col ::: ty ': record) = col ::: NullPG ty ': RowOf record

191

183

192{- | `NullPG` turns a Haskell type into a `NullityType`.

184{- | `NullPG` turns a Haskell type into a `NullityType`.

193

185

@@ -214,17 +206,8 @@ type family TuplePG (hask :: Type) :: [NullityType] where

214

206

215-- | `TupleOf` turns a list of Haskell `Type`s into a list of `NullityType`s.

207-- | `TupleOf` turns a list of Haskell `Type`s into a list of `NullityType`s.

216type family TupleOf (tuple :: [Type]) :: [NullityType] where

208type family TupleOf (tuple :: [Type]) :: [NullityType] where

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

226− TupleOf (hask ': tuple) = NullPG hask ': TupleOf tuple

227 TupleOf '[] = '[]

209 TupleOf '[] = '[]

210+ TupleOf (hask ': tuple) = NullPG hask ': TupleOf tuple

228

211

229-- | `TupleCodeOf` takes the `SOP.Code` of a haskell `Type`

212-- | `TupleCodeOf` takes the `SOP.Code` of a haskell `Type`

230-- and if it's a simple product returns it, otherwise giving a `TypeError`.

213-- and if it's a simple product returns it, otherwise giving a `TypeError`.

@@ -386,3 +369,10 @@ newtype FixArray arr = FixArray {getFixArray :: arr}

386 deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)

369 deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)

387-- | `PGfixarray` @(@`DimPG` @hask) (@`FixPG` @hask)@

370-- | `PGfixarray` @(@`DimPG` @hask) (@`FixPG` @hask)@

388type instance PG (FixArray hask) = 'PGfixarray (DimPG hask) (FixPG hask)

371type 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+17−41

@@ -78,7 +78,6 @@ import UnliftIO (MonadUnliftIO (..), bracket, catch, handle, try)

78import Data.ByteString (ByteString)

79import Data.Foldable

80import Data.Function ((&))

81−import Data.Functor ((<&>))

82import Data.Kind

81import Data.Kind

83import Data.Text (pack, Text)

82import Data.Text (pack, Text)

84import Data.Traversable

83import Data.Traversable

@@ -87,7 +86,6 @@ import PostgreSQL.Binary.Encoding (encodingBytes)

87

86

88import qualified Control.Monad.Fail as Fail

87import qualified Control.Monad.Fail as Fail

89import qualified Database.PostgreSQL.LibPQ as LibPQ

88import qualified Database.PostgreSQL.LibPQ as LibPQ

90−import qualified PostgreSQL.Binary.Encoding as Encoding

91

89

92import Squeal.PostgreSQL.Binary

90import Squeal.PostgreSQL.Binary

93import Squeal.PostgreSQL.Definition

91import Squeal.PostgreSQL.Definition

@@ -317,13 +315,13 @@ a default instance.

317-}

315-}

318class Monad pq => MonadPQ schemas pq | pq -> schemas where

316class Monad pq => MonadPQ schemas pq | pq -> schemas where

319 manipulateParams

317 manipulateParams

320− :: (ToParams x params, All OidOfParam params)

318+ :: ToParams x params

321 => Manipulation '[] schemas params ys

319 => Manipulation '[] schemas params ys

322 -- ^ `insertInto`, `update` or `deleteFrom`

320 -- ^ `insertInto`, `update` or `deleteFrom`

323 -> x -> pq (K LibPQ.Result ys)

321 -> x -> pq (K LibPQ.Result ys)

324 default manipulateParams

322 default manipulateParams

325 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)

323 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)

326− => (ToParams x params, All OidOfParam params)

324+ => ToParams x params

327 => Manipulation '[] schemas params ys

325 => Manipulation '[] schemas params ys

328 -- ^ `insertInto`, `update` or `deleteFrom`

326 -- ^ `insertInto`, `update` or `deleteFrom`

329 -> x -> pq (K LibPQ.Result ys)

327 -> x -> pq (K LibPQ.Result ys)

@@ -331,7 +329,7 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where

331 manipulateParams manipulation params

329 manipulateParams manipulation params

332

330

333 manipulateParams_

331 manipulateParams_

334− :: (ToParams x params, All OidOfParam params)

332+ :: ToParams x params

335 => Manipulation '[] schemas params '[]

333 => Manipulation '[] schemas params '[]

336 -- ^ `insertInto`, `update` or `deleteFrom`

334 -- ^ `insertInto`, `update` or `deleteFrom`

337 -> x -> pq ()

335 -> x -> pq ()

@@ -344,7 +342,7 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where

344 manipulate_ = void . manipulate

342 manipulate_ = void . manipulate

345

343

346 runQueryParams

344 runQueryParams

347− :: (ToParams x params, All OidOfParam params)

345+ :: ToParams x params

348 => Query '[] '[] schemas params ys

346 => Query '[] '[] schemas params ys

349 -- ^ `select` and friends

347 -- ^ `select` and friends

350 -> x -> pq (K LibPQ.Result ys)

348 -> x -> pq (K LibPQ.Result ys)

@@ -357,19 +355,19 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where

357 runQuery q = runQueryParams q ()

355 runQuery q = runQueryParams q ()

358

356

359 traversePrepared

357 traversePrepared

360− :: (ToParams x params, Traversable list, All OidOfParam params)

358+ :: (ToParams x params, Traversable list)

361 => Manipulation '[] schemas params ys

359 => Manipulation '[] schemas params ys

362 -- ^ `insertInto`, `update`, or `deleteFrom`, and friends

360 -- ^ `insertInto`, `update`, or `deleteFrom`, and friends

363 -> list x -> pq (list (K LibPQ.Result ys))

361 -> list x -> pq (list (K LibPQ.Result ys))

364 default traversePrepared

362 default traversePrepared

365 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)

363 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)

366− => (ToParams x params, Traversable list, All OidOfParam params)

364+ => (ToParams x params, Traversable list)

367 => Manipulation '[] schemas params ys -> list x -> pq (list (K LibPQ.Result ys))

365 => Manipulation '[] schemas params ys -> list x -> pq (list (K LibPQ.Result ys))

368 traversePrepared manipulation params = lift $

366 traversePrepared manipulation params = lift $

369 traversePrepared manipulation params

367 traversePrepared manipulation params

370

368

371 forPrepared

369 forPrepared

372− :: (ToParams x params, Traversable list, All OidOfParam params)

370+ :: (ToParams x params, Traversable list)

373 => list x

371 => list x

374 -> Manipulation '[] schemas params ys

372 -> Manipulation '[] schemas params ys

375 -- ^ `insertInto`, `update` or `deleteFrom`

373 -- ^ `insertInto`, `update` or `deleteFrom`

@@ -377,13 +375,13 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where

377 forPrepared = flip traversePrepared

375 forPrepared = flip traversePrepared

378

376

379 traversePrepared_

377 traversePrepared_

380− :: (ToParams x params, Foldable list, All OidOfParam params)

378+ :: (ToParams x params, Foldable list)

381 => Manipulation '[] schemas params '[]

379 => Manipulation '[] schemas params '[]

382 -- ^ `insertInto`, `update` or `deleteFrom`

380 -- ^ `insertInto`, `update` or `deleteFrom`

383 -> list x -> pq ()

381 -> list x -> pq ()

384 default traversePrepared_

382 default traversePrepared_

385 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)

383 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)

386− => (ToParams x params, Foldable list, All OidOfParam params)

384+ => (ToParams x params, Foldable list)

387 => Manipulation '[] schemas params '[]

385 => Manipulation '[] schemas params '[]

388 -- ^ `insertInto`, `update` or `deleteFrom`

386 -- ^ `insertInto`, `update` or `deleteFrom`

389 -> list x -> pq ()

387 -> list x -> pq ()

@@ -391,7 +389,7 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where

391 traversePrepared_ manipulation params

389 traversePrepared_ manipulation params

392

390

393 forPrepared_

391 forPrepared_

394− :: (ToParams x params, Foldable list, All OidOfParam params)

392+ :: (ToParams x params, Foldable list)

395 => list x

393 => list x

396 -> Manipulation '[] schemas params '[]

394 -> Manipulation '[] schemas params '[]

397 -- ^ `insertInto`, `update` or `deleteFrom`

395 -- ^ `insertInto`, `update` or `deleteFrom`

@@ -411,17 +409,9 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)

411 (UnsafeManipulation q :: Manipulation '[] schemas ps ys) (params :: x) =

409 (UnsafeManipulation q :: Manipulation '[] schemas ps ys) (params :: x) =

412 PQ $ \ (K conn) -> do

410 PQ $ \ (K conn) -> do

413 let

411 let

414− paramSet

412+ toParam' encoding =

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)

413+ (LibPQ.invalidOid, encodingBytes encoding, LibPQ.Binary)

421− params'

422− = hcollapse

423− . hcmap (Proxy @OidOfParam) paramSet

424− $ toParams @x @ps params

414+ params' = fmap (fmap toParam') (hcollapse (toParams @x @ps params))

425 q' = q <> ";"

415 q' = q <> ";"

426 resultMaybe <- liftIO $ LibPQ.execParams conn q' params' LibPQ.Binary

416 resultMaybe <- liftIO $ LibPQ.execParams conn q' params' LibPQ.Binary

427 case resultMaybe of

417 case resultMaybe of

@@ -434,15 +424,8 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)

434 traversePrepared

424 traversePrepared

435 (UnsafeManipulation q :: Manipulation '[] schemas xs ys) (list :: list x) =

425 (UnsafeManipulation q :: Manipulation '[] schemas xs ys) (list :: list x) =

436 PQ $ \ (K conn) -> liftIO $ do

426 PQ $ \ (K conn) -> liftIO $ do

437− let

438− temp = "temporary_statement"

427+ let 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')

428+ prepResultMaybe <- LibPQ.prepare conn temp q Nothing

446 case prepResultMaybe of

429 case prepResultMaybe of

447 Nothing -> throw $ ResultException

430 Nothing -> throw $ ResultException

448 "traversePrepared: LibPQ.prepare returned no results"

431 "traversePrepared: LibPQ.prepare returned no results"

@@ -468,15 +451,8 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)

468 traversePrepared_

451 traversePrepared_

469 (UnsafeManipulation q :: Manipulation '[] schemas xs '[]) (list :: list x) =

452 (UnsafeManipulation q :: Manipulation '[] schemas xs '[]) (list :: list x) =

470 PQ $ \ (K conn) -> liftIO $ do

453 PQ $ \ (K conn) -> liftIO $ do

471− let

472− temp = "temporary_statement"

454+ let 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')

455+ prepResultMaybe <- LibPQ.prepare conn temp q Nothing

480 case prepResultMaybe of

456 case prepResultMaybe of

481 Nothing -> throw $ ResultException

457 Nothing -> throw $ ResultException

482 "traversePrepared_: LibPQ.prepare returned no results"

458 "traversePrepared_: LibPQ.prepare returned no results"

squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+25−33

@@ -554,9 +554,9 @@ select_ = select . List

554-- be subject to the elimination of duplicate rows using `selectDistinct`.

555selectDistinct

556 :: (SListI columns, columns ~ (col ': cols))

557− => Selection outer commons grp schemas params from columns

557+ => Selection outer commons 'Ungrouped schemas params from columns

558 -- ^ selection

559− -> TableExpression outer commons grp schemas params from

559+ -> TableExpression outer commons 'Ungrouped schemas params from

560 -- ^ intermediate virtual table

561 -> Query outer commons schemas params columns

562selectDistinct selection tabexpr = UnsafeQuery $

@@ -568,9 +568,9 @@ selectDistinct selection tabexpr = UnsafeQuery $

568-- of a general `Selection`.

569selectDistinct_

570 :: (SListI columns, columns ~ (col ': cols))

571− => NP (Aliased (Expression outer commons grp schemas params from)) columns

571+ => NP (Aliased (Expression outer commons 'Ungrouped schemas params from)) columns

572 -- ^ select list

573− -> TableExpression outer commons grp schemas params from

573+ -> TableExpression outer commons 'Ungrouped schemas params from

574 -- ^ intermediate virtual table

575 -> Query outer commons schemas params columns

576selectDistinct_ = selectDistinct . List

@@ -580,21 +580,14 @@ selectDistinct_ = selectDistinct . List

580the given expressions evaluate to equal. The DISTINCT ON expressions are

581interpreted using the same rules as for ORDER BY. ORDER BY is used to

582ensure 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.

590-}

583-}

591selectDistinctOn

584selectDistinctOn

592 :: (SListI columns, columns ~ (col ': cols))

585 :: (SListI columns, columns ~ (col ': cols))

593− => [SortExpression outer commons grp schemas params from]

586+ => [SortExpression outer commons 'Ungrouped schemas params from]

594− -- ^ DISTINCT ON expression(s) and prepended to ORDER BY clause

587+ -- ^ distinct on and return the first row in ordering

595− -> Selection outer commons grp schemas params from columns

588+ -> Selection outer commons 'Ungrouped schemas params from columns

596 -- ^ selection

589 -- ^ selection

597− -> TableExpression outer commons grp schemas params from

590+ -> TableExpression outer commons 'Ungrouped schemas params from

598 -- ^ intermediate virtual table

591 -- ^ intermediate virtual table

599 -> Query outer commons schemas params columns

592 -> Query outer commons schemas params columns

600selectDistinctOn distincts selection tab = UnsafeQuery $

593selectDistinctOn distincts selection tab = UnsafeQuery $

@@ -615,11 +608,11 @@ selectDistinctOn distincts selection tab = UnsafeQuery $

615-- of a general `Selection`.

608-- of a general `Selection`.

616selectDistinctOn_

609selectDistinctOn_

617 :: (SListI columns, columns ~ (col ': cols))

610 :: (SListI columns, columns ~ (col ': cols))

618− => [SortExpression outer commons grp schemas params from]

611+ => [SortExpression outer commons 'Ungrouped schemas params from]

619 -- ^ distinct on and return the first row in ordering

612 -- ^ distinct on and return the first row in ordering

620− -> NP (Aliased (Expression outer commons grp schemas params from)) columns

613+ -> NP (Aliased (Expression outer commons 'Ungrouped schemas params from)) columns

621 -- ^ selection

614 -- ^ selection

622− -> TableExpression outer commons grp schemas params from

615+ -> TableExpression outer commons 'Ungrouped schemas params from

623 -- ^ intermediate virtual table

616 -- ^ intermediate virtual table

624 -> Query outer commons schemas params columns

617 -> Query outer commons schemas params columns

625selectDistinctOn_ distincts = selectDistinctOn distincts . List

618selectDistinctOn_ distincts = selectDistinctOn distincts . List

@@ -757,7 +750,7 @@ instance RenderSQL (TableExpression outer commons grp schemas params from) where

757from

750from

758 :: FromClause outer commons schemas params from -- ^ table reference

751 :: FromClause outer commons schemas params from -- ^ table reference

759 -> TableExpression outer commons 'Ungrouped schemas params from

752 -> TableExpression outer commons 'Ungrouped schemas params from

760−from tab = TableExpression tab [] noGroups NoHaving [] [] []

753+from tab = TableExpression tab [] NoGroups NoHaving [] [] []

761

754

762-- | A `where_` is an endomorphism of `TableExpression`s which adds a

755-- | A `where_` is an endomorphism of `TableExpression`s which adds a

763-- search condition to the `whereClause`.

756-- search condition to the `whereClause`.

@@ -778,7 +771,7 @@ groupBy

778groupBy bys rels = TableExpression

771groupBy bys rels = TableExpression

779 { fromClause = fromClause rels

772 { fromClause = fromClause rels

780 , whereClause = whereClause rels

773 , whereClause = whereClause rels

781− , groupByClause = group bys

774+ , groupByClause = Group bys

782 , havingClause = Having []

775 , havingClause = Having []

783 , orderByClause = []

776 , orderByClause = []

784 , limitClause = limitClause rels

777 , limitClause = limitClause rels

@@ -992,20 +985,19 @@ instance (Has rel rels cols, Has col cols ty, bys ~ '[ '(rel, col)])

992-- done on @NoGroups@ while all output `Expression`s must be aggregated

985-- done on @NoGroups@ while all output `Expression`s must be aggregated

993-- in @Group Nil@. In general, all output `Expression`s in the

986-- in @Group Nil@. In general, all output `Expression`s in the

994-- complement of @bys@ must be aggregated in @Group bys@.

987-- complement of @bys@ must be aggregated in @Group bys@.

995−newtype GroupByClause grp from = UnsafeGroupByClause

988+data GroupByClause grp from where

996− { renderGroupByClause :: ByteString }

989+ NoGroups :: GroupByClause 'Ungrouped from

997− deriving (GHC.Generic,Show,Eq,Ord,NFData)

990+ Group

991+ :: SListI bys

992+ => NP (By from) bys

993+ -> GroupByClause ('Grouped bys) from

994+

995+-- | Renders a `GroupByClause`.

998instance RenderSQL (GroupByClause grp from) where

996instance RenderSQL (GroupByClause grp from) where

999− renderSQL = renderGroupByClause

997+ renderSQL = \case

1000−noGroups :: GroupByClause 'Ungrouped from

998+ NoGroups -> ""

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 -> ""

999+ Group Nil -> ""

1008− bys' -> " GROUP BY" <+> renderCommaSeparated renderSQL bys'

1000+ Group bys -> " GROUP BY" <+> renderCommaSeparated renderSQL bys

1009

1001

1010-- | A `HavingClause` is used to eliminate groups that are not of interest.

1002-- | A `HavingClause` is used to eliminate groups that are not of interest.

1011-- An `Ungrouped` `TableExpression` may only use `NoHaving` while a `Grouped`

1003-- An `Ungrouped` `TableExpression` may only use `NoHaving` while a `Grouped`

squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+9−69

@@ -45,7 +45,7 @@ module Squeal.PostgreSQL.Schema

45 , TableType

46 , SchemumType (..)

47 , IndexType (..)

48− , FunctionType

48+ , FunctionType (..)

49 , OperatorType (..)

50 , ReturnsType (..)

51 , SchemaType

@@ -69,9 +69,7 @@ module Squeal.PostgreSQL.Schema

69 , DropIfExists

70 , DropSchemumIfExists

71 , Alter

72− , AlterIfExists

73 , Rename

72 , Rename

74− , RenameIfExists

75 , ConstraintInvolves

73 , ConstraintInvolves

76 , DropIfConstraintsInvolve

74 , DropIfConstraintsInvolve

77 , IsNotElem

75 , IsNotElem

@@ -260,19 +258,9 @@ type FromType = [(Symbol,RowType)]

260

258

261-- | `ColumnsToRow` removes column constraints.

259-- | `ColumnsToRow` removes column constraints.

262type family ColumnsToRow (columns :: ColumnsType) :: RowType where

260type family ColumnsToRow (columns :: ColumnsType) :: RowType where

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) =

274− column ::: ty ': ColumnsToRow columns

275 ColumnsToRow '[] = '[]

261 ColumnsToRow '[] = '[]

262+ ColumnsToRow (column ::: constraint :=> ty ': columns) =

263+ column ::: ty ': ColumnsToRow columns

276

264

277-- | `TableToColumns` removes table constraints.

265-- | `TableToColumns` removes table constraints.

278type family TableToColumns (table :: TableType) :: ColumnsType where

266type family TableToColumns (table :: TableType) :: ColumnsType where

@@ -305,24 +293,14 @@ instance ty0 ~ ty1 => SamePGType

305

293

306-- | `AllNotNull` is a constraint that proves a `ColumnsType` has no @NULL@s.

294-- | `AllNotNull` is a constraint that proves a `ColumnsType` has no @NULL@s.

307type family AllNotNull (columns :: ColumnsType) :: Constraint where

295type 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

314 AllNotNull '[] = ()

296 AllNotNull '[] = ()

297+ AllNotNull (column ::: def :=> 'NotNull ty ': columns) = AllNotNull columns

315

298

316-- | `NotAllNull` is a constraint that proves a `ColumnsType` has some

299-- | `NotAllNull` is a constraint that proves a `ColumnsType` has some

317-- @NOT NULL@.

300-- @NOT NULL@.

318type family NotAllNull (columns :: ColumnsType) :: Constraint where

301type family NotAllNull (columns :: ColumnsType) :: Constraint where

319− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

302+ NotAllNull (column ::: def :=> 'NotNull ty ': columns) = ()

320− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

321− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

322− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

323− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

324− NotAllNull (_ ::: _ :=> 'NotNull _ ': _) = ()

325− NotAllNull (_ ::: _ :=> 'Null _ ': columns) = NotAllNull columns

303+ NotAllNull (column ::: def :=> 'Null ty ': columns) = NotAllNull columns

326

304

327-- | `NullifyType` is an idempotent that nullifies a `NullityType`.

305-- | `NullifyType` is an idempotent that nullifies a `NullityType`.

328type family NullifyType (ty :: NullityType) :: NullityType where

306type family NullifyType (ty :: NullityType) :: NullityType where

@@ -331,37 +309,17 @@ type family NullifyType (ty :: NullityType) :: NullityType where

331

309

332-- | `NullifyRow` is an idempotent that nullifies a `RowType`.

310-- | `NullifyRow` is an idempotent that nullifies a `RowType`.

333type family NullifyRow (columns :: RowType) :: RowType where

311type family NullifyRow (columns :: RowType) :: RowType where

334− NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': column5 ::: ty5 ': columns) =

312+ NullifyRow '[] = '[]

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

344 NullifyRow (column ::: ty ': columns) =

313 NullifyRow (column ::: ty ': columns) =

345 column ::: NullifyType ty ': NullifyRow columns

314 column ::: NullifyType ty ': NullifyRow columns

346− NullifyRow '[] = '[]

347

315

348-- | `NullifyFrom` is an idempotent that nullifies a `FromType`

316-- | `NullifyFrom` is an idempotent that nullifies a `FromType`

349-- used to nullify the left or right hand side of an outer join

317-- used to nullify the left or right hand side of an outer join

350-- in a `Squeal.PostgreSQL.Query.FromClause`.

318-- in a `Squeal.PostgreSQL.Query.FromClause`.

351type family NullifyFrom (tables :: FromType) :: FromType where

319type family NullifyFrom (tables :: FromType) :: FromType where

352− NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': table4 ::: columns4 ': table5 ::: columns5 ': tables) =

320+ NullifyFrom '[] = '[]

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

362 NullifyFrom (table ::: columns ': tables) =

321 NullifyFrom (table ::: columns ': tables) =

363 table ::: NullifyRow columns ': NullifyFrom tables

322 table ::: NullifyRow columns ': NullifyFrom tables

364− NullifyFrom '[] = '[]

365

323

366-- | @Create alias x xs@ adds @alias ::: x@ to the end of @xs@ and is used in

324-- | @Create alias x xs@ adds @alias ::: x@ to the end of @xs@ and is used in

367-- `Squeal.PostgreSQL.Definition.createTable` statements and in @ALTER TABLE@

325-- `Squeal.PostgreSQL.Definition.createTable` statements and in @ALTER TABLE@

@@ -438,34 +396,16 @@ type family DropSchemumIfExists alias sch xs where

438-- with the type @x@ and is used in `Squeal.PostgreSQL.Definition.alterTable`

396-- with the type @x@ and is used in `Squeal.PostgreSQL.Definition.alterTable`

439-- and `Squeal.PostgreSQL.Definition.alterColumn`.

397-- and `Squeal.PostgreSQL.Definition.alterColumn`.

440type family Alter alias x xs where

398type family Alter alias x xs where

441− Alter alias x '[] = TypeError

442− ('Text "Alter: alias "

443− ':<>: 'ShowType alias

444− ':<>: 'Text " does not exist" )

445 Alter alias x1 (alias ::: x0 ': xs) = alias ::: x1 ': xs

399 Alter alias x1 (alias ::: x0 ': xs) = alias ::: x1 ': xs

446 Alter alias x1 (x0 ': xs) = x0 ': Alter alias x1 xs

400 Alter alias x1 (x0 ': xs) = x0 ': Alter alias x1 xs

447

401

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−

453-- | @Rename alias0 alias1 xs@ replaces the alias @alias0@ by @alias1@ in @xs@

402-- | @Rename alias0 alias1 xs@ replaces the alias @alias0@ by @alias1@ in @xs@

454-- and is used in `Squeal.PostgreSQL.Definition.alterTableRename` and

403-- and is used in `Squeal.PostgreSQL.Definition.alterTableRename` and

455-- `Squeal.PostgreSQL.Definition.renameColumn`.

404-- `Squeal.PostgreSQL.Definition.renameColumn`.

456type family Rename alias0 alias1 xs where

405type family Rename alias0 alias1 xs where

457− Rename alias0 alias1 '[] = TypeError

458− ('Text "Rename: alias "

459− ':<>: 'ShowType alias0

460− ':<>: 'Text " does not exist" )

461 Rename alias0 alias1 ((alias0 ::: x0) ': xs) = (alias1 ::: x0) ': xs

406 Rename alias0 alias1 ((alias0 ::: x0) ': xs) = (alias1 ::: x0) ': xs

462 Rename alias0 alias1 (x ': xs) = x ': Rename alias0 alias1 xs

407 Rename alias0 alias1 (x ': xs) = x ': Rename alias0 alias1 xs

463

408

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−

469-- | Check if a `TableConstraint` involves a column

409-- | Check if a `TableConstraint` involves a column

470type family ConstraintInvolves column constraint where

410type family ConstraintInvolves column constraint where

471 ConstraintInvolves column ('Check columns) = column `Elem` columns

411 ConstraintInvolves column ('Check columns) = column `Elem` columns

@@ -493,7 +433,7 @@ data SchemumType

493 | Operator OperatorType

433 | Operator OperatorType

494 | UnsafeSchemum Symbol

434 | UnsafeSchemum Symbol

495

435

496−type FunctionType = ([NullityType], ReturnsType)

436+data FunctionType = (::-->) [NullityType] ReturnsType

497

437

498data IndexType

438data IndexType

499 = Btree

439 = Btree

squeal-postgresql/test/Property.hs+2−2

@@ -92,14 +92,14 @@ roundtrips = Group "roundtrips"

92 -- genTimeWithZone = (,) <$> genTimeOfDay <*> genTimeZone

93

94roundtrip

95− :: (OidOf ty, ToParam x ty, FromValue ty x, Show x, Eq x)

95+ :: (ToParam x ty, FromValue ty x, Show x, Eq x)

96 => TypeExpression schemas ('NotNull ty)

97 -> Gen x

98 -> (PropertyName, Property)

99roundtrip = roundtripOn id

100

101roundtripOn

102− :: (OidOf ty, ToParam x ty, FromValue ty x, Show x, Eq x)

102+ :: (ToParam x ty, FromValue ty x, Show x, Eq x)

103 => (x -> x)

104 -> TypeExpression schemas ('NotNull ty)

105 -> Gen x

squeal-postgresql/test/Spec.hs−11

@@ -123,14 +123,3 @@ spec = before_ setupDB . after_ dropDB $ do

123 getRows =<< runQuery query

124 (fromOnly <$> rangesOut :: [Range Int32]) `shouldBe`

125 [ 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