c42b09d...dev · squeal

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 `GHC.TypeLits.Symbol` with a `SchemumType`,

124+`:::` is used to pair an alias `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 `Generics.SOP.Generic` and

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

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

184+`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 `Generics.SOP.Generic` a

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− (int & notNullable) `as` #user_id :*

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

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

57+ hask @(Maybe Text) `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.Column

32 Squeal.PostgreSQL.Definition.Table.Constraint

31 Squeal.PostgreSQL.Definition.Table.Constraint

33 Squeal.PostgreSQL.Definition.Type

32 Squeal.PostgreSQL.Definition.Type

34 Squeal.PostgreSQL.Definition.Schema

33 Squeal.PostgreSQL.Definition.Schema

@@ -44,7 +43,7 @@ library

44 Squeal.PostgreSQL.Expression.Null

43 Squeal.PostgreSQL.Expression.Null

45 Squeal.PostgreSQL.Expression.Parameter

44 Squeal.PostgreSQL.Expression.Parameter

46 Squeal.PostgreSQL.Expression.Range

45 Squeal.PostgreSQL.Expression.Range

47− Squeal.PostgreSQL.Expression.SetOf

46+ Squeal.PostgreSQL.Expression.Set

48 Squeal.PostgreSQL.Expression.Sort

47 Squeal.PostgreSQL.Expression.Sort

49 Squeal.PostgreSQL.Expression.Subquery

48 Squeal.PostgreSQL.Expression.Subquery

50 Squeal.PostgreSQL.Expression.Text

49 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.Column as X

203import Squeal.PostgreSQL.Definition.Table.Constraint as X

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

204import Squeal.PostgreSQL.Definition.Type as X

203import Squeal.PostgreSQL.Definition.Type as X

205import Squeal.PostgreSQL.Definition.View as X

204import Squeal.PostgreSQL.Definition.View as X

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

214import Squeal.PostgreSQL.Expression.Null as X

213import Squeal.PostgreSQL.Expression.Null as X

215import Squeal.PostgreSQL.Expression.Parameter as X

214import Squeal.PostgreSQL.Expression.Parameter as X

216import Squeal.PostgreSQL.Expression.Range as X

215import Squeal.PostgreSQL.Expression.Range as X

217−import Squeal.PostgreSQL.Expression.SetOf as X

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

218import Squeal.PostgreSQL.Expression.Sort as X

217import Squeal.PostgreSQL.Expression.Sort as X

219import Squeal.PostgreSQL.Expression.Subquery as X

218import Squeal.PostgreSQL.Expression.Subquery as X

220import Squeal.PostgreSQL.Expression.Text as X

219import Squeal.PostgreSQL.Expression.Text as X

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

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

216 -- * Only

217 , Only (..)

218 -- * Oid

219− , HasOid (..)

219+ , OidOf (..)

220− , HasAliasedOid (..)

220+ , OidOfParam (..)

221+ , OidOfField (..)

221 ) where

222 ) where

222

223

223import BinaryParser

224import BinaryParser

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

231import Data.UUID.Types

232import Data.UUID.Types

232import Data.Vector (Vector)

233import Data.Vector (Vector)

233import Data.Word

234import Data.Word

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

234import Generics.SOP

236import Generics.SOP

235import Generics.SOP.Record

237import Generics.SOP.Record

236import GHC.TypeLits

238import GHC.TypeLits

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

244import qualified Data.Text as Strict (Text)

246import qualified Data.Text as Strict (Text)

245import qualified Data.Text as Strict.Text

247import qualified Data.Text as Strict.Text

246import qualified Data.Vector as Vector

248import qualified Data.Vector as Vector

249+import qualified Database.PostgreSQL.LibPQ as LibPQ

247import qualified GHC.Generics as GHC

250import qualified GHC.Generics as GHC

248import qualified PostgreSQL.Binary.Decoding as Decoding

251import qualified PostgreSQL.Binary.Decoding as Decoding

249import qualified PostgreSQL.Binary.Encoding as Encoding

252import qualified PostgreSQL.Binary.Encoding as Encoding

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

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

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

310 toParam = K . Encoding.jsonb_bytes

313 toParam = K . Encoding.jsonb_bytes

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

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

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

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

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

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

314 toParam = K

317 toParam = K

315 . Encoding.array_foldable

318 . Encoding.array_foldable

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

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

317 . getVarArray

320 . getVarArray

318−instance (ToParam x pg, HasOid pg)

321+instance (ToParam x pg, OidOf pg)

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

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

320 toParam = K

323 toParam = K

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

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

322 . getVarArray

325 . getVarArray

323−instance (ToParam x pg, HasOid pg)

326+instance (ToParam x pg, OidOf pg)

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

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

325 toParam = K

328 toParam = K

326 . Encoding.nullableArray_vector

329 . Encoding.nullableArray_vector

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

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

328 . getVarArray

331 . getVarArray

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

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

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

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

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

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

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

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

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

353 ( SListI fields

356 ( SListI fields

354 , IsRecord x xs

357 , IsRecord x xs

355 , AllZip ToField xs fields

358 , AllZip ToField xs fields

356− , All HasAliasedOid fields

359+ , All OidOfField fields

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

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

358 toParam =

361 toParam =

359 let

362 let

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

361 encoders = htrans (Proxy @ToField) toField

364 encoders = htrans (Proxy @ToField) toField

362

365

363 composite

366 composite

364− :: All HasAliasedOid row

367+ :: All OidOfField row

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

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

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

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

367 composite fields = K $

370 composite fields = K $

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

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

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

379 let

382 let

380 each

383 each

381− :: HasAliasedOid field

384+ :: OidOfField field

382 => K (Maybe Encoding.Encoding) field

385 => K (Maybe Encoding.Encoding) field

383 -> Encoding.Encoding

386 -> Encoding.Encoding

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

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

385− word32BE (getOid (aliasedOid @field))

388+ word32BE (getOid (oidOfField @field))

386 <> case field of

389 <> case field of

387 Nothing -> int64BE (-1)

390 Nothing -> int64BE (-1)

388 Just value ->

391 Just value ->

389 int32BE (fromIntegral (builderLength value))

392 int32BE (fromIntegral (builderLength value))

390 <> value

393 <> value

391 in

394 in

392− hcfoldMap (Proxy @HasAliasedOid) each fields

395+ hcfoldMap (Proxy @OidOfField) each fields

393

396

394 in

397 in

395 composite . encoders . toRecord . getComposite

398 composite . encoders . toRecord . getComposite

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

398--

401--

399-- >>> :set -XTypeApplications

402-- >>> :set -XTypeApplications

400-- >>> oidOf @'PGbool

403-- >>> oidOf @'PGbool

401−-- Oid {getOid = 16}

404+-- Oid 16

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

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

403−instance HasOid 'PGbool where oidOf = Oid 16

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

407+instance OidOf ('PGfixarray ns (null 'PGbool)) where oidOf = LibPQ.Oid 1000

408+instance OidOf ('PGvararray (null 'PGbool)) where oidOf = LibPQ.Oid 1000

404−instance HasOid 'PGint2 where oidOf = Oid 21

409+instance OidOf 'PGint2 where oidOf = LibPQ.Oid 21

410+instance OidOf ('PGfixarray ns (null 'PGint2)) where oidOf = LibPQ.Oid 1005

411+instance OidOf ('PGvararray (null 'PGint2)) where oidOf = LibPQ.Oid 1005

405−instance HasOid 'PGint4 where oidOf = Oid 23

412+instance OidOf 'PGint4 where oidOf = LibPQ.Oid 23

413+instance OidOf ('PGfixarray ns (null 'PGint4)) where oidOf = LibPQ.Oid 1007

414+instance OidOf ('PGvararray (null 'PGint4)) where oidOf = LibPQ.Oid 1007

406−instance HasOid 'PGint8 where oidOf = Oid 20

415+instance OidOf 'PGint8 where oidOf = LibPQ.Oid 20

416+instance OidOf ('PGfixarray ns (null 'PGint8)) where oidOf = LibPQ.Oid 1016

417+instance OidOf ('PGvararray (null 'PGint8)) where oidOf = LibPQ.Oid 1016

407−instance HasOid 'PGnumeric where oidOf = Oid 1700

418+instance OidOf 'PGnumeric where oidOf = LibPQ.Oid 1700

419+instance OidOf ('PGfixarray ns (null 'PGnumeric)) where oidOf = LibPQ.Oid 1231

420+instance OidOf ('PGvararray (null 'PGnumeric)) where oidOf = LibPQ.Oid 1231

408−instance HasOid 'PGfloat4 where oidOf = Oid 700

421+instance OidOf 'PGfloat4 where oidOf = LibPQ.Oid 700

422+instance OidOf ('PGfixarray ns (null 'PGfloat4)) where oidOf = LibPQ.Oid 1021

423+instance OidOf ('PGvararray (null 'PGfloat4)) where oidOf = LibPQ.Oid 1021

409−instance HasOid 'PGfloat8 where oidOf = Oid 701

424+instance OidOf 'PGfloat8 where oidOf = LibPQ.Oid 701

425+instance OidOf ('PGfixarray ns (null 'PGfloat8)) where oidOf = LibPQ.Oid 1022

426+instance OidOf ('PGvararray (null 'PGfloat8)) where oidOf = LibPQ.Oid 1022

427+instance OidOf 'PGmoney where oidOf = LibPQ.Oid 790

428+instance OidOf ('PGfixarray ns (null 'PGmoney)) where oidOf = LibPQ.Oid 791

429+instance OidOf ('PGvararray (null 'PGmoney)) where oidOf = LibPQ.Oid 791

410−instance HasOid ('PGchar n) where oidOf = Oid 18

430+instance OidOf ('PGchar n) where oidOf = LibPQ.Oid 18

431+instance OidOf ('PGfixarray ns (null ('PGchar n))) where oidOf = LibPQ.Oid 1002

432+instance OidOf ('PGvararray (null ('PGchar n))) where oidOf = LibPQ.Oid 1002

411−instance HasOid ('PGvarchar n) where oidOf = Oid 1043

433+instance OidOf ('PGvarchar n) where oidOf = LibPQ.Oid 1043

434+instance OidOf ('PGfixarray ns (null ('PGvarchar n))) where oidOf = LibPQ.Oid 1015

435+instance OidOf ('PGvararray (null ('PGvarchar n))) where oidOf = LibPQ.Oid 1015

412−instance HasOid 'PGtext where oidOf = Oid 25

436+instance OidOf 'PGtext where oidOf = LibPQ.Oid 25

437+instance OidOf ('PGfixarray ns (null 'PGtext)) where oidOf = LibPQ.Oid 1009

438+instance OidOf ('PGvararray (null 'PGtext)) where oidOf = LibPQ.Oid 1009

413−instance HasOid 'PGbytea where oidOf = Oid 17

439+instance OidOf 'PGbytea where oidOf = LibPQ.Oid 17

440+instance OidOf ('PGfixarray ns (null 'PGbytea)) where oidOf = LibPQ.Oid 1001

441+instance OidOf ('PGvararray (null 'PGbytea)) where oidOf = LibPQ.Oid 1001

414−instance HasOid 'PGtimestamp where oidOf = Oid 1114

442+instance OidOf 'PGtimestamp where oidOf = LibPQ.Oid 1114

443+instance OidOf ('PGfixarray ns (null 'PGtimestamp)) where oidOf = LibPQ.Oid 1115

444+instance OidOf ('PGvararray (null 'PGtimestamp)) where oidOf = LibPQ.Oid 1115

415−instance HasOid 'PGtimestamptz where oidOf = Oid 1184

445+instance OidOf 'PGtimestamptz where oidOf = LibPQ.Oid 1184

446+instance OidOf ('PGfixarray ns (null 'PGtimestamptz)) where oidOf = LibPQ.Oid 1185

447+instance OidOf ('PGvararray (null 'PGtimestamptz)) where oidOf = LibPQ.Oid 1185

416−instance HasOid 'PGdate where oidOf = Oid 1082

448+instance OidOf 'PGdate where oidOf = LibPQ.Oid 1082

449+instance OidOf ('PGfixarray ns (null 'PGdate)) where oidOf = LibPQ.Oid 1182

450+instance OidOf ('PGvararray (null 'PGdate)) where oidOf = LibPQ.Oid 1182

417−instance HasOid 'PGtime where oidOf = Oid 1083

451+instance OidOf 'PGtime where oidOf = LibPQ.Oid 1083

452+instance OidOf ('PGfixarray ns (null 'PGtime)) where oidOf = LibPQ.Oid 1183

453+instance OidOf ('PGvararray (null 'PGtime)) where oidOf = LibPQ.Oid 1183

418−instance HasOid 'PGtimetz where oidOf = Oid 1266

454+instance OidOf 'PGtimetz where oidOf = LibPQ.Oid 1266

455+instance OidOf ('PGfixarray ns (null 'PGtimetz)) where oidOf = LibPQ.Oid 1270

456+instance OidOf ('PGvararray (null 'PGtimetz)) where oidOf = LibPQ.Oid 1270

419−instance HasOid 'PGinterval where oidOf = Oid 1186

457+instance OidOf 'PGinterval where oidOf = LibPQ.Oid 1186

458+instance OidOf ('PGfixarray ns (null 'PGinterval)) where oidOf = LibPQ.Oid 1187

459+instance OidOf ('PGvararray (null 'PGinterval)) where oidOf = LibPQ.Oid 1187

420−instance HasOid 'PGuuid where oidOf = Oid 2950

460+instance OidOf 'PGuuid where oidOf = LibPQ.Oid 2950

461+instance OidOf ('PGfixarray ns (null 'PGuuid)) where oidOf = LibPQ.Oid 2951

462+instance OidOf ('PGvararray (null 'PGuuid)) where oidOf = LibPQ.Oid 2951

421−instance HasOid 'PGinet where oidOf = Oid 869

463+instance OidOf 'PGinet where oidOf = LibPQ.Oid 869

464+instance OidOf ('PGfixarray ns (null 'PGinet)) where oidOf = LibPQ.Oid 1041

465+instance OidOf ('PGvararray (null 'PGinet)) where oidOf = LibPQ.Oid 1041

422−instance HasOid 'PGjson where oidOf = Oid 114

466+instance OidOf 'PGjson where oidOf = LibPQ.Oid 114

467+instance OidOf ('PGfixarray ns (null 'PGjson)) where oidOf = LibPQ.Oid 199

468+instance OidOf ('PGvararray (null 'PGjson)) where oidOf = LibPQ.Oid 199

423−instance HasOid 'PGjsonb where oidOf = Oid 3802

469+instance OidOf 'PGjsonb where oidOf = LibPQ.Oid 3802

424−

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

471+instance OidOf ('PGvararray (null 'PGjsonb)) where oidOf = LibPQ.Oid 3807

472+instance OidOf 'PGtsvector where oidOf = LibPQ.Oid 3614

473+instance OidOf ('PGfixarray ns (null 'PGtsvector)) where oidOf = LibPQ.Oid 3643

474+instance OidOf ('PGvararray (null 'PGtsvector)) where oidOf = LibPQ.Oid 3643

475+instance OidOf 'PGtsquery where oidOf = LibPQ.Oid 3615

476+instance OidOf ('PGfixarray ns (null 'PGtsquery)) where oidOf = LibPQ.Oid 3645

477+instance OidOf ('PGvararray (null 'PGtsquery)) where oidOf = LibPQ.Oid 3645

478+instance OidOf 'PGoid where oidOf = LibPQ.Oid 26

479+instance OidOf ('PGfixarray ns (null 'PGoid)) where oidOf = LibPQ.Oid 1028

480+instance OidOf ('PGvararray (null 'PGoid)) where oidOf = LibPQ.Oid 1028

481+instance OidOf ('PGrange 'PGint4) where oidOf = LibPQ.Oid 3904

482+instance OidOf ('PGfixarray ns (null ('PGrange 'PGint4))) where oidOf = LibPQ.Oid 3905

483+instance OidOf ('PGvararray (null ('PGrange 'PGint4))) where oidOf = LibPQ.Oid 3905

484+instance OidOf ('PGrange 'PGint8) where oidOf = LibPQ.Oid 3926

485+instance OidOf ('PGfixarray ns (null ('PGrange 'PGint8))) where oidOf = LibPQ.Oid 3927

486+instance OidOf ('PGvararray (null ('PGrange 'PGint8))) where oidOf = LibPQ.Oid 3927

487+instance OidOf ('PGrange 'PGnumeric) where oidOf = LibPQ.Oid 3906

488+instance OidOf ('PGfixarray ns (null ('PGrange 'PGnumeric))) where oidOf = LibPQ.Oid 3907

489+instance OidOf ('PGvararray (null ('PGrange 'PGnumeric))) where oidOf = LibPQ.Oid 3907

490+instance OidOf ('PGrange 'PGtimestamp) where oidOf = LibPQ.Oid 3908

491+instance OidOf ('PGfixarray ns (null ('PGrange 'PGtimestamp))) where oidOf = LibPQ.Oid 3909

492+instance OidOf ('PGvararray (null ('PGrange 'PGtimestamp))) where oidOf = LibPQ.Oid 3909

493+instance OidOf ('PGrange 'PGtimestamptz) where oidOf = LibPQ.Oid 3910

494+instance OidOf ('PGfixarray ns (null ('PGrange 'PGtimestamptz))) where oidOf = LibPQ.Oid 3911

495+instance OidOf ('PGvararray (null ('PGrange 'PGtimestamptz))) where oidOf = LibPQ.Oid 3911

496+instance OidOf ('PGrange 'PGdate) where oidOf = LibPQ.Oid 3912

497+instance OidOf ('PGfixarray ns (null ('PGrange 'PGdate))) where oidOf = LibPQ.Oid 3913

498+instance OidOf ('PGvararray (null ('PGrange 'PGdate))) where oidOf = LibPQ.Oid 3913

499+instance {-# OVERLAPPABLE #-} OidOf ('PGrange ty) where oidOf = LibPQ.invalidOid

500+instance {-# OVERLAPPABLE #-} OidOf ('PGfixarray ns (null ('PGrange ty))) where oidOf = LibPQ.invalidOid

501+instance {-# OVERLAPPABLE #-} OidOf ('PGvararray (null ('PGrange ty))) where oidOf = LibPQ.invalidOid

502+instance {-# OVERLAPPABLE #-} OidOf ('PGcomposite row) where oidOf = LibPQ.invalidOid

503+instance {-# OVERLAPPABLE #-} OidOf ('PGfixarray ns (null ('PGcomposite row))) where oidOf = LibPQ.invalidOid

504+instance {-# OVERLAPPABLE #-} OidOf ('PGvararray (null ('PGcomposite row))) where oidOf = LibPQ.invalidOid

505+instance {-# OVERLAPPABLE #-} OidOf ('PGenum labels) where oidOf = LibPQ.invalidOid

506+instance {-# OVERLAPPABLE #-} OidOf ('PGfixarray ns (null ('PGenum labels))) where oidOf = LibPQ.invalidOid

507+instance {-# OVERLAPPABLE #-} OidOf ('PGvararray (null ('PGenum labels))) where oidOf = LibPQ.invalidOid

508+

509+class OidOfParam (ty :: NullityType) where oidOfParam :: Oid

510+instance OidOf ty => OidOfParam (null ty) where oidOfParam = oidOf @ty

511+

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

512+-- | Lifts a `OidOf` constraint to a field.

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

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

427− aliasedOid :: Oid

514+ oidOfField :: Oid

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

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

429− aliasedOid = oidOf @ty

516+ oidOfField = oidOf @ty

430

517

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

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

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

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

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

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

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

757replicateMN mx = hsequence' $

844replicateMN mx = hsequence' $

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

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

846+

847+getOid :: LibPQ.Oid -> Word32

848+getOid (LibPQ.Oid (CUInt oid)) = oid

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

@@ -27,6 +27,7 @@ Squeal data definition language.

27 , TypeInType

28 , TypeOperators

29 , UndecidableSuperClasses

30+ , UndecidableInstances

30#-}

31#-}

31

32

32module Squeal.PostgreSQL.Definition

33module Squeal.PostgreSQL.Definition

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

@@ -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− , Has fun schema ('Function (args0 '::--> ret0))

131+ , KnownSymbol fun

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− => Alias fun

154+ => QualifiedAlias sch 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− => Alias fun

173+ => QualifiedAlias sch 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− => Alias fun

190+ => QualifiedAlias sch 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/Table.hs+36−13

@@ -35,7 +35,9 @@ module Squeal.PostgreSQL.Definition.Table

35 , dropTable

36 , dropTableIfExists

37 , alterTable

38+ , alterTableIfExists

38 , alterTableRename

39 , alterTableRename

40+ , alterTableIfExistsRename

39 , AlterTable (..)

41 , AlterTable (..)

40 , addConstraint

42 , addConstraint

41 , dropConstraint

43 , dropConstraint

@@ -60,9 +62,9 @@ import qualified GHC.Generics as GHC

60

62

61import Squeal.PostgreSQL.Alias

63import Squeal.PostgreSQL.Alias

62import Squeal.PostgreSQL.Definition

64import Squeal.PostgreSQL.Definition

63−import Squeal.PostgreSQL.Definition.Table.Column

64import Squeal.PostgreSQL.Definition.Table.Constraint

65import Squeal.PostgreSQL.Definition.Table.Constraint

65import Squeal.PostgreSQL.Expression

66import Squeal.PostgreSQL.Expression

67+import Squeal.PostgreSQL.Expression.Type

66import Squeal.PostgreSQL.List

68import Squeal.PostgreSQL.List

67import Squeal.PostgreSQL.Render

69import Squeal.PostgreSQL.Render

68import Squeal.PostgreSQL.Schema

70import Squeal.PostgreSQL.Schema

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

195

197

196dropTableIfExists

198dropTableIfExists

197 :: ( Has sch schemas schema

199 :: ( Has sch schemas schema

198− , Has tab schema ('Table table))

200+ , KnownSymbol tab)

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

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

200− -> Definition schemas (Alter sch (DropIfExists tab schema) schemas)

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

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

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

202

204

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

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

204alterTable

206alterTable

205− :: (Has sch schemas schema, Has tab schema ('Table table0))

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

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

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

207− -> AlterTable sch tab schemas table1 -- ^ alteration to perform

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

208− -> Definition schemas (Alter sch (Alter tab ('Table table1) schema) schemas)

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

209alterTable tab alteration = UnsafeDefinition $

211alterTable tab alteration = UnsafeDefinition $

210 "ALTER TABLE"

212 "ALTER TABLE"

211 <+> renderSQL tab

213 <+> renderSQL tab

212 <+> renderAlterTable alteration

214 <+> renderAlterTable alteration

213 <> ";"

215 <> ";"

214

216

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+

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

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

216--

230--

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

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

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

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

219alterTableRename

233alterTableRename

220− :: (KnownSymbol table0, KnownSymbol table1)

234+ :: (KnownSymbol tab0, KnownSymbol tab1)

221− => Alias table0 -- ^ table to rename

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

222− -> Alias table1 -- ^ what to rename it

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

223− -> Definition schema (Rename table0 table1 schema)

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

224−alterTableRename table0 table1 = UnsafeDefinition $

238+alterTableRename tab0 tab1 = UnsafeDefinition $

239+ "ALTER TABLE" <+> renderSQL tab0

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

241+

242+alterTableIfExistsRename

243+ :: (KnownSymbol tab0, KnownSymbol tab1)

244+ => Alias tab0 -- ^ table to rename

245+ -> Alias tab1 -- ^ what to rename it

246+ -> Definition schema (RenameIfExists tab0 tab1 schema)

247+alterTableIfExistsRename tab0 tab1 = UnsafeDefinition $

225− "ALTER TABLE" <+> renderSQL table0

248+ "ALTER TABLE IF EXISTS" <+> renderSQL tab0

226− <+> "RENAME TO" <+> renderSQL table1 <> ";"

249+ <+> "RENAME TO" <+> renderSQL tab1 <> ";"

227

250

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

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

229-- of a table.

252-- of a table.

squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table/Column.hsdeleted−105

@@ -1,105 +0,0 @@

1−{-|

2−Module: Squeal.PostgreSQL.Definition.Table.Column

3−Description: Column type expressions

4−Copyright: (c) Eitan Chatav, 2017

5−Maintainer: eitan@morphism.tech

6−Stability: experimental

7−

8−Column type 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.Column

33− ( ColumnTypeExpression (..)

34− , nullable

35− , notNullable

36− , default_

37− , serial2

38− , smallserial

39− , serial4

40− , serial

41− , serial8

42− , bigserial

43− ) where

44−

45−import Control.DeepSeq

46−import Data.ByteString

47−

48−import qualified GHC.Generics as GHC

49−

50−import Squeal.PostgreSQL.Alias

51−import Squeal.PostgreSQL.Expression

52−import Squeal.PostgreSQL.Expression.Type

53−import Squeal.PostgreSQL.Render

54−import Squeal.PostgreSQL.Schema

55−

56−-- $setup

57−-- >>> import Squeal.PostgreSQL

58−

59−-- | `ColumnTypeExpression`s are used in `createTable` commands.

60−newtype ColumnTypeExpression (schemas :: SchemasType) (ty :: ColumnType)

61− = UnsafeColumnTypeExpression { renderColumnTypeExpression :: ByteString }

62− deriving (GHC.Generic,Show,Eq,Ord,NFData)

63−instance RenderSQL (ColumnTypeExpression schemas ty) where

64− renderSQL = renderColumnTypeExpression

65−

66−-- | used in `createTable` commands as a column constraint to note that

67−-- @NULL@ may be present in a column

68−nullable

69− :: TypeExpression schemas (nullity ty)

70− -> ColumnTypeExpression schemas ('NoDef :=> 'Null ty)

71−nullable ty = UnsafeColumnTypeExpression $ renderSQL ty <+> "NULL"

72−

73−-- | used in `createTable` commands as a column constraint to ensure

74−-- @NULL@ is not present in a column

75−notNullable

76− :: TypeExpression schemas (nullity ty)

77− -> ColumnTypeExpression schemas ('NoDef :=> 'NotNull ty)

78−notNullable ty = UnsafeColumnTypeExpression $ renderSQL ty <+> "NOT NULL"

79−

80−-- | used in `createTable` commands as a column constraint to give a default

81−default_

82− :: Expression '[] '[] 'Ungrouped schemas '[] '[] ty

83− -> ColumnTypeExpression schemas ('NoDef :=> ty)

84− -> ColumnTypeExpression schemas ('Def :=> ty)

85−default_ x ty = UnsafeColumnTypeExpression $

86− renderSQL ty <+> "DEFAULT" <+> renderExpression x

87−

88−-- | not a true type, but merely a notational convenience for creating

89−-- unique identifier columns with type `PGint2`

90−serial2, smallserial

91− :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint2)

92−serial2 = UnsafeColumnTypeExpression "serial2"

93−smallserial = UnsafeColumnTypeExpression "smallserial"

94−-- | not a true type, but merely a notational convenience for creating

95−-- unique identifier columns with type `PGint4`

96−serial4, serial

97− :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint4)

98−serial4 = UnsafeColumnTypeExpression "serial4"

99−serial = UnsafeColumnTypeExpression "serial"

100−-- | not a true type, but merely a notational convenience for creating

101−-- unique identifier columns with type `PGint8`

102−serial8, bigserial

103− :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint8)

104−serial8 = UnsafeColumnTypeExpression "serial8"

105−bigserial = UnsafeColumnTypeExpression "bigserial"

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

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

34 ( -- * Expression

35 Expression (..)

36 , Expr

37− , (:-->)

37+ , type (-->)

38 , FunctionDB

39 , unsafeFunction

40 , function

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

48 , binaryOp

49 , FunctionVar

50 , unsafeFunctionVar

51− , FunctionN

51+ , type (--->)

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 FunctionN xs y

182+type (--->) 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 -> FunctionN xs y

366+unsafeFunctionN :: SListI xs => ByteString -> 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.SetOf

45+import Squeal.PostgreSQL.Expression.Set

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 :: SetOfFunction "unnest" (null ('PGvararray ty)) '["unnest" ::: ty]

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

127−unnest = unsafeSetOfFunction

127+unnest = unsafeSetFunction

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+40−47

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

81

82import Squeal.PostgreSQL.Alias

83import Squeal.PostgreSQL.Expression

84−import Squeal.PostgreSQL.Expression.SetOf

84+import Squeal.PostgreSQL.Expression.Set

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 => FunctionN tuple (null 'PGjson)

214+jsonBuildArray :: SOP.SListI tuple => 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 => FunctionN tuple (null 'PGjsonb)

219+jsonbBuildArray :: SOP.SListI tuple => 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 :: FunctionN tys (null 'PGjson)

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

228 jsonBuildObject = unsafeFunctionN "json_build_object"

229

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

230+ jsonbBuildObject :: 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 :: FunctionN

257+jsonZipObject ::

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 :: FunctionN

266+jsonbZipObject ::

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,12 +309,9 @@ 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

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

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

316− , null 'PGjsonb

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

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

318jsonbSet = unsafeFunctionN "jsonbSet"

315jsonbSet = unsafeFunctionN "jsonbSet"

319

316

320-- | @ jsonbInsert target path new_value insert_after @

317-- | @ jsonbInsert target path new_value insert_after @

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

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

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

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

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

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

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

329−jsonbInsert

326+jsonbInsert ::

330− :: FunctionN

331− '[ null 'PGjsonb

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

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

333− , null 'PGjsonb

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

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

335jsonbInsert = unsafeFunctionN "jsonb_insert"

329jsonbInsert = unsafeFunctionN "jsonb_insert"

336

330

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

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

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

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

339jsonbPretty = unsafeFunction "jsonb_pretty"

333jsonbPretty = unsafeFunction "jsonb_pretty"

340

334

341−

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

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

343

336

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

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

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

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

346-}

339-}

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

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

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

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

349−jsonEach = unsafeSetOfFunction

342+jsonEach = unsafeSetFunction

350

343

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

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

352

345

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

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

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

355-}

348-}

356jsonbEach

349jsonbEach

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

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

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

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

359−jsonbEach = unsafeSetOfFunction

352+jsonbEach = unsafeSetFunction

360

353

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

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

362

355

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

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

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

365-}

358-}

366jsonEachText

359jsonEachText

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

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

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

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

369−jsonEachText = unsafeSetOfFunction

362+jsonEachText = unsafeSetFunction

370

363

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

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

372

365

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

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

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

375-}

368-}

376jsonbEachText

369jsonbEachText

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

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

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

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

379−jsonbEachText = unsafeSetOfFunction

372+jsonbEachText = unsafeSetFunction

380

373

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

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

382

375

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

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

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

385-}

378-}

386jsonObjectKeys

379jsonObjectKeys

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

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

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

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

389−jsonObjectKeys = unsafeSetOfFunction

382+jsonObjectKeys = unsafeSetFunction

390

383

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

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

392

385

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

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

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

395-}

388-}

396jsonbObjectKeys

389jsonbObjectKeys

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

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

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

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

399−jsonbObjectKeys = unsafeSetOfFunction

392+jsonbObjectKeys = unsafeSetFunction

400

393

401-- | Build rows from Json types.

394-- | Build rows from Json types.

402type JsonPopulateFunction fun json

395type 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+4−6

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

37-- in printSQL expression

38-- :}

39-- atan2(pi(), 2)

40−atan2_

41− :: float `In` PGFloating

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

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

43atan2_ = unsafeFunctionN "atan2"

41atan2_ = unsafeFunctionN "atan2"

44

42

45

43

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

78-- in printSQL expression

76-- in printSQL expression

79-- :}

77-- :}

80-- trunc(pi())

78-- trunc(pi())

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

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

82trunc = unsafeFunction "trunc"

80trunc = unsafeFunction "trunc"

83

81

84-- | >>> :{

82-- | >>> :{

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

88-- in printSQL expression

86-- in printSQL expression

89-- :}

87-- :}

90-- round(pi())

88-- round(pi())

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

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

92round_ = unsafeFunction "round"

90round_ = unsafeFunction "round"

93

91

94-- | >>> :{

92-- | >>> :{

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

98-- in printSQL expression

96-- in printSQL expression

99-- :}

97-- :}

100-- ceiling(pi())

98-- ceiling(pi())

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

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

102ceiling_ = unsafeFunction "ceiling"

100ceiling_ = 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 :: FunctionN '[ 'NotNull ty, 'NotNull ty] ('Null ty)

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

104nullIf = unsafeFunctionN "NULLIF"

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

@@ -205,27 +205,26 @@ 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

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

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

231rangeMerge = unsafeFunctionN "range_merge"

230rangeMerge = unsafeFunctionN "range_merge"

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

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

1{-|

2−Module: Squeal.PostgreSQL.Expression.SetOf

2+Module: Squeal.PostgreSQL.Expression.Set

3Description: Set returning functions

4Copyright: (c) Eitan Chatav, 2019

5Maintainer: eitan@morphism.tech

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

20 , TypeOperators

21#-}

22

23−module Squeal.PostgreSQL.Expression.SetOf

23+module Squeal.PostgreSQL.Expression.Set

24 ( generateSeries

25 , generateSeriesStep

26 , generateSeriesTimestamp

27− , SetOfFunction

27+ , SetFunction

28− , unsafeSetOfFunction

28+ , unsafeSetFunction

29− , setOfFunction

29+ , SetFunctionDB

30− , SetOfFunctionN

30+ , setFunction

31− , unsafeSetOfFunctionN

31+ , SetFunctionN

32− , setOfFunctionN

32+ , unsafeSetFunctionN

33+ , SetFunctionNDB

34+ , setFunctionN

33 ) where

35 ) where

34

36

35import GHC.TypeLits

37import GHC.TypeLits

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

46{- |

48{- |

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

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

48-}

50-}

49−type SetOfFunction fun ty setof

51+type SetFunction fun ty row

50 = forall outer commons schemas params

52 = forall outer commons schemas params

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

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

52 -- ^ input

54 -- ^ input

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

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

56+ -- ^ output

57+

58+type SetFunctionDB fun schemas ty row

59+ = forall outer commons params

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

61+ -- ^ input

62+ -> FromClause outer commons schemas params '[fun ::: row]

54 -- ^ output

63 -- ^ output

55

64

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

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

57−unsafeSetOfFunction

66+unsafeSetFunction

58− :: forall fun ty setof. KnownSymbol fun

67+ :: forall fun ty row. KnownSymbol fun

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

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

60−unsafeSetOfFunction x = UnsafeFromClause $

69+unsafeSetFunction x = UnsafeFromClause $

61 renderSymbol @fun <> parenthesized (renderSQL x)

70 renderSymbol @fun <> parenthesized (renderSQL x)

62

71

63−setOfFunction

72+setFunction

64 :: ( Has sch schemas schema

73 :: ( Has sch schemas schema

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

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

66− => Alias fun

75+ => QualifiedAlias sch fun

67− -> ( forall outer commons params

76+ -> SetFunctionDB fun schemas ty row

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

77+setFunction _ = unsafeSetFunction

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

70−setOfFunction _ = unsafeSetOfFunction

71

78

72{- |

79{- |

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

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

74-}

81-}

75−type SetOfFunctionN fun tys setof

82+type SetFunctionN fun tys row

76 = forall outer commons schemas params

83 = forall outer commons schemas params

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

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

78 -- ^ inputs

85 -- ^ inputs

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

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

80 -- ^ output

87 -- ^ output

81

88

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

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

83−unsafeSetOfFunctionN

90+unsafeSetFunctionN

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

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

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

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

86−unsafeSetOfFunctionN xs = UnsafeFromClause $

93+unsafeSetFunctionN xs = UnsafeFromClause $

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

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

88

95

89−setOfFunctionN

96+type SetFunctionNDB fun schemas tys row

97+ = forall outer commons params

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

99+ -- ^ inputs

100+ -> FromClause outer commons schemas params '[fun ::: row]

101+ -- ^ output

102+

103+setFunctionN

90 :: ( Has sch schemas schema

104 :: ( Has sch schemas schema

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

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

92 , SOP.SListI tys )

106 , SOP.SListI tys )

93− => Alias fun

107+ => QualifiedAlias sch fun

94− -> ( forall outer commons params

108+ -> SetFunctionNDB fun schemas tys row

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

109+setFunctionN _ = unsafeSetFunctionN

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

97−setOfFunctionN _ = unsafeSetOfFunctionN

98

110

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

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

100

112

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

102-}

114-}

103generateSeries

115generateSeries

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

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

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

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

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

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

107−generateSeries = unsafeSetOfFunctionN

119+generateSeries = unsafeSetFunctionN

108

120

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

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

110

122

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

112-}

124-}

113generateSeriesStep

125generateSeriesStep

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

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

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

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

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

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

117−generateSeriesStep = unsafeSetOfFunctionN

129+generateSeriesStep = unsafeSetFunctionN

118

130

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

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

120

132

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

122-}

134-}

123generateSeriesTimestamp

135generateSeriesTimestamp

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

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

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

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

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

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

127−generateSeriesTimestamp = unsafeSetOfFunctionN

139+generateSeriesTimestamp = unsafeSetFunctionN

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

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

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+19−20

@@ -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,51 +66,50 @@ 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

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

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

110setWeight = unsafeFunctionN "set_weight"

109setWeight = unsafeFunctionN "set_weight"

111

110

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

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

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

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

114strip = unsafeFunction "strip"

113strip = unsafeFunction "strip"

115

114

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

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

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

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

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

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

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

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

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

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

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

127jsonToTSvector = unsafeFunctionN "json_to_tsvector"

126jsonToTSvector = unsafeFunctionN "json_to_tsvector"

128

127

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

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

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

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

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

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

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

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

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

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

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

140jsonbToTSvector = unsafeFunctionN "jsonb_to_tsvector"

139jsonbToTSvector = unsafeFunctionN "jsonb_to_tsvector"

141

140

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

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

143−tsDelete :: FunctionN

142+tsDelete ::

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

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

145− (null 'PGtsvector)

144+ ---> null 'PGtsvector

146tsDelete = unsafeFunctionN "ts_delete"

145tsDelete = unsafeFunctionN "ts_delete"

147

146

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

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

149−tsFilter :: FunctionN

148+tsFilter ::

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

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

151− (null 'PGtsvector)

150+ ---> null 'PGtsvector

152tsFilter = unsafeFunctionN "ts_filter"

151tsFilter = unsafeFunctionN "ts_filter"

153

152

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

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

155tsHeadline

154tsHeadline

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

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

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

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

158tsHeadline = unsafeFunctionN "ts_headline"

157tsHeadline = unsafeFunctionN "ts_headline"

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

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

17 , OverloadedStrings

18 , PolyKinds

19 , RankNTypes

20+ , TypeOperators

20#-}

21#-}

21

22

22module Squeal.PostgreSQL.Expression.Time

23module Squeal.PostgreSQL.Expression.Time

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

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

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

86make_date(1984, 7, 3)

87make_date(1984, 7, 3)

87-}

88-}

88−makeDate :: FunctionN

89− '[ null 'PGint4, null 'PGint4, null 'PGint4 ]

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

90− ( null 'PGdate )

91makeDate = unsafeFunctionN "make_date"

90makeDate = unsafeFunctionN "make_date"

92

91

93{-|

92{-|

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

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

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

97make_time(8, 15, 23.5)

96make_time(8, 15, 23.5)

98-}

97-}

99−makeTime :: FunctionN

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

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

101− ( null 'PGtime )

102makeTime = unsafeFunctionN "make_time"

99makeTime = unsafeFunctionN "make_time"

103

100

104{-|

101{-|

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

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

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

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

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

109-}

106-}

110−makeTimestamp :: FunctionN

107+makeTimestamp ::

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

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

112− , null 'PGint4, null 'PGint4, null 'PGfloat8 ]

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

113− ( null 'PGtimestamp )

114makeTimestamp = unsafeFunctionN "make_timestamp"

110makeTimestamp = unsafeFunctionN "make_timestamp"

115

111

116{-|

112{-|

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

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

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

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

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

123-}

119-}

124−makeTimestamptz :: FunctionN

120+makeTimestamptz ::

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

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

126− , null 'PGint4, null 'PGint4, null 'PGfloat8 ]

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

127− ( null 'PGtimestamptz )

128makeTimestamptz = unsafeFunctionN "make_timestamptz"

123makeTimestamptz = unsafeFunctionN "make_timestamptz"

129

124

130{-|

125{-|

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

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

23 , ScopedTypeVariables

24 , TypeApplications

25 , TypeOperators

26+ , UndecidableInstances

26#-}

27#-}

27

28

28module Squeal.PostgreSQL.Expression.Type

29module Squeal.PostgreSQL.Expression.Type

29− ( TypeExpression (..)

30+ ( -- * type casting

30− , cast

31+ cast

31 , astype

32 , astype

32 , inferredtype

33 , inferredtype

33− , PGTyped (..)

34+ -- * type expressions

34− , FieldTyped (..)

35+ , TypeExpression (..)

35 , typedef

36 , typedef

36 , typetable

37 , typetable

37 , typeview

38 , typeview

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

78 , tsrange

79 , tsrange

79 , tstzrange

80 , tstzrange

80 , daterange

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

81 ) where

98 ) where

82

99

83import Control.DeepSeq

100import Control.DeepSeq

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

91

108

92import Squeal.PostgreSQL.Alias

109import Squeal.PostgreSQL.Alias

93import Squeal.PostgreSQL.Expression

110import Squeal.PostgreSQL.Expression

111+import Squeal.PostgreSQL.PG

94import Squeal.PostgreSQL.Render

112import Squeal.PostgreSQL.Render

95import Squeal.PostgreSQL.Schema

113import Squeal.PostgreSQL.Schema

96

114

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

132inferredtype

150inferredtype

133 :: PGTyped schemas ty

151 :: PGTyped schemas ty

134 => Expression outer common grp schemas params from ty

152 => Expression outer common grp schemas params from ty

153+ -- ^ value

135 -> Expression outer common grp schemas params from ty

154 -> Expression outer common grp schemas params from ty

136inferredtype = astype pgtype

155inferredtype = astype pgtype

137

156

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

151typedef

170typedef

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

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

153 => QualifiedAlias sch td

172 => QualifiedAlias sch td

173+ -- ^ type alias

154 -> TypeExpression schemas (null ty)

174 -> TypeExpression schemas (null ty)

155typedef = UnsafeTypeExpression . renderSQL

175typedef = UnsafeTypeExpression . renderSQL

156

176

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

159typetable

179typetable

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

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

161 => QualifiedAlias sch tab

181 => QualifiedAlias sch tab

182+ -- ^ table alias

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

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

163typetable = UnsafeTypeExpression . renderSQL

184typetable = UnsafeTypeExpression . renderSQL

164

185

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

167typeview

188typeview

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

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

169 => QualifiedAlias sch vw

190 => QualifiedAlias sch vw

191+ -- ^ view alias

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

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

171typeview = UnsafeTypeExpression . renderSQL

193typeview = UnsafeTypeExpression . renderSQL

172

194

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

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

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

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

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

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

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

343

371

344-- | Lift `PGTyped` to a field

372-- | Lift `PGTyped` to a field

345class FieldTyped schemas ty where

373class FieldTyped schemas ty where

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

347instance (KnownSymbol alias, PGTyped schemas ty)

375instance (KnownSymbol alias, PGTyped schemas ty)

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

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

349 fieldtype = pgtype `As` Alias

377 fieldtype = pgtype `As` Alias

378+

379+-- | `ColumnTypeExpression`s are used in `createTable` commands.

380+newtype ColumnTypeExpression (schemas :: SchemasType) (ty :: ColumnType)

381+ = UnsafeColumnTypeExpression { renderColumnTypeExpression :: ByteString }

382+ deriving (GHC.Generic,Show,Eq,Ord,NFData)

383+instance RenderSQL (ColumnTypeExpression schemas ty) where

384+ renderSQL = renderColumnTypeExpression

385+

386+-- | used in `createTable` commands as a column constraint to note that

387+-- @NULL@ may be present in a column

388+nullable

389+ :: TypeExpression schemas (nullity ty)

390+ -> ColumnTypeExpression schemas ('NoDef :=> 'Null ty)

391+nullable ty = UnsafeColumnTypeExpression $ renderSQL ty <+> "NULL"

392+

393+-- | used in `createTable` commands as a column constraint to ensure

394+-- @NULL@ is not present in a column

395+notNullable

396+ :: TypeExpression schemas (nullity ty)

397+ -> ColumnTypeExpression schemas ('NoDef :=> 'NotNull ty)

398+notNullable ty = UnsafeColumnTypeExpression $ renderSQL ty <+> "NOT NULL"

399+

400+-- | used in `createTable` commands as a column constraint to give a default

401+default_

402+ :: Expression '[] '[] 'Ungrouped schemas '[] '[] ty

403+ -> ColumnTypeExpression schemas ('NoDef :=> ty)

404+ -> ColumnTypeExpression schemas ('Def :=> ty)

405+default_ x ty = UnsafeColumnTypeExpression $

406+ renderSQL ty <+> "DEFAULT" <+> renderExpression x

407+

408+-- | not a true type, but merely a notational convenience for creating

409+-- unique identifier columns with type `PGint2`

410+serial2, smallserial

411+ :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint2)

412+serial2 = UnsafeColumnTypeExpression "serial2"

413+smallserial = UnsafeColumnTypeExpression "smallserial"

414+-- | not a true type, but merely a notational convenience for creating

415+-- unique identifier columns with type `PGint4`

416+serial4, serial

417+ :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint4)

418+serial4 = UnsafeColumnTypeExpression "serial4"

419+serial = UnsafeColumnTypeExpression "serial"

420+-- | not a true type, but merely a notational convenience for creating

421+-- unique identifier columns with type `PGint8`

422+serial8, bigserial

423+ :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint8)

424+serial8 = UnsafeColumnTypeExpression "serial8"

425+bigserial = UnsafeColumnTypeExpression "bigserial"

426+

427+-- | Like @PGTyped@ but also accounts for nullity.

428+class PGNullityTyped schemas (nullty :: NullityType) where

429+ pgNullityType :: ColumnTypeExpression schemas ('NoDef :=> nullty)

430+

431+instance PGTyped schemas ('Null ty) => PGNullityTyped schemas ('Null ty) where

432+ pgNullityType = nullable (pgtype @_ @('Null ty))

433+

434+instance PGTyped schemas ('NotNull ty) => PGNullityTyped schemas ('NotNull ty) where

435+ pgNullityType = notNullable (pgtype @_ @('NotNull ty))

436+

437+-- | Allow you to specify pg column types in relation to haskell types.

438+-- >>> printSQL $ hask @(Maybe String)

439+-- text NULL

440+--

441+-- >>> printSQL $ hask @Double

442+-- float8 NOT NULL

443+hask

444+ :: forall hask schemas. PGNullityTyped schemas (NullPG hask)

445+ => ColumnTypeExpression schemas ('NoDef :=> NullPG hask)

446+hask = pgNullityType

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

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

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

85type family Elem x xs where

86 Elem x '[] = 'False

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

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

88+ Elem x (_ ': x ': _) = 'True

89+ Elem x (_ ': _ ': x ': _) = 'True

90+ Elem x (_ ': _ ': _ ': x ': _) = 'True

91+ Elem x (_ ': _ ': _ ': _ ': x ': _) = 'True

92+ Elem x (_ ': _ ': _ ': _ ': _ ': x ': _) = 'True

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

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

89

94

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

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

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

99= 4

104= 4

100-}

105-}

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

106type 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

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

111+ Length (_ : xs) = 1 + Length xs

103 Length '[] = 0

112 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.Column

172import Squeal.PostgreSQL.Definition.Table.Constraint

171import Squeal.PostgreSQL.Definition.Table.Constraint

173import Squeal.PostgreSQL.Expression.Comparison

172import Squeal.PostgreSQL.Expression.Comparison

174import Squeal.PostgreSQL.Expression.Parameter

173import Squeal.PostgreSQL.Expression.Parameter

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

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

47 , Enumerated (..)

48 , VarArray (..)

49 , FixArray (..)

50− , Oid (..)

50+ , LibPQ.Oid (..)

51 -- * Type families

52 , LabelsPG

53 , DimPG

@@ -66,7 +66,6 @@ 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)

70import Data.UUID.Types (UUID)

69import Data.UUID.Types (UUID)

71import GHC.TypeLits

70import GHC.TypeLits

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

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

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

75import qualified Data.ByteString as Strict (ByteString)

74import qualified Data.ByteString as Strict (ByteString)

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

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

77import qualified Data.Text as Strict (Text)

76import 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 Oid = 'PGoid

111+type instance PG LibPQ.Oid = 'PGoid

112-- | `PGnumeric`

113type instance PG Scientific = 'PGnumeric

114-- | `PGfloat4`

@@ -178,8 +178,16 @@ 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 '[] = '[]

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

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

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

190+ RowOf '[] = '[]

183

191

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

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

185

193

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

206

214

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

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

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

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

209− TupleOf '[] = '[]

217+ TupleOf (hask ': hask1 ': hask2 ': hask3 ': hask4 ': hask5 ': tuple) =

218+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': NullPG hask3 ': NullPG hask4 ': NullPG hask5 ': TupleOf tuple

219+ TupleOf (hask ': hask1 ': hask2 ': hask3 ': hask4 ': tuple) =

220+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': NullPG hask3 ': NullPG hask4 ': TupleOf tuple

221+ TupleOf (hask ': hask1 ': hask2 ': hask3 ': tuple) =

222+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': NullPG hask3 ': TupleOf tuple

223+ TupleOf (hask ': hask1 ': hask2 ': tuple) =

224+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': TupleOf tuple

225+ TupleOf (hask ': hask1 ': tuple) = NullPG hask ': NullPG hask1 ': TupleOf tuple

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

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

227+ TupleOf '[] = '[]

211

228

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

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

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

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

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

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

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

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

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

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

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

372−

373−{- | Object identifiers (`Oid`s) are used internally by PostgreSQL

374−as primary keys for various system tables.

375−-}

376−newtype Oid = Oid { getOid :: Word32 }

377− deriving stock (Eq, Ord, Show, Read, GHC.Generic)

378− deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)

squeal-postgresql/src/Squeal/PostgreSQL/PQ.hs+41−17

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

78import Data.ByteString (ByteString)

79import Data.Foldable

80import Data.Function ((&))

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

81import Data.Kind

82import Data.Kind

82import Data.Text (pack, Text)

83import Data.Text (pack, Text)

83import Data.Traversable

84import Data.Traversable

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

86

87

87import qualified Control.Monad.Fail as Fail

88import qualified Control.Monad.Fail as Fail

88import qualified Database.PostgreSQL.LibPQ as LibPQ

89import qualified Database.PostgreSQL.LibPQ as LibPQ

90+import qualified PostgreSQL.Binary.Encoding as Encoding

89

91

90import Squeal.PostgreSQL.Binary

92import Squeal.PostgreSQL.Binary

91import Squeal.PostgreSQL.Definition

93import Squeal.PostgreSQL.Definition

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

315-}

317-}

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

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

317 manipulateParams

319 manipulateParams

318− :: ToParams x params

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

319 => Manipulation '[] schemas params ys

321 => Manipulation '[] schemas params ys

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

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

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

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

322 default manipulateParams

324 default manipulateParams

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

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

324− => ToParams x params

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

325 => Manipulation '[] schemas params ys

327 => Manipulation '[] schemas params ys

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

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

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

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

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

329 manipulateParams manipulation params

331 manipulateParams manipulation params

330

332

331 manipulateParams_

333 manipulateParams_

332− :: ToParams x params

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

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

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

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

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

335 -> x -> pq ()

337 -> x -> pq ()

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

342 manipulate_ = void . manipulate

344 manipulate_ = void . manipulate

343

345

344 runQueryParams

346 runQueryParams

345− :: ToParams x params

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

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

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

347 -- ^ `select` and friends

349 -- ^ `select` and friends

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

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

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

355 runQuery q = runQueryParams q ()

357 runQuery q = runQueryParams q ()

356

358

357 traversePrepared

359 traversePrepared

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

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

359 => Manipulation '[] schemas params ys

361 => Manipulation '[] schemas params ys

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

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

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

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

362 default traversePrepared

364 default traversePrepared

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

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

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

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

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

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

366 traversePrepared manipulation params = lift $

368 traversePrepared manipulation params = lift $

367 traversePrepared manipulation params

369 traversePrepared manipulation params

368

370

369 forPrepared

371 forPrepared

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

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

371 => list x

373 => list x

372 -> Manipulation '[] schemas params ys

374 -> Manipulation '[] schemas params ys

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

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

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

375 forPrepared = flip traversePrepared

377 forPrepared = flip traversePrepared

376

378

377 traversePrepared_

379 traversePrepared_

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

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

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

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

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

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

381 -> list x -> pq ()

383 -> list x -> pq ()

382 default traversePrepared_

384 default traversePrepared_

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

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

384− => (ToParams x params, Foldable list)

386+ => (ToParams x params, Foldable list, All OidOfParam params)

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

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

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

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

387 -> list x -> pq ()

389 -> list x -> pq ()

@@ -389,7 +391,7 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where

389 traversePrepared_ manipulation params

391 traversePrepared_ manipulation params

390

392

391 forPrepared_

393 forPrepared_

392− :: (ToParams x params, Foldable list)

394+ :: (ToParams x params, Foldable list, All OidOfParam params)

393 => list x

395 => list x

394 -> Manipulation '[] schemas params '[]

396 -> Manipulation '[] schemas params '[]

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

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

@@ -409,9 +411,17 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)

409 (UnsafeManipulation q :: Manipulation '[] schemas ps ys) (params :: x) =

411 (UnsafeManipulation q :: Manipulation '[] schemas ps ys) (params :: x) =

410 PQ $ \ (K conn) -> do

412 PQ $ \ (K conn) -> do

411 let

413 let

412− toParam' encoding =

414+ paramSet

415+ :: forall param. OidOfParam param

416+ => K (Maybe Encoding.Encoding) param

417+ -> K (Maybe (LibPQ.Oid, ByteString, LibPQ.Format)) param

418+ paramSet (K maybeEncoding) = K $

419+ maybeEncoding <&> \encoding ->

413− (LibPQ.invalidOid, encodingBytes encoding, LibPQ.Binary)

420+ (oidOfParam @param, encodingBytes encoding, LibPQ.Binary)

421+ params'

422+ = hcollapse

423+ . hcmap (Proxy @OidOfParam) paramSet

414− params' = fmap (fmap toParam') (hcollapse (toParams @x @ps params))

424+ $ toParams @x @ps params

415 q' = q <> ";"

425 q' = q <> ";"

416 resultMaybe <- liftIO $ LibPQ.execParams conn q' params' LibPQ.Binary

426 resultMaybe <- liftIO $ LibPQ.execParams conn q' params' LibPQ.Binary

417 case resultMaybe of

427 case resultMaybe of

@@ -424,8 +434,15 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)

424 traversePrepared

434 traversePrepared

425 (UnsafeManipulation q :: Manipulation '[] schemas xs ys) (list :: list x) =

435 (UnsafeManipulation q :: Manipulation '[] schemas xs ys) (list :: list x) =

426 PQ $ \ (K conn) -> liftIO $ do

436 PQ $ \ (K conn) -> liftIO $ do

437+ let

427− let temp = "temporary_statement"

438+ temp = "temporary_statement"

439+ paramOid :: forall p. OidOfParam p => K LibPQ.Oid p

440+ paramOid = K (oidOfParam @p)

441+ paramOids :: NP (K LibPQ.Oid) xs

442+ paramOids = hcpure (Proxy @OidOfParam) paramOid

443+ paramOids' :: [LibPQ.Oid]

444+ paramOids' = hcollapse paramOids

428− prepResultMaybe <- LibPQ.prepare conn temp q Nothing

445+ prepResultMaybe <- LibPQ.prepare conn temp q (Just paramOids')

429 case prepResultMaybe of

446 case prepResultMaybe of

430 Nothing -> throw $ ResultException

447 Nothing -> throw $ ResultException

431 "traversePrepared: LibPQ.prepare returned no results"

448 "traversePrepared: LibPQ.prepare returned no results"

@@ -451,8 +468,15 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)

451 traversePrepared_

468 traversePrepared_

452 (UnsafeManipulation q :: Manipulation '[] schemas xs '[]) (list :: list x) =

469 (UnsafeManipulation q :: Manipulation '[] schemas xs '[]) (list :: list x) =

453 PQ $ \ (K conn) -> liftIO $ do

470 PQ $ \ (K conn) -> liftIO $ do

471+ let

454− let temp = "temporary_statement"

472+ temp = "temporary_statement"

473+ paramOid :: forall p. OidOfParam p => K LibPQ.Oid p

474+ paramOid = K (oidOfParam @p)

475+ paramOids :: NP (K LibPQ.Oid) xs

476+ paramOids = hcpure (Proxy @OidOfParam) paramOid

477+ paramOids' :: [LibPQ.Oid]

478+ paramOids' = hcollapse paramOids

455− prepResultMaybe <- LibPQ.prepare conn temp q Nothing

479+ prepResultMaybe <- LibPQ.prepare conn temp q (Just paramOids')

456 case prepResultMaybe of

480 case prepResultMaybe of

457 Nothing -> throw $ ResultException

481 Nothing -> throw $ ResultException

458 "traversePrepared_: LibPQ.prepare returned no results"

482 "traversePrepared_: LibPQ.prepare returned no results"

squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+33−25

@@ -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 'Ungrouped schemas params from columns

557+ => Selection outer commons grp schemas params from columns

558 -- ^ selection

559− -> TableExpression outer commons 'Ungrouped schemas params from

559+ -> TableExpression outer commons grp 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 'Ungrouped schemas params from)) columns

571+ => NP (Aliased (Expression outer commons grp schemas params from)) columns

572 -- ^ select list

573− -> TableExpression outer commons 'Ungrouped schemas params from

573+ -> TableExpression outer commons grp schemas params from

574 -- ^ intermediate virtual table

575 -> Query outer commons schemas params columns

576selectDistinct_ = selectDistinct . List

@@ -580,14 +580,21 @@ 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.

583-}

590-}

584selectDistinctOn

591selectDistinctOn

585 :: (SListI columns, columns ~ (col ': cols))

592 :: (SListI columns, columns ~ (col ': cols))

586− => [SortExpression outer commons 'Ungrouped schemas params from]

593+ => [SortExpression outer commons grp schemas params from]

587− -- ^ distinct on and return the first row in ordering

594+ -- ^ DISTINCT ON expression(s) and prepended to ORDER BY clause

588− -> Selection outer commons 'Ungrouped schemas params from columns

595+ -> Selection outer commons grp schemas params from columns

589 -- ^ selection

596 -- ^ selection

590− -> TableExpression outer commons 'Ungrouped schemas params from

597+ -> TableExpression outer commons grp schemas params from

591 -- ^ intermediate virtual table

598 -- ^ intermediate virtual table

592 -> Query outer commons schemas params columns

599 -> Query outer commons schemas params columns

593selectDistinctOn distincts selection tab = UnsafeQuery $

600selectDistinctOn distincts selection tab = UnsafeQuery $

@@ -608,11 +615,11 @@ selectDistinctOn distincts selection tab = UnsafeQuery $

608-- of a general `Selection`.

615-- of a general `Selection`.

609selectDistinctOn_

616selectDistinctOn_

610 :: (SListI columns, columns ~ (col ': cols))

617 :: (SListI columns, columns ~ (col ': cols))

611− => [SortExpression outer commons 'Ungrouped schemas params from]

618+ => [SortExpression outer commons grp schemas params from]

612 -- ^ distinct on and return the first row in ordering

619 -- ^ distinct on and return the first row in ordering

613− -> NP (Aliased (Expression outer commons 'Ungrouped schemas params from)) columns

620+ -> NP (Aliased (Expression outer commons grp schemas params from)) columns

614 -- ^ selection

621 -- ^ selection

615− -> TableExpression outer commons 'Ungrouped schemas params from

622+ -> TableExpression outer commons grp schemas params from

616 -- ^ intermediate virtual table

623 -- ^ intermediate virtual table

617 -> Query outer commons schemas params columns

624 -> Query outer commons schemas params columns

618selectDistinctOn_ distincts = selectDistinctOn distincts . List

625selectDistinctOn_ distincts = selectDistinctOn distincts . List

@@ -750,7 +757,7 @@ instance RenderSQL (TableExpression outer commons grp schemas params from) where

750from

757from

751 :: FromClause outer commons schemas params from -- ^ table reference

758 :: FromClause outer commons schemas params from -- ^ table reference

752 -> TableExpression outer commons 'Ungrouped schemas params from

759 -> TableExpression outer commons 'Ungrouped schemas params from

753−from tab = TableExpression tab [] NoGroups NoHaving [] [] []

760+from tab = TableExpression tab [] noGroups NoHaving [] [] []

754

761

755-- | A `where_` is an endomorphism of `TableExpression`s which adds a

762-- | A `where_` is an endomorphism of `TableExpression`s which adds a

756-- search condition to the `whereClause`.

763-- search condition to the `whereClause`.

@@ -771,7 +778,7 @@ groupBy

771groupBy bys rels = TableExpression

778groupBy bys rels = TableExpression

772 { fromClause = fromClause rels

779 { fromClause = fromClause rels

773 , whereClause = whereClause rels

780 , whereClause = whereClause rels

774− , groupByClause = Group bys

781+ , groupByClause = group bys

775 , havingClause = Having []

782 , havingClause = Having []

776 , orderByClause = []

783 , orderByClause = []

777 , limitClause = limitClause rels

784 , limitClause = limitClause rels

@@ -985,19 +992,20 @@ instance (Has rel rels cols, Has col cols ty, bys ~ '[ '(rel, col)])

985-- done on @NoGroups@ while all output `Expression`s must be aggregated

992-- done on @NoGroups@ while all output `Expression`s must be aggregated

986-- in @Group Nil@. In general, all output `Expression`s in the

993-- in @Group Nil@. In general, all output `Expression`s in the

987-- complement of @bys@ must be aggregated in @Group bys@.

994-- complement of @bys@ must be aggregated in @Group bys@.

988−data GroupByClause grp from where

995+newtype GroupByClause grp from = UnsafeGroupByClause

989− NoGroups :: GroupByClause 'Ungrouped from

996+ { renderGroupByClause :: ByteString }

990− Group

997+ deriving (GHC.Generic,Show,Eq,Ord,NFData)

991− :: SListI bys

992− => NP (By from) bys

993− -> GroupByClause ('Grouped bys) from

994−

995−-- | Renders a `GroupByClause`.

996instance RenderSQL (GroupByClause grp from) where

998instance RenderSQL (GroupByClause grp from) where

997− renderSQL = \case

999+ renderSQL = renderGroupByClause

998− NoGroups -> ""

1000+noGroups :: GroupByClause 'Ungrouped from

1001+noGroups = UnsafeGroupByClause ""

1002+group

1003+ :: SListI bys

1004+ => NP (By from) bys

1005+ -> GroupByClause ('Grouped bys) from

1006+group bys = UnsafeGroupByClause $ case bys of

999− Group Nil -> ""

1007+ Nil -> ""

1000− Group bys -> " GROUP BY" <+> renderCommaSeparated renderSQL bys

1008+ bys' -> " GROUP BY" <+> renderCommaSeparated renderSQL bys'

1001

1009

1002-- | A `HavingClause` is used to eliminate groups that are not of interest.

1010-- | A `HavingClause` is used to eliminate groups that are not of interest.

1003-- An `Ungrouped` `TableExpression` may only use `NoHaving` while a `Grouped`

1011-- An `Ungrouped` `TableExpression` may only use `NoHaving` while a `Grouped`

squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+69−9

@@ -45,7 +45,7 @@ module Squeal.PostgreSQL.Schema

45 , TableType

46 , SchemumType (..)

47 , IndexType (..)

48− , FunctionType (..)

48+ , FunctionType

49 , OperatorType (..)

50 , ReturnsType (..)

51 , SchemaType

@@ -69,7 +69,9 @@ module Squeal.PostgreSQL.Schema

69 , DropIfExists

70 , DropSchemumIfExists

71 , Alter

72+ , AlterIfExists

72 , Rename

73 , Rename

74+ , RenameIfExists

73 , ConstraintInvolves

75 , ConstraintInvolves

74 , DropIfConstraintsInvolve

76 , DropIfConstraintsInvolve

75 , IsNotElem

77 , IsNotElem

@@ -258,9 +260,19 @@ type FromType = [(Symbol,RowType)]

258

260

259-- | `ColumnsToRow` removes column constraints.

261-- | `ColumnsToRow` removes column constraints.

260type family ColumnsToRow (columns :: ColumnsType) :: RowType where

262type family ColumnsToRow (columns :: ColumnsType) :: RowType where

261− ColumnsToRow '[] = '[]

263+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': column3 ::: _ :=> ty3 ': column4 ::: _ :=> ty4 ': column5 ::: _ :=> ty5 ': columns) =

262− ColumnsToRow (column ::: constraint :=> ty ': 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) =

263 column ::: ty ': ColumnsToRow columns

274 column ::: ty ': ColumnsToRow columns

275+ ColumnsToRow '[] = '[]

264

276

265-- | `TableToColumns` removes table constraints.

277-- | `TableToColumns` removes table constraints.

266type family TableToColumns (table :: TableType) :: ColumnsType where

278type family TableToColumns (table :: TableType) :: ColumnsType where

@@ -293,14 +305,24 @@ instance ty0 ~ ty1 => SamePGType

293

305

294-- | `AllNotNull` is a constraint that proves a `ColumnsType` has no @NULL@s.

306-- | `AllNotNull` is a constraint that proves a `ColumnsType` has no @NULL@s.

295type family AllNotNull (columns :: ColumnsType) :: Constraint where

307type 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

296 AllNotNull '[] = ()

314 AllNotNull '[] = ()

297− AllNotNull (column ::: def :=> 'NotNull ty ': columns) = AllNotNull columns

298

315

299-- | `NotAllNull` is a constraint that proves a `ColumnsType` has some

316-- | `NotAllNull` is a constraint that proves a `ColumnsType` has some

300-- @NOT NULL@.

317-- @NOT NULL@.

301type family NotAllNull (columns :: ColumnsType) :: Constraint where

318type family NotAllNull (columns :: ColumnsType) :: Constraint where

302− NotAllNull (column ::: def :=> 'NotNull ty ': columns) = ()

319+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

320+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

321+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

322+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

323+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

324+ NotAllNull (_ ::: _ :=> 'NotNull _ ': _) = ()

303− NotAllNull (column ::: def :=> 'Null ty ': columns) = NotAllNull columns

325+ NotAllNull (_ ::: _ :=> 'Null _ ': columns) = NotAllNull columns

304

326

305-- | `NullifyType` is an idempotent that nullifies a `NullityType`.

327-- | `NullifyType` is an idempotent that nullifies a `NullityType`.

306type family NullifyType (ty :: NullityType) :: NullityType where

328type family NullifyType (ty :: NullityType) :: NullityType where

@@ -309,17 +331,37 @@ type family NullifyType (ty :: NullityType) :: NullityType where

309

331

310-- | `NullifyRow` is an idempotent that nullifies a `RowType`.

332-- | `NullifyRow` is an idempotent that nullifies a `RowType`.

311type family NullifyRow (columns :: RowType) :: RowType where

333type family NullifyRow (columns :: RowType) :: RowType where

312− NullifyRow '[] = '[]

334+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': column5 ::: ty5 ': columns) =

335+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': column4 ::: NullifyType ty4 ': column5 ::: NullifyType ty5 ': NullifyRow columns

336+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': columns) =

337+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': column4 ::: NullifyType ty4 ': NullifyRow columns

338+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': columns) =

339+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': NullifyRow columns

340+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': columns) =

341+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': NullifyRow columns

342+ NullifyRow (column ::: ty ': column1 ::: ty1 ': columns) =

343+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': NullifyRow columns

313 NullifyRow (column ::: ty ': columns) =

344 NullifyRow (column ::: ty ': columns) =

314 column ::: NullifyType ty ': NullifyRow columns

345 column ::: NullifyType ty ': NullifyRow columns

346+ NullifyRow '[] = '[]

315

347

316-- | `NullifyFrom` is an idempotent that nullifies a `FromType`

348-- | `NullifyFrom` is an idempotent that nullifies a `FromType`

317-- used to nullify the left or right hand side of an outer join

349-- used to nullify the left or right hand side of an outer join

318-- in a `Squeal.PostgreSQL.Query.FromClause`.

350-- in a `Squeal.PostgreSQL.Query.FromClause`.

319type family NullifyFrom (tables :: FromType) :: FromType where

351type family NullifyFrom (tables :: FromType) :: FromType where

320− NullifyFrom '[] = '[]

352+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': table4 ::: columns4 ': table5 ::: columns5 ': tables) =

353+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': table4 ::: NullifyRow columns5 ': table5 ::: NullifyRow columns4 ': NullifyFrom tables

354+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': table4 ::: columns4 ': tables) =

355+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': table4 ::: NullifyRow columns4 ': NullifyFrom tables

356+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': tables) =

357+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': NullifyFrom tables

358+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': tables) =

359+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': NullifyFrom tables

360+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': tables) =

361+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': NullifyFrom tables

321 NullifyFrom (table ::: columns ': tables) =

362 NullifyFrom (table ::: columns ': tables) =

322 table ::: NullifyRow columns ': NullifyFrom tables

363 table ::: NullifyRow columns ': NullifyFrom tables

364+ NullifyFrom '[] = '[]

323

365

324-- | @Create alias x xs@ adds @alias ::: x@ to the end of @xs@ and is used in

366-- | @Create alias x xs@ adds @alias ::: x@ to the end of @xs@ and is used in

325-- `Squeal.PostgreSQL.Definition.createTable` statements and in @ALTER TABLE@

367-- `Squeal.PostgreSQL.Definition.createTable` statements and in @ALTER TABLE@

@@ -396,16 +438,34 @@ type family DropSchemumIfExists alias sch xs where

396-- with the type @x@ and is used in `Squeal.PostgreSQL.Definition.alterTable`

438-- with the type @x@ and is used in `Squeal.PostgreSQL.Definition.alterTable`

397-- and `Squeal.PostgreSQL.Definition.alterColumn`.

439-- and `Squeal.PostgreSQL.Definition.alterColumn`.

398type family Alter alias x xs where

440type family Alter alias x xs where

441+ Alter alias x '[] = TypeError

442+ ('Text "Alter: alias "

443+ ':<>: 'ShowType alias

444+ ':<>: 'Text " does not exist" )

399 Alter alias x1 (alias ::: x0 ': xs) = alias ::: x1 ': xs

445 Alter alias x1 (alias ::: x0 ': xs) = alias ::: x1 ': xs

400 Alter alias x1 (x0 ': xs) = x0 ': Alter alias x1 xs

446 Alter alias x1 (x0 ': xs) = x0 ': Alter alias x1 xs

401

447

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+

402-- | @Rename alias0 alias1 xs@ replaces the alias @alias0@ by @alias1@ in @xs@

453-- | @Rename alias0 alias1 xs@ replaces the alias @alias0@ by @alias1@ in @xs@

403-- and is used in `Squeal.PostgreSQL.Definition.alterTableRename` and

454-- and is used in `Squeal.PostgreSQL.Definition.alterTableRename` and

404-- `Squeal.PostgreSQL.Definition.renameColumn`.

455-- `Squeal.PostgreSQL.Definition.renameColumn`.

405type family Rename alias0 alias1 xs where

456type family Rename alias0 alias1 xs where

457+ Rename alias0 alias1 '[] = TypeError

458+ ('Text "Rename: alias "

459+ ':<>: 'ShowType alias0

460+ ':<>: 'Text " does not exist" )

406 Rename alias0 alias1 ((alias0 ::: x0) ': xs) = (alias1 ::: x0) ': xs

461 Rename alias0 alias1 ((alias0 ::: x0) ': xs) = (alias1 ::: x0) ': xs

407 Rename alias0 alias1 (x ': xs) = x ': Rename alias0 alias1 xs

462 Rename alias0 alias1 (x ': xs) = x ': Rename alias0 alias1 xs

408

463

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+

409-- | Check if a `TableConstraint` involves a column

469-- | Check if a `TableConstraint` involves a column

410type family ConstraintInvolves column constraint where

470type family ConstraintInvolves column constraint where

411 ConstraintInvolves column ('Check columns) = column `Elem` columns

471 ConstraintInvolves column ('Check columns) = column `Elem` columns

@@ -433,7 +493,7 @@ data SchemumType

433 | Operator OperatorType

493 | Operator OperatorType

434 | UnsafeSchemum Symbol

494 | UnsafeSchemum Symbol

435

495

436−data FunctionType = (::-->) [NullityType] ReturnsType

496+type FunctionType = ([NullityType], ReturnsType)

437

497

438data IndexType

498data IndexType

439 = Btree

499 = Btree

squeal-postgresql/test/Property.hs+2−2

@@ -92,14 +92,14 @@ roundtrips = Group "roundtrips"

92 -- genTimeWithZone = (,) <$> genTimeOfDay <*> genTimeZone

93

94roundtrip

95− :: (ToParam x ty, FromValue ty x, Show x, Eq x)

95+ :: (OidOf ty, 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− :: (ToParam x ty, FromValue ty x, Show x, Eq x)

102+ :: (OidOf ty, 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,3 +123,14 @@ 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