dev..901ff7b · squeal · git.iko.soy

git.iko.soy/squeal

on 901ff7b help sign in

README.md+6−6

since splitsnapshots

unifiedsplit

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

121

122Notice the use of type operators.

123

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

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

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

126operator.

127

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

180DROP TABLE "users";

181```

182

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

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

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

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

185

186```Haskell

187>>> data User = User { userName :: Text, userEmail :: Maybe Text } deriving (Show, GHC.Generic)

@@ -189,12 +189,12 @@ We'll need a Haskell type for `User`s. We give the type `SOP.Generic` and

189>>> instance SOP.HasDatatypeInfo User

190```

191

192−Next, we'll write `Manipulation_`s to insert `User`s into our two tables.

192+Next, we'll write `Manipulation_`s to insert @User@s into our two tables.

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

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

195and an output row. When

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

196+we insert into the users table, we will need a parameter for the @name@

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

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

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

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

200the emails table. We can do this in a single `Manipulation_` by using a

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

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

53 >>>

54 createTable #emails

55 ( serial `as` #id :*

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

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

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

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

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

59 foreignKey #user_id #users #id

60 OnDeleteCascade OnUpdateCascade `as` #fk_user_id )

squeal-postgresql/squeal-postgresql.cabal+1

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

28 Squeal.PostgreSQL.Definition.Function

29 Squeal.PostgreSQL.Definition.Index

30 Squeal.PostgreSQL.Definition.Table

31+ Squeal.PostgreSQL.Definition.Table.Column

31 Squeal.PostgreSQL.Definition.Table.Constraint

32 Squeal.PostgreSQL.Definition.Table.Constraint

32 Squeal.PostgreSQL.Definition.Type

33 Squeal.PostgreSQL.Definition.Type

33 Squeal.PostgreSQL.Definition.Schema

34 Squeal.PostgreSQL.Definition.Schema

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

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

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

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

203import Squeal.PostgreSQL.Definition.Type as X

204import Squeal.PostgreSQL.Definition.Type as X

204import Squeal.PostgreSQL.Definition.View as X

205import Squeal.PostgreSQL.Definition.View as X

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

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

216 -- * Only

217 , Only (..)

218 -- * Oid

219− , OidOf (..)

219+ , HasOid (..)

220− , OidOfParam (..)

220+ , HasAliasedOid (..)

221− , OidOfField (..)

222 ) where

221 ) where

223

222

224import BinaryParser

223import BinaryParser

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

232import Data.UUID.Types

231import Data.UUID.Types

233import Data.Vector (Vector)

232import Data.Vector (Vector)

234import Data.Word

233import Data.Word

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

236import Generics.SOP

234import Generics.SOP

237import Generics.SOP.Record

235import Generics.SOP.Record

238import GHC.TypeLits

236import GHC.TypeLits

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

246import qualified Data.Text as Strict (Text)

244import qualified Data.Text as Strict (Text)

247import qualified Data.Text as Strict.Text

245import qualified Data.Text as Strict.Text

248import qualified Data.Vector as Vector

246import qualified Data.Vector as Vector

249−import qualified Database.PostgreSQL.LibPQ as LibPQ

250import qualified GHC.Generics as GHC

247import qualified GHC.Generics as GHC

251import qualified PostgreSQL.Binary.Decoding as Decoding

248import qualified PostgreSQL.Binary.Decoding as Decoding

252import qualified PostgreSQL.Binary.Encoding as Encoding

249import qualified PostgreSQL.Binary.Encoding as Encoding

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

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

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

313 toParam = K . Encoding.jsonb_bytes

310 toParam = K . Encoding.jsonb_bytes

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

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

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

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

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

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

317 toParam = K

314 toParam = K

318 . Encoding.array_foldable

315 . Encoding.array_foldable

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

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

320 . getVarArray

317 . getVarArray

321−instance (ToParam x pg, OidOf pg)

318+instance (ToParam x pg, HasOid pg)

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

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

323 toParam = K

320 toParam = K

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

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

325 . getVarArray

322 . getVarArray

326−instance (ToParam x pg, OidOf pg)

323+instance (ToParam x pg, HasOid pg)

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

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

328 toParam = K

325 toParam = K

329 . Encoding.nullableArray_vector

326 . Encoding.nullableArray_vector

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

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

331 . getVarArray

328 . getVarArray

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

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

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

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

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

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

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

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

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

356 ( SListI fields

353 ( SListI fields

357 , IsRecord x xs

354 , IsRecord x xs

358 , AllZip ToField xs fields

355 , AllZip ToField xs fields

359− , All OidOfField fields

356+ , All HasAliasedOid fields

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

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

361 toParam =

358 toParam =

362 let

359 let

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

364 encoders = htrans (Proxy @ToField) toField

361 encoders = htrans (Proxy @ToField) toField

365

362

366 composite

363 composite

367− :: All OidOfField row

364+ :: All HasAliasedOid row

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

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

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

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

370 composite fields = K $

367 composite fields = K $

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

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

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

382 let

379 let

383 each

380 each

384− :: OidOfField field

381+ :: HasAliasedOid field

385 => K (Maybe Encoding.Encoding) field

382 => K (Maybe Encoding.Encoding) field

386 -> Encoding.Encoding

383 -> Encoding.Encoding

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

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

388− word32BE (getOid (oidOfField @field))

385+ word32BE (getOid (aliasedOid @field))

389 <> case field of

386 <> case field of

390 Nothing -> int64BE (-1)

387 Nothing -> int64BE (-1)

391 Just value ->

388 Just value ->

392 int32BE (fromIntegral (builderLength value))

389 int32BE (fromIntegral (builderLength value))

393 <> value

390 <> value

394 in

391 in

395− hcfoldMap (Proxy @OidOfField) each fields

392+ hcfoldMap (Proxy @HasAliasedOid) each fields

396

393

397 in

394 in

398 composite . encoders . toRecord . getComposite

395 composite . encoders . toRecord . getComposite

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

401--

398--

402-- >>> :set -XTypeApplications

399-- >>> :set -XTypeApplications

403-- >>> oidOf @'PGbool

400-- >>> oidOf @'PGbool

404−-- Oid 16

401+-- Oid {getOid = 16}

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

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

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

403+instance HasOid 'PGbool where oidOf = Oid 16

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

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

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

404+instance HasOid 'PGint2 where oidOf = Oid 21

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

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

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

405+instance HasOid 'PGint4 where oidOf = Oid 23

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

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

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

406+instance HasOid 'PGint8 where oidOf = Oid 20

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

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

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

407+instance HasOid 'PGnumeric where oidOf = Oid 1700

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

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

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

408+instance HasOid 'PGfloat4 where oidOf = Oid 700

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

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

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

409+instance HasOid 'PGfloat8 where oidOf = Oid 701

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

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

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

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

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

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

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

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

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

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

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

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

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

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

412+instance HasOid 'PGtext where oidOf = Oid 25

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

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

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

413+instance HasOid 'PGbytea where oidOf = Oid 17

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

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

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

414+instance HasOid 'PGtimestamp where oidOf = Oid 1114

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

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

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

415+instance HasOid 'PGtimestamptz where oidOf = Oid 1184

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

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

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

416+instance HasOid 'PGdate where oidOf = Oid 1082

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

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

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

417+instance HasOid 'PGtime where oidOf = Oid 1083

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

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

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

418+instance HasOid 'PGtimetz where oidOf = Oid 1266

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

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

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

419+instance HasOid 'PGinterval where oidOf = Oid 1186

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

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

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

420+instance HasOid 'PGuuid where oidOf = Oid 2950

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

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

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

421+instance HasOid 'PGinet where oidOf = Oid 869

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

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

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

422+instance HasOid 'PGjson where oidOf = Oid 114

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

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

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

423+instance HasOid 'PGjsonb where oidOf = Oid 3802

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

424+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

508−

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

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

511−

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

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

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

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

514− oidOfField :: Oid

427+ aliasedOid :: Oid

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

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

516− oidOfField = oidOf @ty

429+ aliasedOid = oidOf @ty

517

430

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

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

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

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

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

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

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

844replicateMN mx = hsequence' $

757replicateMN mx = hsequence' $

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

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

846−

847−getOid :: LibPQ.Oid -> Word32

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

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

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

27 , TypeInType

28 , TypeOperators

29 , UndecidableSuperClasses

30− , UndecidableInstances

31#-}

30#-}

33module Squeal.PostgreSQL.Definition

32module Squeal.PostgreSQL.Definition

squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table.hs+4−27

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

35 , dropTable

36 , dropTableIfExists

37 , alterTable

38− , alterTableIfExists

39 , alterTableRename

38 , alterTableRename

40− , alterTableIfExistsRename

41 , AlterTable (..)

39 , AlterTable (..)

42 , addConstraint

40 , addConstraint

43 , dropConstraint

41 , dropConstraint

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

63import Squeal.PostgreSQL.Alias

61import Squeal.PostgreSQL.Alias

64import Squeal.PostgreSQL.Definition

62import Squeal.PostgreSQL.Definition

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

65import Squeal.PostgreSQL.Definition.Table.Constraint

64import Squeal.PostgreSQL.Definition.Table.Constraint

66import Squeal.PostgreSQL.Expression

65import Squeal.PostgreSQL.Expression

67−import Squeal.PostgreSQL.Expression.Type

68import Squeal.PostgreSQL.List

66import Squeal.PostgreSQL.List

69import Squeal.PostgreSQL.Render

67import Squeal.PostgreSQL.Render

70import Squeal.PostgreSQL.Schema

68import Squeal.PostgreSQL.Schema

@@ -204,28 +202,16 @@ dropTableIfExists tab = UnsafeDefinition $ "DROP TABLE IF EXISTS" <+> renderSQL

204

202

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

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

206alterTable

204alterTable

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

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

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

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

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

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

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

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

211alterTable tab alteration = UnsafeDefinition $

209alterTable tab alteration = UnsafeDefinition $

212 "ALTER TABLE"

210 "ALTER TABLE"

213 <+> renderSQL tab

211 <+> renderSQL tab

214 <+> renderAlterTable alteration

212 <+> renderAlterTable alteration

215 <> ";"

213 <> ";"

216

214

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

218−alterTableIfExists

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

220− => QualifiedAlias sch tab -- ^ table to alter

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

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

223−alterTableIfExists tab alteration = UnsafeDefinition $

224− "ALTER TABLE IF EXISTS"

225− <+> renderSQL tab

226− <+> renderAlterTable alteration

227− <> ";"

228−

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

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

230--

216--

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

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

@@ -239,15 +225,6 @@ alterTableRename tab0 tab1 = UnsafeDefinition $

239 "ALTER TABLE" <+> renderSQL tab0

225 "ALTER TABLE" <+> renderSQL tab0

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

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

241

227

242−alterTableIfExistsRename

243− :: (KnownSymbol tab0, KnownSymbol tab1)

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

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

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

247−alterTableIfExistsRename tab0 tab1 = UnsafeDefinition $

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

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

250−

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

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

252-- of a table.

229-- of a table.

253newtype AlterTable

230newtype AlterTable

squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table/Column.hsnew file+105

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

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

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/Type.hs+4−101

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

23 , ScopedTypeVariables

24 , TypeApplications

25 , TypeOperators

26− , UndecidableInstances

27#-}

26#-}

29module Squeal.PostgreSQL.Expression.Type

28module Squeal.PostgreSQL.Expression.Type

30− ( -- * type casting

29+ ( TypeExpression (..)

31− cast

30+ , cast

32 , astype

31 , astype

33 , inferredtype

32 , inferredtype

34− -- * type expressions

33+ , PGTyped (..)

35− , TypeExpression (..)

34+ , FieldTyped (..)

36 , typedef

35 , typedef

37 , typetable

36 , typetable

38 , typeview

37 , typeview

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

79 , tsrange

78 , tsrange

80 , tstzrange

79 , tstzrange

81 , daterange

80 , daterange

82− -- * column type definitions

83− , ColumnTypeExpression (..)

84− , nullable

85− , notNullable

86− , default_

87− , serial2

88− , smallserial

89− , serial4

90− , serial

91− , serial8

92− , bigserial

93− , hask

94− -- * type inference

95− , PGTyped (..)

96− , PGNullityTyped (..)

97− , FieldTyped (..)

98 ) where

81 ) where

100import Control.DeepSeq

83import Control.DeepSeq

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

108

109import Squeal.PostgreSQL.Alias

92import Squeal.PostgreSQL.Alias

110import Squeal.PostgreSQL.Expression

93import Squeal.PostgreSQL.Expression

111−import Squeal.PostgreSQL.PG

112import Squeal.PostgreSQL.Render

94import Squeal.PostgreSQL.Render

113import Squeal.PostgreSQL.Schema

95import Squeal.PostgreSQL.Schema

114

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

150inferredtype

132inferredtype

151 :: PGTyped schemas ty

133 :: PGTyped schemas ty

152 => Expression outer common grp schemas params from ty

134 => Expression outer common grp schemas params from ty

153− -- ^ value

154 -> Expression outer common grp schemas params from ty

135 -> Expression outer common grp schemas params from ty

155inferredtype = astype pgtype

136inferredtype = astype pgtype

156

137

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

170typedef

151typedef

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

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

172 => QualifiedAlias sch td

153 => QualifiedAlias sch td

173− -- ^ type alias

174 -> TypeExpression schemas (null ty)

154 -> TypeExpression schemas (null ty)

175typedef = UnsafeTypeExpression . renderSQL

155typedef = UnsafeTypeExpression . renderSQL

176

156

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

179typetable

159typetable

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

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

181 => QualifiedAlias sch tab

161 => QualifiedAlias sch tab

182− -- ^ table alias

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

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

184typetable = UnsafeTypeExpression . renderSQL

163typetable = UnsafeTypeExpression . renderSQL

185

164

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

188typeview

167typeview

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

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

190 => QualifiedAlias sch vw

169 => QualifiedAlias sch vw

191− -- ^ view alias

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

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

193typeview = UnsafeTypeExpression . renderSQL

171typeview = UnsafeTypeExpression . renderSQL

194

172

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

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

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

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

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

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

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

365−instance PGTyped schemas (null ('PGrange 'PGint4)) where pgtype = int4range

366−instance PGTyped schemas (null ('PGrange 'PGint8)) where pgtype = int8range

367−instance PGTyped schemas (null ('PGrange 'PGnumeric)) where pgtype = numrange

368−instance PGTyped schemas (null ('PGrange 'PGtimestamp)) where pgtype = tsrange

369−instance PGTyped schemas (null ('PGrange 'PGtimestamptz)) where pgtype = tstzrange

370−instance PGTyped schemas (null ('PGrange 'PGdate)) where pgtype = daterange

371

343

372-- | Lift `PGTyped` to a field

344-- | Lift `PGTyped` to a field

373class FieldTyped schemas ty where

345class FieldTyped schemas ty where

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

375instance (KnownSymbol alias, PGTyped schemas ty)

347instance (KnownSymbol alias, PGTyped schemas ty)

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

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

377 fieldtype = pgtype `As` Alias

349 fieldtype = pgtype `As` Alias

378−

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

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

381− = UnsafeColumnTypeExpression { renderColumnTypeExpression :: ByteString }

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

383−instance RenderSQL (ColumnTypeExpression schemas ty) where

384− renderSQL = renderColumnTypeExpression

385−

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

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

388−nullable

389− :: TypeExpression schemas (nullity ty)

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

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

392−

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

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

395−notNullable

396− :: TypeExpression schemas (nullity ty)

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

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

399−

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

401−default_

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

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

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

405−default_ x ty = UnsafeColumnTypeExpression $

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

407−

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

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

410−serial2, smallserial

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

412−serial2 = UnsafeColumnTypeExpression "serial2"

413−smallserial = UnsafeColumnTypeExpression "smallserial"

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

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

416−serial4, serial

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

418−serial4 = UnsafeColumnTypeExpression "serial4"

419−serial = UnsafeColumnTypeExpression "serial"

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

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

422−serial8, bigserial

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

424−serial8 = UnsafeColumnTypeExpression "serial8"

425−bigserial = UnsafeColumnTypeExpression "bigserial"

426−

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

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

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

430−

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

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

433−

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

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

436−

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

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

439−-- text NULL

440−--

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

442−-- float8 NOT NULL

443−hask

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

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

446−hask = pgNullityType

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

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

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

85type family Elem x xs where

86 Elem x '[] = 'False

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

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

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

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

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

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

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

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

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

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

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

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

104= 4

99= 4

105-}

100-}

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

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

107− Length (_ ': _ ': _ ': _ ': _ : xs) = 5 + Length xs

108− Length (_ ': _ ': _ ': _ : xs) = 4 + Length xs

109− Length (_ ': _ ': _ : xs) = 3 + Length xs

110− Length (_ ': _ : xs) = 2 + Length xs

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

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

112 Length '[] = 0

103 Length '[] = 0

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

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

168import Squeal.PostgreSQL.Binary

169import Squeal.PostgreSQL.Definition

170import Squeal.PostgreSQL.Definition.Table

171+import Squeal.PostgreSQL.Definition.Table.Column

171import Squeal.PostgreSQL.Definition.Table.Constraint

172import Squeal.PostgreSQL.Definition.Table.Constraint

172import Squeal.PostgreSQL.Expression.Comparison

173import Squeal.PostgreSQL.Expression.Comparison

173import Squeal.PostgreSQL.Expression.Parameter

174import Squeal.PostgreSQL.Expression.Parameter

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

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

47 , Enumerated (..)

48 , VarArray (..)

49 , FixArray (..)

50− , LibPQ.Oid (..)

50+ , Oid (..)

51 -- * Type families

52 , LabelsPG

53 , DimPG

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

66import Data.Scientific (Scientific)

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

68import Data.Vector (Vector)

69+import Data.Word (Word32)

69import Data.UUID.Types (UUID)

70import Data.UUID.Types (UUID)

70import GHC.TypeLits

71import GHC.TypeLits

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

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

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

74import qualified Data.ByteString as Strict (ByteString)

75import qualified Data.ByteString as Strict (ByteString)

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

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

76import qualified Data.Text as Strict (Text)

77import qualified Data.Text as Strict (Text)

77−import qualified Database.PostgreSQL.LibPQ as LibPQ

78import qualified GHC.Generics as GHC

79import qualified Generics.SOP as SOP

80import qualified Generics.SOP.Record as SOP

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

108-- | `PGint8`

109type instance PG Int64 = 'PGint8

110-- | `PGint2`

111−type instance PG LibPQ.Oid = 'PGoid

111+type instance PG Oid = 'PGoid

112-- | `PGnumeric`

113type instance PG Scientific = 'PGnumeric

114-- | `PGfloat4`

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

178

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

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

181− RowOf (col ::: ty ': col1 ::: ty1 ': col2 ::: ty2 ': col3 ::: ty3 ': col4 ::: ty4 ': record) =

182− col ::: NullPG ty ': col1 ::: NullPG ty1 ': col2 ::: NullPG ty2 ': col3 ::: NullPG ty3 ': col4 ::: NullPG ty4 ': RowOf record

183− RowOf (col ::: ty ': col1 ::: ty1 ': col2 ::: ty2 ': col3 ::: ty3 ': record) =

184− col ::: NullPG ty ': col1 ::: NullPG ty1 ': col2 ::: NullPG ty2 ': col3 ::: NullPG ty3 ': RowOf record

185− RowOf (col ::: ty ': col1 ::: ty1 ': col2 ::: ty2 ': record) =

186− col ::: NullPG ty ': col1 ::: NullPG ty1 ': col2 ::: NullPG ty2 ': RowOf record

187− RowOf (col ::: ty ': col1 ::: ty1 ': record) =

188− col ::: NullPG ty ': col1::: NullPG ty1 ': RowOf record

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

190 RowOf '[] = '[]

181 RowOf '[] = '[]

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

191

183

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

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

193

185

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

214

206

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

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

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

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

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

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

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

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

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

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

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

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

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

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

227 TupleOf '[] = '[]

209 TupleOf '[] = '[]

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

228

211

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

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

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

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

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

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

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

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

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

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

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

372+

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

374+as primary keys for various system tables.

375+-}

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

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

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

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

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

78import Data.ByteString (ByteString)

79import Data.Foldable

80import Data.Function ((&))

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

82import Data.Kind

81import Data.Kind

83import Data.Text (pack, Text)

82import Data.Text (pack, Text)

84import Data.Traversable

83import Data.Traversable

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

88import qualified Control.Monad.Fail as Fail

87import qualified Control.Monad.Fail as Fail

89import qualified Database.PostgreSQL.LibPQ as LibPQ

88import qualified Database.PostgreSQL.LibPQ as LibPQ

90−import qualified PostgreSQL.Binary.Encoding as Encoding

92import Squeal.PostgreSQL.Binary

90import Squeal.PostgreSQL.Binary

93import Squeal.PostgreSQL.Definition

91import Squeal.PostgreSQL.Definition

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

317-}

315-}

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

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

319 manipulateParams

317 manipulateParams

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

318+ :: ToParams x params

321 => Manipulation '[] schemas params ys

319 => Manipulation '[] schemas params ys

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

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

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

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

324 default manipulateParams

322 default manipulateParams

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

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

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

324+ => ToParams x params

327 => Manipulation '[] schemas params ys

325 => Manipulation '[] schemas params ys

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

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

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

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

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

331 manipulateParams manipulation params

329 manipulateParams manipulation params

332

330

333 manipulateParams_

331 manipulateParams_

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

332+ :: ToParams x params

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

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

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

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

337 -> x -> pq ()

335 -> x -> pq ()

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

344 manipulate_ = void . manipulate

342 manipulate_ = void . manipulate

345

343

346 runQueryParams

344 runQueryParams

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

345+ :: ToParams x params

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

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

349 -- ^ `select` and friends

347 -- ^ `select` and friends

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

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

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

357 runQuery q = runQueryParams q ()

355 runQuery q = runQueryParams q ()

358

356

359 traversePrepared

357 traversePrepared

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

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

361 => Manipulation '[] schemas params ys

359 => Manipulation '[] schemas params ys

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

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

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

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

364 default traversePrepared

362 default traversePrepared

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

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

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

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

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

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

368 traversePrepared manipulation params = lift $

366 traversePrepared manipulation params = lift $

369 traversePrepared manipulation params

367 traversePrepared manipulation params

370

368

371 forPrepared

369 forPrepared

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

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

373 => list x

371 => list x

374 -> Manipulation '[] schemas params ys

372 -> Manipulation '[] schemas params ys

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

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

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

377 forPrepared = flip traversePrepared

375 forPrepared = flip traversePrepared

378

376

379 traversePrepared_

377 traversePrepared_

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

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

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

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

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

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

383 -> list x -> pq ()

381 -> list x -> pq ()

384 default traversePrepared_

382 default traversePrepared_

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

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

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

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

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

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

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

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

389 -> list x -> pq ()

387 -> list x -> pq ()

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

391 traversePrepared_ manipulation params

389 traversePrepared_ manipulation params

392

390

393 forPrepared_

391 forPrepared_

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

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

395 => list x

393 => list x

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

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

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

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

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

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

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

412 PQ $ \ (K conn) -> do

410 PQ $ \ (K conn) -> do

413 let

411 let

414− paramSet

412+ toParam' encoding =

415− :: forall param. OidOfParam param

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

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

418− paramSet (K maybeEncoding) = K $

419− maybeEncoding <&> \encoding ->

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

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

421− params'

422− = hcollapse

423− . hcmap (Proxy @OidOfParam) paramSet

424− $ toParams @x @ps params

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

425 q' = q <> ";"

415 q' = q <> ";"

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

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

427 case resultMaybe of

417 case resultMaybe of

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

434 traversePrepared

424 traversePrepared

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

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

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

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

437− let

438− temp = "temporary_statement"

427+ let temp = "temporary_statement"

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

440− paramOid = K (oidOfParam @p)

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

442− paramOids = hcpure (Proxy @OidOfParam) paramOid

443− paramOids' :: [LibPQ.Oid]

444− paramOids' = hcollapse paramOids

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

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

446 case prepResultMaybe of

429 case prepResultMaybe of

447 Nothing -> throw $ ResultException

430 Nothing -> throw $ ResultException

448 "traversePrepared: LibPQ.prepare returned no results"

431 "traversePrepared: LibPQ.prepare returned no results"

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

468 traversePrepared_

451 traversePrepared_

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

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

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

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

471− let

472− temp = "temporary_statement"

454+ let temp = "temporary_statement"

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

474− paramOid = K (oidOfParam @p)

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

476− paramOids = hcpure (Proxy @OidOfParam) paramOid

477− paramOids' :: [LibPQ.Oid]

478− paramOids' = hcollapse paramOids

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

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

480 case prepResultMaybe of

456 case prepResultMaybe of

481 Nothing -> throw $ ResultException

457 Nothing -> throw $ ResultException

482 "traversePrepared_: LibPQ.prepare returned no results"

458 "traversePrepared_: LibPQ.prepare returned no results"

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

@@ -554,9 +554,9 @@ select_ = select . List

554-- be subject to the elimination of duplicate rows using `selectDistinct`.

555selectDistinct

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

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

557+ => Selection outer commons 'Ungrouped schemas params from columns

558 -- ^ selection

559− -> TableExpression outer commons grp schemas params from

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

560 -- ^ intermediate virtual table

561 -> Query outer commons schemas params columns

562selectDistinct selection tabexpr = UnsafeQuery $

@@ -568,9 +568,9 @@ selectDistinct selection tabexpr = UnsafeQuery $

568-- of a general `Selection`.

569selectDistinct_

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

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

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

572 -- ^ select list

573− -> TableExpression outer commons grp schemas params from

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

574 -- ^ intermediate virtual table

575 -> Query outer commons schemas params columns

576selectDistinct_ = selectDistinct . List

@@ -580,21 +580,14 @@ selectDistinct_ = selectDistinct . List

580the given expressions evaluate to equal. The DISTINCT ON expressions are

581interpreted using the same rules as for ORDER BY. ORDER BY is used to

582ensure that the desired row appears first.

583−

584−The DISTINCT ON expression(s) must match the leftmost ORDER BY expression(s).

585−The ORDER BY clause will normally contain additional expression(s) that

586−determine the desired precedence of rows within each DISTINCT ON group.

587−

588−In order to guarantee they match and reduce redundancy, this function

589−will prepend the The DISTINCT ON expressions to the ORDER BY clause.

590-}

583-}

591selectDistinctOn

584selectDistinctOn

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

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

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

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

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

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

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

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

596 -- ^ selection

589 -- ^ selection

597− -> TableExpression outer commons grp schemas params from

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

598 -- ^ intermediate virtual table

591 -- ^ intermediate virtual table

599 -> Query outer commons schemas params columns

592 -> Query outer commons schemas params columns

600selectDistinctOn distincts selection tab = UnsafeQuery $

593selectDistinctOn distincts selection tab = UnsafeQuery $

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

615-- of a general `Selection`.

608-- of a general `Selection`.

616selectDistinctOn_

609selectDistinctOn_

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

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

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

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

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

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

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

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

621 -- ^ selection

614 -- ^ selection

622− -> TableExpression outer commons grp schemas params from

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

623 -- ^ intermediate virtual table

616 -- ^ intermediate virtual table

624 -> Query outer commons schemas params columns

617 -> Query outer commons schemas params columns

625selectDistinctOn_ distincts = selectDistinctOn distincts . List

618selectDistinctOn_ distincts = selectDistinctOn distincts . List

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

757from

750from

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

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

759 -> TableExpression outer commons 'Ungrouped schemas params from

752 -> TableExpression outer commons 'Ungrouped schemas params from

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

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

761

754

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

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

763-- search condition to the `whereClause`.

756-- search condition to the `whereClause`.

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

778groupBy bys rels = TableExpression

771groupBy bys rels = TableExpression

779 { fromClause = fromClause rels

772 { fromClause = fromClause rels

780 , whereClause = whereClause rels

773 , whereClause = whereClause rels

781− , groupByClause = group bys

774+ , groupByClause = Group bys

782 , havingClause = Having []

775 , havingClause = Having []

783 , orderByClause = []

776 , orderByClause = []

784 , limitClause = limitClause rels

777 , limitClause = limitClause rels

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

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

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

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

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

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

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

995−newtype GroupByClause grp from = UnsafeGroupByClause

988+data GroupByClause grp from where

996− { renderGroupByClause :: ByteString }

989+ NoGroups :: GroupByClause 'Ungrouped from

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

990+ Group

991+ :: SListI bys

992+ => NP (By from) bys

993+ -> GroupByClause ('Grouped bys) from

994+

995+-- | Renders a `GroupByClause`.

998instance RenderSQL (GroupByClause grp from) where

996instance RenderSQL (GroupByClause grp from) where

999− renderSQL = renderGroupByClause

997+ renderSQL = \case

1000−noGroups :: GroupByClause 'Ungrouped from

998+ NoGroups -> ""

1001−noGroups = UnsafeGroupByClause ""

1002−group

1003− :: SListI bys

1004− => NP (By from) bys

1005− -> GroupByClause ('Grouped bys) from

1006−group bys = UnsafeGroupByClause $ case bys of

1007− Nil -> ""

999+ Group Nil -> ""

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

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

1009

1001

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

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

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

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

squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+7−67

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

69 , DropIfExists

70 , DropSchemumIfExists

71 , Alter

72− , AlterIfExists

73 , Rename

72 , Rename

74− , RenameIfExists

75 , ConstraintInvolves

73 , ConstraintInvolves

76 , DropIfConstraintsInvolve

74 , DropIfConstraintsInvolve

77 , IsNotElem

75 , IsNotElem

@@ -260,19 +258,9 @@ type FromType = [(Symbol,RowType)]

260

258

261-- | `ColumnsToRow` removes column constraints.

259-- | `ColumnsToRow` removes column constraints.

262type family ColumnsToRow (columns :: ColumnsType) :: RowType where

260type family ColumnsToRow (columns :: ColumnsType) :: RowType where

263− ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': column3 ::: _ :=> ty3 ': column4 ::: _ :=> ty4 ': column5 ::: _ :=> ty5 ': columns) =

264− column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': column5 ::: ty5 ': ColumnsToRow columns

265− ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': column3 ::: _ :=> ty3 ': column4 ::: _ :=> ty4 ': columns) =

266− column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': ColumnsToRow columns

267− ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': column3 ::: _ :=> ty3 ': columns) =

268− column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': ColumnsToRow columns

269− ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': columns) =

270− column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': ColumnsToRow columns

271− ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': columns) =

272− column ::: ty ': column1 ::: ty1 ': ColumnsToRow columns

273− ColumnsToRow (column ::: _ :=> ty ': columns) =

274− column ::: ty ': ColumnsToRow columns

275 ColumnsToRow '[] = '[]

261 ColumnsToRow '[] = '[]

262+ ColumnsToRow (column ::: constraint :=> ty ': columns) =

263+ column ::: ty ': ColumnsToRow columns

276

264

277-- | `TableToColumns` removes table constraints.

265-- | `TableToColumns` removes table constraints.

278type family TableToColumns (table :: TableType) :: ColumnsType where

266type family TableToColumns (table :: TableType) :: ColumnsType where

@@ -305,24 +293,14 @@ instance ty0 ~ ty1 => SamePGType

305

293

306-- | `AllNotNull` is a constraint that proves a `ColumnsType` has no @NULL@s.

294-- | `AllNotNull` is a constraint that proves a `ColumnsType` has no @NULL@s.

307type family AllNotNull (columns :: ColumnsType) :: Constraint where

295type family AllNotNull (columns :: ColumnsType) :: Constraint where

308− AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

309− AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

310− AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

311− AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

312− AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

313− AllNotNull (_ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

314 AllNotNull '[] = ()

296 AllNotNull '[] = ()

297+ AllNotNull (column ::: def :=> 'NotNull ty ': columns) = AllNotNull columns

315

298

316-- | `NotAllNull` is a constraint that proves a `ColumnsType` has some

299-- | `NotAllNull` is a constraint that proves a `ColumnsType` has some

317-- @NOT NULL@.

300-- @NOT NULL@.

318type family NotAllNull (columns :: ColumnsType) :: Constraint where

301type family NotAllNull (columns :: ColumnsType) :: Constraint where

319− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

302+ NotAllNull (column ::: def :=> 'NotNull ty ': columns) = ()

320− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

321− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

322− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

323− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

324− NotAllNull (_ ::: _ :=> 'NotNull _ ': _) = ()

325− NotAllNull (_ ::: _ :=> 'Null _ ': columns) = NotAllNull columns

303+ NotAllNull (column ::: def :=> 'Null ty ': columns) = NotAllNull columns

326

304

327-- | `NullifyType` is an idempotent that nullifies a `NullityType`.

305-- | `NullifyType` is an idempotent that nullifies a `NullityType`.

328type family NullifyType (ty :: NullityType) :: NullityType where

306type family NullifyType (ty :: NullityType) :: NullityType where

@@ -331,37 +309,17 @@ type family NullifyType (ty :: NullityType) :: NullityType where

331

309

332-- | `NullifyRow` is an idempotent that nullifies a `RowType`.

310-- | `NullifyRow` is an idempotent that nullifies a `RowType`.

333type family NullifyRow (columns :: RowType) :: RowType where

311type family NullifyRow (columns :: RowType) :: RowType where

334− NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': column5 ::: ty5 ': columns) =

312+ NullifyRow '[] = '[]

335− column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': column4 ::: NullifyType ty4 ': column5 ::: NullifyType ty5 ': NullifyRow columns

336− NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': columns) =

337− column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': column4 ::: NullifyType ty4 ': NullifyRow columns

338− NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': columns) =

339− column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': NullifyRow columns

340− NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': columns) =

341− column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': NullifyRow columns

342− NullifyRow (column ::: ty ': column1 ::: ty1 ': columns) =

343− column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': NullifyRow columns

344 NullifyRow (column ::: ty ': columns) =

313 NullifyRow (column ::: ty ': columns) =

345 column ::: NullifyType ty ': NullifyRow columns

314 column ::: NullifyType ty ': NullifyRow columns

346− NullifyRow '[] = '[]

347

315

348-- | `NullifyFrom` is an idempotent that nullifies a `FromType`

316-- | `NullifyFrom` is an idempotent that nullifies a `FromType`

349-- used to nullify the left or right hand side of an outer join

317-- used to nullify the left or right hand side of an outer join

350-- in a `Squeal.PostgreSQL.Query.FromClause`.

318-- in a `Squeal.PostgreSQL.Query.FromClause`.

351type family NullifyFrom (tables :: FromType) :: FromType where

319type family NullifyFrom (tables :: FromType) :: FromType where

352− NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': table4 ::: columns4 ': table5 ::: columns5 ': tables) =

320+ NullifyFrom '[] = '[]

353− table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': table4 ::: NullifyRow columns5 ': table5 ::: NullifyRow columns4 ': NullifyFrom tables

354− NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': table4 ::: columns4 ': tables) =

355− table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': table4 ::: NullifyRow columns4 ': NullifyFrom tables

356− NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': tables) =

357− table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': NullifyFrom tables

358− NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': tables) =

359− table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': NullifyFrom tables

360− NullifyFrom (table ::: columns ': table1 ::: columns1 ': tables) =

361− table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': NullifyFrom tables

362 NullifyFrom (table ::: columns ': tables) =

321 NullifyFrom (table ::: columns ': tables) =

363 table ::: NullifyRow columns ': NullifyFrom tables

322 table ::: NullifyRow columns ': NullifyFrom tables

364− NullifyFrom '[] = '[]

365

323

366-- | @Create alias x xs@ adds @alias ::: x@ to the end of @xs@ and is used in

324-- | @Create alias x xs@ adds @alias ::: x@ to the end of @xs@ and is used in

367-- `Squeal.PostgreSQL.Definition.createTable` statements and in @ALTER TABLE@

325-- `Squeal.PostgreSQL.Definition.createTable` statements and in @ALTER TABLE@

@@ -438,34 +396,16 @@ type family DropSchemumIfExists alias sch xs where

438-- with the type @x@ and is used in `Squeal.PostgreSQL.Definition.alterTable`

396-- with the type @x@ and is used in `Squeal.PostgreSQL.Definition.alterTable`

439-- and `Squeal.PostgreSQL.Definition.alterColumn`.

397-- and `Squeal.PostgreSQL.Definition.alterColumn`.

440type family Alter alias x xs where

398type family Alter alias x xs where

441− Alter alias x '[] = TypeError

442− ('Text "Alter: alias "

443− ':<>: 'ShowType alias

444− ':<>: 'Text " does not exist" )

445 Alter alias x1 (alias ::: x0 ': xs) = alias ::: x1 ': xs

399 Alter alias x1 (alias ::: x0 ': xs) = alias ::: x1 ': xs

446 Alter alias x1 (x0 ': xs) = x0 ': Alter alias x1 xs

400 Alter alias x1 (x0 ': xs) = x0 ': Alter alias x1 xs

447

401

448−type family AlterIfExists alias x xs where

449− AlterIfExists alias x '[] = '[]

450− AlterIfExists alias x1 (alias ::: x0 ': xs) = alias ::: x1 ': xs

451− AlterIfExists alias x1 (x0 ': xs) = x0 ': AlterIfExists alias x1 xs

452−

453-- | @Rename alias0 alias1 xs@ replaces the alias @alias0@ by @alias1@ in @xs@

402-- | @Rename alias0 alias1 xs@ replaces the alias @alias0@ by @alias1@ in @xs@

454-- and is used in `Squeal.PostgreSQL.Definition.alterTableRename` and

403-- and is used in `Squeal.PostgreSQL.Definition.alterTableRename` and

455-- `Squeal.PostgreSQL.Definition.renameColumn`.

404-- `Squeal.PostgreSQL.Definition.renameColumn`.

456type family Rename alias0 alias1 xs where

405type family Rename alias0 alias1 xs where

457− Rename alias0 alias1 '[] = TypeError

458− ('Text "Rename: alias "

459− ':<>: 'ShowType alias0

460− ':<>: 'Text " does not exist" )

461 Rename alias0 alias1 ((alias0 ::: x0) ': xs) = (alias1 ::: x0) ': xs

406 Rename alias0 alias1 ((alias0 ::: x0) ': xs) = (alias1 ::: x0) ': xs

462 Rename alias0 alias1 (x ': xs) = x ': Rename alias0 alias1 xs

407 Rename alias0 alias1 (x ': xs) = x ': Rename alias0 alias1 xs

463

408

464−type family RenameIfExists alias0 alias1 xs where

465− RenameIfExists alias x '[] = '[]

466− RenameIfExists alias0 alias1 ((alias0 ::: x0) ': xs) = (alias1 ::: x0) ': xs

467− RenameIfExists alias0 alias1 (x ': xs) = x ': RenameIfExists alias0 alias1 xs

468−

469-- | Check if a `TableConstraint` involves a column

409-- | Check if a `TableConstraint` involves a column

470type family ConstraintInvolves column constraint where

410type family ConstraintInvolves column constraint where

471 ConstraintInvolves column ('Check columns) = column `Elem` columns

411 ConstraintInvolves column ('Check columns) = column `Elem` columns

squeal-postgresql/test/Property.hs+2−2

@@ -92,14 +92,14 @@ roundtrips = Group "roundtrips"

92 -- genTimeWithZone = (,) <$> genTimeOfDay <*> genTimeZone

94roundtrip

95− :: (OidOf ty, ToParam x ty, FromValue ty x, Show x, Eq x)

95+ :: (ToParam x ty, FromValue ty x, Show x, Eq x)

96 => TypeExpression schemas ('NotNull ty)

97 -> Gen x

98 -> (PropertyName, Property)

99roundtrip = roundtripOn id

100

101roundtripOn

102− :: (OidOf ty, ToParam x ty, FromValue ty x, Show x, Eq x)

102+ :: (ToParam x ty, FromValue ty x, Show x, Eq x)

103 => (x -> x)

104 -> TypeExpression schemas ('NotNull ty)

105 -> Gen x

squeal-postgresql/test/Spec.hs−11

@@ -123,14 +123,3 @@ spec = before_ setupDB . after_ dropDB $ do

123 getRows =<< runQuery query

124 (fromOnly <$> rangesOut :: [Range Int32]) `shouldBe`

125 [ atLeast 3, 3 <=..< 5, Empty, whole ]

126−

127− describe "Parameters" $ do

128−

129− it "should run queries that don't reference all their parameters" $ do

130−

131− out <- withConnection connectionString $ do

132− let

133− query :: Query_ (Public '[]) (Char,Int32) (Only Int32)

134− query = values_ (param @2 `as` #fromOnly)

135− firstRow =<< runQueryParams query ('a', 3 :: Int32)

136− (fromOnly <$> out :: Maybe Int32) `shouldBe` Just 3