on 1086cfc help sign in
.circleci/config.yml+1−1
since splitsnapshots
unifiedsplit
@@ -2,7 +2,7 @@ version: 2
2jobs:
2jobs:
3 build:
3 build:
4 docker:
4 docker:
5− - image: haskell:8.6.5
5+ - image: haskell:8.6.3
6 - image: circleci/postgres:latest
6 - image: circleci/postgres:latest
7 environment:
7 environment:
8 POSTGRES_USER: root
8 POSTGRES_USER: root
README.md+70−59
@@ -46,11 +46,7 @@ composable and cover a large portion of SQL.
46* transactions
46* transactions
47* views
47* views
48* array, composite and enumerated types
48* array, composite and enumerated types
49−* json functions and operations
49+* json operations
50−* multischema support
51−* correlated subqueries
52−* window functions
53−* text search
54
50
55## installation
51## installation
56
52
@@ -76,17 +72,19 @@ First, we need some language extensions because Squeal uses modern GHC
76features.
72features.
77
73
78```Haskell
74```Haskell
79−>>> :set -XDataKinds -XDeriveGeneric -XOverloadedLabels -XFlexibleContexts
75+>>> :set -XDataKinds -XDeriveGeneric -XOverloadedLabels
80−>>> :set -XOverloadedStrings -XTypeApplications -XTypeOperators -XGADTs
76+>>> :set -XOverloadedStrings -XTypeApplications -XTypeOperators
81```
77```
82
78
83We'll need some imports.
79We'll need some imports.
84
80
85```Haskell
81```Haskell
82+>>> import Control.Monad (void)
86>>> import Control.Monad.IO.Class (liftIO)
83>>> import Control.Monad.IO.Class (liftIO)
87>>> import Data.Int (Int32)
84>>> import Data.Int (Int32)
88>>> import Data.Text (Text)
85>>> import Data.Text (Text)
89>>> import Squeal.PostgreSQL
86>>> import Squeal.PostgreSQL
87+>>> import Squeal.PostgreSQL.Render
90```
88```
91
89
92We'll use generics to easily convert between Haskell and PostgreSQL values.
90We'll use generics to easily convert between Haskell and PostgreSQL values.
@@ -101,27 +99,27 @@ we use `DataKinds` and `TypeOperators`.
101
99
102```Haskell
100```Haskell
103>>> :{
101>>> :{
104−type UsersColumns =
105− '[ "id" ::: 'Def :=> 'NotNull 'PGint4
106− , "name" ::: 'NoDef :=> 'NotNull 'PGtext ]
107−type UsersConstraints = '[ "pk_users" ::: 'PrimaryKey '["id"] ]
108−type EmailsColumns =
109− '[ "id" ::: 'Def :=> 'NotNull 'PGint4
110− , "user_id" ::: 'NoDef :=> 'NotNull 'PGint4
111− , "email" ::: 'NoDef :=> 'Null 'PGtext ]
112−type EmailsConstraints =
113− '[ "pk_emails" ::: 'PrimaryKey '["id"]
114− , "fk_user_id" ::: 'ForeignKey '["user_id"] "users" '["id"] ]
115type Schema =
102type Schema =
116− '[ "users" ::: 'Table (UsersConstraints :=> UsersColumns)
103+ '[ "users" ::: 'Table (
104+ '[ "pk_users" ::: 'PrimaryKey '["id"] ] :=>
105+ '[ "id" ::: 'Def :=> 'NotNull 'PGint4
106+ , "name" ::: 'NoDef :=> 'NotNull 'PGtext
107+ ])
117− , "emails" ::: 'Table (EmailsConstraints :=> EmailsColumns) ]
108+ , "emails" ::: 'Table (
118−type Schemas = Public Schema
109+ '[ "pk_emails" ::: 'PrimaryKey '["id"]
110+ , "fk_user_id" ::: 'ForeignKey '["user_id"] "users" '["id"]
111+ ] :=>
112+ '[ "id" ::: 'Def :=> 'NotNull 'PGint4
113+ , "user_id" ::: 'NoDef :=> 'NotNull 'PGint4
114+ , "email" ::: 'NoDef :=> 'Null 'PGtext
115+ ])
116+ ]
119:}
117:}
120```
118```
121
119
122Notice the use of type operators.
120Notice the use of type operators.
123
121
124−`:::` is used to pair an alias `Symbol` with a `SchemumType`,
122+`:::` is used to pair an alias `GHC.TypeLits.Symbol` with a `SchemumType`,
125a `TableConstraint` or a `ColumnType`. It is intended to connote Haskell's `::`
123a `TableConstraint` or a `ColumnType`. It is intended to connote Haskell's `::`
126operator.
124operator.
127
125
@@ -139,7 +137,7 @@ labels to refer to named tables and columns in our schema.
139```Haskell
137```Haskell
140>>> :{
138>>> :{
141let
139let
142− setup :: Definition (Public '[]) Schemas
140+ setup :: Definition '[] Schema
143 setup =
141 setup =
144 createTable #users
142 createTable #users
145 ( serial `as` #id :*
143 ( serial `as` #id :*
@@ -171,7 +169,7 @@ primary and foreign keys, making them somewhat complex. Our `teardown`
171```Haskell
169```Haskell
172>>> :{
170>>> :{
173let
171let
174− teardown :: Definition Schemas (Public '[])
172+ teardown :: Definition Schema '[]
175 teardown = dropTable #emails >>> dropTable #users
173 teardown = dropTable #emails >>> dropTable #users
176:}
174:}
177
175
@@ -180,54 +178,54 @@ DROP TABLE "emails";
180DROP TABLE "users";
178DROP TABLE "users";
181```
179```
182
180
183−We'll need a Haskell type for `User`s. We give the type `SOP.Generic` and
184−`SOP.HasDatatypeInfo` instances so that we can encode and decode `User`s.
185−
186−```Haskell
187−>>> data User = User { userName :: Text, userEmail :: Maybe Text } deriving (Show, GHC.Generic)
188−>>> instance SOP.Generic User
189−>>> instance SOP.HasDatatypeInfo User
190−```
191−
192−Next, we'll write `Manipulation_`s to insert `User`s into our two tables.
181+Next, we'll write `Manipulation`s to insert data into our two tables.
193−A `Manipulation_` like `insertInto`, `update` or `deleteFrom`
182+A `Manipulation` like `insertRow`, `update` or `deleteFrom`
194−has three type parameters, the schemas it refers to, input parameters
183+has three type parameters, the schema it refers to, a list of parameters
195−and an output row. When
184+it can take as input, and a list of columns it produces as output. When
196we insert into the users table, we will need a parameter for the `name`
185we insert into the users table, we will need a parameter for the `name`
197field but not for the `id` field. Since it's serial, we can use a default
186field 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
187value. 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
188need to retrieve the user id that the insert generates and insert it into
200−the emails table. We can do this in a single `Manipulation_` by using a
189+the emails table. Take a careful look at the type and definition of both
201−`with` statement.
190+of our inserts.
202
191
203```Haskell
192```Haskell
204>>> :{
193>>> :{
205let
194let
206− insertUser :: Manipulation_ Schemas User ()
195+ insertUser :: Manipulation Schema '[ 'NotNull 'PGtext ] '[ "fromOnly" ::: 'NotNull 'PGint4 ]
207− insertUser = with (u `as` #u) e
196+ insertUser = insertRow #users
208− where
209− u = insertInto #users
210− (Values_ (Default `as` #id :* Set (param @1) `as` #name))
197+ (Default `as` #id :* Set (param @1) `as` #name)
211− OnConflictDoRaise (Returning_ (#id :* param @2 `as` #email))
198+ OnConflictDoNothing (Returning (#id `as` #fromOnly))
212− e = insertInto_ #emails $ Select
199+:}
200+
201+>>> :{
202+let
203+ insertEmail :: Manipulation Schema '[ 'NotNull 'PGint4, 'Null 'PGtext] '[]
204+ insertEmail = insertRow #emails
213− (Default `as` #id :* Set (#u ! #id) `as` #user_id :* Set (#u ! #email) `as` #email)
205+ ( Default `as` #id :*
214− (from (common #u))
206+ Set (param @1) `as` #user_id :*
207+ Set (param @2) `as` #email )
208+ OnConflictDoNothing (Returning Nil)
215:}
209:}
216
210
217>>> printSQL insertUser
211>>> printSQL insertUser
218−WITH "u" AS (INSERT INTO "users" ("id", "name") VALUES (DEFAULT, ($1 :: text)) RETURNING "id" AS "id", ($2 :: text) AS "email") INSERT INTO "emails" ("user_id", "email") SELECT "u"."id", "u"."email" FROM "u" AS "u"
212+INSERT INTO "users" ("id", "name") VALUES (DEFAULT, ($1 :: text)) ON CONFLICT DO NOTHING RETURNING "id" AS "fromOnly"
213+>>> printSQL insertEmail
214+INSERT INTO "emails" ("id", "user_id", "email") VALUES (DEFAULT, ($1 :: int4), ($2 :: text)) ON CONFLICT DO NOTHING
219```
215```
220
216
221−Next we write a `Query_` to retrieve users from the database. We're not
217+Next we write a `Query` to retrieve users from the database. We're not
222interested in the ids here, just the usernames and email addresses. We
218interested in the ids here, just the usernames and email addresses. We
223−need to use an `innerJoin` to get the right result. A `Query_` is like a
219+need to use an inner join to get the right result. A `Query` is like a
224−`Manipulation_` with the same kind of type parameters.
220+`Manipulation` with the same kind of type parameters.
225
221
226```Haskell
222```Haskell
227>>> :{
223>>> :{
228let
224let
229− getUsers :: Query_ Schemas () User
225+ getUsers :: Query Schema '[]
226+ '[ "userName" ::: 'NotNull 'PGtext
227+ , "userEmail" ::: 'Null 'PGtext ]
230− getUsers = select_
228+ getUsers = select
231 (#u ! #name `as` #userName :* #e ! #email `as` #userEmail)
229 (#u ! #name `as` #userName :* #e ! #email `as` #userEmail)
232 ( from (table (#users `as` #u)
230 ( from (table (#users `as` #u)
233 & innerJoin (table (#emails `as` #e))
231 & innerJoin (table (#emails `as` #e))
@@ -238,7 +236,19 @@ let
238SELECT "u"."name" AS "userName", "e"."email" AS "userEmail" FROM "users" AS "u" INNER JOIN "emails" AS "e" ON ("u"."id" = "e"."user_id")
236SELECT "u"."name" AS "userName", "e"."email" AS "userEmail" FROM "users" AS "u" INNER JOIN "emails" AS "e" ON ("u"."id" = "e"."user_id")
239```
237```
240
238
239+Now that we've defined the SQL side of things, we'll need a Haskell type
240+for users. We give the type `Generics.SOP.Generic` and
241+`Generics.SOP.HasDatatypeInfo` instances so that we can decode the rows
242+we receive when we run `getUsers`. Notice that the record fields of the
243+`User` type match the column names of `getUsers`.
244+
245+```Haskell
246+>>> data User = User { userName :: Text, userEmail :: Maybe Text } deriving (Show, GHC.Generic)
247+>>> instance SOP.Generic User
248+>>> instance SOP.HasDatatypeInfo User
249+```
250+
241−Let's create some users to add to the database.
251+Let's also create some users to add to the database.
242
252
243```Haskell
253```Haskell
244>>> :{
254>>> :{
@@ -263,18 +273,19 @@ transformer and when the schema doesn't change we can use `Monad` and
263```Haskell
273```Haskell
264>>> :{
274>>> :{
265let
275let
266− session :: PQ Schemas Schemas IO ()
276+ session :: PQ Schema Schema IO ()
267 session = do
277 session = do
268− _ <- traversePrepared_ insertUser users
278+ idResults <- traversePrepared insertUser (Only . userName <$> users)
279+ ids <- traverse (fmap fromOnly . getRow 0) idResults
280+ traversePrepared_ insertEmail (zip (ids :: [Int32]) (userEmail <$> users))
269 usersResult <- runQuery getUsers
281 usersResult <- runQuery getUsers
270 usersRows <- getRows usersResult
282 usersRows <- getRows usersResult
271 liftIO $ print (usersRows :: [User])
283 liftIO $ print (usersRows :: [User])
272in
284in
273− withConnection "host=localhost port=5432 dbname=exampledb" $
285+ void . withConnection "host=localhost port=5432 dbname=exampledb" $
274 define setup
286 define setup
275 & pqThen session
287 & pqThen session
276 & pqThen (define teardown)
288 & pqThen (define teardown)
277:}
289:}
278[User {userName = "Alice", userEmail = Just "alice@gmail.com"},User {userName = "Bob", userEmail = Nothing},User {userName = "Carole", userEmail = Just "carole@hotmail.com"}]
290[User {userName = "Alice", userEmail = Just "alice@gmail.com"},User {userName = "Bob", userEmail = Nothing},User {userName = "Carole", userEmail = Just "carole@hotmail.com"}]
279−-}
280```
291```
RELEASE NOTES.md−400
@@ -1,405 +1,5 @@
1## RELEASE NOTES
1## RELEASE NOTES
2
2
3−### Version 0.5
4−
5−Version 0.5 makes a number of large changes and additions to Squeal.
6−I want to thank folks who contributed issues and pull requests;
7−Raveline, rimmington, ilyakooo0, chshersh, reygoch, and more.
8−
9−**Multi-schema support**
10−
11−Previous versions of Squeal only supported definitions in the "public"
12−schema. Squeal 0.5 adds support for multiple schemas with the new kind
13−
14−```Haskell
15−type SchemasType = [(Symbol,SchemaType)]
16−```
17−
18−In order to upgrade your queries, manipulations and definitions from
19−Squeal 0.4, you will have to apply the `Public` type family, which indicates
20−that your only schema is the "public" schema.
21−
22−```Haskell
23−-- Squeal 0.4
24−setup :: Definition '[] Schema
25−
26−-- Squeal 0.5
27−setup :: Definition (Public '[]) (Public Schema)
28−```
29−
30−You can create non-public schemas using `createSchema` and inversely
31−remove them using `dropSchema`. There is also an idempotent
32−`createSchemaIfNotExists`.
33−
34−In order to handle aliases which may refer to non-public schemas, Squeal 0.5
35−introduces `QualifiedAlias`es. A `QualifiedAlias` can be referred to using
36−the `(!)` operator from the `IsQualified` typeclass; but if you want to refer
37−to an alias from the "public" schema, you can continue to use a single
38−overloaded label, no need to write `#public ! #tab`, just write `#tab`.
39−
40−**Top-level statements**
41−
42−As a consequence of multi-schema support, common table expressions that
43−a `Query` or `Manipulation` may refer to had to be broken into a new parameter.
44−Additionally, `Query` gained another new parameter for its outer scope which
45−will be discussed in the next section.
46−
47−To simplify type signatures that you have to write for top-level queries
48−and manipulations, Squeal 0.5 introduces the `Query_` and `Manipulation_`
49−type families.
50−
51−```
52−type family Query_
53− (schemas :: SchemasType)
54− (parameters :: Type)
55− (row :: Type) where
56− Query_ schemas params row =
57− Query '[] '[] schemas (TuplePG params) (RowPG row)
58−```
59−
60−As you see, a top-level `Query_` has no outer scope and no common
61−table expressions in scope, they are empty `'[]`. Moreover,
62−its parameters and row parameters are now `Type`s, which are
63−converted to corresponding Postgres types using the `TuplePG`
64−and `RowPG` type families. This means you can write the type signatures
65−for your top-level statements using the Haskell types that you
66−intend to input and retrieve when running the statements. Similar
67−to `Query_`, there is a `Manipulation_` type, the only difference
68−being that a general `Manipulation` doesn't have an outer scope,
69−only a scope for common table expressions.
70−
71−**Subquery expressions**
72−
73−Previous versions of Squeal offered subquery expression support
74−but there were issues. The common use case of using the `IN` operator
75−from SQL was overly complex. There was a proliferation of subquery
76−functions to handle different comparison operators, each with two versions
77−for comparing `ALL` or `ANY` of the query rows. And, most confoundedly,
78−there was no way to support the `EXISTS` subquery because the "outer scope"
79−for a query was not available.
80−
81−Squeal adds an outer scope to the `Query` type.
82−
83−```Haskell
84−newtype Query
85− (outer :: FromType)
86− (commons :: FromType)
87− (schemas :: SchemasType)
88− (params :: [NullityType])
89− (row :: RowType)
90− = UnsafeQuery { renderQuery :: ByteString }
91−```
92−
93−This enables a well-typed `exists` function.
94−
95−```Haskell
96−exists
97− :: Query (Join outer from) commons schemas params row
98− -> Condition outer commons grp schemas params from
99−```
100−
101−The `in_` and `notIn` functions were simplified to handle the most
102−common use case of comparing to a list of values.
103−
104−```Haskell
105−in_
106− :: Expression outer commons grp schemas params from ty -- ^ expression
107− -> [Expression outer commons grp schemas params from ty]
108− -> Condition outer commons grp schemas params from
109−```
110−
111−Finally, general subquery comparisons were abstracted to work with
112−any comparison operators, using the `Operator` type which will be discussed in
113−the next section.
114−
115−```Haskell
116−subAll
117− :: Expression outer commons grp schemas params from ty1
118− -> Operator ty1 ty2 ('Null 'PGbool)
119− -> Query (Join outer from) commons schemas params '[col ::: ty2]
120− -> Condition outer commons grp schemas params from
121−
122−subAny
123− :: Expression outer commons grp schemas params from ty1
124− -> Operator ty1 ty2 ('Null 'PGbool)
125− -> Query (Join outer from) commons schemas params '[col ::: ty2]
126− -> Condition outer commons grp schemas params from
127−```
128−
129−**Expression RankNTypes**
130−
131−Squeal 0.5 introduces RankNType type synonyms for common expression patterns.
132−The simplest example is the `Expr` type, a type for "closed" expressions
133−that cannot reference any aliases or parameters.
134−
135−```Haskell
136−type Expr x
137− = forall outer commons grp schemas params from
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
142−type `(->)`.
143−
144−```Haskell
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
149−```
150−
151−We saw in the subquery section that there is an `Operator` type.
152−
153−```Haskell
154−type Operator x1 x2 y
155− = forall outer commons grp schemas params from
156− . Expression outer commons grp schemas params from x1
157− -> Expression outer commons grp schemas params from x2
158− -> Expression outer commons grp schemas params from y
159−```
160−
161−There are also types `FunctionN` and `FunctionVar` for n-ary functions
162−and variadic functions.
163−
164−```
165−type FunctionN xs y
166− = forall outer commons grp schemas params from
167− . NP (Expression outer commons grp schemas params from) xs
168− -> Expression outer commons grp schemas params from y
169−```
170−
171−An n-ary function takes an `NP` list of `Expression`s as its argument.
172−Squeal 0.5 adds a helpful operator `(*:)`, to help scrap your `Nil`s.
173−You can construct an `NP` list now by using the operator `(:*)`,
174−until your last element, using `(*:)` there. For instance, the function
175−`atan2_` takes two arguments, `atan2_ (pi *: 2)`.
176−
177−**Selections**
178−
179−Previously, Squeal provided a couple versions of `SELECT` depending
180−on whether you wanted to select all columns of a unique table
181−in the from clause, i.e. `*`, all columns of a particular table
182−in the from clause, i.e. `.*`, or a list of columns from the from clause.
183−
184−Squeal 0.5 refactors this pattern into a `Selection` GADT type, allowing
185−for abstraction and combinations that were not possible before.
186−
187−```Haskell
188−data Selection outer commons grp schemas params from row where
189− Star
190− :: HasUnique tab from row
191− => Selection outer commons 'Ungrouped schemas params from row
192− DotStar
193− :: Has tab from row
194− => Alias tab
195− -> Selection outer commons 'Ungrouped schemas params from row
196− List
197− :: SListI row
198− => NP (Aliased (Expression outer commons grp schemas params from)) row
199− -> Selection outer commons grp schemas params from row
200− Over
201− :: SListI row
202− => NP (Aliased (WindowFunction outer commons grp schemas params from)) row
203− -> WindowDefinition outer commons grp schemas params from
204− -> Selection outer commons grp schemas params from row
205− Also
206− :: Selection outer commons grp schemas params from right
207− -> Selection outer commons grp schemas params from left
208− -> Selection outer commons grp schemas params from (Join left right)
209−```
210−
211−In addition to the `Star`, `DotStar` and `List` constructors, there is an
212−`Also` constructor combinator, which enables users to combine `Selection`s.
213−Additionally, there is an `Over` constructor that is used to enable
214−window functions, described in the next section.
215−
216−To upgrade from Squeal 0.4, you will replace `selectStar` with `select Star`,
217−replace `selectDotStar #tab` with `select (DotStar #tab)`. The `List`
218−selection is such a common use case that there is a function `select_` which
219−automatically applies it, so to upgrade from Squeal 0.4, replace `select`
220−with `select_`. There are also independent `selectDistinct` and `selectDistinct_`
221−functions to filter out duplicate rows.
222−
223−**Query clauses**
224−
225−Previously, Squeal provided a couple versions of `INSERT` depending
226−on whether you wanted to insert `VALUES` or a query.
227−
228−Squeal 0.5 refactors this pattern into a `QueryClause` GADT.
229−
230−```
231−-- Squeal 0.4
232−insertRow_ #tab (Set 2 `as` #col1 :* Default `as` #col2)
233−insertQuery_ #tab (selectStar (from (table #other_tab)))
234−
235−-- Squeal 0.5
236−insertInto_ #tab (Values_ (Set 2 `as` #col1 :* Default `as` #col2))
237−insertInto_ #tab (Subquery (select Star (from (table #other_tab))))
238−```
239−
240−**Window functions and aggregation**
241−
242−Previous versions of Squeal provided no support for window functions.
243−Squeal 0.5 adds support for window functions. We saw `Over` in the
244−previous section.
245−
246−```Haskell
247−Over
248− :: SListI row
249− => NP (Aliased (WindowFunction outer commons grp schemas params from)) row
250− -> WindowDefinition outer commons grp schemas params from
251− -> Selection outer commons grp schemas params from row
252−```
253−
254−`Over` combines window functions with window definitions. A `WindowDefinition`
255−is constructed using the `partitionBy` function, optionally with an `orderBy`
256−clause. For example,
257−
258−```Haskell
259−query :: Query_ (Public Schema) () (Row Int32 Int32)
260−query = select
261− (#col1 & Also (rank `as` #col2 `Over` (partitionBy #col1 & orderBy [#col2 & Asc])))
262− (from (table #tab))
263−```
264−
265−Here the `rank` function is a `WindowFunction`
266−
267−```Haskell
268−rank :: WinFun0 ('NotNull 'PGint8)
269−rank = UnsafeWindowFunction "rank()"
270−```
271−
272−`WinFun0` is a RankNType, like `Expr` was, used for no argument window functions.
273−Similarly, there are also `WinFun1` and `WinFunN` types for
274−window functions and n-ary window functions.
275−
276−In order to use the same syntax for certain window functions and aggregate functions,
277−a new typeclass `Aggregate` was introduced. So for instance, `sum_` can be
278−either a `Distinction` `Expression` or a `WindowFunction`, used either with
279−a `groupBy` or with a `partitionBy` in the appropriate way.
280−
281−```
282−data Distinction (expr :: kind -> Type) (ty :: kind)
283− = All (expr ty)
284− | Distinct (expr ty)
285−```
286−
287−Aggregate functions can be run over all rows or only over distinct rows,
288−while window functions bear no such distinction.
289−
290−**Migrations**
291−
292−Thanks to [https://github.com/Raveline](Raveline) Squeal 0.5 introduces
293−a function `defaultMain` to easily create a command line program to
294−run or rewind your migrations.
295−
296−Previously, Squeal's migrations were impure, allowing in addition to
297−running `Definition`s to run arbitrary `IO` operations, such as inserting
298−data into the database or printing out status messages. In order to
299−provide compatibility with other migration systems, Squeal 0.5 introduces
300−pure migrations, that is migrations that are only `Definition`s.
301−
302−```Haskell
303−data Migration p schemas0 schemas1 = Migration
304− { name :: Text -- ^ The `name` of a `Migration`.
305− -- Each `name` in a `Migration` should be unique.
306− , up :: p schemas0 schemas1 -- ^ The `up` instruction of a `Migration`.
307− , down :: p schemas1 schemas0 -- ^ The `down` instruction of a `Migration`.
308− } deriving (GHC.Generic)
309−```
310−
311−A pure migration is a `Migration Definition`, a pair of inverse
312−`Definition`s with a unique name. To recover impure migrations, Squeal 0.5
313−introduces the `Terminally` type.
314−
315−```Haskell
316−newtype Terminally trans monad x0 x1 = Terminally
317− { runTerminally :: trans x0 x1 monad () }
318−```
319−
320−`Terminally` applies the indexed monad transformer and the monad it transforms
321−to the unit type `()`, thereby turning an indexed monad into a `Category`. An
322−impure migration is a `Migration (Terminally PQ IO)`. You can always cast
323−a pure migration into an impure migration with the functor, `pureMigration`.
324−
325−```Haskell
326−pureMigration
327− :: Migration Definition schemas0 schemas1
328− -> Migration (Terminally PQ IO) schemas0 schemas1
329−```
330−
331−To run either pure or impure migrations, Squeal 0.5 introduces
332−a typeclass, `Migratory`.
333−
334−```
335−class Category p => Migratory p where
336−
337− migrateUp
338− :: AlignedList (Migration p) schemas0 schemas1
339− -> PQ schemas0 schemas1 IO ()
340−
341− migrateDown
342− :: AlignedList (Migration p) schemas0 schemas1
343− -> PQ schemas1 schemas0 IO ()
344−```
345−
346−The signatures of `migrateUp` and `migrateDown` have been changed
347−to make them easier to compose with other `PQ` actions.
348−
349−**Transactions**
350−
351−You can now run transactions `ephemerally`, guaranteed to roll back,
352−but return the result or throw the exception that the transaction
353−would have generated. This is useful for testing. You can also
354−`transactionallyRetry` computations, retrying the transaction if
355−a [serialization failure](https://www.postgresql.org/docs/11/transaction-iso.html#XACT-REPEATABLE-READ) occurs.
356−
357−**Types**
358−
359−Squeal now supports money via a `Money` Haskell `Type` and a `'PGmoney`
360−`PGType`. Squeal 0.5 also adds support for creating domain types
361−with `createDomain`.
362−
363−**Time**
364−
365−Squeal 0.5 adds support for new functions; `now`, `makeDate`, `makeTime`,
366−, `makeTimestamp`, and `makeTimestamptz`, a function `interval_` for
367−constructing time intervals out multiples of `TimeUnit`s, and a new
368−`TimeOp` class, defining affine space operators for time types and their
369−differences.
370−
371−**Literals**
372−
373−Squeal allows you to include Haskell values in your statements using
374−out of line `parameter`s, but often you want to include them inline,
375−as a SQL `literal`. Squeal 0.5 enables this using the `Literal` class.
376−
377−**Set returning functions**
378−
379−Squeal 0.5 adds support for set returning functions such as `unnest`,
380−with the `RankNType` `SetOfFunction`, which can be used as as a `FromClause`.
381−
382−**Text search**
383−
384−Squeal 0.5 adds extensive support for text search types, functions and operators.
385−
386−**Much more**
387−
388−Lots more changes went into and under the hood of the new version.
389−The `Expression` module was split into coherent submodules since it
390−had grown to immense proportions. New modules `Alias`, `PG` and `List`
391−were added to relieve some of the burden that the `Schema` module
392−had been carrying. Rendering has been better unified with a new
393−`RenderSQL` typeclass. Type level list concatenation with the `Additional`
394−typeclass has been added. `Manipulation`s `update` and `delete`
395−were upgraded, so you can leave out fields you don't want to update and
396−use `USING` clauses in deletes. Upserts which were previously broken
397−now work. The `IO` typeclass hierarchy was changed from `MonadBase`
398−and `MonadBaseControl` to `MonadIO` and `MonadUnliftIO`. A new
399−`withRecursive` `Manipulation` was added. `SquealException`s were
400−refactored and a `trySqueal` function added. Arrays were refactored.
401−And there was probably more I've forgotten.
402−
403### Version 0.4
3### Version 0.4
404
4
405Version 0.4 strengthens Squeal's type system, adds
5Version 0.4 strengthens Squeal's type system, adds
squeal-postgresql/exe/Example.hs+7−9
@@ -11,6 +11,7 @@
11
11
12module Main (main, main2) where
12module Main (main, main2) where
13
13
14+import Control.Monad (void)
14import Control.Monad.IO.Class (MonadIO (..))
15import Control.Monad.IO.Class (MonadIO (..))
15import Data.Int (Int16, Int32)
16import Data.Int (Int16, Int32)
16import Data.Monoid ((<>))
17import Data.Monoid ((<>))
@@ -38,7 +39,6 @@ type Schema =
38 , "user_id" ::: 'NoDef :=> 'NotNull 'PGint4
39 , "user_id" ::: 'NoDef :=> 'NotNull 'PGint4
39 , "email" ::: 'NoDef :=> 'Null 'PGtext
40 , "email" ::: 'NoDef :=> 'Null 'PGtext
40 ])
41 ])
41− , "positive" ::: 'Typedef 'PGfloat4
42 ]
42 ]
43
43
44type Schemas = Public Schema
44type Schemas = Public Schema
@@ -53,25 +53,23 @@ setup =
53 >>>
53 >>>
54 createTable #emails
54 createTable #emails
55 ( serial `as` #id :*
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 :*
58 ( primaryKey #id `as` #pk_emails :*
59 foreignKey #user_id #users #id
59 foreignKey #user_id #users #id
60 OnDeleteCascade OnUpdateCascade `as` #fk_user_id )
60 OnDeleteCascade OnUpdateCascade `as` #fk_user_id )
61− >>>
62− createDomain #positive real (#value .> 0 .&& (#value & isNotNull))
63
61
64teardown :: Definition Schemas (Public '[])
62teardown :: Definition Schemas (Public '[])
65−teardown = dropType #positive >>> dropTable #emails >>> dropTable #users
63+teardown = dropTable #emails >>> dropTable #users
66
64
67insertUser :: Manipulation_ Schemas (Text, VarArray (Vector (Maybe Int16))) (Only Int32)
65insertUser :: Manipulation_ Schemas (Text, VarArray (Vector (Maybe Int16))) (Only Int32)
68insertUser = insertInto #users
66insertUser = insertInto #users
69− (Values_ (Default `as` #id :* Set (param @1) `as` #name :* Set (param @2) `as` #vec))
67+ (Values_ (defaultAs #id :* param @1 `as` #name :* param @2 `as` #vec))
70 (OnConflict (OnConstraint #pk_users) DoNothing) (Returning_ (#id `as` #fromOnly))
68 (OnConflict (OnConstraint #pk_users) DoNothing) (Returning_ (#id `as` #fromOnly))
71
69
72insertEmail :: Manipulation_ Schemas (Int32, Maybe Text) ()
70insertEmail :: Manipulation_ Schemas (Int32, Maybe Text) ()
73insertEmail = insertInto_ #emails
71insertEmail = insertInto_ #emails
74− (Values_ (Default `as` #id :* Set (param @1) `as` #user_id :* Set (param @2) `as` #email))
72+ (Values_ (defaultAs #id :* param @1 `as` #user_id :* param @2 `as` #email))
75
73
76getUsers :: Query_ Schemas () User
74getUsers :: Query_ Schemas () User
77getUsers = select_
75getUsers = select_
@@ -119,7 +117,7 @@ main = do
119
117
120main2 :: IO ()
118main2 :: IO ()
121main2 =
119main2 =
122− withConnection "host=localhost port=5432 dbname=exampledb" $
120+ void . withConnection "host=localhost port=5432 dbname=exampledb" $
123 define setup
121 define setup
124 & pqThen session
122 & pqThen session
125 & pqThen (define teardown)
123 & pqThen (define teardown)
squeal-postgresql/squeal-postgresql.cabal+13−38
@@ -1,5 +1,5 @@
1name: squeal-postgresql
1name: squeal-postgresql
2−version: 0.5.1.0
2+version: 0.4.9.0
3synopsis: Squeal PostgreSQL Library
3synopsis: Squeal PostgreSQL Library
4description: Squeal is a type-safe embedding of PostgreSQL in Haskell
4description: Squeal is a type-safe embedding of PostgreSQL in Haskell
5homepage: https://github.com/morphismtech/squeal
5homepage: https://github.com/morphismtech/squeal
@@ -25,13 +25,6 @@ library
25 Squeal.PostgreSQL.Alias
25 Squeal.PostgreSQL.Alias
26 Squeal.PostgreSQL.Binary
26 Squeal.PostgreSQL.Binary
27 Squeal.PostgreSQL.Definition
27 Squeal.PostgreSQL.Definition
28− Squeal.PostgreSQL.Definition.Function
29− Squeal.PostgreSQL.Definition.Index
30− Squeal.PostgreSQL.Definition.Table
31− Squeal.PostgreSQL.Definition.Table.Constraint
32− Squeal.PostgreSQL.Definition.Type
33− Squeal.PostgreSQL.Definition.Schema
34− Squeal.PostgreSQL.Definition.View
35 Squeal.PostgreSQL.Expression
28 Squeal.PostgreSQL.Expression
36 Squeal.PostgreSQL.Expression.Aggregate
29 Squeal.PostgreSQL.Expression.Aggregate
37 Squeal.PostgreSQL.Expression.Collection
30 Squeal.PostgreSQL.Expression.Collection
@@ -42,8 +35,7 @@ library
42 Squeal.PostgreSQL.Expression.Math
35 Squeal.PostgreSQL.Expression.Math
43 Squeal.PostgreSQL.Expression.Null
36 Squeal.PostgreSQL.Expression.Null
44 Squeal.PostgreSQL.Expression.Parameter
37 Squeal.PostgreSQL.Expression.Parameter
45− Squeal.PostgreSQL.Expression.Range
38+ Squeal.PostgreSQL.Expression.SetOf
46− Squeal.PostgreSQL.Expression.Set
47 Squeal.PostgreSQL.Expression.Sort
39 Squeal.PostgreSQL.Expression.Sort
48 Squeal.PostgreSQL.Expression.Subquery
40 Squeal.PostgreSQL.Expression.Subquery
49 Squeal.PostgreSQL.Expression.Text
41 Squeal.PostgreSQL.Expression.Text
@@ -62,7 +54,7 @@ library
62 Squeal.PostgreSQL.Schema
54 Squeal.PostgreSQL.Schema
63 Squeal.PostgreSQL.Transaction
55 Squeal.PostgreSQL.Transaction
64 default-language: Haskell2010
56 default-language: Haskell2010
65− ghc-options: -Wall
57+ ghc-options: -Wall -Werror
66 build-depends:
58 build-depends:
67 aeson >= 1.2.4.0
59 aeson >= 1.2.4.0
68 , base >= 4.11.1.0 && < 5.0
60 , base >= 4.11.1.0 && < 5.0
@@ -70,8 +62,7 @@ library
70 , bytestring >= 0.10.8.2
62 , bytestring >= 0.10.8.2
71 , bytestring-strict-builder >= 0.4.5
63 , bytestring-strict-builder >= 0.4.5
72 , deepseq >= 1.4.3.0
64 , deepseq >= 1.4.3.0
73− , free-categories >= 0.1.0.0
74− , generics-sop >= 0.3.2.0 && < 0.5.0.0
65+ , generics-sop >= 0.3.2.0
75 , mmorph >= 1.1.1
66 , mmorph >= 1.1.1
76 , mtl >= 2.2.2
67 , mtl >= 2.2.2
77 , network-ip >= 0.3.0.2
68 , network-ip >= 0.3.0.2
@@ -88,50 +79,34 @@ library
88 , uuid-types >= 1.0.3
79 , uuid-types >= 1.0.3
89 , vector >= 0.12.0.1
80 , vector >= 0.12.0.1
90
81
91−test-suite doctest
82+test-suite squeal-postgresql-doctest
92 default-language: Haskell2010
83 default-language: Haskell2010
93 type: exitcode-stdio-1.0
84 type: exitcode-stdio-1.0
94 hs-source-dirs: test
85 hs-source-dirs: test
95 ghc-options: -Wall
86 ghc-options: -Wall
96− main-is: Doc.hs
87+ main-is: DocTest.hs
97 build-depends:
88 build-depends:
98 base >= 4.10.0.0
89 base >= 4.10.0.0
99 , doctest >= 0.11.4
90 , doctest >= 0.11.4
100− , squeal-postgresql
101−
102−test-suite properties
103− default-language: Haskell2010
104− type: exitcode-stdio-1.0
105− hs-source-dirs: test
106− ghc-options: -Wall
107− main-is: Property.hs
108− build-depends:
109− base >= 4.10.0.0
110− , bytestring >= 0.10.8.2
111− , hedgehog >= 1.0
112− , mtl >= 2.2.2
113− , scientific >= 0.3.5.3
114− , squeal-postgresql
115− , time >= 1.8.0.2
116
91
117−test-suite spec
92+test-suite squeal-postgresql-specs
118 default-language: Haskell2010
93 default-language: Haskell2010
119 type: exitcode-stdio-1.0
94 type: exitcode-stdio-1.0
120− hs-source-dirs: test
95+ hs-source-dirs: test/Specs
121− ghc-options: -Wall
96+ ghc-options: -Wall -main-is Specs
122− main-is: Spec.hs
97+ main-is: Specs.hs
98+ other-modules: ExceptionHandling
123 build-depends:
99 build-depends:
124 base >= 4.10.0.0
100 base >= 4.10.0.0
125− , async >= 2.2.2
126 , bytestring >= 0.10.8.2
101 , bytestring >= 0.10.8.2
127 , generics-sop >= 0.3.1.0
102 , generics-sop >= 0.3.1.0
128 , hspec >= 2.4.8
103 , hspec >= 2.4.8
129− , mtl >= 2.2.2
130 , squeal-postgresql
104 , squeal-postgresql
131 , text >= 1.2.2.2
105 , text >= 1.2.2.2
106+ , transformers >= 0.5.2.0
132 , vector >= 0.12.0.1
107 , vector >= 0.12.0.1
133
108
134−executable example
109+executable squeal-postgresql-example
135 default-language: Haskell2010
110 default-language: Haskell2010
136 hs-source-dirs: exe
111 hs-source-dirs: exe
137 ghc-options: -Wall
112 ghc-options: -Wall
squeal-postgresql/src/Squeal/PostgreSQL.hs+84−63
@@ -11,15 +11,17 @@ Let's see an example!
11First, we need some language extensions because Squeal uses modern GHC
11First, we need some language extensions because Squeal uses modern GHC
12features.
12features.
13
13
14−>>> :set -XDataKinds -XDeriveGeneric -XOverloadedLabels -XFlexibleContexts
14+>>> :set -XDataKinds -XDeriveGeneric -XOverloadedLabels
15>>> :set -XOverloadedStrings -XTypeApplications -XTypeOperators -XGADTs
15>>> :set -XOverloadedStrings -XTypeApplications -XTypeOperators -XGADTs
16
16
17We'll need some imports.
17We'll need some imports.
18
18
19+>>> import Control.Monad (void)
19>>> import Control.Monad.IO.Class (liftIO)
20>>> import Control.Monad.IO.Class (liftIO)
20>>> import Data.Int (Int32)
21>>> import Data.Int (Int32)
21>>> import Data.Text (Text)
22>>> import Data.Text (Text)
22>>> import Squeal.PostgreSQL
23>>> import Squeal.PostgreSQL
24+>>> import Squeal.PostgreSQL.Render
23
25
24We'll use generics to easily convert between Haskell and PostgreSQL values.
26We'll use generics to easily convert between Haskell and PostgreSQL values.
25
27
@@ -102,23 +104,25 @@ let
102DROP TABLE "emails";
104DROP TABLE "emails";
103DROP TABLE "users";
105DROP TABLE "users";
104
106
105−We'll need a Haskell type for @User@s. We give the type `Generics.SOP.Generic` and
106−`Generics.SOP.HasDatatypeInfo` instances so that we can encode and decode @User@s.
107−
108−>>> data User = User { userName :: Text, userEmail :: Maybe Text } deriving (Show, GHC.Generic)
109−>>> instance SOP.Generic User
110−>>> instance SOP.HasDatatypeInfo User
111−
112−Next, we'll write `Manipulation_`s to insert @User@s into our two tables.
107+Next, we'll write `Manipulation`s to insert data into our two tables.
113−A `Manipulation_` like `insertInto`, `update` or `deleteFrom`
108+A `Manipulation` like `insertInto`, `update` or `deleteFrom`
114−has three type parameters, the schemas it refers to, input parameters
109+has three type parameters, the schema it refers to, a list of parameters
115−and an output row. When
110+it can take as input, and a list of columns it produces as output. When
116we insert into the users table, we will need a parameter for the @name@
111we insert into the users table, we will need a parameter for the @name@
117field but not for the @id@ field. Since it's serial, we can use a default
112field but not for the @id@ field. Since it's serial, we can use a default
118value. However, since the emails table refers to the users table, we will
113value. However, since the emails table refers to the users table, we will
119need to retrieve the user id that the insert generates and insert it into
114need to retrieve the user id that the insert generates and insert it into
120−the emails table. We can do this in a single `Manipulation_` by using a
115+the emails table. Take a careful look at the type and definition of both
121−`with` statement.
116+of our inserts.
117+
118+We'll need a Haskell type for users. We give the type `Generics.SOP.Generic` and
119+`Generics.SOP.HasDatatypeInfo` instances so that we can decode the rows
120+we receive when we run @getUsers@. Notice that the record fields of the
121+@User@ type match the column names of @getUsers@.
122+
123+>>> data User = User { userName :: Text, userEmail :: Maybe Text } deriving (Show, GHC.Generic)
124+>>> instance SOP.Generic User
125+>>> instance SOP.HasDatatypeInfo User
122
126
123>>> :{
127>>> :{
124let
128let
@@ -126,20 +130,19 @@ let
126 insertUser = with (u `as` #u) e
130 insertUser = with (u `as` #u) e
127 where
131 where
128 u = insertInto #users
132 u = insertInto #users
129− (Values_ (Default `as` #id :* Set (param @1) `as` #name))
133+ (Values_ (defaultAs #id :* param @1 `as` #name))
130 OnConflictDoRaise (Returning_ (#id :* param @2 `as` #email))
134 OnConflictDoRaise (Returning_ (#id :* param @2 `as` #email))
131− e = insertInto_ #emails $ Select
135+ e = insertInto_ #emails
132− (Default `as` #id :* Set (#u ! #id) `as` #user_id :* Set (#u ! #email) `as` #email)
136+ (Select (defaultAs #id :* #u ! #id `as` #user_id :* #u ! #email) (from (common #u)))
133− (from (common #u))
134:}
137:}
135
138
136>>> printSQL insertUser
139>>> printSQL insertUser
137WITH "u" AS (INSERT INTO "users" ("id", "name") VALUES (DEFAULT, ($1 :: text)) RETURNING "id" AS "id", ($2 :: text) AS "email") INSERT INTO "emails" ("user_id", "email") SELECT "u"."id", "u"."email" FROM "u" AS "u"
140WITH "u" AS (INSERT INTO "users" ("id", "name") VALUES (DEFAULT, ($1 :: text)) RETURNING "id" AS "id", ($2 :: text) AS "email") INSERT INTO "emails" ("user_id", "email") SELECT "u"."id", "u"."email" FROM "u" AS "u"
138
141
139−Next we write a `Query_` to retrieve users from the database. We're not
142+Next we write a `Query` to retrieve users from the database. We're not
140interested in the ids here, just the usernames and email addresses. We
143interested in the ids here, just the usernames and email addresses. We
141−need to use an `innerJoin` to get the right result. A `Query_` is like a
144+need to use an inner join to get the right result. A `Query` is like a
142−`Manipulation_` with the same kind of type parameters.
145+`Manipulation` with the same kind of type parameters.
143
146
144>>> :{
147>>> :{
145let
148let
@@ -183,51 +186,69 @@ let
183 usersRows <- getRows usersResult
186 usersRows <- getRows usersResult
184 liftIO $ print (usersRows :: [User])
187 liftIO $ print (usersRows :: [User])
185in
188in
186− withConnection "host=localhost port=5432 dbname=exampledb" $
189+ void . withConnection "host=localhost port=5432 dbname=exampledb" $
187 define setup
190 define setup
188 & pqThen session
191 & pqThen session
189 & pqThen (define teardown)
192 & pqThen (define teardown)
190:}
193:}
191[User {userName = "Alice", userEmail = Just "alice@gmail.com"},User {userName = "Bob", userEmail = Nothing},User {userName = "Carole", userEmail = Just "carole@hotmail.com"}]
194[User {userName = "Alice", userEmail = Just "alice@gmail.com"},User {userName = "Bob", userEmail = Nothing},User {userName = "Carole", userEmail = Just "carole@hotmail.com"}]
192-}
195-}
193−module Squeal.PostgreSQL (module X, RenderSQL(..), printSQL) where
196+module Squeal.PostgreSQL
194−
197+ ( module Squeal.PostgreSQL.Alias
198+ , module Squeal.PostgreSQL.Binary
199+ , module Squeal.PostgreSQL.Definition
200+ , module Squeal.PostgreSQL.Expression
201+ , module Squeal.PostgreSQL.Expression.Aggregate
202+ , module Squeal.PostgreSQL.Expression.Collection
203+ , module Squeal.PostgreSQL.Expression.Comparison
204+ , module Squeal.PostgreSQL.Expression.Json
205+ , module Squeal.PostgreSQL.Expression.Literal
206+ , module Squeal.PostgreSQL.Expression.Logic
207+ , module Squeal.PostgreSQL.Expression.Math
208+ , module Squeal.PostgreSQL.Expression.Null
209+ , module Squeal.PostgreSQL.Expression.Parameter
210+ , module Squeal.PostgreSQL.Expression.SetOf
211+ , module Squeal.PostgreSQL.Expression.Sort
212+ , module Squeal.PostgreSQL.Expression.Subquery
213+ , module Squeal.PostgreSQL.Expression.Text
214+ , module Squeal.PostgreSQL.Expression.TextSearch
215+ , module Squeal.PostgreSQL.Expression.Time
216+ , module Squeal.PostgreSQL.Expression.Type
217+ , module Squeal.PostgreSQL.Expression.Window
218+ , module Squeal.PostgreSQL.List
219+ , module Squeal.PostgreSQL.Manipulation
220+ , module Squeal.PostgreSQL.PG
221+ , module Squeal.PostgreSQL.PQ
222+ , module Squeal.PostgreSQL.Query
223+ , module Squeal.PostgreSQL.Schema
224+ , module Squeal.PostgreSQL.Transaction
225+ ) where
226+
195−import Squeal.PostgreSQL.Alias as X
227+import Squeal.PostgreSQL.Alias
196−import Squeal.PostgreSQL.Binary as X
228+import Squeal.PostgreSQL.Binary
197−import Squeal.PostgreSQL.Definition as X
198−import Squeal.PostgreSQL.Definition.Function as X
199−import Squeal.PostgreSQL.Definition.Index as X
200−import Squeal.PostgreSQL.Definition.Schema as X
201−import Squeal.PostgreSQL.Definition.Table as X
202−import Squeal.PostgreSQL.Definition.Table.Constraint as X
203−import Squeal.PostgreSQL.Definition.Type as X
204−import Squeal.PostgreSQL.Definition.View as X
229+import Squeal.PostgreSQL.Definition
205−import Squeal.PostgreSQL.Expression as X
230+import Squeal.PostgreSQL.Expression
206−import Squeal.PostgreSQL.Expression.Aggregate as X
231+import Squeal.PostgreSQL.Expression.Aggregate
207−import Squeal.PostgreSQL.Expression.Collection as X
232+import Squeal.PostgreSQL.Expression.Collection
208−import Squeal.PostgreSQL.Expression.Comparison as X
233+import Squeal.PostgreSQL.Expression.Comparison
209−import Squeal.PostgreSQL.Expression.Json as X
234+import Squeal.PostgreSQL.Expression.Json
210−import Squeal.PostgreSQL.Expression.Literal as X
235+import Squeal.PostgreSQL.Expression.Literal
211−import Squeal.PostgreSQL.Expression.Logic as X
236+import Squeal.PostgreSQL.Expression.Logic
212−import Squeal.PostgreSQL.Expression.Math as X
237+import Squeal.PostgreSQL.Expression.Math
213−import Squeal.PostgreSQL.Expression.Null as X
238+import Squeal.PostgreSQL.Expression.Null
214−import Squeal.PostgreSQL.Expression.Parameter as X
239+import Squeal.PostgreSQL.Expression.Parameter
215−import Squeal.PostgreSQL.Expression.Range as X
240+import Squeal.PostgreSQL.Expression.SetOf
216−import Squeal.PostgreSQL.Expression.Set as X
217−import Squeal.PostgreSQL.Expression.Sort as X
241+import Squeal.PostgreSQL.Expression.Sort
218−import Squeal.PostgreSQL.Expression.Subquery as X
242+import Squeal.PostgreSQL.Expression.Subquery
219−import Squeal.PostgreSQL.Expression.Text as X
243+import Squeal.PostgreSQL.Expression.Text
220−import Squeal.PostgreSQL.Expression.TextSearch as X
244+import Squeal.PostgreSQL.Expression.TextSearch
221−import Squeal.PostgreSQL.Expression.Time as X
245+import Squeal.PostgreSQL.Expression.Time
222−import Squeal.PostgreSQL.Expression.Type as X
246+import Squeal.PostgreSQL.Expression.Type
223−import Squeal.PostgreSQL.Expression.Window as X
247+import Squeal.PostgreSQL.Expression.Window
224−import Squeal.PostgreSQL.List as X
248+import Squeal.PostgreSQL.List
225−import Squeal.PostgreSQL.Manipulation as X
249+import Squeal.PostgreSQL.Manipulation
226−import Squeal.PostgreSQL.Migration as X
250+import Squeal.PostgreSQL.PG
227−import Squeal.PostgreSQL.PG as X
228−import Squeal.PostgreSQL.Pool as X
251+import Squeal.PostgreSQL.PQ
229−import Squeal.PostgreSQL.PQ as X
230−import Squeal.PostgreSQL.Query as X
252+import Squeal.PostgreSQL.Query
231−import Squeal.PostgreSQL.Render (RenderSQL(..), printSQL)
253+import Squeal.PostgreSQL.Schema
232−import Squeal.PostgreSQL.Schema as X
233−import Squeal.PostgreSQL.Transaction as X
254+import Squeal.PostgreSQL.Transaction
squeal-postgresql/src/Squeal/PostgreSQL/Alias.hs+9
@@ -46,6 +46,7 @@ module Squeal.PostgreSQL.Alias
46 , HasIn
46 , HasIn
47 , QualifiedAlias (..)
47 , QualifiedAlias (..)
48 , IsQualified (..)
48 , IsQualified (..)
49+ , DefaultAliasable (..)
49 -- * Grouping
50 -- * Grouping
50 , Grouping (..)
51 , Grouping (..)
51 , GroupedBy
52 , GroupedBy
@@ -188,6 +189,14 @@ choose which subfields to update.
188class HasIn fields field where
189class HasIn fields field where
189instance (Has alias fields field) => HasIn fields (alias ::: field) where
190instance (Has alias fields field) => HasIn fields (alias ::: field) where
190
191
192+{- |
193+The `DefaultAliasable` class is intended to help with Scrap your Nils
194+for default inserts and updates.
195+-}
196+class KnownSymbol alias
197+ => DefaultAliasable alias aliased | aliased -> alias where
198+ defaultAs :: Alias alias -> aliased
199+
191-- | `HasAll` extends `Has` to take lists of @aliases@ and @fields@ and infer
200-- | `HasAll` extends `Has` to take lists of @aliases@ and @fields@ and infer
192-- a list of @subfields@.
201-- a list of @subfields@.
193class
202class
squeal-postgresql/src/Squeal/PostgreSQL/Binary.hs+67−193
@@ -39,7 +39,7 @@ the input and output should be equal.
39
39
40>>> let input = Row 2 "hi" (Just True)
40>>> let input = Row 2 "hi" (Just True)
41>>> :{
41>>> :{
42−withConnection "host=localhost port=5432 dbname=exampledb" $ do
42+void . withConnection "host=localhost port=5432 dbname=exampledb" $ do
43 result <- runQueryParams roundTrip input
43 result <- runQueryParams roundTrip input
44 Just output <- firstRow result
44 Just output <- firstRow result
45 liftIO . print $ input == output
45 liftIO . print $ input == output
@@ -78,7 +78,7 @@ let
78>>> :set -XOverloadedLists
78>>> :set -XOverloadedLists
79>>> let input = Row (VarArray [1,2]) (FixArray (Just 1,Nothing)) (FixArray ((1,2),(3,4),(5,6)))
79>>> let input = Row (VarArray [1,2]) (FixArray (Just 1,Nothing)) (FixArray ((1,2),(3,4),(5,6)))
80>>> :{
80>>> :{
81−withConnection "host=localhost port=5432 dbname=exampledb" $ do
81+void . withConnection "host=localhost port=5432 dbname=exampledb" $ do
82 result <- runQueryParams roundTrip input
82 result <- runQueryParams roundTrip input
83 Just output <- firstRow result
83 Just output <- firstRow result
84 liftIO . print $ input == output
84 liftIO . print $ input == output
@@ -170,7 +170,7 @@ let
170 Just output <- firstRow result
170 Just output <- firstRow result
171 liftIO . print $ input == output
171 liftIO . print $ input == output
172in
172in
173− withConnection "host=localhost port=5432 dbname=exampledb" $
173+ void . withConnection "host=localhost port=5432 dbname=exampledb" $
174 define setup
174 define setup
175 & pqThen session
175 & pqThen session
176 & pqThen (define teardown)
176 & pqThen (define teardown)
@@ -215,10 +215,6 @@ module Squeal.PostgreSQL.Binary
215 , FromFixArray (..)
215 , FromFixArray (..)
216 -- * Only
216 -- * Only
217 , Only (..)
217 , Only (..)
218− -- * Oid
219− , OidOf (..)
220− , OidOfParam (..)
221− , OidOfField (..)
222 ) where
218 ) where
223
219
224import BinaryParser
220import BinaryParser
@@ -232,7 +228,6 @@ import Data.Time
232import Data.UUID.Types
228import Data.UUID.Types
233import Data.Vector (Vector)
229import Data.Vector (Vector)
234import Data.Word
230import Data.Word
235−import Foreign.C.Types (CUInt(CUInt))
236import Generics.SOP
231import Generics.SOP
237import Generics.SOP.Record
232import Generics.SOP.Record
238import GHC.TypeLits
233import GHC.TypeLits
@@ -246,7 +241,6 @@ import qualified Data.Text.Lazy as Lazy (Text)
246import qualified Data.Text as Strict (Text)
241import qualified Data.Text as Strict (Text)
247import qualified Data.Text as Strict.Text
242import qualified Data.Text as Strict.Text
248import qualified Data.Vector as Vector
243import qualified Data.Vector as Vector
249−import qualified Database.PostgreSQL.LibPQ as LibPQ
250import qualified GHC.Generics as GHC
244import qualified GHC.Generics as GHC
251import qualified PostgreSQL.Binary.Decoding as Decoding
245import qualified PostgreSQL.Binary.Decoding as Decoding
252import qualified PostgreSQL.Binary.Encoding as Encoding
246import qualified PostgreSQL.Binary.Encoding as Encoding
@@ -277,9 +271,11 @@ class ToParam (x :: Type) (pg :: PGType) where
277 toParam :: x -> K Encoding.Encoding pg
271 toParam :: x -> K Encoding.Encoding pg
278instance ToParam Bool 'PGbool where toParam = K . Encoding.bool
272instance ToParam Bool 'PGbool where toParam = K . Encoding.bool
279instance ToParam Int16 'PGint2 where toParam = K . Encoding.int2_int16
273instance ToParam Int16 'PGint2 where toParam = K . Encoding.int2_int16
274+instance ToParam Word16 'PGint2 where toParam = K . Encoding.int2_word16
280instance ToParam Int32 'PGint4 where toParam = K . Encoding.int4_int32
275instance ToParam Int32 'PGint4 where toParam = K . Encoding.int4_int32
276+instance ToParam Word32 'PGint4 where toParam = K . Encoding.int4_word32
281instance ToParam Int64 'PGint8 where toParam = K . Encoding.int8_int64
277instance ToParam Int64 'PGint8 where toParam = K . Encoding.int8_int64
282−instance ToParam Oid 'PGoid where toParam = K . Encoding.int4_word32 . getOid
278+instance ToParam Word64 'PGint8 where toParam = K . Encoding.int8_word64
283instance ToParam Float 'PGfloat4 where toParam = K . Encoding.float4
279instance ToParam Float 'PGfloat4 where toParam = K . Encoding.float4
284instance ToParam Double 'PGfloat8 where toParam = K . Encoding.float8
280instance ToParam Double 'PGfloat8 where toParam = K . Encoding.float8
285instance ToParam Scientific 'PGnumeric where toParam = K . Encoding.numeric
281instance ToParam Scientific 'PGnumeric where toParam = K . Encoding.numeric
@@ -312,26 +308,24 @@ instance Aeson.ToJSON x => ToParam (Json x) 'PGjson where
312instance Aeson.ToJSON x => ToParam (Jsonb x) 'PGjsonb where
308instance Aeson.ToJSON x => ToParam (Jsonb x) 'PGjsonb where
313 toParam = K . Encoding.jsonb_bytes
309 toParam = K . Encoding.jsonb_bytes
314 . Lazy.ByteString.toStrict . Aeson.encode . getJsonb
310 . Lazy.ByteString.toStrict . Aeson.encode . getJsonb
315−instance (ToNullityParam x ty, ty ~ nullity pg, OidOf pg)
311+instance (ToNullityParam x ty, ty ~ nullity pg, HasOid pg)
316 => ToParam (VarArray [x]) ('PGvararray ty) where
312 => ToParam (VarArray [x]) ('PGvararray ty) where
317 toParam = K
313 toParam = K
318− . Encoding.array_foldable
314+ . Encoding.array_foldable (oid @pg) (unK . toNullityParam @x @ty)
319− (getOid (oidOf @pg)) (unK . toNullityParam @x @ty)
320 . getVarArray
315 . getVarArray
321−instance (ToParam x pg, OidOf pg)
316+instance (ToParam x pg, HasOid pg)
322 => ToParam (VarArray (Vector x)) ('PGvararray ('NotNull pg)) where
317 => ToParam (VarArray (Vector x)) ('PGvararray ('NotNull pg)) where
323 toParam = K
318 toParam = K
324− . Encoding.array_vector (getOid (oidOf @pg)) (unK . toParam @x @pg)
319+ . Encoding.array_vector (oid @pg) (unK . toParam @x @pg)
325 . getVarArray
320 . getVarArray
326−instance (ToParam x pg, OidOf pg)
321+instance (ToParam x pg, HasOid pg)
327 => ToParam (VarArray (Vector (Maybe x))) ('PGvararray ('Null pg)) where
322 => ToParam (VarArray (Vector (Maybe x))) ('PGvararray ('Null pg)) where
328 toParam = K
323 toParam = K
329− . Encoding.nullableArray_vector
324+ . Encoding.nullableArray_vector (oid @pg) (unK . toParam @x @pg)
330− (getOid (oidOf @pg)) (unK . toParam @x @pg)
331 . getVarArray
325 . getVarArray
332−instance (ToFixArray x dims ty, ty ~ nullity pg, OidOf pg)
326+instance (ToFixArray x dims ty, ty ~ nullity pg, HasOid pg)
333 => ToParam (FixArray x) ('PGfixarray dims ty) where
327 => ToParam (FixArray x) ('PGfixarray dims ty) where
334− toParam = K . Encoding.array (getOid (oidOf @pg))
328+ toParam = K . Encoding.array (oid @pg)
335 . unK . unK . toFixArray @x @dims @ty . getFixArray
329 . unK . unK . toFixArray @x @dims @ty . getFixArray
336instance
330instance
337 ( IsEnumType x
331 ( IsEnumType x
@@ -356,7 +350,7 @@ instance
356 ( SListI fields
350 ( SListI fields
357 , IsRecord x xs
351 , IsRecord x xs
358 , AllZip ToField xs fields
352 , AllZip ToField xs fields
359− , All OidOfField fields
353+ , All HasAliasedOid fields
360 ) => ToParam (Composite x) ('PGcomposite fields) where
354 ) => ToParam (Composite x) ('PGcomposite fields) where
361 toParam =
355 toParam =
362 let
356 let
@@ -364,7 +358,7 @@ instance
364 encoders = htrans (Proxy @ToField) toField
358 encoders = htrans (Proxy @ToField) toField
365
359
366 composite
360 composite
367− :: All OidOfField row
361+ :: All HasAliasedOid row
368 => NP (K (Maybe Encoding.Encoding)) row
362 => NP (K (Maybe Encoding.Encoding)) row
369 -> K Encoding.Encoding ('PGcomposite row)
363 -> K Encoding.Encoding ('PGcomposite row)
370 composite fields = K $
364 composite fields = K $
@@ -381,139 +375,26 @@ instance
381 int32BE (fromIntegral (lengthSList (Proxy @xs))) <>
375 int32BE (fromIntegral (lengthSList (Proxy @xs))) <>
382 let
376 let
383 each
377 each
384− :: OidOfField field
378+ :: HasAliasedOid field
385 => K (Maybe Encoding.Encoding) field
379 => K (Maybe Encoding.Encoding) field
386 -> Encoding.Encoding
380 -> Encoding.Encoding
387 each (K field :: K (Maybe Encoding.Encoding) field) =
381 each (K field :: K (Maybe Encoding.Encoding) field) =
388− word32BE (getOid (oidOfField @field))
382+ word32BE (aliasedOid @field)
389 <> case field of
383 <> case field of
390 Nothing -> int64BE (-1)
384 Nothing -> int64BE (-1)
391 Just value ->
385 Just value ->
392 int32BE (fromIntegral (builderLength value))
386 int32BE (fromIntegral (builderLength value))
393 <> value
387 <> value
394 in
388 in
395− hcfoldMap (Proxy @OidOfField) each fields
389+ hcfoldMap (Proxy @HasAliasedOid) each fields
396
390
397 in
391 in
398 composite . encoders . toRecord . getComposite
392 composite . encoders . toRecord . getComposite
399
393
400−-- | The object identifier of a `PGType`.
401−--
402−-- >>> :set -XTypeApplications
403−-- >>> oidOf @'PGbool
404−-- Oid 16
405−class OidOf (ty :: PGType) where oidOf :: LibPQ.Oid
406−instance OidOf 'PGbool where oidOf = LibPQ.Oid 16
407−instance OidOf ('PGfixarray ns (null 'PGbool)) where oidOf = LibPQ.Oid 1000
408−instance OidOf ('PGvararray (null 'PGbool)) where oidOf = LibPQ.Oid 1000
409−instance OidOf 'PGint2 where oidOf = LibPQ.Oid 21
410−instance OidOf ('PGfixarray ns (null 'PGint2)) where oidOf = LibPQ.Oid 1005
411−instance OidOf ('PGvararray (null 'PGint2)) where oidOf = LibPQ.Oid 1005
412−instance OidOf 'PGint4 where oidOf = LibPQ.Oid 23
413−instance OidOf ('PGfixarray ns (null 'PGint4)) where oidOf = LibPQ.Oid 1007
414−instance OidOf ('PGvararray (null 'PGint4)) where oidOf = LibPQ.Oid 1007
415−instance OidOf 'PGint8 where oidOf = LibPQ.Oid 20
416−instance OidOf ('PGfixarray ns (null 'PGint8)) where oidOf = LibPQ.Oid 1016
417−instance OidOf ('PGvararray (null 'PGint8)) where oidOf = LibPQ.Oid 1016
418−instance OidOf 'PGnumeric where oidOf = LibPQ.Oid 1700
419−instance OidOf ('PGfixarray ns (null 'PGnumeric)) where oidOf = LibPQ.Oid 1231
420−instance OidOf ('PGvararray (null 'PGnumeric)) where oidOf = LibPQ.Oid 1231
421−instance OidOf 'PGfloat4 where oidOf = LibPQ.Oid 700
422−instance OidOf ('PGfixarray ns (null 'PGfloat4)) where oidOf = LibPQ.Oid 1021
423−instance OidOf ('PGvararray (null 'PGfloat4)) where oidOf = LibPQ.Oid 1021
424−instance OidOf 'PGfloat8 where oidOf = LibPQ.Oid 701
425−instance OidOf ('PGfixarray ns (null 'PGfloat8)) where oidOf = LibPQ.Oid 1022
426−instance OidOf ('PGvararray (null 'PGfloat8)) where oidOf = LibPQ.Oid 1022
427−instance OidOf 'PGmoney where oidOf = LibPQ.Oid 790
428−instance OidOf ('PGfixarray ns (null 'PGmoney)) where oidOf = LibPQ.Oid 791
429−instance OidOf ('PGvararray (null 'PGmoney)) where oidOf = LibPQ.Oid 791
430−instance OidOf ('PGchar n) where oidOf = LibPQ.Oid 18
431−instance OidOf ('PGfixarray ns (null ('PGchar n))) where oidOf = LibPQ.Oid 1002
432−instance OidOf ('PGvararray (null ('PGchar n))) where oidOf = LibPQ.Oid 1002
433−instance OidOf ('PGvarchar n) where oidOf = LibPQ.Oid 1043
434−instance OidOf ('PGfixarray ns (null ('PGvarchar n))) where oidOf = LibPQ.Oid 1015
435−instance OidOf ('PGvararray (null ('PGvarchar n))) where oidOf = LibPQ.Oid 1015
436−instance OidOf 'PGtext where oidOf = LibPQ.Oid 25
437−instance OidOf ('PGfixarray ns (null 'PGtext)) where oidOf = LibPQ.Oid 1009
438−instance OidOf ('PGvararray (null 'PGtext)) where oidOf = LibPQ.Oid 1009
439−instance OidOf 'PGbytea where oidOf = LibPQ.Oid 17
440−instance OidOf ('PGfixarray ns (null 'PGbytea)) where oidOf = LibPQ.Oid 1001
441−instance OidOf ('PGvararray (null 'PGbytea)) where oidOf = LibPQ.Oid 1001
442−instance OidOf 'PGtimestamp where oidOf = LibPQ.Oid 1114
443−instance OidOf ('PGfixarray ns (null 'PGtimestamp)) where oidOf = LibPQ.Oid 1115
444−instance OidOf ('PGvararray (null 'PGtimestamp)) where oidOf = LibPQ.Oid 1115
445−instance OidOf 'PGtimestamptz where oidOf = LibPQ.Oid 1184
446−instance OidOf ('PGfixarray ns (null 'PGtimestamptz)) where oidOf = LibPQ.Oid 1185
447−instance OidOf ('PGvararray (null 'PGtimestamptz)) where oidOf = LibPQ.Oid 1185
448−instance OidOf 'PGdate where oidOf = LibPQ.Oid 1082
449−instance OidOf ('PGfixarray ns (null 'PGdate)) where oidOf = LibPQ.Oid 1182
450−instance OidOf ('PGvararray (null 'PGdate)) where oidOf = LibPQ.Oid 1182
451−instance OidOf 'PGtime where oidOf = LibPQ.Oid 1083
452−instance OidOf ('PGfixarray ns (null 'PGtime)) where oidOf = LibPQ.Oid 1183
453−instance OidOf ('PGvararray (null 'PGtime)) where oidOf = LibPQ.Oid 1183
454−instance OidOf 'PGtimetz where oidOf = LibPQ.Oid 1266
455−instance OidOf ('PGfixarray ns (null 'PGtimetz)) where oidOf = LibPQ.Oid 1270
456−instance OidOf ('PGvararray (null 'PGtimetz)) where oidOf = LibPQ.Oid 1270
457−instance OidOf 'PGinterval where oidOf = LibPQ.Oid 1186
458−instance OidOf ('PGfixarray ns (null 'PGinterval)) where oidOf = LibPQ.Oid 1187
459−instance OidOf ('PGvararray (null 'PGinterval)) where oidOf = LibPQ.Oid 1187
460−instance OidOf 'PGuuid where oidOf = LibPQ.Oid 2950
461−instance OidOf ('PGfixarray ns (null 'PGuuid)) where oidOf = LibPQ.Oid 2951
462−instance OidOf ('PGvararray (null 'PGuuid)) where oidOf = LibPQ.Oid 2951
463−instance OidOf 'PGinet where oidOf = LibPQ.Oid 869
464−instance OidOf ('PGfixarray ns (null 'PGinet)) where oidOf = LibPQ.Oid 1041
465−instance OidOf ('PGvararray (null 'PGinet)) where oidOf = LibPQ.Oid 1041
466−instance OidOf 'PGjson where oidOf = LibPQ.Oid 114
467−instance OidOf ('PGfixarray ns (null 'PGjson)) where oidOf = LibPQ.Oid 199
468−instance OidOf ('PGvararray (null 'PGjson)) where oidOf = LibPQ.Oid 199
469−instance OidOf 'PGjsonb where oidOf = LibPQ.Oid 3802
470−instance OidOf ('PGfixarray ns (null 'PGjsonb)) where oidOf = LibPQ.Oid 3807
471−instance OidOf ('PGvararray (null 'PGjsonb)) where oidOf = LibPQ.Oid 3807
472−instance OidOf 'PGtsvector where oidOf = LibPQ.Oid 3614
473−instance OidOf ('PGfixarray ns (null 'PGtsvector)) where oidOf = LibPQ.Oid 3643
474−instance OidOf ('PGvararray (null 'PGtsvector)) where oidOf = LibPQ.Oid 3643
475−instance OidOf 'PGtsquery where oidOf = LibPQ.Oid 3615
476−instance OidOf ('PGfixarray ns (null 'PGtsquery)) where oidOf = LibPQ.Oid 3645
477−instance OidOf ('PGvararray (null 'PGtsquery)) where oidOf = LibPQ.Oid 3645
478−instance OidOf 'PGoid where oidOf = LibPQ.Oid 26
479−instance OidOf ('PGfixarray ns (null 'PGoid)) where oidOf = LibPQ.Oid 1028
480−instance OidOf ('PGvararray (null 'PGoid)) where oidOf = LibPQ.Oid 1028
481−instance OidOf ('PGrange 'PGint4) where oidOf = LibPQ.Oid 3904
482−instance OidOf ('PGfixarray ns (null ('PGrange 'PGint4))) where oidOf = LibPQ.Oid 3905
483−instance OidOf ('PGvararray (null ('PGrange 'PGint4))) where oidOf = LibPQ.Oid 3905
484−instance OidOf ('PGrange 'PGint8) where oidOf = LibPQ.Oid 3926
485−instance OidOf ('PGfixarray ns (null ('PGrange 'PGint8))) where oidOf = LibPQ.Oid 3927
486−instance OidOf ('PGvararray (null ('PGrange 'PGint8))) where oidOf = LibPQ.Oid 3927
487−instance OidOf ('PGrange 'PGnumeric) where oidOf = LibPQ.Oid 3906
488−instance OidOf ('PGfixarray ns (null ('PGrange 'PGnumeric))) where oidOf = LibPQ.Oid 3907
489−instance OidOf ('PGvararray (null ('PGrange 'PGnumeric))) where oidOf = LibPQ.Oid 3907
490−instance OidOf ('PGrange 'PGtimestamp) where oidOf = LibPQ.Oid 3908
491−instance OidOf ('PGfixarray ns (null ('PGrange 'PGtimestamp))) where oidOf = LibPQ.Oid 3909
492−instance OidOf ('PGvararray (null ('PGrange 'PGtimestamp))) where oidOf = LibPQ.Oid 3909
493−instance OidOf ('PGrange 'PGtimestamptz) where oidOf = LibPQ.Oid 3910
494−instance OidOf ('PGfixarray ns (null ('PGrange 'PGtimestamptz))) where oidOf = LibPQ.Oid 3911
495−instance OidOf ('PGvararray (null ('PGrange 'PGtimestamptz))) where oidOf = LibPQ.Oid 3911
496−instance OidOf ('PGrange 'PGdate) where oidOf = LibPQ.Oid 3912
497−instance OidOf ('PGfixarray ns (null ('PGrange 'PGdate))) where oidOf = LibPQ.Oid 3913
498−instance OidOf ('PGvararray (null ('PGrange 'PGdate))) where oidOf = LibPQ.Oid 3913
499−instance {-# OVERLAPPABLE #-} OidOf ('PGrange ty) where oidOf = LibPQ.invalidOid
500−instance {-# OVERLAPPABLE #-} OidOf ('PGfixarray ns (null ('PGrange ty))) where oidOf = LibPQ.invalidOid
501−instance {-# OVERLAPPABLE #-} OidOf ('PGvararray (null ('PGrange ty))) where oidOf = LibPQ.invalidOid
502−instance {-# OVERLAPPABLE #-} OidOf ('PGcomposite row) where oidOf = LibPQ.invalidOid
503−instance {-# OVERLAPPABLE #-} OidOf ('PGfixarray ns (null ('PGcomposite row))) where oidOf = LibPQ.invalidOid
504−instance {-# OVERLAPPABLE #-} OidOf ('PGvararray (null ('PGcomposite row))) where oidOf = LibPQ.invalidOid
505−instance {-# OVERLAPPABLE #-} OidOf ('PGenum labels) where oidOf = LibPQ.invalidOid
506−instance {-# OVERLAPPABLE #-} OidOf ('PGfixarray ns (null ('PGenum labels))) where oidOf = LibPQ.invalidOid
507−instance {-# OVERLAPPABLE #-} OidOf ('PGvararray (null ('PGenum labels))) where oidOf = LibPQ.invalidOid
508−
509−class OidOfParam (ty :: NullityType) where oidOfParam :: Oid
510−instance OidOf ty => OidOfParam (null ty) where oidOfParam = oidOf @ty
511−
512−-- | Lifts a `OidOf` constraint to a field.
513−class OidOfField (field :: (Symbol, NullityType)) where
394+class HasAliasedOid (field :: (Symbol, NullityType)) where
514− oidOfField :: Oid
395+ aliasedOid :: Word32
515−instance OidOf ty => OidOfField (alias ::: nullity ty) where
396+instance HasOid ty => HasAliasedOid (alias ::: nullity ty) where
516− oidOfField = oidOf @ty
397+ aliasedOid = oid @ty
517
398
518-- | A `ToNullityParam` constraint gives an encoding of a Haskell `Type` into
399-- | A `ToNullityParam` constraint gives an encoding of a Haskell `Type` into
519-- into the binary format of a PostgreSQL `NullityType`.
400-- into the binary format of a PostgreSQL `NullityType`.
@@ -582,7 +463,6 @@ instance FromValue 'PGbool Bool where fromValue = Decoding.bool
582instance FromValue 'PGint2 Int16 where fromValue = Decoding.int
463instance FromValue 'PGint2 Int16 where fromValue = Decoding.int
583instance FromValue 'PGint4 Int32 where fromValue = Decoding.int
464instance FromValue 'PGint4 Int32 where fromValue = Decoding.int
584instance FromValue 'PGint8 Int64 where fromValue = Decoding.int
465instance FromValue 'PGint8 Int64 where fromValue = Decoding.int
585−instance FromValue 'PGoid Word32 where fromValue = Decoding.int
586instance FromValue 'PGfloat4 Float where fromValue = Decoding.float4
466instance FromValue 'PGfloat4 Float where fromValue = Decoding.float4
587instance FromValue 'PGfloat8 Double where fromValue = Decoding.float8
467instance FromValue 'PGfloat8 Double where fromValue = Decoding.float8
588instance FromValue 'PGnumeric Scientific where fromValue = Decoding.numeric
468instance FromValue 'PGnumeric Scientific where fromValue = Decoding.numeric
@@ -769,53 +649,50 @@ instance
769 = fmap fromRecord
649 = fmap fromRecord
770 . hsequence'
650 . hsequence'
771 . htrans (Proxy @FromField) fromField
651 . htrans (Proxy @FromField) fromField
772−------------------------------------------------------
773−-- P records
774−------------------------------------------------------
775−-- instance (FromField (col ::: pg) (col ::: hask))
652+instance (FromField (col ::: pg) (col ::: hask))
776−-- => FromRow '[col ::: pg] (P (col ::: hask)) where
653+ => FromRow '[col ::: pg] (P (col ::: hask)) where
777−-- fromRow (pg :* Nil) = (unComp . fromField) pg
654+ fromRow (pg :* Nil) = (unComp . fromField) pg
778−-- instance
655+instance
779−-- ( row ~ Join row1 row2
656+ ( row ~ Join row1 row2
780−-- , FromRow row1 hask1
657+ , FromRow row1 hask1
781−-- , FromRow row2 hask2
658+ , FromRow row2 hask2
782−-- , SListI row
659+ , SListI row
783−-- ) => FromRow row (hask1, hask2) where
660+ ) => FromRow row (hask1, hask2) where
784−-- fromRow row = case disjoin @row1 @row2 row of
661+ fromRow row = case disjoin @row1 @row2 row of
785−-- (row1, row2) -> (,) <$> fromRow row1 <*> fromRow row2
662+ (row1, row2) -> (,) <$> fromRow row1 <*> fromRow row2
786−-- instance
663+instance
787−-- ( row ~ Join row1 row23
664+ ( row ~ Join row1 row23
788−-- , FromRow row1 hask1
665+ , FromRow row1 hask1
789−-- , FromRow row23 (hask2, hask3)
666+ , FromRow row23 (hask2, hask3)
790−-- , SListI row
667+ , SListI row
791−-- ) => FromRow row (hask1, hask2, hask3) where
668+ ) => FromRow row (hask1, hask2, hask3) where
792−-- fromRow row = case disjoin @row1 @row23 row of
669+ fromRow row = case disjoin @row1 @row23 row of
793−-- (row1, row23) -> do
670+ (row1, row23) -> do
794−-- hask1 <- fromRow row1
671+ hask1 <- fromRow row1
795−-- (hask2, hask3) <- fromRow row23
672+ (hask2, hask3) <- fromRow row23
796−-- return (hask1, hask2, hask3)
673+ return (hask1, hask2, hask3)
797−-- instance
674+instance
798−-- ( row ~ Join row1 row234
675+ ( row ~ Join row1 row234
799−-- , FromRow row1 hask1
676+ , FromRow row1 hask1
800−-- , FromRow row234 (hask2, hask3, hask4)
677+ , FromRow row234 (hask2, hask3, hask4)
801−-- , SListI row
678+ , SListI row
802−-- ) => FromRow row (hask1, hask2, hask3, hask4) where
679+ ) => FromRow row (hask1, hask2, hask3, hask4) where
803−-- fromRow row = case disjoin @row1 @row234 row of
680+ fromRow row = case disjoin @row1 @row234 row of
804−-- (row1, row234) -> do
681+ (row1, row234) -> do
805−-- hask1 <- fromRow row1
682+ hask1 <- fromRow row1
806−-- (hask2, hask3, hask4) <- fromRow row234
683+ (hask2, hask3, hask4) <- fromRow row234
807−-- return (hask1, hask2, hask3, hask4)
684+ return (hask1, hask2, hask3, hask4)
808−-- instance
685+instance
809−-- ( row ~ Join row1 row2345
686+ ( row ~ Join row1 row2345
810−-- , FromRow row1 hask1
687+ , FromRow row1 hask1
811−-- , FromRow row2345 (hask2, hask3, hask4, hask5)
688+ , FromRow row2345 (hask2, hask3, hask4, hask5)
812−-- , SListI row
689+ , SListI row
813−-- ) => FromRow row (hask1, hask2, hask3, hask4, hask5) where
690+ ) => FromRow row (hask1, hask2, hask3, hask4, hask5) where
814−-- fromRow row = case disjoin @row1 @row2345 row of
691+ fromRow row = case disjoin @row1 @row2345 row of
815−-- (row1, row2345) -> do
692+ (row1, row2345) -> do
816−-- hask1 <- fromRow row1
693+ hask1 <- fromRow row1
817−-- (hask2, hask3, hask4, hask5) <- fromRow row2345
694+ (hask2, hask3, hask4, hask5) <- fromRow row2345
818−-- return (hask1, hask2, hask3, hask4, hask5)
695+ return (hask1, hask2, hask3, hask4, hask5)
819
696
820-- | `Only` is a 1-tuple type, useful for encoding a single parameter with
697-- | `Only` is a 1-tuple type, useful for encoding a single parameter with
821-- `toParams` or decoding a single value with `fromRow`.
698-- `toParams` or decoding a single value with `fromRow`.
@@ -843,6 +720,3 @@ replicateMN
843 => m x -> m (NP I xs)
720 => m x -> m (NP I xs)
844replicateMN mx = hsequence' $
721replicateMN mx = hsequence' $
845 hcpure (Proxy :: Proxy ((~) x)) (Comp (I <$> mx))
722 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+1016−12
@@ -11,15 +11,13 @@ Squeal data definition language.
11{-# LANGUAGE
11{-# LANGUAGE
12 AllowAmbiguousTypes
12 AllowAmbiguousTypes
13 , ConstraintKinds
13 , ConstraintKinds
14− , DeriveAnyClass
15 , DeriveGeneric
14 , DeriveGeneric
16− , DerivingStrategies
17 , FlexibleContexts
15 , FlexibleContexts
18 , FlexibleInstances
16 , FlexibleInstances
19 , GADTs
17 , GADTs
18+ , GeneralizedNewtypeDeriving
20 , LambdaCase
19 , LambdaCase
21 , MultiParamTypeClasses
20 , MultiParamTypeClasses
22− , OverloadedLabels
23 , OverloadedStrings
21 , OverloadedStrings
24 , RankNTypes
22 , RankNTypes
25 , ScopedTypeVariables
23 , ScopedTypeVariables
@@ -27,25 +25,83 @@ Squeal data definition language.
27 , TypeInType
25 , TypeInType
28 , TypeOperators
26 , TypeOperators
29 , UndecidableSuperClasses
27 , UndecidableSuperClasses
30− , UndecidableInstances
31#-}
28#-}
32
29
33module Squeal.PostgreSQL.Definition
30module Squeal.PostgreSQL.Definition
34 ( -- * Definition
31 ( -- * Definition
35 Definition (..)
32 Definition (..)
36 , (>>>)
33 , (>>>)
37− , manipDefinition
34+ -- * Tables
35+ -- ** Create
36+ , createSchema
37+ , createSchemaIfNotExists
38+ , createTable
39+ , createTableIfNotExists
40+ , createView
41+ , createTypeEnum
42+ , createTypeEnumFrom
43+ , createTypeComposite
44+ , createTypeCompositeFrom
45+ , createDomain
46+ , TableConstraintExpression (..)
47+ , check
48+ , unique
49+ , primaryKey
50+ , foreignKey
51+ , ForeignKeyed
52+ , OnDeleteClause (..)
53+ , OnUpdateClause (..)
54+ -- ** Drop
55+ , dropSchema
56+ , dropTable
57+ , dropView
58+ , dropType
59+ -- ** Alter
60+ , alterTable
61+ , alterTableRename
62+ , AlterTable (..)
63+ , addConstraint
64+ , dropConstraint
65+ , AddColumn (..)
66+ , dropColumn
67+ , renameColumn
68+ , alterColumn
69+ , AlterColumn (..)
70+ , setDefault
71+ , dropDefault
72+ , setNotNull
73+ , dropNotNull
74+ , alterType
75+ -- * Columns
76+ , ColumnTypeExpression (..)
77+ , nullable
78+ , notNullable
79+ , default_
80+ , serial2
81+ , smallserial
82+ , serial4
83+ , serial
84+ , serial8
85+ , bigserial
38 ) where
86 ) where
39
87
40import Control.Category
88import Control.Category
41import Control.DeepSeq
89import Control.DeepSeq
42import Data.ByteString
90import Data.ByteString
43import Data.Monoid
91import Data.Monoid
92+import GHC.TypeLits
44import Prelude hiding ((.), id)
93import Prelude hiding ((.), id)
45
94
95+import qualified Generics.SOP as SOP
46import qualified GHC.Generics as GHC
96import qualified GHC.Generics as GHC
47
97
48−import Squeal.PostgreSQL.Manipulation
98+import Squeal.PostgreSQL.Alias
99+import Squeal.PostgreSQL.Expression
100+import Squeal.PostgreSQL.Expression.Logic
101+import Squeal.PostgreSQL.Expression.Type
102+import Squeal.PostgreSQL.List
103+import Squeal.PostgreSQL.PG
104+import Squeal.PostgreSQL.Query
49import Squeal.PostgreSQL.Render
105import Squeal.PostgreSQL.Render
50import Squeal.PostgreSQL.Schema
106import Squeal.PostgreSQL.Schema
51
107
@@ -73,10 +129,958 @@ instance Category Definition where
73 ddl1 . ddl0 = UnsafeDefinition $
129 ddl1 . ddl0 = UnsafeDefinition $
74 renderSQL ddl0 <> "\n" <> renderSQL ddl1
130 renderSQL ddl0 <> "\n" <> renderSQL ddl1
75
131
76−-- | A `Manipulation` without input or output can be run as a statement
132+{-----------------------------------------
77−-- along with other `Definition`s, by embedding it using `manipDefinition`.
133+CREATE statements
78−manipDefinition
134+-----------------------------------------}
79− :: Manipulation '[] schemas '[] '[]
135+
80− -- ^ no input or output
136+createSchema
137+ :: KnownSymbol sch
138+ => Alias sch
139+ -> Definition schemas (Create sch '[] schemas)
140+createSchema sch = UnsafeDefinition $
141+ "CREATE" <+> "SCHEMA" <+> renderSQL sch <> ";"
142+
143+createSchemaIfNotExists
144+ :: (KnownSymbol sch, Has sch schemas schema)
145+ => Alias sch
81 -> Definition schemas schemas
146 -> Definition schemas schemas
82−manipDefinition = UnsafeDefinition . (<> ";") . renderSQL
147+createSchemaIfNotExists sch = UnsafeDefinition $
148+ "CREATE" <+> "SCHEMA" <+> "IF" <+> "NOT" <+> "EXISTS"
149+ <+> renderSQL sch <> ";"
150+
151+{- | `createTable` adds a table to the schema.
152+
153+>>> :set -XOverloadedLabels
154+>>> :{
155+type Table = '[] :=>
156+ '[ "a" ::: 'NoDef :=> 'Null 'PGint4
157+ , "b" ::: 'NoDef :=> 'Null 'PGfloat4 ]
158+:}
159+
160+>>> :{
161+let
162+ setup :: Definition (Public '[]) (Public '["tab" ::: 'Table Table])
163+ setup = createTable #tab
164+ (nullable int `as` #a :* nullable real `as` #b) Nil
165+in printSQL setup
166+:}
167+CREATE TABLE "tab" ("a" int NULL, "b" real NULL);
168+-}
169+createTable
170+ :: ( KnownSymbol sch
171+ , KnownSymbol tab
172+ , columns ~ (col ': cols)
173+ , SOP.SListI columns
174+ , SOP.SListI constraints
175+ , Has sch schemas0 schema0
176+ , schemas1 ~ Alter sch (Create tab ('Table (constraints :=> columns)) schema0) schemas0 )
177+ => QualifiedAlias sch tab -- ^ the name of the table to add
178+ -> NP (Aliased (ColumnTypeExpression schemas0)) columns
179+ -- ^ the names and datatype of each column
180+ -> NP (Aliased (TableConstraintExpression sch tab schemas1)) constraints
181+ -- ^ constraints that must hold for the table
182+ -> Definition schemas0 schemas1
183+createTable tab columns constraints = UnsafeDefinition $
184+ "CREATE TABLE" <+> renderCreation tab columns constraints
185+
186+{-| `createTableIfNotExists` creates a table if it doesn't exist, but does not add it to the schema.
187+Instead, the schema already has the table so if the table did not yet exist, the schema was wrong.
188+`createTableIfNotExists` fixes this. Interestingly, this property makes it an idempotent in
189+the `Category` of `Definition`s.
190+
191+>>> :set -XOverloadedLabels -XTypeApplications
192+>>> :{
193+type Table = '[] :=>
194+ '[ "a" ::: 'NoDef :=> 'Null 'PGint4
195+ , "b" ::: 'NoDef :=> 'Null 'PGfloat4 ]
196+:}
197+
198+>>> type Schemas = Public '["tab" ::: 'Table Table]
199+
200+>>> :{
201+let
202+ setup :: Definition Schemas Schemas
203+ setup = createTableIfNotExists #tab
204+ (nullable int `as` #a :* nullable real `as` #b) Nil
205+in printSQL setup
206+:}
207+CREATE TABLE IF NOT EXISTS "tab" ("a" int NULL, "b" real NULL);
208+-}
209+createTableIfNotExists
210+ :: ( Has sch schemas schema
211+ , Has tab schema ('Table (constraints :=> columns))
212+ , SOP.SListI columns
213+ , SOP.SListI constraints )
214+ => QualifiedAlias sch tab -- ^ the name of the table to add
215+ -> NP (Aliased (ColumnTypeExpression schemas)) columns
216+ -- ^ the names and datatype of each column
217+ -> NP (Aliased (TableConstraintExpression sch tab schemas)) constraints
218+ -- ^ constraints that must hold for the table
219+ -> Definition schemas schemas
220+createTableIfNotExists tab columns constraints = UnsafeDefinition $
221+ "CREATE TABLE IF NOT EXISTS"
222+ <+> renderCreation tab columns constraints
223+
224+-- helper function for `createTable` and `createTableIfNotExists`
225+renderCreation
226+ :: ( KnownSymbol sch
227+ , KnownSymbol tab
228+ , SOP.SListI columns
229+ , SOP.SListI constraints )
230+ => QualifiedAlias sch tab -- ^ the name of the table to add
231+ -> NP (Aliased (ColumnTypeExpression schemas0)) columns
232+ -- ^ the names and datatype of each column
233+ -> NP (Aliased (TableConstraintExpression sch tab schemas1)) constraints
234+ -- ^ constraints that must hold for the table
235+ -> ByteString
236+renderCreation tab columns constraints = renderSQL tab
237+ <+> parenthesized
238+ ( renderCommaSeparated renderColumnDef columns
239+ <> ( case constraints of
240+ Nil -> ""
241+ _ -> ", " <>
242+ renderCommaSeparated renderConstraint constraints ) )
243+ <> ";"
244+ where
245+ renderColumnDef :: Aliased (ColumnTypeExpression schemas) x -> ByteString
246+ renderColumnDef (ty `As` column) =
247+ renderSQL column <+> renderColumnTypeExpression ty
248+ renderConstraint
249+ :: Aliased (TableConstraintExpression sch tab schemas) constraint
250+ -> ByteString
251+ renderConstraint (constraint `As` alias) =
252+ "CONSTRAINT" <+> renderSQL alias <+> renderSQL constraint
253+
254+-- | Data types are a way to limit the kind of data that can be stored in a
255+-- table. For many applications, however, the constraint they provide is
256+-- too coarse. For example, a column containing a product price should
257+-- probably only accept positive values. But there is no standard data type
258+-- that accepts only positive numbers. Another issue is that you might want
259+-- to constrain column data with respect to other columns or rows.
260+-- For example, in a table containing product information,
261+-- there should be only one row for each product number.
262+-- `TableConstraint`s give you as much control over the data in your tables
263+-- as you wish. If a user attempts to store data in a column that would
264+-- violate a constraint, an error is raised. This applies
265+-- even if the value came from the default value definition.
266+newtype TableConstraintExpression
267+ (sch :: Symbol)
268+ (tab :: Symbol)
269+ (schemas :: SchemasType)
270+ (constraint :: TableConstraint)
271+ = UnsafeTableConstraintExpression
272+ { renderTableConstraintExpression :: ByteString }
273+ deriving (GHC.Generic,Show,Eq,Ord,NFData)
274+instance RenderSQL
275+ (TableConstraintExpression sch tab schemas constraint) where
276+ renderSQL = renderTableConstraintExpression
277+
278+{-| A `check` constraint is the most generic `TableConstraint` type.
279+It allows you to specify that the value in a certain column must satisfy
280+a Boolean (truth-value) expression.
281+
282+>>> :{
283+type Schema = '[
284+ "tab" ::: 'Table ('[ "inequality" ::: 'Check '["a","b"]] :=> '[
285+ "a" ::: 'NoDef :=> 'NotNull 'PGint4,
286+ "b" ::: 'NoDef :=> 'NotNull 'PGint4
287+ ])]
288+:}
289+
290+>>> :{
291+let
292+ definition :: Definition (Public '[]) (Public Schema)
293+ definition = createTable #tab
294+ ( (int & notNullable) `as` #a :*
295+ (int & notNullable) `as` #b )
296+ ( check (#a :* #b) (#a .> #b) `as` #inequality )
297+:}
298+
299+>>> printSQL definition
300+CREATE TABLE "tab" ("a" int NOT NULL, "b" int NOT NULL, CONSTRAINT "inequality" CHECK (("a" > "b")));
301+-}
302+check
303+ :: ( Has sch schemas schema
304+ , Has tab schema ('Table table)
305+ , HasAll aliases (TableToRow table) subcolumns )
306+ => NP Alias aliases
307+ -- ^ specify the subcolumns which are getting checked
308+ -> (forall t. Condition '[] '[] 'Ungrouped schemas '[] '[t ::: subcolumns])
309+ -- ^ a closed `Condition` on those subcolumns
310+ -> TableConstraintExpression sch tab schemas ('Check aliases)
311+check _cols condition = UnsafeTableConstraintExpression $
312+ "CHECK" <+> parenthesized (renderSQL condition)
313+
314+{-| A `unique` constraint ensure that the data contained in a column,
315+or a group of columns, is unique among all the rows in the table.
316+
317+>>> :{
318+type Schema = '[
319+ "tab" ::: 'Table( '[ "uq_a_b" ::: 'Unique '["a","b"]] :=> '[
320+ "a" ::: 'NoDef :=> 'Null 'PGint4,
321+ "b" ::: 'NoDef :=> 'Null 'PGint4
322+ ])]
323+:}
324+
325+>>> :{
326+let
327+ definition :: Definition (Public '[]) (Public Schema)
328+ definition = createTable #tab
329+ ( (int & nullable) `as` #a :*
330+ (int & nullable) `as` #b )
331+ ( unique (#a :* #b) `as` #uq_a_b )
332+:}
333+
334+>>> printSQL definition
335+CREATE TABLE "tab" ("a" int NULL, "b" int NULL, CONSTRAINT "uq_a_b" UNIQUE ("a", "b"));
336+-}
337+unique
338+ :: ( Has sch schemas schema
339+ , Has tab schema('Table table)
340+ , HasAll aliases (TableToRow table) subcolumns )
341+ => NP Alias aliases
342+ -- ^ specify subcolumns which together are unique for each row
343+ -> TableConstraintExpression sch tab schemas ('Unique aliases)
344+unique columns = UnsafeTableConstraintExpression $
345+ "UNIQUE" <+> parenthesized (renderSQL columns)
346+
347+{-| A `primaryKey` constraint indicates that a column, or group of columns,
348+can be used as a unique identifier for rows in the table.
349+This requires that the values be both unique and not null.
350+
351+>>> :{
352+type Schema = '[
353+ "tab" ::: 'Table ('[ "pk_id" ::: 'PrimaryKey '["id"]] :=> '[
354+ "id" ::: 'Def :=> 'NotNull 'PGint4,
355+ "name" ::: 'NoDef :=> 'NotNull 'PGtext
356+ ])]
357+:}
358+
359+>>> :{
360+let
361+ definition :: Definition (Public '[]) (Public Schema)
362+ definition = createTable #tab
363+ ( serial `as` #id :*
364+ (text & notNullable) `as` #name )
365+ ( primaryKey #id `as` #pk_id )
366+:}
367+
368+>>> printSQL definition
369+CREATE TABLE "tab" ("id" serial, "name" text NOT NULL, CONSTRAINT "pk_id" PRIMARY KEY ("id"));
370+-}
371+primaryKey
372+ :: ( Has sch schemas schema
373+ , Has tab schema ('Table table)
374+ , HasAll aliases (TableToColumns table) subcolumns
375+ , AllNotNull subcolumns )
376+ => NP Alias aliases
377+ -- ^ specify the subcolumns which together form a primary key.
378+ -> TableConstraintExpression sch tab schemas ('PrimaryKey aliases)
379+primaryKey columns = UnsafeTableConstraintExpression $
380+ "PRIMARY KEY" <+> parenthesized (renderSQL columns)
381+
382+{-| A `foreignKey` specifies that the values in a column
383+(or a group of columns) must match the values appearing in some row of
384+another table. We say this maintains the referential integrity
385+between two related tables.
386+
387+>>> :{
388+type Schema =
389+ '[ "users" ::: 'Table (
390+ '[ "pk_users" ::: 'PrimaryKey '["id"] ] :=>
391+ '[ "id" ::: 'Def :=> 'NotNull 'PGint4
392+ , "name" ::: 'NoDef :=> 'NotNull 'PGtext
393+ ])
394+ , "emails" ::: 'Table (
395+ '[ "pk_emails" ::: 'PrimaryKey '["id"]
396+ , "fk_user_id" ::: 'ForeignKey '["user_id"] "users" '["id"]
397+ ] :=>
398+ '[ "id" ::: 'Def :=> 'NotNull 'PGint4
399+ , "user_id" ::: 'NoDef :=> 'NotNull 'PGint4
400+ , "email" ::: 'NoDef :=> 'Null 'PGtext
401+ ])
402+ ]
403+:}
404+
405+>>> :{
406+let
407+ setup :: Definition (Public '[]) (Public Schema)
408+ setup =
409+ createTable #users
410+ ( serial `as` #id :*
411+ (text & notNullable) `as` #name )
412+ ( primaryKey #id `as` #pk_users ) >>>
413+ createTable #emails
414+ ( serial `as` #id :*
415+ (int & notNullable) `as` #user_id :*
416+ (text & nullable) `as` #email )
417+ ( primaryKey #id `as` #pk_emails :*
418+ foreignKey #user_id #users #id
419+ OnDeleteCascade OnUpdateCascade `as` #fk_user_id )
420+in printSQL setup
421+:}
422+CREATE TABLE "users" ("id" serial, "name" text NOT NULL, CONSTRAINT "pk_users" PRIMARY KEY ("id"));
423+CREATE TABLE "emails" ("id" serial, "user_id" int NOT NULL, "email" text NULL, CONSTRAINT "pk_emails" PRIMARY KEY ("id"), CONSTRAINT "fk_user_id" FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE CASCADE ON UPDATE CASCADE);
424+
425+A `foreignKey` can even be a table self-reference.
426+
427+>>> :{
428+type Schema =
429+ '[ "employees" ::: 'Table (
430+ '[ "employees_pk" ::: 'PrimaryKey '["id"]
431+ , "employees_employer_fk" ::: 'ForeignKey '["employer_id"] "employees" '["id"]
432+ ] :=>
433+ '[ "id" ::: 'Def :=> 'NotNull 'PGint4
434+ , "name" ::: 'NoDef :=> 'NotNull 'PGtext
435+ , "employer_id" ::: 'NoDef :=> 'Null 'PGint4
436+ ])
437+ ]
438+:}
439+
440+>>> :{
441+let
442+ setup :: Definition (Public '[]) (Public Schema)
443+ setup =
444+ createTable #employees
445+ ( serial `as` #id :*
446+ (text & notNullable) `as` #name :*
447+ (integer & nullable) `as` #employer_id )
448+ ( primaryKey #id `as` #employees_pk :*
449+ foreignKey #employer_id #employees #id
450+ OnDeleteCascade OnUpdateCascade `as` #employees_employer_fk )
451+in printSQL setup
452+:}
453+CREATE TABLE "employees" ("id" serial, "name" text NOT NULL, "employer_id" integer NULL, CONSTRAINT "employees_pk" PRIMARY KEY ("id"), CONSTRAINT "employees_employer_fk" FOREIGN KEY ("employer_id") REFERENCES "employees" ("id") ON DELETE CASCADE ON UPDATE CASCADE);
454+-}
455+foreignKey
456+ :: (ForeignKeyed schemas sch schema child parent
457+ table reftable
458+ columns refcolumns
459+ constraints cols
460+ reftys tys )
461+ => NP Alias columns
462+ -- ^ column or columns in the table
463+ -> Alias parent
464+ -- ^ reference table
465+ -> NP Alias refcolumns
466+ -- ^ reference column or columns in the reference table
467+ -> OnDeleteClause
468+ -- ^ what to do when reference is deleted
469+ -> OnUpdateClause
470+ -- ^ what to do when reference is updated
471+ -> TableConstraintExpression sch child schemas
472+ ('ForeignKey columns parent refcolumns)
473+foreignKey keys parent refs ondel onupd = UnsafeTableConstraintExpression $
474+ "FOREIGN KEY" <+> parenthesized (renderSQL keys)
475+ <+> "REFERENCES" <+> renderSQL parent
476+ <+> parenthesized (renderSQL refs)
477+ <+> renderSQL ondel
478+ <+> renderSQL onupd
479+
480+-- | A constraint synonym between types involved in a foreign key constraint.
481+type ForeignKeyed schemas
482+ sch
483+ schema
484+ child parent
485+ table reftable
486+ columns refcolumns
487+ constraints cols
488+ reftys tys =
489+ ( Has sch schemas schema
490+ , Has child schema ('Table table)
491+ , Has parent schema ('Table reftable)
492+ , HasAll columns (TableToColumns table) tys
493+ , reftable ~ (constraints :=> cols)
494+ , HasAll refcolumns cols reftys
495+ , SOP.AllZip SamePGType tys reftys
496+ , Uniquely refcolumns constraints )
497+
498+-- | `OnDeleteClause` indicates what to do with rows that reference a deleted row.
499+data OnDeleteClause
500+ = OnDeleteNoAction
501+ -- ^ if any referencing rows still exist when the constraint is checked,
502+ -- an error is raised
503+ | OnDeleteRestrict -- ^ prevents deletion of a referenced row
504+ | OnDeleteCascade
505+ -- ^ specifies that when a referenced row is deleted,
506+ -- row(s) referencing it should be automatically deleted as well
507+ deriving (GHC.Generic,Show,Eq,Ord)
508+instance NFData OnDeleteClause
509+-- | Render `OnDeleteClause`.
510+instance RenderSQL OnDeleteClause where
511+ renderSQL = \case
512+ OnDeleteNoAction -> "ON DELETE NO ACTION"
513+ OnDeleteRestrict -> "ON DELETE RESTRICT"
514+ OnDeleteCascade -> "ON DELETE CASCADE"
515+
516+-- | Analagous to `OnDeleteClause` there is also `OnUpdateClause` which is invoked
517+-- when a referenced column is changed (updated).
518+data OnUpdateClause
519+ = OnUpdateNoAction
520+ -- ^ if any referencing rows has not changed when the constraint is checked,
521+ -- an error is raised
522+ | OnUpdateRestrict -- ^ prevents update of a referenced row
523+ | OnUpdateCascade
524+ -- ^ the updated values of the referenced column(s) should be copied
525+ -- into the referencing row(s)
526+ deriving (GHC.Generic,Show,Eq,Ord)
527+instance NFData OnUpdateClause
528+
529+-- | Render `OnUpdateClause`.
530+instance RenderSQL OnUpdateClause where
531+ renderSQL = \case
532+ OnUpdateNoAction -> "ON UPDATE NO ACTION"
533+ OnUpdateRestrict -> "ON UPDATE RESTRICT"
534+ OnUpdateCascade -> "ON UPDATE CASCADE"
535+
536+{-----------------------------------------
537+DROP statements
538+-----------------------------------------}
539+
540+-- >>> :{
541+-- let
542+-- definition :: Definition '["muh_schema" ::: schema, "public" ::: public] '["public" ::: public]
543+-- definition = dropSchema #muh_schema
544+-- :}
545+--
546+-- >>> printSQL definition
547+-- DROP SCHEMA "muh_schema";
548+dropSchema
549+ :: Has sch schemas schema
550+ => Alias sch
551+ -> Definition schemas (Drop sch schemas)
552+dropSchema sch = UnsafeDefinition $ "DROP SCHEMA" <+> renderSQL sch <> ";"
553+
554+-- | `dropTable` removes a table from the schema.
555+--
556+-- >>> :{
557+-- let
558+-- definition :: Definition '["public" ::: '["muh_table" ::: 'Table t]] (Public '[])
559+-- definition = dropTable #muh_table
560+-- :}
561+--
562+-- >>> printSQL definition
563+-- DROP TABLE "muh_table";
564+dropTable
565+ :: ( Has sch schemas schema
566+ , Has tab schema ('Table table))
567+ => QualifiedAlias sch tab -- ^ table to remove
568+ -> Definition schemas (Alter sch (Drop tab schema) schemas)
569+dropTable tab = UnsafeDefinition $ "DROP TABLE" <+> renderSQL tab <> ";"
570+
571+{-----------------------------------------
572+ALTER statements
573+-----------------------------------------}
574+
575+-- | `alterTable` changes the definition of a table from the schema.
576+alterTable
577+ :: (Has sch schemas schema, Has tab schema ('Table table0))
578+ => QualifiedAlias sch tab -- ^ table to alter
579+ -> AlterTable sch tab schemas table1 -- ^ alteration to perform
580+ -> Definition schemas (Alter sch (Alter tab ('Table table1) schema) schemas)
581+alterTable tab alteration = UnsafeDefinition $
582+ "ALTER TABLE"
583+ <+> renderSQL tab
584+ <+> renderAlterTable alteration
585+ <> ";"
586+
587+-- | `alterTableRename` changes the name of a table from the schema.
588+--
589+-- >>> printSQL $ alterTableRename #foo #bar
590+-- ALTER TABLE "foo" RENAME TO "bar";
591+alterTableRename
592+ :: (KnownSymbol table0, KnownSymbol table1)
593+ => Alias table0 -- ^ table to rename
594+ -> Alias table1 -- ^ what to rename it
595+ -> Definition schema (Rename table0 table1 schema)
596+alterTableRename table0 table1 = UnsafeDefinition $
597+ "ALTER TABLE" <+> renderSQL table0
598+ <+> "RENAME TO" <+> renderSQL table1 <> ";"
599+
600+-- | An `AlterTable` describes the alteration to perform on the columns
601+-- of a table.
602+newtype AlterTable
603+ (sch :: Symbol)
604+ (tab :: Symbol)
605+ (schemas :: SchemasType)
606+ (table :: TableType) =
607+ UnsafeAlterTable {renderAlterTable :: ByteString}
608+ deriving (GHC.Generic,Show,Eq,Ord,NFData)
609+
610+-- | An `addConstraint` adds a table constraint.
611+--
612+-- >>> :{
613+-- let
614+-- definition :: Definition
615+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
616+-- '["public" ::: '["tab" ::: 'Table ('["positive" ::: 'Check '["col"]] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
617+-- definition = alterTable #tab (addConstraint #positive (check #col (#col .> 0)))
618+-- in printSQL definition
619+-- :}
620+-- ALTER TABLE "tab" ADD CONSTRAINT "positive" CHECK (("col" > 0));
621+addConstraint
622+ :: ( KnownSymbol alias
623+ , Has sch schemas schema
624+ , Has tab schema ('Table table0)
625+ , table0 ~ (constraints :=> columns)
626+ , table1 ~ (Create alias constraint constraints :=> columns) )
627+ => Alias alias
628+ -> TableConstraintExpression sch tab schemas constraint
629+ -- ^ constraint to add
630+ -> AlterTable sch tab schemas table1
631+addConstraint alias constraint = UnsafeAlterTable $
632+ "ADD" <+> "CONSTRAINT" <+> renderSQL alias
633+ <+> renderSQL constraint
634+
635+-- | A `dropConstraint` drops a table constraint.
636+--
637+-- >>> :{
638+-- let
639+-- definition :: Definition
640+-- '["public" ::: '["tab" ::: 'Table ('["positive" ::: Check '["col"]] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
641+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
642+-- definition = alterTable #tab (dropConstraint #positive)
643+-- in printSQL definition
644+-- :}
645+-- ALTER TABLE "tab" DROP CONSTRAINT "positive";
646+dropConstraint
647+ :: ( KnownSymbol constraint
648+ , Has sch schemas schema
649+ , Has tab schema ('Table table0)
650+ , table0 ~ (constraints :=> columns)
651+ , table1 ~ (Drop constraint constraints :=> columns) )
652+ => Alias constraint
653+ -- ^ constraint to drop
654+ -> AlterTable sch tab schemas table1
655+dropConstraint constraint = UnsafeAlterTable $
656+ "DROP" <+> "CONSTRAINT" <+> renderSQL constraint
657+
658+-- | An `AddColumn` is either @NULL@ or has @DEFAULT@.
659+class AddColumn ty where
660+ -- | `addColumn` adds a new column, initially filled with whatever
661+ -- default value is given or with @NULL@.
662+ --
663+ -- >>> :{
664+ -- let
665+ -- definition :: Definition
666+ -- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4])]]
667+ -- '["public" ::: '["tab" ::: 'Table ('[] :=>
668+ -- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
669+ -- , "col2" ::: 'Def :=> 'Null 'PGtext ])]]
670+ -- definition = alterTable #tab (addColumn #col2 (text & nullable & default_ "foo"))
671+ -- in printSQL definition
672+ -- :}
673+ -- ALTER TABLE "tab" ADD COLUMN "col2" text NULL DEFAULT E'foo';
674+ --
675+ -- >>> :{
676+ -- let
677+ -- definition :: Definition
678+ -- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4])]]
679+ -- '["public" ::: '["tab" ::: 'Table ('[] :=>
680+ -- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
681+ -- , "col2" ::: 'NoDef :=> 'Null 'PGtext ])]]
682+ -- definition = alterTable #tab (addColumn #col2 (text & nullable))
683+ -- in printSQL definition
684+ -- :}
685+ -- ALTER TABLE "tab" ADD COLUMN "col2" text NULL;
686+ addColumn
687+ :: ( KnownSymbol column
688+ , Has sch schemas schema
689+ , Has tab schema ('Table table0)
690+ , table0 ~ (constraints :=> columns) )
691+ => Alias column -- ^ column to add
692+ -> ColumnTypeExpression schemas ty -- ^ type of the new column
693+ -> AlterTable sch tab schemas (constraints :=> Create column ty columns)
694+ addColumn column ty = UnsafeAlterTable $
695+ "ADD COLUMN" <+> renderSQL column <+> renderColumnTypeExpression ty
696+instance {-# OVERLAPPING #-} AddColumn ('Def :=> ty)
697+instance {-# OVERLAPPABLE #-} AddColumn ('NoDef :=> 'Null ty)
698+
699+-- | A `dropColumn` removes a column. Whatever data was in the column
700+-- disappears. Table constraints involving the column are dropped, too.
701+-- However, if the column is referenced by a foreign key constraint of
702+-- another table, PostgreSQL will not silently drop that constraint.
703+--
704+-- >>> :{
705+-- let
706+-- definition :: Definition
707+-- '["public" ::: '["tab" ::: 'Table ('[] :=>
708+-- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
709+-- , "col2" ::: 'NoDef :=> 'Null 'PGtext ])]]
710+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4])]]
711+-- definition = alterTable #tab (dropColumn #col2)
712+-- in printSQL definition
713+-- :}
714+-- ALTER TABLE "tab" DROP COLUMN "col2";
715+dropColumn
716+ :: ( KnownSymbol column
717+ , Has sch schemas schema
718+ , Has tab schema ('Table table0)
719+ , table0 ~ (constraints :=> columns)
720+ , table1 ~ (constraints :=> Drop column columns) )
721+ => Alias column -- ^ column to remove
722+ -> AlterTable sch tab schemas table1
723+dropColumn column = UnsafeAlterTable $
724+ "DROP COLUMN" <+> renderSQL column
725+
726+-- | A `renameColumn` renames a column.
727+--
728+-- >>> :{
729+-- let
730+-- definition :: Definition
731+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["foo" ::: 'NoDef :=> 'Null 'PGint4])]]
732+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["bar" ::: 'NoDef :=> 'Null 'PGint4])]]
733+-- definition = alterTable #tab (renameColumn #foo #bar)
734+-- in printSQL definition
735+-- :}
736+-- ALTER TABLE "tab" RENAME COLUMN "foo" TO "bar";
737+renameColumn
738+ :: ( KnownSymbol column0
739+ , KnownSymbol column1
740+ , Has sch schemas schema
741+ , Has tab schema ('Table table0)
742+ , table0 ~ (constraints :=> columns)
743+ , table1 ~ (constraints :=> Rename column0 column1 columns) )
744+ => Alias column0 -- ^ column to rename
745+ -> Alias column1 -- ^ what to rename the column
746+ -> AlterTable sch tab schemas table1
747+renameColumn column0 column1 = UnsafeAlterTable $
748+ "RENAME COLUMN" <+> renderSQL column0 <+> "TO" <+> renderSQL column1
749+
750+-- | An `alterColumn` alters a single column.
751+alterColumn
752+ :: ( KnownSymbol column
753+ , Has sch schemas schema
754+ , Has tab schema ('Table table0)
755+ , table0 ~ (constraints :=> columns)
756+ , Has column columns ty0
757+ , table1 ~ (constraints :=> Alter column ty1 columns))
758+ => Alias column -- ^ column to alter
759+ -> AlterColumn schemas ty0 ty1 -- ^ alteration to perform
760+ -> AlterTable sch tab schemas table1
761+alterColumn column alteration = UnsafeAlterTable $
762+ "ALTER COLUMN" <+> renderSQL column <+> renderAlterColumn alteration
763+
764+-- | An `AlterColumn` describes the alteration to perform on a single column.
765+newtype AlterColumn (schemas :: SchemasType) (ty0 :: ColumnType) (ty1 :: ColumnType) =
766+ UnsafeAlterColumn {renderAlterColumn :: ByteString}
767+ deriving (GHC.Generic,Show,Eq,Ord,NFData)
768+
769+-- | A `setDefault` sets a new default for a column. Note that this doesn't
770+-- affect any existing rows in the table, it just changes the default for
771+-- future insert and update commands.
772+--
773+-- >>> :{
774+-- let
775+-- definition :: Definition
776+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]]
777+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'Def :=> 'Null 'PGint4])]]
778+-- definition = alterTable #tab (alterColumn #col (setDefault 5))
779+-- in printSQL definition
780+-- :}
781+-- ALTER TABLE "tab" ALTER COLUMN "col" SET DEFAULT 5;
782+setDefault
783+ :: Expression '[] '[] 'Ungrouped schemas '[] '[] ty -- ^ default value to set
784+ -> AlterColumn schemas (constraint :=> ty) ('Def :=> ty)
785+setDefault expression = UnsafeAlterColumn $
786+ "SET DEFAULT" <+> renderExpression expression
787+
788+-- | A `dropDefault` removes any default value for a column.
789+--
790+-- >>> :{
791+-- let
792+-- definition :: Definition
793+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'Def :=> 'Null 'PGint4])]]
794+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]]
795+-- definition = alterTable #tab (alterColumn #col dropDefault)
796+-- in printSQL definition
797+-- :}
798+-- ALTER TABLE "tab" ALTER COLUMN "col" DROP DEFAULT;
799+dropDefault :: AlterColumn schemas ('Def :=> ty) ('NoDef :=> ty)
800+dropDefault = UnsafeAlterColumn $ "DROP DEFAULT"
801+
802+-- | A `setNotNull` adds a @NOT NULL@ constraint to a column.
803+-- The constraint will be checked immediately, so the table data must satisfy
804+-- the constraint before it can be added.
805+--
806+-- >>> :{
807+-- let
808+-- definition :: Definition
809+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]]
810+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
811+-- definition = alterTable #tab (alterColumn #col setNotNull)
812+-- in printSQL definition
813+-- :}
814+-- ALTER TABLE "tab" ALTER COLUMN "col" SET NOT NULL;
815+setNotNull
816+ :: AlterColumn schemas (constraint :=> 'Null ty) (constraint :=> 'NotNull ty)
817+setNotNull = UnsafeAlterColumn $ "SET NOT NULL"
818+
819+-- | A `dropNotNull` drops a @NOT NULL@ constraint from a column.
820+--
821+-- >>> :{
822+-- let
823+-- definition :: Definition
824+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
825+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]]
826+-- definition = alterTable #tab (alterColumn #col dropNotNull)
827+-- in printSQL definition
828+-- :}
829+-- ALTER TABLE "tab" ALTER COLUMN "col" DROP NOT NULL;
830+dropNotNull
831+ :: AlterColumn schemas (constraint :=> 'NotNull ty) (constraint :=> 'Null ty)
832+dropNotNull = UnsafeAlterColumn $ "DROP NOT NULL"
833+
834+-- | An `alterType` converts a column to a different data type.
835+-- This will succeed only if each existing entry in the column can be
836+-- converted to the new type by an implicit cast.
837+--
838+-- >>> :{
839+-- let
840+-- definition :: Definition
841+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
842+-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGnumeric])]]
843+-- definition =
844+-- alterTable #tab (alterColumn #col (alterType (numeric & notNullable)))
845+-- in printSQL definition
846+-- :}
847+-- ALTER TABLE "tab" ALTER COLUMN "col" TYPE numeric NOT NULL;
848+alterType :: ColumnTypeExpression schemas ty -> AlterColumn schemas ty0 ty
849+alterType ty = UnsafeAlterColumn $ "TYPE" <+> renderColumnTypeExpression ty
850+
851+{- | Create a view.
852+>>> type ABC = '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4]
853+>>> type BC = '["b" ::: 'Null 'PGint4, "c" ::: 'Null 'PGint4]
854+>>> :{
855+let
856+ definition :: Definition
857+ '[ "public" ::: '["abc" ::: 'Table ('[] :=> ABC)]]
858+ '[ "public" ::: '["abc" ::: 'Table ('[] :=> ABC), "bc" ::: 'View BC]]
859+ definition =
860+ createView #bc (select_ (#b :* #c) (from (table #abc)))
861+in printSQL definition
862+:}
863+CREATE VIEW "bc" AS SELECT "b" AS "b", "c" AS "c" FROM "abc" AS "abc";
864+-}
865+createView
866+ :: (KnownSymbol sch, KnownSymbol vw, Has sch schemas schema)
867+ => QualifiedAlias sch vw -- ^ the name of the view to add
868+ -> Query '[] '[] schemas '[] view -- ^ query
869+ -> Definition schemas (Alter sch (Create vw ('View view) schema) schemas)
870+createView alias query = UnsafeDefinition $
871+ "CREATE" <+> "VIEW" <+> renderSQL alias <+> "AS"
872+ <+> renderQuery query <> ";"
873+
874+-- | Drop a view.
875+--
876+-- >>> :{
877+-- let
878+-- definition :: Definition
879+-- '[ "public" ::: '["abc" ::: 'Table ('[] :=> '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4])
880+-- , "bc" ::: 'View ('["b" ::: 'Null 'PGint4, "c" ::: 'Null 'PGint4])]]
881+-- '[ "public" ::: '["abc" ::: 'Table ('[] :=> '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4])]]
882+-- definition = dropView #bc
883+-- in printSQL definition
884+-- :}
885+-- DROP VIEW "bc";
886+dropView
887+ :: (Has sch schemas schema, Has vw schema ('View view))
888+ => QualifiedAlias sch vw -- ^ view to remove
889+ -> Definition schemas (Alter sch (Drop vw schema) schemas)
890+dropView vw = UnsafeDefinition $ "DROP VIEW" <+> renderSQL vw <> ";"
891+
892+-- | Enumerated types are created using the `createTypeEnum` command, for example
893+--
894+-- >>> printSQL $ (createTypeEnum #mood (label @"sad" :* label @"ok" :* label @"happy") :: Definition (Public '[]) '["public" ::: '["mood" ::: 'Typedef ('PGenum '["sad","ok","happy"])]])
895+-- CREATE TYPE "mood" AS ENUM ('sad', 'ok', 'happy');
896+createTypeEnum
897+ :: (KnownSymbol enum, Has sch schemas schema, SOP.All KnownSymbol labels)
898+ => QualifiedAlias sch enum
899+ -- ^ name of the user defined enumerated type
900+ -> NP PGlabel labels
901+ -- ^ labels of the enumerated type
902+ -> Definition schemas (Alter sch (Create enum ('Typedef ('PGenum labels)) schema) schemas)
903+createTypeEnum enum labels = UnsafeDefinition $
904+ "CREATE" <+> "TYPE" <+> renderSQL enum <+> "AS" <+> "ENUM" <+>
905+ parenthesized (renderSQL labels) <> ";"
906+
907+-- | Enumerated types can also be generated from a Haskell type, for example
908+--
909+-- >>> data Schwarma = Beef | Lamb | Chicken deriving GHC.Generic
910+-- >>> instance SOP.Generic Schwarma
911+-- >>> instance SOP.HasDatatypeInfo Schwarma
912+-- >>> :{
913+-- let
914+-- createSchwarma :: Definition (Public '[]) '["public" ::: '["schwarma" ::: 'Typedef (PG (Enumerated Schwarma))]]
915+-- createSchwarma = createTypeEnumFrom @Schwarma #schwarma
916+-- in
917+-- printSQL createSchwarma
918+-- :}
919+-- CREATE TYPE "schwarma" AS ENUM ('Beef', 'Lamb', 'Chicken');
920+createTypeEnumFrom
921+ :: forall hask sch enum schemas schema.
922+ ( SOP.Generic hask
923+ , SOP.All KnownSymbol (LabelsPG hask)
924+ , KnownSymbol enum
925+ , Has sch schemas schema )
926+ => QualifiedAlias sch enum
927+ -- ^ name of the user defined enumerated type
928+ -> Definition schemas (Alter sch (Create enum ('Typedef (PG (Enumerated hask))) schema) schemas)
929+createTypeEnumFrom enum = createTypeEnum enum
930+ (SOP.hpure label :: NP PGlabel (LabelsPG hask))
931+
932+{- | `createTypeComposite` creates a composite type. The composite type is
933+specified by a list of attribute names and data types.
934+
935+>>> :{
936+type PGcomplex = 'PGcomposite
937+ '[ "real" ::: 'NotNull 'PGfloat8
938+ , "imaginary" ::: 'NotNull 'PGfloat8 ]
939+:}
940+
941+>>> :{
942+let
943+ setup :: Definition (Public '[]) '["public" ::: '["complex" ::: 'Typedef PGcomplex]]
944+ setup = createTypeComposite #complex
945+ (float8 `as` #real :* float8 `as` #imaginary)
946+in printSQL setup
947+:}
948+CREATE TYPE "complex" AS ("real" float8, "imaginary" float8);
949+-}
950+createTypeComposite
951+ :: (KnownSymbol ty, Has sch schemas schema, SOP.SListI fields)
952+ => QualifiedAlias sch ty
953+ -- ^ name of the user defined composite type
954+ -> NP (Aliased (TypeExpression schemas)) fields
955+ -- ^ list of attribute names and data types
956+ -> Definition schemas (Alter sch (Create ty ('Typedef ('PGcomposite fields)) schema) schemas)
957+createTypeComposite ty fields = UnsafeDefinition $
958+ "CREATE" <+> "TYPE" <+> renderSQL ty <+> "AS" <+> parenthesized
959+ (renderCommaSeparated renderField fields) <> ";"
960+ where
961+ renderField :: Aliased (TypeExpression schemas) x -> ByteString
962+ renderField (typ `As` alias) =
963+ renderSQL alias <+> renderSQL typ
964+
965+-- | Composite types can also be generated from a Haskell type, for example
966+--
967+-- >>> data Complex = Complex {real :: Double, imaginary :: Double} deriving GHC.Generic
968+-- >>> instance SOP.Generic Complex
969+-- >>> instance SOP.HasDatatypeInfo Complex
970+-- >>> type Schema = '["complex" ::: 'Typedef (PG (Composite Complex))]
971+-- >>> :{
972+-- let
973+-- createComplex :: Definition (Public '[]) (Public Schema)
974+-- createComplex = createTypeCompositeFrom @Complex #complex
975+-- in
976+-- printSQL createComplex
977+-- :}
978+-- CREATE TYPE "complex" AS ("real" float8, "imaginary" float8);
979+createTypeCompositeFrom
980+ :: forall hask sch ty schemas schema.
981+ ( SOP.All (FieldTyped schemas) (RowPG hask)
982+ , KnownSymbol ty
983+ , Has sch schemas schema )
984+ => QualifiedAlias sch ty
985+ -- ^ name of the user defined composite type
986+ -> Definition schemas (Alter sch (Create ty ( 'Typedef (PG (Composite hask))) schema) schemas)
987+createTypeCompositeFrom ty = createTypeComposite ty
988+ (SOP.hcpure (SOP.Proxy :: SOP.Proxy (FieldTyped schemas)) fieldtype
989+ :: NP (Aliased (TypeExpression schemas)) (RowPG hask))
990+
991+{-|
992+`createDomain` creates a new domain. A domain is essentially a data type
993+with constraints (restrictions on the allowed set of values).
994+
995+Domains are useful for abstracting common constraints on fields
996+into a single location for maintenance. For example, several tables might
997+contain email address columns, all requiring the same `check` constraint
998+to verify the address syntax. Define a domain rather than setting up
999+each table's constraint individually.
1000+
1001+>>> :{
1002+let
1003+ createPositive :: Definition (Public '[]) (Public '["positive" ::: 'Typedef 'PGfloat4])
1004+ createPositive = createDomain #positive real (#value .> 0 .&& (#value & isNotNull))
1005+in printSQL createPositive
1006+:}
1007+CREATE DOMAIN "positive" AS real CHECK ((("value" > 0) AND "value" IS NOT NULL));
1008+-}
1009+createDomain
1010+ :: (Has sch schemas schema, KnownSymbol dom)
1011+ => QualifiedAlias sch dom
1012+ -> (forall nullity. TypeExpression schemas (nullity ty))
1013+ -> (forall tab. Condition '[] '[] 'Ungrouped schemas '[] '[tab ::: '["value" ::: 'Null ty]])
1014+ -> Definition schemas (Alter sch (Create alias ('Typedef ty) schema) schemas)
1015+createDomain dom ty condition =
1016+ UnsafeDefinition $ "CREATE DOMAIN" <+> renderSQL dom
1017+ <+> "AS" <+> renderTypeExpression ty
1018+ <+> "CHECK" <+> parenthesized (renderSQL condition) <> ";"
1019+
1020+class FieldTyped schemas ty where
1021+ fieldtype :: Aliased (TypeExpression schemas) ty
1022+instance (KnownSymbol alias, PGTyped schemas ty)
1023+ => FieldTyped schemas (alias ::: ty) where
1024+ fieldtype = pgtype `As` Alias
1025+
1026+-- | Drop a type.
1027+--
1028+-- >>> data Schwarma = Beef | Lamb | Chicken deriving GHC.Generic
1029+-- >>> instance SOP.Generic Schwarma
1030+-- >>> instance SOP.HasDatatypeInfo Schwarma
1031+-- >>> printSQL (dropType #schwarma :: Definition '["public" ::: '["schwarma" ::: 'Typedef (PG (Enumerated Schwarma))]] (Public '[]))
1032+-- DROP TYPE "schwarma";
1033+dropType
1034+ :: (Has sch schemas schema, Has td schema ('Typedef ty))
1035+ => QualifiedAlias sch td
1036+ -- ^ name of the user defined type
1037+ -> Definition schemas (Alter sch (Drop td schema) schemas)
1038+dropType tydef = UnsafeDefinition $ "DROP" <+> "TYPE" <+> renderSQL tydef <> ";"
1039+
1040+-- | `ColumnTypeExpression`s are used in `createTable` commands.
1041+newtype ColumnTypeExpression (schemas :: SchemasType) (ty :: ColumnType)
1042+ = UnsafeColumnTypeExpression { renderColumnTypeExpression :: ByteString }
1043+ deriving (GHC.Generic,Show,Eq,Ord,NFData)
1044+instance RenderSQL (ColumnTypeExpression schemas ty) where
1045+ renderSQL = renderColumnTypeExpression
1046+
1047+-- | used in `createTable` commands as a column constraint to note that
1048+-- @NULL@ may be present in a column
1049+nullable
1050+ :: TypeExpression schemas (nullity ty)
1051+ -> ColumnTypeExpression schemas ('NoDef :=> 'Null ty)
1052+nullable ty = UnsafeColumnTypeExpression $ renderSQL ty <+> "NULL"
1053+
1054+-- | used in `createTable` commands as a column constraint to ensure
1055+-- @NULL@ is not present in a column
1056+notNullable
1057+ :: TypeExpression schemas (nullity ty)
1058+ -> ColumnTypeExpression schemas ('NoDef :=> 'NotNull ty)
1059+notNullable ty = UnsafeColumnTypeExpression $ renderSQL ty <+> "NOT NULL"
1060+
1061+-- | used in `createTable` commands as a column constraint to give a default
1062+default_
1063+ :: Expression '[] '[] 'Ungrouped schemas '[] '[] ty
1064+ -> ColumnTypeExpression schemas ('NoDef :=> ty)
1065+ -> ColumnTypeExpression schemas ('Def :=> ty)
1066+default_ x ty = UnsafeColumnTypeExpression $
1067+ renderSQL ty <+> "DEFAULT" <+> renderExpression x
1068+
1069+-- | not a true type, but merely a notational convenience for creating
1070+-- unique identifier columns with type `PGint2`
1071+serial2, smallserial
1072+ :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint2)
1073+serial2 = UnsafeColumnTypeExpression "serial2"
1074+smallserial = UnsafeColumnTypeExpression "smallserial"
1075+-- | not a true type, but merely a notational convenience for creating
1076+-- unique identifier columns with type `PGint4`
1077+serial4, serial
1078+ :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint4)
1079+serial4 = UnsafeColumnTypeExpression "serial4"
1080+serial = UnsafeColumnTypeExpression "serial"
1081+-- | not a true type, but merely a notational convenience for creating
1082+-- unique identifier columns with type `PGint8`
1083+serial8, bigserial
1084+ :: ColumnTypeExpression schemas ('Def :=> 'NotNull 'PGint8)
1085+serial8 = UnsafeColumnTypeExpression "serial8"
1086+bigserial = UnsafeColumnTypeExpression "bigserial"
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Function.hsdeleted−238
@@ -1,238 +0,0 @@
1−{-|
2−Module: Squeal.PostgreSQL.Definition.Function
3−Description: Create and drop function and operator definitions
4−Copyright: (c) Eitan Chatav, 2017
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Create and drop function and operator definitions.
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.Function
33− ( createFunction
34− , createOrReplaceFunction
35− , createSetFunction
36− , createOrReplaceSetFunction
37− , createBinaryOp
38− , createLeftOp
39− , createRightOp
40− , dropFunction
41− , dropFunctionIfExists
42− , dropOperator
43− , dropOperatorIfExists
44− , FunctionDefinition(..)
45− , languageSqlExpr
46− , languageSqlQuery
47− ) where
48−
49−import Control.DeepSeq
50−import Data.ByteString
51−import GHC.TypeLits
52−
53−import qualified Generics.SOP as SOP
54−import qualified GHC.Generics as GHC
55−
56−import Squeal.PostgreSQL.Alias
57−import Squeal.PostgreSQL.Definition
58−import Squeal.PostgreSQL.Expression
59−import Squeal.PostgreSQL.Expression.Type
60−import Squeal.PostgreSQL.List
61−import Squeal.PostgreSQL.Query
62−import Squeal.PostgreSQL.Render
63−import Squeal.PostgreSQL.Schema
64−
65−-- $setup
66−-- >>> import Squeal.PostgreSQL
67−
68−createFunction
69− :: ( Has sch schemas schema
70− , KnownSymbol fun
71− , SOP.SListI args )
72− => QualifiedAlias sch fun
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)
77−createFunction fun args ret fundef = UnsafeDefinition $
78− "CREATE" <+> "FUNCTION" <+> renderSQL fun
79− <+> parenthesized (renderCommaSeparated renderSQL args)
80− <+> "RETURNS" <+> renderSQL ret <+> renderSQL fundef <> ";"
81−
82−createOrReplaceFunction
83− :: ( Has sch schemas schema
84− , KnownSymbol fun
85− , SOP.SListI args )
86− => QualifiedAlias sch fun
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)
91−createOrReplaceFunction fun args ret fundef = UnsafeDefinition $
92− "CREATE" <+> "OR" <+> "REPLACE" <+> "FUNCTION" <+> renderSQL fun
93− <+> parenthesized (renderCommaSeparated renderSQL args)
94− <+> "RETURNS" <+> renderSQL ret <+> renderSQL fundef <> ";"
95−
96−languageSqlExpr
97− :: Expression '[] '[] 'Ungrouped schemas args '[] ret
98− -> FunctionDefinition schemas args ('Returns ret)
99−languageSqlExpr expr = UnsafeFunctionDefinition $
100− "language sql as"
101− <+> "$$" <+> renderSQL (values_ (expr `as` #ret)) <+> "$$"
102−
103−languageSqlQuery
104− :: Query '[] '[] schemas args rets
105− -> FunctionDefinition schemas args ('ReturnsTable rets)
106−languageSqlQuery qry = UnsafeFunctionDefinition $
107− "language sql as" <+> "$$" <+> renderSQL qry <+> "$$"
108−
109−createSetFunction
110− :: ( Has sch schemas schema
111− , KnownSymbol fun
112− , SOP.SListI args
113− , SOP.SListI rets )
114− => QualifiedAlias sch fun
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)
119−createSetFunction fun args rets fundef = UnsafeDefinition $
120− "CREATE" <+> "FUNCTION" <+> renderSQL fun
121− <+> parenthesized (renderCommaSeparated renderSQL args)
122− <+> "RETURNS" <+> "TABLE"
123− <+> parenthesized (renderCommaSeparated renderRet rets)
124− <+> renderSQL fundef <> ";"
125− where
126− renderRet :: Aliased (TypeExpression s) r -> ByteString
127− renderRet (ty `As` col) = renderSQL col <+> renderSQL ty
128−
129−createOrReplaceSetFunction
130− :: ( Has sch schemas schema
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)
139−createOrReplaceSetFunction fun args rets fundef = UnsafeDefinition $
140− "CREATE" <+> "OR" <+> "REPLACE" <+> "FUNCTION" <+> renderSQL fun
141− <+> parenthesized (renderCommaSeparated renderSQL args)
142− <+> "RETURNS" <+> "TABLE"
143− <+> parenthesized (renderCommaSeparated renderRet rets)
144− <+> renderSQL fundef <> ";"
145− where
146− renderRet :: Aliased (TypeExpression s) r -> ByteString
147− renderRet (ty `As` col) = renderSQL col <+> renderSQL ty
148−
149−createBinaryOp
150− :: forall op fun sch schemas schema x y z.
151− ( Has sch schemas schema
152− , Has fun schema ('Function ('[x,y] :=> 'Returns z))
153− , KnownSymbol op )
154− => QualifiedAlias sch fun
155− -> TypeExpression schemas x
156− -> TypeExpression schemas y
157− -> Definition schemas
158− (Alter sch (Create op ('Operator ('BinaryOp x y z)) schema) schemas)
159−createBinaryOp fun x y = UnsafeDefinition $
160− "CREATE" <+> "OPERATOR" <+> renderSymbol @op
161− <+> parenthesized (commaSeparated opdef)
162− where
163− opdef =
164− [ "FUNCTION" <+> "=" <+> renderSQL fun
165− , "LEFTARG" <+> "=" <+> renderSQL x
166− , "RIGHTARG" <+> "=" <+> renderSQL y ]
167−
168−createLeftOp
169− :: forall op fun sch schemas schema x y.
170− ( Has sch schemas schema
171− , Has fun schema ('Function ('[x] :=> 'Returns y))
172− , KnownSymbol op )
173− => QualifiedAlias sch fun
174− -> TypeExpression schemas x
175− -> Definition schemas
176− (Alter sch (Create op ('Operator ('LeftOp x y)) schema) schemas)
177−createLeftOp fun x = UnsafeDefinition $
178− "CREATE" <+> "OPERATOR" <+> renderSymbol @op
179− <+> parenthesized (commaSeparated opdef)
180− where
181− opdef =
182− [ "FUNCTION" <+> "=" <+> renderSQL fun
183− , "RIGHTARG" <+> "=" <+> renderSQL x ]
184−
185−createRightOp
186− :: forall op fun sch schemas schema x y.
187− ( Has sch schemas schema
188− , Has fun schema ('Function ('[x] :=> 'Returns y))
189− , KnownSymbol op )
190− => QualifiedAlias sch fun
191− -> TypeExpression schemas x
192− -> Definition schemas
193− (Alter sch (Create op ('Operator ('RightOp x y)) schema) schemas)
194−createRightOp fun x = UnsafeDefinition $
195− "CREATE" <+> "OPERATOR" <+> renderSymbol @op
196− <+> parenthesized (commaSeparated opdef)
197− where
198− opdef =
199− [ "FUNCTION" <+> "=" <+> renderSQL fun
200− , "LEFTARG" <+> "=" <+> renderSQL x ]
201−
202−dropFunction
203− :: (Has sch schemas schema, KnownSymbol fun)
204− => QualifiedAlias sch fun
205− -- ^ name of the user defined function
206− -> Definition schemas (Alter sch (DropSchemum fun 'Function schema) schemas)
207−dropFunction fun = UnsafeDefinition $
208− "DROP" <+> "FUNCTION" <+> renderSQL fun <> ";"
209−
210−dropFunctionIfExists
211− :: (Has sch schemas schema, KnownSymbol fun)
212− => QualifiedAlias sch fun
213− -- ^ name of the user defined function
214− -> Definition schemas (Alter sch (DropSchemumIfExists fun 'Function schema) schemas)
215−dropFunctionIfExists fun = UnsafeDefinition $
216− "DROP FUNCTION IF EXISTS" <+> renderSQL fun <> ";"
217−
218−dropOperator
219− :: (Has sch schemas schema, KnownSymbol op)
220− => QualifiedAlias sch op
221− -- ^ name of the user defined operator
222− -> Definition schemas (Alter sch (DropSchemum op 'Operator schema) schemas)
223−dropOperator op = UnsafeDefinition $
224− "DROP" <+> "OPERATOR" <+> renderSQL op <> ";"
225−
226−dropOperatorIfExists
227− :: (Has sch schemas schema, KnownSymbol op)
228− => QualifiedAlias sch op
229− -- ^ name of the user defined operator
230− -> Definition schemas (Alter sch (DropSchemumIfExists op 'Operator schema) schemas)
231−dropOperatorIfExists op = UnsafeDefinition $
232− "DROP OPERATOR IF EXISTS" <+> renderSQL op <> ";"
233−
234−newtype FunctionDefinition schemas args ret = UnsafeFunctionDefinition
235− { renderFunctionDefinition :: ByteString }
236− deriving (Eq,Show,GHC.Generic,NFData)
237−instance RenderSQL (FunctionDefinition schemas args ret) where
238− renderSQL = renderFunctionDefinition
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Index.hsdeleted−159
@@ -1,159 +0,0 @@
1−{-|
2−Module: Squeal.PostgreSQL.Definition.Index
3−Description: Create and drop index definitions
4−Copyright: (c) Eitan Chatav, 2017
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Create and drop index definitions.
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.Index
33− ( createIndex
34− , createIndexIfNotExists
35− , dropIndex
36− , dropIndexIfExists
37− , IndexMethod (..)
38− , btree
39− , hash
40− , gist
41− , spgist
42− , gin
43− , brin
44− ) where
45−
46−import Data.ByteString
47−import GHC.TypeLits
48−
49−import qualified GHC.Generics as GHC
50−
51−import Squeal.PostgreSQL.Alias
52−import Squeal.PostgreSQL.Definition
53−import Squeal.PostgreSQL.Expression.Sort
54−import Squeal.PostgreSQL.Render
55−import Squeal.PostgreSQL.Schema
56−
57−-- $setup
58−-- >>> import Squeal.PostgreSQL
59−
60−{- |
61−>>> :{
62−type Table = '[] :=>
63− '[ "a" ::: 'NoDef :=> 'Null 'PGint4
64− , "b" ::: 'NoDef :=> 'Null 'PGfloat4 ]
65−:}
66−
67−>>> :{
68−let
69− setup :: Definition (Public '[]) (Public '["tab" ::: 'Table Table, "ix" ::: 'Index 'Btree])
70− setup =
71− createTable #tab (nullable int `as` #a :* nullable real `as` #b) Nil >>>
72− createIndex #ix #tab btree [#a & AscNullsFirst, #b & AscNullsLast]
73−in printSQL setup
74−:}
75−CREATE TABLE "tab" ("a" int NULL, "b" real NULL);
76−CREATE INDEX "ix" ON "tab" USING btree (("a") ASC NULLS FIRST, ("b") ASC NULLS LAST);
77−-}
78−createIndex
79− :: (Has sch schemas schema, Has tab schema ('Table table), KnownSymbol ix)
80− => Alias ix
81− -> QualifiedAlias sch tab
82− -> IndexMethod method
83− -> [SortExpression '[] '[] 'Ungrouped schemas '[] '[tab ::: TableToRow table]]
84− -> Definition schemas (Alter sch (Create ix ('Index method) schema) schemas)
85−createIndex ix tab method cols = UnsafeDefinition $
86− "CREATE" <+> "INDEX" <+> renderSQL ix <+> "ON" <+> renderSQL tab
87− <+> "USING" <+> renderSQL method
88− <+> parenthesized (commaSeparated (renderIndex <$> cols))
89− <> ";"
90− where
91− renderIndex = \case
92− Asc expression -> parenthesized (renderSQL expression) <+> "ASC"
93− Desc expression -> parenthesized (renderSQL expression) <+> "DESC"
94− AscNullsFirst expression -> parenthesized (renderSQL expression)
95− <+> "ASC NULLS FIRST"
96− DescNullsFirst expression -> parenthesized (renderSQL expression)
97− <+> "DESC NULLS FIRST"
98− AscNullsLast expression -> parenthesized (renderSQL expression)
99− <+> "ASC NULLS LAST"
100− DescNullsLast expression -> parenthesized (renderSQL expression)
101− <+> "DESC NULLS LAST"
102−
103−createIndexIfNotExists
104− :: (Has sch schemas schema, Has tab schema ('Table table), KnownSymbol ix)
105− => Alias ix
106− -> QualifiedAlias sch tab
107− -> IndexMethod method
108− -> [SortExpression '[] '[] 'Ungrouped schemas '[] '[tab ::: TableToRow table]]
109− -> Definition schemas (Alter sch (CreateIfNotExists ix ('Index method) schema) schemas)
110−createIndexIfNotExists ix tab method cols = UnsafeDefinition $
111− "CREATE INDEX IF NOT EXISTS" <+> renderSQL ix <+> "ON" <+> renderSQL tab
112− <+> "USING" <+> renderSQL method
113− <+> parenthesized (commaSeparated (renderIndex <$> cols))
114− <> ";"
115− where
116− renderIndex = \case
117− Asc expression -> parenthesized (renderSQL expression) <+> "ASC"
118− Desc expression -> parenthesized (renderSQL expression) <+> "DESC"
119− AscNullsFirst expression -> parenthesized (renderSQL expression)
120− <+> "ASC NULLS FIRST"
121− DescNullsFirst expression -> parenthesized (renderSQL expression)
122− <+> "DESC NULLS FIRST"
123− AscNullsLast expression -> parenthesized (renderSQL expression)
124− <+> "ASC NULLS LAST"
125− DescNullsLast expression -> parenthesized (renderSQL expression)
126− <+> "DESC NULLS LAST"
127−
128−newtype IndexMethod ty = UnsafeIndexMethod {renderIndexMethod :: ByteString}
129− deriving stock (Eq, Ord, Show, GHC.Generic)
130−instance RenderSQL (IndexMethod ty) where renderSQL = renderIndexMethod
131−btree :: IndexMethod 'Btree
132−btree = UnsafeIndexMethod "btree"
133−hash :: IndexMethod 'Hash
134−hash = UnsafeIndexMethod "hash"
135−gist :: IndexMethod 'Gist
136−gist = UnsafeIndexMethod "gist"
137−spgist :: IndexMethod 'Spgist
138−spgist = UnsafeIndexMethod "spgist"
139−gin :: IndexMethod 'Gin
140−gin = UnsafeIndexMethod "gin"
141−brin :: IndexMethod 'Brin
142−brin = UnsafeIndexMethod "brin"
143−
144−-- |
145−-- >>> printSQL (dropIndex #ix :: Definition (Public '["ix" ::: 'Index 'Btree]) (Public '[]))
146−-- DROP INDEX "ix";
147−dropIndex
148− :: (Has sch schemas schema, KnownSymbol ix)
149− => QualifiedAlias sch ix
150− -- ^ name of the user defined index
151− -> Definition schemas (Alter sch (DropSchemum ix 'Index schema) schemas)
152−dropIndex ix = UnsafeDefinition $ "DROP" <+> "INDEX" <+> renderSQL ix <> ";"
153−
154−dropIndexIfExists
155− :: (Has sch schemas schema, KnownSymbol ix)
156− => QualifiedAlias sch ix
157− -- ^ name of the user defined index
158− -> Definition schemas (Alter sch (DropSchemumIfExists ix 'Index schema) schemas)
159−dropIndexIfExists ix = UnsafeDefinition $ "DROP INDEX IF EXISTS" <+> renderSQL ix <> ";"
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Schema.hsdeleted−96
@@ -1,96 +0,0 @@
1−{-|
2−Module: Squeal.PostgreSQL.Definition.Schema
3−Description: Create and drop schema definitions
4−Copyright: (c) Eitan Chatav, 2017
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Create and drop schema definitions.
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.Schema
33− ( createSchema
34− , createSchemaIfNotExists
35− , dropSchema
36− , dropSchemaIfExists
37− ) where
38−
39−import GHC.TypeLits
40−
41−import Squeal.PostgreSQL.Alias
42−import Squeal.PostgreSQL.Definition
43−import Squeal.PostgreSQL.Render
44−import Squeal.PostgreSQL.Schema
45−
46−-- $setup
47−-- >>> import Squeal.PostgreSQL
48−
49−{- |
50−`createSchema` enters a new schema into the current database.
51−The schema name must be distinct from the name of any existing schema
52−in the current database.
53−
54−A schema is essentially a namespace: it contains named objects
55−(tables, data types, functions, and operators) whose names
56−can duplicate those of other objects existing in other schemas.
57−Named objects are accessed by `QualifiedAlias`es with the schema
58−name as a prefix.
59−-}
60−createSchema
61− :: KnownSymbol sch
62− => Alias sch
63− -> Definition schemas (Create sch '[] schemas)
64−createSchema sch = UnsafeDefinition $
65− "CREATE" <+> "SCHEMA" <+> renderSQL sch <> ";"
66−
67−{- | Idempotent version of `createSchema`. -}
68−createSchemaIfNotExists
69− :: (KnownSymbol sch, Has sch schemas schema)
70− => Alias sch
71− -> Definition schemas (CreateIfNotExists sch '[] schemas)
72−createSchemaIfNotExists sch = UnsafeDefinition $
73− "CREATE" <+> "SCHEMA" <+> "IF" <+> "NOT" <+> "EXISTS"
74− <+> renderSQL sch <> ";"
75−
76−-- | >>> :{
77−-- let
78−-- definition :: Definition '["muh_schema" ::: schema, "public" ::: public] '["public" ::: public]
79−-- definition = dropSchema #muh_schema
80−-- :}
81−--
82−-- >>> printSQL definition
83−-- DROP SCHEMA "muh_schema";
84−dropSchema
85− :: KnownSymbol sch
86− => Alias sch
87− -- ^ user defined schema
88− -> Definition schemas (Drop sch schemas)
89−dropSchema sch = UnsafeDefinition $ "DROP SCHEMA" <+> renderSQL sch <> ";"
90−
91−dropSchemaIfExists
92− :: KnownSymbol sch
93− => Alias sch
94− -- ^ user defined schema
95− -> Definition schemas (DropIfExists sch schemas)
96−dropSchemaIfExists sch = UnsafeDefinition $ "DROP SCHEMA" <+> renderSQL sch <> ";"
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table.hsdeleted−500
@@ -1,500 +0,0 @@
1−{-|
2−Module: Squeal.PostgreSQL.Definition.Table
3−Description: Create, drop and alter table definitions
4−Copyright: (c) Eitan Chatav, 2017
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Create, drop and alter table definitions.
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
33− ( createTable
34− , createTableIfNotExists
35− , dropTable
36− , dropTableIfExists
37− , alterTable
38− , alterTableIfExists
39− , alterTableRename
40− , alterTableIfExistsRename
41− , AlterTable (..)
42− , addConstraint
43− , dropConstraint
44− , AddColumn (..)
45− , dropColumn
46− , renameColumn
47− , alterColumn
48− , AlterColumn (..)
49− , setDefault
50− , dropDefault
51− , setNotNull
52− , dropNotNull
53− , alterType
54− ) where
55−
56−import Control.DeepSeq
57−import Data.ByteString
58−import GHC.TypeLits
59−
60−import qualified Generics.SOP as SOP
61−import qualified GHC.Generics as GHC
62−
63−import Squeal.PostgreSQL.Alias
64−import Squeal.PostgreSQL.Definition
65−import Squeal.PostgreSQL.Definition.Table.Constraint
66−import Squeal.PostgreSQL.Expression
67−import Squeal.PostgreSQL.Expression.Type
68−import Squeal.PostgreSQL.List
69−import Squeal.PostgreSQL.Render
70−import Squeal.PostgreSQL.Schema
71−
72−-- $setup
73−-- >>> import Squeal.PostgreSQL
74−
75−{- | `createTable` adds a table to the schema.
76−
77−>>> :set -XOverloadedLabels
78−>>> :{
79−type Table = '[] :=>
80− '[ "a" ::: 'NoDef :=> 'Null 'PGint4
81− , "b" ::: 'NoDef :=> 'Null 'PGfloat4 ]
82−:}
83−
84−>>> :{
85−let
86− setup :: Definition (Public '[]) (Public '["tab" ::: 'Table Table])
87− setup = createTable #tab
88− (nullable int `as` #a :* nullable real `as` #b) Nil
89−in printSQL setup
90−:}
91−CREATE TABLE "tab" ("a" int NULL, "b" real NULL);
92−-}
93−createTable
94− :: ( KnownSymbol sch
95− , KnownSymbol tab
96− , columns ~ (col ': cols)
97− , SOP.SListI columns
98− , SOP.SListI constraints
99− , Has sch schemas0 schema0
100− , schemas1 ~ Alter sch (Create tab ('Table (constraints :=> columns)) schema0) schemas0 )
101− => QualifiedAlias sch tab -- ^ the name of the table to add
102− -> NP (Aliased (ColumnTypeExpression schemas0)) columns
103− -- ^ the names and datatype of each column
104− -> NP (Aliased (TableConstraintExpression sch tab schemas1)) constraints
105− -- ^ constraints that must hold for the table
106− -> Definition schemas0 schemas1
107−createTable tab columns constraints = UnsafeDefinition $
108− "CREATE TABLE" <+> renderCreation tab columns constraints
109−
110−{-| `createTableIfNotExists` creates a table if it doesn't exist, but does not add it to the schema.
111−Instead, the schema already has the table so if the table did not yet exist, the schema was wrong.
112−`createTableIfNotExists` fixes this. Interestingly, this property makes it an idempotent in
113−the `Category` of `Definition`s.
114−
115−>>> :set -XOverloadedLabels -XTypeApplications
116−>>> :{
117−type Table = '[] :=>
118− '[ "a" ::: 'NoDef :=> 'Null 'PGint4
119− , "b" ::: 'NoDef :=> 'Null 'PGfloat4 ]
120−:}
121−
122−>>> type Schemas = Public '["tab" ::: 'Table Table]
123−
124−>>> :{
125−let
126− setup :: Definition Schemas Schemas
127− setup = createTableIfNotExists #tab
128− (nullable int `as` #a :* nullable real `as` #b) Nil
129−in printSQL setup
130−:}
131−CREATE TABLE IF NOT EXISTS "tab" ("a" int NULL, "b" real NULL);
132−-}
133−createTableIfNotExists
134− :: ( KnownSymbol sch
135− , KnownSymbol tab
136− , columns ~ (col ': cols)
137− , SOP.SListI columns
138− , SOP.SListI constraints
139− , Has sch schemas0 schema0
140− , schemas1 ~ Alter sch (CreateIfNotExists tab ('Table (constraints :=> columns)) schema0) schemas0 )
141− => QualifiedAlias sch tab -- ^ the name of the table to add
142− -> NP (Aliased (ColumnTypeExpression schemas0)) columns
143− -- ^ the names and datatype of each column
144− -> NP (Aliased (TableConstraintExpression sch tab schemas1)) constraints
145− -- ^ constraints that must hold for the table
146− -> Definition schemas0 schemas1
147−createTableIfNotExists tab columns constraints = UnsafeDefinition $
148− "CREATE TABLE IF NOT EXISTS"
149− <+> renderCreation tab columns constraints
150−
151−-- helper function for `createTable` and `createTableIfNotExists`
152−renderCreation
153− :: ( KnownSymbol sch
154− , KnownSymbol tab
155− , SOP.SListI columns
156− , SOP.SListI constraints )
157− => QualifiedAlias sch tab -- ^ the name of the table to add
158− -> NP (Aliased (ColumnTypeExpression schemas0)) columns
159− -- ^ the names and datatype of each column
160− -> NP (Aliased (TableConstraintExpression sch tab schemas1)) constraints
161− -- ^ constraints that must hold for the table
162− -> ByteString
163−renderCreation tab columns constraints = renderSQL tab
164− <+> parenthesized
165− ( renderCommaSeparated renderColumnDef columns
166− <> ( case constraints of
167− Nil -> ""
168− _ -> ", " <>
169− renderCommaSeparated renderConstraint constraints ) )
170− <> ";"
171− where
172− renderColumnDef :: Aliased (ColumnTypeExpression schemas) x -> ByteString
173− renderColumnDef (ty `As` column) =
174− renderSQL column <+> renderColumnTypeExpression ty
175− renderConstraint
176− :: Aliased (TableConstraintExpression sch tab schemas) constraint
177− -> ByteString
178− renderConstraint (constraint `As` alias) =
179− "CONSTRAINT" <+> renderSQL alias <+> renderSQL constraint
180−
181−-- | `dropTable` removes a table from the schema.
182−--
183−-- >>> :{
184−-- let
185−-- definition :: Definition '["public" ::: '["muh_table" ::: 'Table t]] (Public '[])
186−-- definition = dropTable #muh_table
187−-- :}
188−--
189−-- >>> printSQL definition
190−-- DROP TABLE "muh_table";
191−dropTable
192− :: ( Has sch schemas schema
193− , KnownSymbol tab )
194− => QualifiedAlias sch tab -- ^ table to remove
195− -> Definition schemas (Alter sch (DropSchemum tab 'Table schema) schemas)
196−dropTable tab = UnsafeDefinition $ "DROP TABLE" <+> renderSQL tab <> ";"
197−
198−dropTableIfExists
199− :: ( Has sch schemas schema
200− , KnownSymbol tab)
201− => QualifiedAlias sch tab -- ^ table to remove
202− -> Definition schemas (Alter sch (DropSchemumIfExists tab 'Table schema) schemas)
203−dropTableIfExists tab = UnsafeDefinition $ "DROP TABLE IF EXISTS" <+> renderSQL tab <> ";"
204−
205−-- | `alterTable` changes the definition of a table from the schema.
206−alterTable
207− :: (Has sch schemas schema, KnownSymbol tab)
208− => QualifiedAlias sch tab -- ^ table to alter
209− -> AlterTable sch tab schemas table -- ^ alteration to perform
210− -> Definition schemas (Alter sch (Alter tab ('Table table) schema) schemas)
211−alterTable tab alteration = UnsafeDefinition $
212− "ALTER TABLE"
213− <+> renderSQL tab
214− <+> renderAlterTable alteration
215− <> ";"
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−
229−-- | `alterTableRename` changes the name of a table from the schema.
230−--
231−-- >>> printSQL $ alterTableRename #foo #bar
232−-- ALTER TABLE "foo" RENAME TO "bar";
233−alterTableRename
234− :: (KnownSymbol tab0, KnownSymbol tab1)
235− => Alias tab0 -- ^ table to rename
236− -> Alias tab1 -- ^ what to rename it
237− -> Definition schema (Rename tab0 tab1 schema)
238−alterTableRename tab0 tab1 = UnsafeDefinition $
239− "ALTER TABLE" <+> renderSQL tab0
240− <+> "RENAME TO" <+> renderSQL tab1 <> ";"
241−
242−alterTableIfExistsRename
243− :: (KnownSymbol tab0, KnownSymbol tab1)
244− => Alias tab0 -- ^ table to rename
245− -> Alias tab1 -- ^ what to rename it
246− -> Definition schema (RenameIfExists tab0 tab1 schema)
247−alterTableIfExistsRename tab0 tab1 = UnsafeDefinition $
248− "ALTER TABLE IF EXISTS" <+> renderSQL tab0
249− <+> "RENAME TO" <+> renderSQL tab1 <> ";"
250−
251−-- | An `AlterTable` describes the alteration to perform on the columns
252−-- of a table.
253−newtype AlterTable
254− (sch :: Symbol)
255− (tab :: Symbol)
256− (schemas :: SchemasType)
257− (table :: TableType) =
258− UnsafeAlterTable {renderAlterTable :: ByteString}
259− deriving (GHC.Generic,Show,Eq,Ord,NFData)
260−
261−-- | An `addConstraint` adds a table constraint.
262−--
263−-- >>> :{
264−-- let
265−-- definition :: Definition
266−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
267−-- '["public" ::: '["tab" ::: 'Table ('["positive" ::: 'Check '["col"]] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
268−-- definition = alterTable #tab (addConstraint #positive (check #col (#col .> 0)))
269−-- in printSQL definition
270−-- :}
271−-- ALTER TABLE "tab" ADD CONSTRAINT "positive" CHECK (("col" > 0));
272−addConstraint
273− :: ( KnownSymbol alias
274− , Has sch schemas schema
275− , Has tab schema ('Table table0)
276− , table0 ~ (constraints :=> columns)
277− , table1 ~ (Create alias constraint constraints :=> columns) )
278− => Alias alias
279− -> TableConstraintExpression sch tab schemas constraint
280− -- ^ constraint to add
281− -> AlterTable sch tab schemas table1
282−addConstraint alias constraint = UnsafeAlterTable $
283− "ADD" <+> "CONSTRAINT" <+> renderSQL alias
284− <+> renderSQL constraint
285−
286−-- | A `dropConstraint` drops a table constraint.
287−--
288−-- >>> :{
289−-- let
290−-- definition :: Definition
291−-- '["public" ::: '["tab" ::: 'Table ('["positive" ::: Check '["col"]] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
292−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
293−-- definition = alterTable #tab (dropConstraint #positive)
294−-- in printSQL definition
295−-- :}
296−-- ALTER TABLE "tab" DROP CONSTRAINT "positive";
297−dropConstraint
298− :: ( KnownSymbol constraint
299− , Has sch schemas schema
300− , Has tab schema ('Table table0)
301− , table0 ~ (constraints :=> columns)
302− , table1 ~ (Drop constraint constraints :=> columns) )
303− => Alias constraint
304− -- ^ constraint to drop
305− -> AlterTable sch tab schemas table1
306−dropConstraint constraint = UnsafeAlterTable $
307− "DROP" <+> "CONSTRAINT" <+> renderSQL constraint
308−
309−-- | An `AddColumn` is either @NULL@ or has @DEFAULT@.
310−class AddColumn ty where
311− -- | `addColumn` adds a new column, initially filled with whatever
312− -- default value is given or with @NULL@.
313− --
314− -- >>> :{
315− -- let
316− -- definition :: Definition
317− -- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4])]]
318− -- '["public" ::: '["tab" ::: 'Table ('[] :=>
319− -- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
320− -- , "col2" ::: 'Def :=> 'Null 'PGtext ])]]
321− -- definition = alterTable #tab (addColumn #col2 (text & nullable & default_ "foo"))
322− -- in printSQL definition
323− -- :}
324− -- ALTER TABLE "tab" ADD COLUMN "col2" text NULL DEFAULT E'foo';
325− --
326− -- >>> :{
327− -- let
328− -- definition :: Definition
329− -- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4])]]
330− -- '["public" ::: '["tab" ::: 'Table ('[] :=>
331− -- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
332− -- , "col2" ::: 'NoDef :=> 'Null 'PGtext ])]]
333− -- definition = alterTable #tab (addColumn #col2 (text & nullable))
334− -- in printSQL definition
335− -- :}
336− -- ALTER TABLE "tab" ADD COLUMN "col2" text NULL;
337− addColumn
338− :: ( KnownSymbol column
339− , Has sch schemas schema
340− , Has tab schema ('Table table0)
341− , table0 ~ (constraints :=> columns) )
342− => Alias column -- ^ column to add
343− -> ColumnTypeExpression schemas ty -- ^ type of the new column
344− -> AlterTable sch tab schemas (constraints :=> Create column ty columns)
345− addColumn column ty = UnsafeAlterTable $
346− "ADD COLUMN" <+> renderSQL column <+> renderColumnTypeExpression ty
347−instance {-# OVERLAPPING #-} AddColumn ('Def :=> ty)
348−instance {-# OVERLAPPABLE #-} AddColumn ('NoDef :=> 'Null ty)
349−
350−-- | A `dropColumn` removes a column. Whatever data was in the column
351−-- disappears. Table constraints involving the column are dropped, too.
352−-- However, if the column is referenced by a foreign key constraint of
353−-- another table, PostgreSQL will not silently drop that constraint.
354−--
355−-- >>> :{
356−-- let
357−-- definition :: Definition
358−-- '["public" ::: '["tab" ::: 'Table ('[] :=>
359−-- '[ "col1" ::: 'NoDef :=> 'Null 'PGint4
360−-- , "col2" ::: 'NoDef :=> 'Null 'PGtext ])]]
361−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col1" ::: 'NoDef :=> 'Null 'PGint4])]]
362−-- definition = alterTable #tab (dropColumn #col2)
363−-- in printSQL definition
364−-- :}
365−-- ALTER TABLE "tab" DROP COLUMN "col2";
366−dropColumn
367− :: ( KnownSymbol column
368− , Has sch schemas schema
369− , Has tab schema ('Table table0)
370− , table0 ~ (constraints :=> columns)
371− , table1 ~ (constraints :=> Drop column columns) )
372− => Alias column -- ^ column to remove
373− -> AlterTable sch tab schemas table1
374−dropColumn column = UnsafeAlterTable $
375− "DROP COLUMN" <+> renderSQL column
376−
377−-- | A `renameColumn` renames a column.
378−--
379−-- >>> :{
380−-- let
381−-- definition :: Definition
382−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["foo" ::: 'NoDef :=> 'Null 'PGint4])]]
383−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["bar" ::: 'NoDef :=> 'Null 'PGint4])]]
384−-- definition = alterTable #tab (renameColumn #foo #bar)
385−-- in printSQL definition
386−-- :}
387−-- ALTER TABLE "tab" RENAME COLUMN "foo" TO "bar";
388−renameColumn
389− :: ( KnownSymbol column0
390− , KnownSymbol column1
391− , Has sch schemas schema
392− , Has tab schema ('Table table0)
393− , table0 ~ (constraints :=> columns)
394− , table1 ~ (constraints :=> Rename column0 column1 columns) )
395− => Alias column0 -- ^ column to rename
396− -> Alias column1 -- ^ what to rename the column
397− -> AlterTable sch tab schemas table1
398−renameColumn column0 column1 = UnsafeAlterTable $
399− "RENAME COLUMN" <+> renderSQL column0 <+> "TO" <+> renderSQL column1
400−
401−-- | An `alterColumn` alters a single column.
402−alterColumn
403− :: ( KnownSymbol column
404− , Has sch schemas schema
405− , Has tab schema ('Table table0)
406− , table0 ~ (constraints :=> columns)
407− , Has column columns ty0
408− , table1 ~ (constraints :=> Alter column ty1 columns))
409− => Alias column -- ^ column to alter
410− -> AlterColumn schemas ty0 ty1 -- ^ alteration to perform
411− -> AlterTable sch tab schemas table1
412−alterColumn column alteration = UnsafeAlterTable $
413− "ALTER COLUMN" <+> renderSQL column <+> renderAlterColumn alteration
414−
415−-- | An `AlterColumn` describes the alteration to perform on a single column.
416−newtype AlterColumn (schemas :: SchemasType) (ty0 :: ColumnType) (ty1 :: ColumnType) =
417− UnsafeAlterColumn {renderAlterColumn :: ByteString}
418− deriving (GHC.Generic,Show,Eq,Ord,NFData)
419−
420−-- | A `setDefault` sets a new default for a column. Note that this doesn't
421−-- affect any existing rows in the table, it just changes the default for
422−-- future insert and update commands.
423−--
424−-- >>> :{
425−-- let
426−-- definition :: Definition
427−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]]
428−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'Def :=> 'Null 'PGint4])]]
429−-- definition = alterTable #tab (alterColumn #col (setDefault 5))
430−-- in printSQL definition
431−-- :}
432−-- ALTER TABLE "tab" ALTER COLUMN "col" SET DEFAULT 5;
433−setDefault
434− :: Expression '[] '[] 'Ungrouped schemas '[] '[] ty -- ^ default value to set
435− -> AlterColumn schemas (constraint :=> ty) ('Def :=> ty)
436−setDefault expression = UnsafeAlterColumn $
437− "SET DEFAULT" <+> renderExpression expression
438−
439−-- | A `dropDefault` removes any default value for a column.
440−--
441−-- >>> :{
442−-- let
443−-- definition :: Definition
444−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'Def :=> 'Null 'PGint4])]]
445−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]]
446−-- definition = alterTable #tab (alterColumn #col dropDefault)
447−-- in printSQL definition
448−-- :}
449−-- ALTER TABLE "tab" ALTER COLUMN "col" DROP DEFAULT;
450−dropDefault :: AlterColumn schemas ('Def :=> ty) ('NoDef :=> ty)
451−dropDefault = UnsafeAlterColumn $ "DROP DEFAULT"
452−
453−-- | A `setNotNull` adds a @NOT NULL@ constraint to a column.
454−-- The constraint will be checked immediately, so the table data must satisfy
455−-- the constraint before it can be added.
456−--
457−-- >>> :{
458−-- let
459−-- definition :: Definition
460−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]]
461−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
462−-- definition = alterTable #tab (alterColumn #col setNotNull)
463−-- in printSQL definition
464−-- :}
465−-- ALTER TABLE "tab" ALTER COLUMN "col" SET NOT NULL;
466−setNotNull
467− :: AlterColumn schemas (constraint :=> 'Null ty) (constraint :=> 'NotNull ty)
468−setNotNull = UnsafeAlterColumn $ "SET NOT NULL"
469−
470−-- | A `dropNotNull` drops a @NOT NULL@ constraint from a column.
471−--
472−-- >>> :{
473−-- let
474−-- definition :: Definition
475−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
476−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'Null 'PGint4])]]
477−-- definition = alterTable #tab (alterColumn #col dropNotNull)
478−-- in printSQL definition
479−-- :}
480−-- ALTER TABLE "tab" ALTER COLUMN "col" DROP NOT NULL;
481−dropNotNull
482− :: AlterColumn schemas (constraint :=> 'NotNull ty) (constraint :=> 'Null ty)
483−dropNotNull = UnsafeAlterColumn $ "DROP NOT NULL"
484−
485−-- | An `alterType` converts a column to a different data type.
486−-- This will succeed only if each existing entry in the column can be
487−-- converted to the new type by an implicit cast.
488−--
489−-- >>> :{
490−-- let
491−-- definition :: Definition
492−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGint4])]]
493−-- '["public" ::: '["tab" ::: 'Table ('[] :=> '["col" ::: 'NoDef :=> 'NotNull 'PGnumeric])]]
494−-- definition =
495−-- alterTable #tab (alterColumn #col (alterType (numeric & notNullable)))
496−-- in printSQL definition
497−-- :}
498−-- ALTER TABLE "tab" ALTER COLUMN "col" TYPE numeric NOT NULL;
499−alterType :: ColumnTypeExpression schemas ty -> AlterColumn schemas ty0 ty
500−alterType ty = UnsafeAlterColumn $ "TYPE" <+> renderColumnTypeExpression ty
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table/Constraint.hsdeleted−339
@@ -1,339 +0,0 @@
1−{-|
2−Module: Squeal.PostgreSQL.Definition.Table.Constraint
3−Description: Table constraint expressions
4−Copyright: (c) Eitan Chatav, 2017
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Table constraint expressions.
9−-}
10−
11−{-# LANGUAGE
12− AllowAmbiguousTypes
13− , ConstraintKinds
14− , DeriveAnyClass
15− , DeriveGeneric
16− , DerivingStrategies
17− , FlexibleContexts
18− , FlexibleInstances
19− , GADTs
20− , LambdaCase
21− , MultiParamTypeClasses
22− , OverloadedLabels
23− , OverloadedStrings
24− , RankNTypes
25− , ScopedTypeVariables
26− , TypeApplications
27− , TypeInType
28− , TypeOperators
29− , UndecidableSuperClasses
30−#-}
31−
32−module Squeal.PostgreSQL.Definition.Table.Constraint
33− ( TableConstraintExpression (..)
34− , check
35− , unique
36− , primaryKey
37− , foreignKey
38− , ForeignKeyed
39− , OnDeleteClause (..)
40− , OnUpdateClause (..)
41− ) where
42−
43−import Control.DeepSeq
44−import Data.ByteString
45−import GHC.TypeLits
46−
47−import qualified Generics.SOP as SOP
48−import qualified GHC.Generics as GHC
49−
50−import Squeal.PostgreSQL.Alias
51−import Squeal.PostgreSQL.Expression.Logic
52−import Squeal.PostgreSQL.List
53−import Squeal.PostgreSQL.Render
54−import Squeal.PostgreSQL.Schema
55−
56−-- $setup
57−-- >>> import Squeal.PostgreSQL
58−
59−-- | Data types are a way to limit the kind of data that can be stored in a
60−-- table. For many applications, however, the constraint they provide is
61−-- too coarse. For example, a column containing a product price should
62−-- probably only accept positive values. But there is no standard data type
63−-- that accepts only positive numbers. Another issue is that you might want
64−-- to constrain column data with respect to other columns or rows.
65−-- For example, in a table containing product information,
66−-- there should be only one row for each product number.
67−-- `TableConstraint`s give you as much control over the data in your tables
68−-- as you wish. If a user attempts to store data in a column that would
69−-- violate a constraint, an error is raised. This applies
70−-- even if the value came from the default value definition.
71−newtype TableConstraintExpression
72− (sch :: Symbol)
73− (tab :: Symbol)
74− (schemas :: SchemasType)
75− (constraint :: TableConstraint)
76− = UnsafeTableConstraintExpression
77− { renderTableConstraintExpression :: ByteString }
78− deriving (GHC.Generic,Show,Eq,Ord,NFData)
79−instance RenderSQL
80− (TableConstraintExpression sch tab schemas constraint) where
81− renderSQL = renderTableConstraintExpression
82−
83−{-| A `check` constraint is the most generic `TableConstraint` type.
84−It allows you to specify that the value in a certain column must satisfy
85−a Boolean (truth-value) expression.
86−
87−>>> :{
88−type Schema = '[
89− "tab" ::: 'Table ('[ "inequality" ::: 'Check '["a","b"]] :=> '[
90− "a" ::: 'NoDef :=> 'NotNull 'PGint4,
91− "b" ::: 'NoDef :=> 'NotNull 'PGint4
92− ])]
93−:}
94−
95−>>> :{
96−let
97− definition :: Definition (Public '[]) (Public Schema)
98− definition = createTable #tab
99− ( (int & notNullable) `as` #a :*
100− (int & notNullable) `as` #b )
101− ( check (#a :* #b) (#a .> #b) `as` #inequality )
102−:}
103−
104−>>> printSQL definition
105−CREATE TABLE "tab" ("a" int NOT NULL, "b" int NOT NULL, CONSTRAINT "inequality" CHECK (("a" > "b")));
106−-}
107−check
108− :: ( Has sch schemas schema
109− , Has tab schema ('Table table)
110− , HasAll aliases (TableToRow table) subcolumns )
111− => NP Alias aliases
112− -- ^ specify the subcolumns which are getting checked
113− -> (forall t. Condition '[] '[] 'Ungrouped schemas '[] '[t ::: subcolumns])
114− -- ^ a closed `Condition` on those subcolumns
115− -> TableConstraintExpression sch tab schemas ('Check aliases)
116−check _cols condition = UnsafeTableConstraintExpression $
117− "CHECK" <+> parenthesized (renderSQL condition)
118−
119−{-| A `unique` constraint ensure that the data contained in a column,
120−or a group of columns, is unique among all the rows in the table.
121−
122−>>> :{
123−type Schema = '[
124− "tab" ::: 'Table( '[ "uq_a_b" ::: 'Unique '["a","b"]] :=> '[
125− "a" ::: 'NoDef :=> 'Null 'PGint4,
126− "b" ::: 'NoDef :=> 'Null 'PGint4
127− ])]
128−:}
129−
130−>>> :{
131−let
132− definition :: Definition (Public '[]) (Public Schema)
133− definition = createTable #tab
134− ( (int & nullable) `as` #a :*
135− (int & nullable) `as` #b )
136− ( unique (#a :* #b) `as` #uq_a_b )
137−:}
138−
139−>>> printSQL definition
140−CREATE TABLE "tab" ("a" int NULL, "b" int NULL, CONSTRAINT "uq_a_b" UNIQUE ("a", "b"));
141−-}
142−unique
143− :: ( Has sch schemas schema
144− , Has tab schema('Table table)
145− , HasAll aliases (TableToRow table) subcolumns )
146− => NP Alias aliases
147− -- ^ specify subcolumns which together are unique for each row
148− -> TableConstraintExpression sch tab schemas ('Unique aliases)
149−unique columns = UnsafeTableConstraintExpression $
150− "UNIQUE" <+> parenthesized (renderSQL columns)
151−
152−{-| A `primaryKey` constraint indicates that a column, or group of columns,
153−can be used as a unique identifier for rows in the table.
154−This requires that the values be both unique and not null.
155−
156−>>> :{
157−type Schema = '[
158− "tab" ::: 'Table ('[ "pk_id" ::: 'PrimaryKey '["id"]] :=> '[
159− "id" ::: 'Def :=> 'NotNull 'PGint4,
160− "name" ::: 'NoDef :=> 'NotNull 'PGtext
161− ])]
162−:}
163−
164−>>> :{
165−let
166− definition :: Definition (Public '[]) (Public Schema)
167− definition = createTable #tab
168− ( serial `as` #id :*
169− (text & notNullable) `as` #name )
170− ( primaryKey #id `as` #pk_id )
171−:}
172−
173−>>> printSQL definition
174−CREATE TABLE "tab" ("id" serial, "name" text NOT NULL, CONSTRAINT "pk_id" PRIMARY KEY ("id"));
175−-}
176−primaryKey
177− :: ( Has sch schemas schema
178− , Has tab schema ('Table table)
179− , HasAll aliases (TableToColumns table) subcolumns
180− , AllNotNull subcolumns )
181− => NP Alias aliases
182− -- ^ specify the subcolumns which together form a primary key.
183− -> TableConstraintExpression sch tab schemas ('PrimaryKey aliases)
184−primaryKey columns = UnsafeTableConstraintExpression $
185− "PRIMARY KEY" <+> parenthesized (renderSQL columns)
186−
187−{-| A `foreignKey` specifies that the values in a column
188−(or a group of columns) must match the values appearing in some row of
189−another table. We say this maintains the referential integrity
190−between two related tables.
191−
192−>>> :{
193−type Schema =
194− '[ "users" ::: 'Table (
195− '[ "pk_users" ::: 'PrimaryKey '["id"] ] :=>
196− '[ "id" ::: 'Def :=> 'NotNull 'PGint4
197− , "name" ::: 'NoDef :=> 'NotNull 'PGtext
198− ])
199− , "emails" ::: 'Table (
200− '[ "pk_emails" ::: 'PrimaryKey '["id"]
201− , "fk_user_id" ::: 'ForeignKey '["user_id"] "users" '["id"]
202− ] :=>
203− '[ "id" ::: 'Def :=> 'NotNull 'PGint4
204− , "user_id" ::: 'NoDef :=> 'NotNull 'PGint4
205− , "email" ::: 'NoDef :=> 'Null 'PGtext
206− ])
207− ]
208−:}
209−
210−>>> :{
211−let
212− setup :: Definition (Public '[]) (Public Schema)
213− setup =
214− createTable #users
215− ( serial `as` #id :*
216− (text & notNullable) `as` #name )
217− ( primaryKey #id `as` #pk_users ) >>>
218− createTable #emails
219− ( serial `as` #id :*
220− (int & notNullable) `as` #user_id :*
221− (text & nullable) `as` #email )
222− ( primaryKey #id `as` #pk_emails :*
223− foreignKey #user_id #users #id
224− OnDeleteCascade OnUpdateCascade `as` #fk_user_id )
225−in printSQL setup
226−:}
227−CREATE TABLE "users" ("id" serial, "name" text NOT NULL, CONSTRAINT "pk_users" PRIMARY KEY ("id"));
228−CREATE TABLE "emails" ("id" serial, "user_id" int NOT NULL, "email" text NULL, CONSTRAINT "pk_emails" PRIMARY KEY ("id"), CONSTRAINT "fk_user_id" FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE CASCADE ON UPDATE CASCADE);
229−
230−A `foreignKey` can even be a table self-reference.
231−
232−>>> :{
233−type Schema =
234− '[ "employees" ::: 'Table (
235− '[ "employees_pk" ::: 'PrimaryKey '["id"]
236− , "employees_employer_fk" ::: 'ForeignKey '["employer_id"] "employees" '["id"]
237− ] :=>
238− '[ "id" ::: 'Def :=> 'NotNull 'PGint4
239− , "name" ::: 'NoDef :=> 'NotNull 'PGtext
240− , "employer_id" ::: 'NoDef :=> 'Null 'PGint4
241− ])
242− ]
243−:}
244−
245−>>> :{
246−let
247− setup :: Definition (Public '[]) (Public Schema)
248− setup =
249− createTable #employees
250− ( serial `as` #id :*
251− (text & notNullable) `as` #name :*
252− (integer & nullable) `as` #employer_id )
253− ( primaryKey #id `as` #employees_pk :*
254− foreignKey #employer_id #employees #id
255− OnDeleteCascade OnUpdateCascade `as` #employees_employer_fk )
256−in printSQL setup
257−:}
258−CREATE TABLE "employees" ("id" serial, "name" text NOT NULL, "employer_id" integer NULL, CONSTRAINT "employees_pk" PRIMARY KEY ("id"), CONSTRAINT "employees_employer_fk" FOREIGN KEY ("employer_id") REFERENCES "employees" ("id") ON DELETE CASCADE ON UPDATE CASCADE);
259−-}
260−foreignKey
261− :: (ForeignKeyed schemas sch schema child parent
262− table reftable
263− columns refcolumns
264− constraints cols
265− reftys tys )
266− => NP Alias columns
267− -- ^ column or columns in the table
268− -> Alias parent
269− -- ^ reference table
270− -> NP Alias refcolumns
271− -- ^ reference column or columns in the reference table
272− -> OnDeleteClause
273− -- ^ what to do when reference is deleted
274− -> OnUpdateClause
275− -- ^ what to do when reference is updated
276− -> TableConstraintExpression sch child schemas
277− ('ForeignKey columns parent refcolumns)
278−foreignKey keys parent refs ondel onupd = UnsafeTableConstraintExpression $
279− "FOREIGN KEY" <+> parenthesized (renderSQL keys)
280− <+> "REFERENCES" <+> renderSQL parent
281− <+> parenthesized (renderSQL refs)
282− <+> renderSQL ondel
283− <+> renderSQL onupd
284−
285−-- | A constraint synonym between types involved in a foreign key constraint.
286−type ForeignKeyed schemas
287− sch
288− schema
289− child parent
290− table reftable
291− columns refcolumns
292− constraints cols
293− reftys tys =
294− ( Has sch schemas schema
295− , Has child schema ('Table table)
296− , Has parent schema ('Table reftable)
297− , HasAll columns (TableToColumns table) tys
298− , reftable ~ (constraints :=> cols)
299− , HasAll refcolumns cols reftys
300− , SOP.AllZip SamePGType tys reftys
301− , Uniquely refcolumns constraints )
302−
303−-- | `OnDeleteClause` indicates what to do with rows that reference a deleted row.
304−data OnDeleteClause
305− = OnDeleteNoAction
306− -- ^ if any referencing rows still exist when the constraint is checked,
307− -- an error is raised
308− | OnDeleteRestrict -- ^ prevents deletion of a referenced row
309− | OnDeleteCascade
310− -- ^ specifies that when a referenced row is deleted,
311− -- row(s) referencing it should be automatically deleted as well
312− deriving (GHC.Generic,Show,Eq,Ord)
313−instance NFData OnDeleteClause
314−-- | Render `OnDeleteClause`.
315−instance RenderSQL OnDeleteClause where
316− renderSQL = \case
317− OnDeleteNoAction -> "ON DELETE NO ACTION"
318− OnDeleteRestrict -> "ON DELETE RESTRICT"
319− OnDeleteCascade -> "ON DELETE CASCADE"
320−
321−-- | Analagous to `OnDeleteClause` there is also `OnUpdateClause` which is invoked
322−-- when a referenced column is changed (updated).
323−data OnUpdateClause
324− = OnUpdateNoAction
325− -- ^ if any referencing rows has not changed when the constraint is checked,
326− -- an error is raised
327− | OnUpdateRestrict -- ^ prevents update of a referenced row
328− | OnUpdateCascade
329− -- ^ the updated values of the referenced column(s) should be copied
330− -- into the referencing row(s)
331− deriving (GHC.Generic,Show,Eq,Ord)
332−instance NFData OnUpdateClause
333−
334−-- | Render `OnUpdateClause`.
335−instance RenderSQL OnUpdateClause where
336− renderSQL = \case
337− OnUpdateNoAction -> "ON UPDATE NO ACTION"
338− OnUpdateRestrict -> "ON UPDATE RESTRICT"
339− OnUpdateCascade -> "ON UPDATE CASCADE"
squeal-postgresql/src/Squeal/PostgreSQL/Definition/Type.hsdeleted−229
@@ -1,229 +0,0 @@
1−{-|
2−Module: Squeal.PostgreSQL.Definition.Type
3−Description: Create and drop type definitions
4−Copyright: (c) Eitan Chatav, 2017
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Create and drop type definitions.
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.Type
33− ( createTypeEnum
34− , createTypeEnumFrom
35− , createTypeComposite
36− , createTypeCompositeFrom
37− , createTypeRange
38− , createDomain
39− , dropType
40− , dropTypeIfExists
41− ) where
42−
43−import Data.ByteString
44−import Data.Monoid
45−import GHC.TypeLits
46−import Prelude hiding ((.), id)
47−
48−import qualified Generics.SOP as SOP
49−
50−import Squeal.PostgreSQL.Alias
51−import Squeal.PostgreSQL.Expression.Logic
52−import Squeal.PostgreSQL.Expression.Type
53−import Squeal.PostgreSQL.Definition
54−import Squeal.PostgreSQL.List
55−import Squeal.PostgreSQL.PG
56−import Squeal.PostgreSQL.Render
57−import Squeal.PostgreSQL.Schema
58−
59−-- $setup
60−-- >>> import Squeal.PostgreSQL
61−-- >>> import qualified GHC.Generics as GHC
62−-- >>> import qualified Generics.SOP as SOP
63−
64−-- | Enumerated types are created using the `createTypeEnum` command, for example
65−--
66−-- >>> printSQL $ (createTypeEnum #mood (label @"sad" :* label @"ok" :* label @"happy") :: Definition (Public '[]) '["public" ::: '["mood" ::: 'Typedef ('PGenum '["sad","ok","happy"])]])
67−-- CREATE TYPE "mood" AS ENUM ('sad', 'ok', 'happy');
68−createTypeEnum
69− :: (KnownSymbol enum, Has sch schemas schema, SOP.All KnownSymbol labels)
70− => QualifiedAlias sch enum
71− -- ^ name of the user defined enumerated type
72− -> NP PGlabel labels
73− -- ^ labels of the enumerated type
74− -> Definition schemas (Alter sch (Create enum ('Typedef ('PGenum labels)) schema) schemas)
75−createTypeEnum enum labels = UnsafeDefinition $
76− "CREATE" <+> "TYPE" <+> renderSQL enum <+> "AS" <+> "ENUM" <+>
77− parenthesized (renderSQL labels) <> ";"
78−
79−-- | Enumerated types can also be generated from a Haskell type, for example
80−--
81−-- >>> data Schwarma = Beef | Lamb | Chicken deriving GHC.Generic
82−-- >>> instance SOP.Generic Schwarma
83−-- >>> instance SOP.HasDatatypeInfo Schwarma
84−-- >>> :{
85−-- let
86−-- createSchwarma :: Definition (Public '[]) '["public" ::: '["schwarma" ::: 'Typedef (PG (Enumerated Schwarma))]]
87−-- createSchwarma = createTypeEnumFrom @Schwarma #schwarma
88−-- in
89−-- printSQL createSchwarma
90−-- :}
91−-- CREATE TYPE "schwarma" AS ENUM ('Beef', 'Lamb', 'Chicken');
92−createTypeEnumFrom
93− :: forall hask sch enum schemas schema.
94− ( SOP.Generic hask
95− , SOP.All KnownSymbol (LabelsPG hask)
96− , KnownSymbol enum
97− , Has sch schemas schema )
98− => QualifiedAlias sch enum
99− -- ^ name of the user defined enumerated type
100− -> Definition schemas (Alter sch (Create enum ('Typedef (PG (Enumerated hask))) schema) schemas)
101−createTypeEnumFrom enum = createTypeEnum enum
102− (SOP.hpure label :: NP PGlabel (LabelsPG hask))
103−
104−{- | `createTypeComposite` creates a composite type. The composite type is
105−specified by a list of attribute names and data types.
106−
107−>>> :{
108−type PGcomplex = 'PGcomposite
109− '[ "real" ::: 'NotNull 'PGfloat8
110− , "imaginary" ::: 'NotNull 'PGfloat8 ]
111−:}
112−
113−>>> :{
114−let
115− setup :: Definition (Public '[]) '["public" ::: '["complex" ::: 'Typedef PGcomplex]]
116− setup = createTypeComposite #complex
117− (float8 `as` #real :* float8 `as` #imaginary)
118−in printSQL setup
119−:}
120−CREATE TYPE "complex" AS ("real" float8, "imaginary" float8);
121−-}
122−createTypeComposite
123− :: (KnownSymbol ty, Has sch schemas schema, SOP.SListI fields)
124− => QualifiedAlias sch ty
125− -- ^ name of the user defined composite type
126− -> NP (Aliased (TypeExpression schemas)) fields
127− -- ^ list of attribute names and data types
128− -> Definition schemas (Alter sch (Create ty ('Typedef ('PGcomposite fields)) schema) schemas)
129−createTypeComposite ty fields = UnsafeDefinition $
130− "CREATE" <+> "TYPE" <+> renderSQL ty <+> "AS" <+> parenthesized
131− (renderCommaSeparated renderField fields) <> ";"
132− where
133− renderField :: Aliased (TypeExpression schemas) x -> ByteString
134− renderField (typ `As` alias) =
135− renderSQL alias <+> renderSQL typ
136−
137−-- | Composite types can also be generated from a Haskell type, for example
138−--
139−-- >>> data Complex = Complex {real :: Double, imaginary :: Double} deriving GHC.Generic
140−-- >>> instance SOP.Generic Complex
141−-- >>> instance SOP.HasDatatypeInfo Complex
142−-- >>> type Schema = '["complex" ::: 'Typedef (PG (Composite Complex))]
143−-- >>> :{
144−-- let
145−-- createComplex :: Definition (Public '[]) (Public Schema)
146−-- createComplex = createTypeCompositeFrom @Complex #complex
147−-- in
148−-- printSQL createComplex
149−-- :}
150−-- CREATE TYPE "complex" AS ("real" float8, "imaginary" float8);
151−createTypeCompositeFrom
152− :: forall hask sch ty schemas schema.
153− ( SOP.All (FieldTyped schemas) (RowPG hask)
154− , KnownSymbol ty
155− , Has sch schemas schema )
156− => QualifiedAlias sch ty
157− -- ^ name of the user defined composite type
158− -> Definition schemas (Alter sch (Create ty ( 'Typedef (PG (Composite hask))) schema) schemas)
159−createTypeCompositeFrom ty = createTypeComposite ty
160− (SOP.hcpure (SOP.Proxy :: SOP.Proxy (FieldTyped schemas)) fieldtype
161− :: NP (Aliased (TypeExpression schemas)) (RowPG hask))
162−
163−{-|
164−`createDomain` creates a new domain. A domain is essentially a data type
165−with constraints (restrictions on the allowed set of values).
166−
167−Domains are useful for abstracting common constraints on fields
168−into a single location for maintenance. For example, several tables might
169−contain email address columns, all requiring the same `check` constraint
170−to verify the address syntax. Define a domain rather than setting up
171−each table's constraint individually.
172−
173−>>> :{
174−let
175− createPositive :: Definition (Public '[]) (Public '["positive" ::: 'Typedef 'PGfloat4])
176− createPositive = createDomain #positive real (#value .> 0 .&& (#value & isNotNull))
177−in printSQL createPositive
178−:}
179−CREATE DOMAIN "positive" AS real CHECK ((("value" > 0) AND "value" IS NOT NULL));
180−-}
181−createDomain
182− :: (Has sch schemas schema, KnownSymbol dom)
183− => QualifiedAlias sch dom
184− -> (forall null. TypeExpression schemas (null ty))
185− -> (forall tab. Condition '[] '[] 'Ungrouped schemas '[] '[tab ::: '["value" ::: 'Null ty]])
186− -> Definition schemas (Alter sch (Create dom ('Typedef ty) schema) schemas)
187−createDomain dom ty condition =
188− UnsafeDefinition $ "CREATE DOMAIN" <+> renderSQL dom
189− <+> "AS" <+> renderTypeExpression ty
190− <+> "CHECK" <+> parenthesized (renderSQL condition) <> ";"
191−
192−{- |
193−>>> :{
194−let
195− createSmallIntRange :: Definition (Public '[]) (Public '["int2range" ::: 'Typedef ('PGrange 'PGint2)])
196− createSmallIntRange = createTypeRange #int2range int2
197−in printSQL createSmallIntRange
198−:}
199−CREATE TYPE "int2range" AS RANGE (subtype = int2);
200−-}
201−createTypeRange
202− :: (Has sch schemas schema, KnownSymbol range)
203− => QualifiedAlias sch range
204− -> (forall null. TypeExpression schemas (null ty))
205− -> Definition schemas (Alter sch (Create range ('Typedef ('PGrange ty)) schema) schemas)
206−createTypeRange range ty = UnsafeDefinition $
207− "CREATE" <+> "TYPE" <+> renderSQL range <+> "AS" <+> "RANGE" <+>
208− parenthesized ("subtype" <+> "=" <+> renderTypeExpression ty) <> ";"
209−
210−-- | Drop a type.
211−--
212−-- >>> data Schwarma = Beef | Lamb | Chicken deriving GHC.Generic
213−-- >>> instance SOP.Generic Schwarma
214−-- >>> instance SOP.HasDatatypeInfo Schwarma
215−-- >>> printSQL (dropType #schwarma :: Definition '["public" ::: '["schwarma" ::: 'Typedef (PG (Enumerated Schwarma))]] (Public '[]))
216−-- DROP TYPE "schwarma";
217−dropType
218− :: (Has sch schemas schema, KnownSymbol td)
219− => QualifiedAlias sch td
220− -- ^ name of the user defined type
221− -> Definition schemas (Alter sch (DropSchemum td 'Typedef schema) schemas)
222−dropType tydef = UnsafeDefinition $ "DROP" <+> "TYPE" <+> renderSQL tydef <> ";"
223−
224−dropTypeIfExists
225− :: (Has sch schemas schema, KnownSymbol td)
226− => QualifiedAlias sch td
227− -- ^ name of the user defined type
228− -> Definition schemas (Alter sch (DropSchemumIfExists td 'Typedef schema) schemas)
229−dropTypeIfExists tydef = UnsafeDefinition $ "DROP" <+> "TYPE" <+> renderSQL tydef <> ";"
squeal-postgresql/src/Squeal/PostgreSQL/Definition/View.hsdeleted−104
@@ -1,104 +0,0 @@
1−{-|
2−Module: Squeal.PostgreSQL.Definition.View
3−Description: Create and drop view definitions
4−Copyright: (c) Eitan Chatav, 2017
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Create and drop view definitions.
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.View
33− ( createView
34− , createOrReplaceView
35− , dropView
36− , dropViewIfExists
37− ) where
38−
39−import GHC.TypeLits
40−
41−import Squeal.PostgreSQL.Alias
42−import Squeal.PostgreSQL.Definition
43−import Squeal.PostgreSQL.Query
44−import Squeal.PostgreSQL.Render
45−import Squeal.PostgreSQL.Schema
46−
47−-- $setup
48−-- >>> import Squeal.PostgreSQL
49−
50−{- | Create a view.
51−>>> type ABC = '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4]
52−>>> type BC = '["b" ::: 'Null 'PGint4, "c" ::: 'Null 'PGint4]
53−>>> :{
54−let
55− definition :: Definition
56− '[ "public" ::: '["abc" ::: 'Table ('[] :=> ABC)]]
57− '[ "public" ::: '["abc" ::: 'Table ('[] :=> ABC), "bc" ::: 'View BC]]
58− definition =
59− createView #bc (select_ (#b :* #c) (from (table #abc)))
60−in printSQL definition
61−:}
62−CREATE VIEW "bc" AS SELECT "b" AS "b", "c" AS "c" FROM "abc" AS "abc";
63−-}
64−createView
65− :: (Has sch schemas schema, KnownSymbol vw)
66− => QualifiedAlias sch vw -- ^ the name of the view to add
67− -> Query '[] '[] schemas '[] view -- ^ query
68− -> Definition schemas (Alter sch (Create vw ('View view) schema) schemas)
69−createView alias query = UnsafeDefinition $
70− "CREATE" <+> "VIEW" <+> renderSQL alias <+> "AS"
71− <+> renderQuery query <> ";"
72−
73−createOrReplaceView
74− :: (Has sch schemas schema, KnownSymbol vw)
75− => QualifiedAlias sch vw -- ^ the name of the view to add
76− -> Query '[] '[] schemas '[] view -- ^ query
77− -> Definition schemas (Alter sch (CreateOrReplace vw ('View view) schema) schemas)
78−createOrReplaceView alias query = UnsafeDefinition $
79− "CREATE OR REPLACE VIEW" <+> renderSQL alias <+> "AS"
80− <+> renderQuery query <> ";"
81−
82−-- | Drop a view.
83−--
84−-- >>> :{
85−-- let
86−-- definition :: Definition
87−-- '[ "public" ::: '["abc" ::: 'Table ('[] :=> '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4])
88−-- , "bc" ::: 'View ('["b" ::: 'Null 'PGint4, "c" ::: 'Null 'PGint4])]]
89−-- '[ "public" ::: '["abc" ::: 'Table ('[] :=> '["a" ::: 'NoDef :=> 'Null 'PGint4, "b" ::: 'NoDef :=> 'Null 'PGint4, "c" ::: 'NoDef :=> 'Null 'PGint4])]]
90−-- definition = dropView #bc
91−-- in printSQL definition
92−-- :}
93−-- DROP VIEW "bc";
94−dropView
95− :: (Has sch schemas schema, KnownSymbol vw)
96− => QualifiedAlias sch vw -- ^ view to remove
97− -> Definition schemas (Alter sch (DropSchemum vw 'View schema) schemas)
98−dropView vw = UnsafeDefinition $ "DROP VIEW" <+> renderSQL vw <> ";"
99−
100−dropViewIfExists
101− :: (Has sch schemas schema, KnownSymbol vw)
102− => QualifiedAlias sch vw -- ^ view to remove
103− -> Definition schemas (Alter sch (DropIfExists vw schema) schemas)
104−dropViewIfExists vw = UnsafeDefinition $ "DROP VIEW IF EXISTS" <+> renderSQL vw <> ";"
squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+17−91
@@ -34,26 +34,17 @@ module Squeal.PostgreSQL.Expression
34 ( -- * Expression
34 ( -- * Expression
35 Expression (..)
35 Expression (..)
36 , Expr
36 , Expr
37− , type (-->)
37+ , (:-->)
38− , FunctionDB
39 , unsafeFunction
38 , unsafeFunction
40− , function
39+ , unsafeUnaryOpL
41− , unsafeLeftOp
40+ , unsafeUnaryOpR
42− , leftOp
43− , unsafeRightOp
44− , rightOp
45 , Operator
41 , Operator
46− , OperatorDB
47 , unsafeBinaryOp
42 , unsafeBinaryOp
48− , binaryOp
49 , FunctionVar
43 , FunctionVar
50 , unsafeFunctionVar
44 , unsafeFunctionVar
51− , type (--->)
45+ , FunctionN
52− , FunctionNDB
53 , unsafeFunctionN
46 , unsafeFunctionN
54− , functionN
55 , PGSubset (..)
47 , PGSubset (..)
56− , PGIntersect (..)
57 -- * Re-export
48 -- * Re-export
58 , (&)
49 , (&)
59 , K (..)
50 , K (..)
@@ -145,54 +136,31 @@ type Operator x1 x2 y
145 -> Expression outer commons grp schemas params from y
136 -> Expression outer commons grp schemas params from y
146 -- ^ output
137 -- ^ output
147
138
148−type OperatorDB schemas x1 x2 y
149− = forall outer commons grp params from
150− . Expression outer commons grp schemas params from x1
151− -- ^ left input
152− -> Expression outer commons grp schemas params from x2
153− -- ^ right input
154− -> Expression outer commons grp schemas params from y
155− -- ^ output
156−
157-- | A @RankNType@ for functions with a single argument.
139-- | A @RankNType@ for functions with a single argument.
158-- These could be either function calls or unary operators.
140-- These could be either function calls or unary operators.
159-- This is a subtype of the usual Haskell function type `Prelude.->`,
141-- This is a subtype of the usual Haskell function type `Prelude.->`,
160-- indeed a subcategory as it is closed under the usual
142-- indeed a subcategory as it is closed under the usual
161-- `Prelude..` and `Prelude.id`.
143-- `Prelude..` and `Prelude.id`.
162−type (-->) x y
144+type (:-->) x y
163 = forall outer commons grp schemas params from
145 = forall outer commons grp schemas params from
164 . Expression outer commons grp schemas params from x
146 . Expression outer commons grp schemas params from x
165 -- ^ input
147 -- ^ input
166 -> Expression outer commons grp schemas params from y
148 -> Expression outer commons grp schemas params from y
167 -- ^ output
149 -- ^ output
168
150
169−type FunctionDB schemas x y
170− = forall outer commons grp params from
171− . Expression outer commons grp schemas params from x
172− -- ^ input
173− -> Expression outer commons grp schemas params from y
174− -- ^ output
175−
176{- | A @RankNType@ for functions with a fixed-length list of heterogeneous arguments.
151{- | A @RankNType@ for functions with a fixed-length list of heterogeneous arguments.
177Use the `*:` operator to end your argument lists, like so.
152Use the `*:` operator to end your argument lists, like so.
178
153
179>>> printSQL (unsafeFunctionN "fun" (true :* false :* localTime *: true))
154>>> printSQL (unsafeFunctionN "fun" (true :* false :* localTime *: true))
180fun(TRUE, FALSE, LOCALTIME, TRUE)
155fun(TRUE, FALSE, LOCALTIME, TRUE)
181-}
156-}
182−type (--->) xs y
157+type FunctionN xs y
183 = forall outer commons grp schemas params from
158 = forall outer commons grp schemas params from
184 . NP (Expression outer commons grp schemas params from) xs
159 . NP (Expression outer commons grp schemas params from) xs
185 -- ^ inputs
160 -- ^ inputs
186 -> Expression outer commons grp schemas params from y
161 -> Expression outer commons grp schemas params from y
187 -- ^ output
162 -- ^ output
188
163
189−type FunctionNDB schemas xs y
190− = forall outer commons grp params from
191− . NP (Expression outer commons grp schemas params from) xs
192− -- ^ inputs
193− -> Expression outer commons grp schemas params from y
194− -- ^ output
195−
196{- | A @RankNType@ for functions with a variable-length list of
164{- | A @RankNType@ for functions with a variable-length list of
197homogeneous arguments and at least 1 more argument.
165homogeneous arguments and at least 1 more argument.
198-}
166-}
@@ -318,63 +286,28 @@ unsafeBinaryOp :: ByteString -> Operator ty0 ty1 ty2
318unsafeBinaryOp op x y = UnsafeExpression $ parenthesized $
286unsafeBinaryOp op x y = UnsafeExpression $ parenthesized $
319 renderSQL x <+> op <+> renderSQL y
287 renderSQL x <+> op <+> renderSQL y
320
288
321−binaryOp
322− :: forall op sch schemas schema x y z.
323− ( Has sch schemas schema
324− , Has op schema ('Operator ('BinaryOp x y z)) )
325− => OperatorDB schemas x y z
326−binaryOp = unsafeBinaryOp $ renderSymbol @op
327−
328−-- | >>> printSQL $ unsafeLeftOp "NOT" true
289+-- | >>> printSQL $ unsafeUnaryOpL "NOT" true
329-- (NOT TRUE)
290-- (NOT TRUE)
330−unsafeLeftOp :: ByteString -> x --> y
291+unsafeUnaryOpL :: ByteString -> x :--> y
331−unsafeLeftOp op x = UnsafeExpression $ parenthesized $ op <+> renderSQL x
292+unsafeUnaryOpL op x = UnsafeExpression $ parenthesized $ op <+> renderSQL x
332
293
333−leftOp
334− :: forall op sch schemas schema x y.
335− ( Has sch schemas schema
336− , Has op schema ('Operator ('LeftOp x y)) )
337− => FunctionDB schemas x y
338−leftOp = unsafeLeftOp $ renderSymbol @op
339−
340−-- | >>> printSQL $ true & unsafeRightOp "IS NOT TRUE"
294+-- | >>> printSQL $ true & unsafeUnaryOpR "IS NOT TRUE"
341-- (TRUE IS NOT TRUE)
295-- (TRUE IS NOT TRUE)
342−unsafeRightOp :: ByteString -> x --> y
296+unsafeUnaryOpR :: ByteString -> x :--> y
343−unsafeRightOp op x = UnsafeExpression $ parenthesized $ renderSQL x <+> op
297+unsafeUnaryOpR op x = UnsafeExpression $ parenthesized $ renderSQL x <+> op
344−
345−rightOp
346− :: forall op sch schemas schema x y.
347− ( Has sch schemas schema
348− , Has op schema ('Operator ('RightOp x y)) )
349− => FunctionDB schemas x y
350−rightOp = unsafeRightOp $ renderSymbol @op
351
298
352-- | >>> printSQL $ unsafeFunction "f" true
299-- | >>> printSQL $ unsafeFunction "f" true
353-- f(TRUE)
300-- f(TRUE)
354−unsafeFunction :: ByteString -> x --> y
301+unsafeFunction :: ByteString -> x :--> y
355unsafeFunction fun x = UnsafeExpression $
302unsafeFunction fun x = UnsafeExpression $
356 fun <> parenthesized (renderSQL x)
303 fun <> parenthesized (renderSQL x)
357
304
358−function
359− :: (Has sch schemas schema, Has fun schema ('Function ('[x] :=> 'Returns y)))
360− => QualifiedAlias sch fun
361− -> FunctionDB schemas x y
362−function = unsafeFunction . renderSQL
363−
364-- | >>> printSQL $ unsafeFunctionN "f" (currentTime :* localTimestamp :* false *: literal 'a')
305-- | >>> printSQL $ unsafeFunctionN "f" (currentTime :* localTimestamp :* false *: literal 'a')
365-- f(CURRENT_TIME, LOCALTIMESTAMP, FALSE, E'a')
306-- f(CURRENT_TIME, LOCALTIMESTAMP, FALSE, E'a')
366−unsafeFunctionN :: SListI xs => ByteString -> xs ---> y
307+unsafeFunctionN :: SListI xs => ByteString -> FunctionN xs y
367unsafeFunctionN fun xs = UnsafeExpression $
308unsafeFunctionN fun xs = UnsafeExpression $
368 fun <> parenthesized (renderCommaSeparated renderSQL xs)
309 fun <> parenthesized (renderCommaSeparated renderSQL xs)
369
310
370−functionN
371− :: ( Has sch schemas schema
372− , Has fun schema ('Function (xs :=> 'Returns y))
373− , SListI xs )
374− => QualifiedAlias sch fun
375− -> FunctionNDB schemas xs y
376−functionN = unsafeFunctionN . renderSQL
377−
378instance ty `In` PGNum
311instance ty `In` PGNum
379 => Num (Expression outer commons grp schemas params from (null ty)) where
312 => Num (Expression outer commons grp schemas params from (null ty)) where
380 (+) = unsafeBinaryOp "+"
313 (+) = unsafeBinaryOp "+"
@@ -420,21 +353,14 @@ instance (ty `In` PGNum, ty `In` PGFloating) => Floating
420 atanh x = log ((1 + x) / (1 - x)) / 2
353 atanh x = log ((1 + x) / (1 - x)) / 2
421
354
422-- | Contained by operators
355-- | Contained by operators
423−class PGSubset ty where
356+class PGSubset container where
424− (@>) :: Operator (null0 ty) (null1 ty) ('Null 'PGbool)
357+ (@>) :: Operator (null0 container) (null1 container) ('Null 'PGbool)
425 (@>) = unsafeBinaryOp "@>"
358 (@>) = unsafeBinaryOp "@>"
426− (<@) :: Operator (null0 ty) (null1 ty) ('Null 'PGbool)
359+ (<@) :: Operator (null0 container) (null1 container) ('Null 'PGbool)
427 (<@) = unsafeBinaryOp "<@"
360 (<@) = unsafeBinaryOp "<@"
428instance PGSubset 'PGjsonb
361instance PGSubset 'PGjsonb
429instance PGSubset 'PGtsquery
362instance PGSubset 'PGtsquery
430instance PGSubset ('PGvararray ty)
363instance PGSubset ('PGvararray ty)
431−instance PGSubset ('PGrange ty)
432−
433−class PGIntersect ty where
434− (@&&) :: Operator (null0 ty) (null1 ty) ('Null 'PGbool)
435− (@&&) = unsafeBinaryOp "&&"
436−instance PGIntersect ('PGvararray ty)
437−instance PGIntersect ('PGrange ty)
438
364
439instance IsString
365instance IsString
440 (Expression outer commons grp schemas params from (null 'PGtext)) where
366 (Expression outer commons grp schemas params from (null 'PGtext)) where
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Aggregate.hs+4−19
@@ -26,7 +26,6 @@ Aggregate functions
26module Squeal.PostgreSQL.Expression.Aggregate
26module Squeal.PostgreSQL.Expression.Aggregate
27 ( Aggregate (..)
27 ( Aggregate (..)
28 , Distinction (..)
28 , Distinction (..)
29− , PGSum
30 , PGAvg
29 , PGAvg
31 ) where
30 ) where
32
31
@@ -80,14 +79,15 @@ class Aggregate expr1 exprN aggr
80
79
81 -- | >>> :{
80 -- | >>> :{
82 -- let
81 -- let
83− -- expression :: Expression '[] commons ('Grouped bys) schemas params '[tab ::: '["col" ::: 'Null 'PGnumeric]] ('Null 'PGnumeric)
82+ -- expression :: Expression '[] commons ('Grouped bys) schemas params '[tab ::: '["col" ::: 'Null 'PGnumeric]] ('NotNull 'PGnumeric)
84 -- expression = sum_ (Distinct #col)
83 -- expression = sum_ (Distinct #col)
85 -- in printSQL expression
84 -- in printSQL expression
86 -- :}
85 -- :}
87 -- sum(DISTINCT "col")
86 -- sum(DISTINCT "col")
88 sum_
87 sum_
88+ :: ty `In` PGNum
89− :: expr1 (null ty)
89+ => expr1 (null ty)
90− -> aggr ('Null (PGSum ty))
90+ -> aggr ('NotNull ty)
91
91
92 -- | input values, including nulls, concatenated into an array
92 -- | input values, including nulls, concatenated into an array
93 arrayAgg
93 arrayAgg
@@ -434,21 +434,6 @@ unsafeAggregateN
434 -> Expression outer commons ('Grouped bys) schemas params from y
434 -> Expression outer commons ('Grouped bys) schemas params from y
435unsafeAggregateN fun xs = UnsafeExpression $ fun <> parenthesized (renderSQL xs)
435unsafeAggregateN fun xs = UnsafeExpression $ fun <> parenthesized (renderSQL xs)
436
436
437−-- | A type family that calculates `PGSum``PGType` of
438−-- a given argument `PGType`.
439−type family PGSum ty where
440− PGSum 'PGint2 = 'PGint8
441− PGSum 'PGint4 = 'PGint8
442− PGSum 'PGint8 = 'PGnumeric
443− PGSum 'PGfloat4 = 'PGfloat4
444− PGSum 'PGfloat8 = 'PGfloat8
445− PGSum 'PGnumeric = 'PGnumeric
446− PGSum 'PGinterval = 'PGinterval
447− PGSum 'PGmoney = 'PGmoney
448− PGSum pg = TypeError
449− ( 'Text "Squeal type error: Cannot sum with argument type "
450− ':<>: 'ShowType pg )
451−
452-- | A type family that calculates `PGAvg` type of a `PGType`.
437-- | A type family that calculates `PGAvg` type of a `PGType`.
453type family PGAvg ty where
438type family PGAvg ty where
454 PGAvg 'PGint2 = 'PGnumeric
439 PGAvg 'PGint2 = 'PGnumeric
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Collection.hs+5−15
@@ -1,13 +1,3 @@
1−{-|
2−Module: Squeal.PostgreSQL.Expression.Collection
3−Description: Array and composite functions
4−Copyright: (c) Eitan Chatav, 2019
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Array and composite functions
9−-}
10−
11{-# LANGUAGE
1{-# LANGUAGE
12 AllowAmbiguousTypes
2 AllowAmbiguousTypes
13 , DataKinds
3 , DataKinds
@@ -42,7 +32,7 @@ import qualified Generics.SOP as SOP
42
32
43import Squeal.PostgreSQL.Alias
33import Squeal.PostgreSQL.Alias
44import Squeal.PostgreSQL.Expression
34import Squeal.PostgreSQL.Expression
45−import Squeal.PostgreSQL.Expression.Set
35+import Squeal.PostgreSQL.Expression.SetOf
46import Squeal.PostgreSQL.List
36import Squeal.PostgreSQL.List
47import Squeal.PostgreSQL.Render
37import Squeal.PostgreSQL.Render
48import Squeal.PostgreSQL.Schema
38import Squeal.PostgreSQL.Schema
@@ -111,20 +101,20 @@ array2 xss = UnsafeExpression $ "ARRAY" <>
111
101
112-- | >>> printSQL $ cardinality (array [null_, false, true])
102-- | >>> printSQL $ cardinality (array [null_, false, true])
113-- cardinality(ARRAY[NULL, FALSE, TRUE])
103-- cardinality(ARRAY[NULL, FALSE, TRUE])
114−cardinality :: null ('PGvararray ty) --> null 'PGint8
104+cardinality :: null ('PGvararray ty) :--> null 'PGint8
115cardinality = unsafeFunction "cardinality"
105cardinality = unsafeFunction "cardinality"
116
106
117-- | >>> printSQL $ array [null_, false, true] & index 2
107-- | >>> printSQL $ array [null_, false, true] & index 2
118-- (ARRAY[NULL, FALSE, TRUE])[2]
108-- (ARRAY[NULL, FALSE, TRUE])[2]
119index
109index
120 :: Word64 -- ^ index
110 :: Word64 -- ^ index
121− -> null ('PGvararray ty) --> NullifyType ty
111+ -> null ('PGvararray ty) :--> NullifyType ty
122index n expr = UnsafeExpression $
112index n expr = UnsafeExpression $
123 parenthesized (renderSQL expr) <> "[" <> fromString (show n) <> "]"
113 parenthesized (renderSQL expr) <> "[" <> fromString (show n) <> "]"
124
114
125-- | Expand an array to a set of rows
115-- | Expand an array to a set of rows
126−unnest :: SetFunction "unnest" (null ('PGvararray ty)) '["unnest" ::: ty]
116+unnest :: SetOfFunction "unnest" (null ('PGvararray ty)) '["unnest" ::: ty]
127−unnest = unsafeSetFunction
117+unnest = unsafeSetOfFunction #unnest
128
118
129-- | A row constructor is an expression that builds a row value
119-- | A row constructor is an expression that builds a row value
130-- (also called a composite value) using values for its member fields.
120-- (also called a composite value) using values for its member fields.
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Comparison.hs+12−12
@@ -162,45 +162,45 @@ isNotDistinctFrom = unsafeBinaryOp "IS NOT DISTINCT FROM"
162>>> printSQL $ true & isTrue
162>>> printSQL $ true & isTrue
163(TRUE IS TRUE)
163(TRUE IS TRUE)
164-}
164-}
165−isTrue :: null0 'PGbool --> null1 'PGbool
165+isTrue :: null0 'PGbool :--> null1 'PGbool
166−isTrue = unsafeRightOp "IS TRUE"
166+isTrue = unsafeUnaryOpR "IS TRUE"
167
167
168{- | is false or unknown
168{- | is false or unknown
169
169
170>>> printSQL $ true & isNotTrue
170>>> printSQL $ true & isNotTrue
171(TRUE IS NOT TRUE)
171(TRUE IS NOT TRUE)
172-}
172-}
173−isNotTrue :: null0 'PGbool --> null1 'PGbool
173+isNotTrue :: null0 'PGbool :--> null1 'PGbool
174−isNotTrue = unsafeRightOp "IS NOT TRUE"
174+isNotTrue = unsafeUnaryOpR "IS NOT TRUE"
175
175
176{- | is false
176{- | is false
177
177
178>>> printSQL $ true & isFalse
178>>> printSQL $ true & isFalse
179(TRUE IS FALSE)
179(TRUE IS FALSE)
180-}
180-}
181−isFalse :: null0 'PGbool --> null1 'PGbool
181+isFalse :: null0 'PGbool :--> null1 'PGbool
182−isFalse = unsafeRightOp "IS FALSE"
182+isFalse = unsafeUnaryOpR "IS FALSE"
183
183
184{- | is true or unknown
184{- | is true or unknown
185
185
186>>> printSQL $ true & isNotFalse
186>>> printSQL $ true & isNotFalse
187(TRUE IS NOT FALSE)
187(TRUE IS NOT FALSE)
188-}
188-}
189−isNotFalse :: null0 'PGbool --> null1 'PGbool
189+isNotFalse :: null0 'PGbool :--> null1 'PGbool
190−isNotFalse = unsafeRightOp "IS NOT FALSE"
190+isNotFalse = unsafeUnaryOpR "IS NOT FALSE"
191
191
192{- | is unknown
192{- | is unknown
193
193
194>>> printSQL $ true & isUnknown
194>>> printSQL $ true & isUnknown
195(TRUE IS UNKNOWN)
195(TRUE IS UNKNOWN)
196-}
196-}
197−isUnknown :: null0 'PGbool --> null1 'PGbool
197+isUnknown :: null0 'PGbool :--> null1 'PGbool
198−isUnknown = unsafeRightOp "IS UNKNOWN"
198+isUnknown = unsafeUnaryOpR "IS UNKNOWN"
199
199
200{- | is true or false
200{- | is true or false
201
201
202>>> printSQL $ true & isNotUnknown
202>>> printSQL $ true & isNotUnknown
203(TRUE IS NOT UNKNOWN)
203(TRUE IS NOT UNKNOWN)
204-}
204-}
205−isNotUnknown :: null0 'PGbool --> null1 'PGbool
205+isNotUnknown :: null0 'PGbool :--> null1 'PGbool
206−isNotUnknown = unsafeRightOp "IS NOT UNKNOWN"
206+isNotUnknown = unsafeUnaryOpR "IS NOT UNKNOWN"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Json.hs+198−139
@@ -1,13 +1,3 @@
1−{-|
2−Module: Squeal.PostgreSQL.Expression.Json
3−Description: Json and Jsonb functions and operators
4−Copyright: (c) Eitan Chatav, 2019
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Json and Jsonb functions and operators
9−-}
10−
11{-# LANGUAGE
1{-# LANGUAGE
12 DataKinds
2 DataKinds
13 , FlexibleContexts
3 , FlexibleContexts
@@ -21,7 +11,6 @@ Json and Jsonb functions and operators
21 , TypeApplications
11 , TypeApplications
22 , TypeOperators
12 , TypeOperators
23 , UndecidableInstances
13 , UndecidableInstances
24− , UndecidableSuperClasses
25#-}
14#-}
26
15
27module Squeal.PostgreSQL.Expression.Json
16module Squeal.PostgreSQL.Expression.Json
@@ -43,13 +32,19 @@ module Squeal.PostgreSQL.Expression.Json
43 , rowToJson
32 , rowToJson
44 , jsonBuildArray
33 , jsonBuildArray
45 , jsonbBuildArray
34 , jsonbBuildArray
46− , JsonBuildObject (..)
35+ , PGBuildObject
36+ , jsonBuildObject
37+ , jsonbBuildObject
47 , jsonObject
38 , jsonObject
48 , jsonbObject
39 , jsonbObject
49 , jsonZipObject
40 , jsonZipObject
50 , jsonbZipObject
41 , jsonbZipObject
51 , jsonArrayLength
42 , jsonArrayLength
52 , jsonbArrayLength
43 , jsonbArrayLength
44+ , jsonExtractPath
45+ , jsonbExtractPath
46+ , jsonExtractPathAsText
47+ , jsonbExtractPathAsText
53 , jsonTypeof
48 , jsonTypeof
54 , jsonbTypeof
49 , jsonbTypeof
55 , jsonStripNulls
50 , jsonStripNulls
@@ -64,12 +59,10 @@ module Squeal.PostgreSQL.Expression.Json
64 , jsonbEachText
59 , jsonbEachText
65 , jsonObjectKeys
60 , jsonObjectKeys
66 , jsonbObjectKeys
61 , jsonbObjectKeys
67− , JsonPopulateFunction
68 , jsonPopulateRecord
62 , jsonPopulateRecord
69 , jsonbPopulateRecord
63 , jsonbPopulateRecord
70 , jsonPopulateRecordSet
64 , jsonPopulateRecordSet
71 , jsonbPopulateRecordSet
65 , jsonbPopulateRecordSet
72− , JsonToRecordFunction
73 , jsonToRecord
66 , jsonToRecord
74 , jsonbToRecord
67 , jsonbToRecord
75 , jsonToRecordSet
68 , jsonToRecordSet
@@ -81,7 +74,7 @@ import GHC.TypeLits
81
74
82import Squeal.PostgreSQL.Alias
75import Squeal.PostgreSQL.Alias
83import Squeal.PostgreSQL.Expression
76import Squeal.PostgreSQL.Expression
84−import Squeal.PostgreSQL.Expression.Set
77+import Squeal.PostgreSQL.Expression.SetOf
85import Squeal.PostgreSQL.Expression.Type
78import Squeal.PostgreSQL.Expression.Type
86import Squeal.PostgreSQL.List
79import Squeal.PostgreSQL.List
87import Squeal.PostgreSQL.Query
80import Squeal.PostgreSQL.Query
@@ -92,7 +85,6 @@ import qualified Generics.SOP as SOP
92
85
93-- $setup
86-- $setup
94-- >>> import Squeal.PostgreSQL
87-- >>> import Squeal.PostgreSQL
95−-- >>> import Data.Aeson
96
88
97{-----------------------------------------
89{-----------------------------------------
98 -- json and jsonb support
90 -- json and jsonb support
@@ -156,18 +148,18 @@ infixl 9 .?&
156
148
157-- | Delete a key or keys from a JSON object, or remove an array element.
149-- | Delete a key or keys from a JSON object, or remove an array element.
158--
150--
159−-- If the right operand is
151+-- If the right operand is..
160--
152--
161−-- @ text @: Delete key / value pair or string element from left operand.
153+-- @ text @: Delete key/value pair or string element from left operand. Key/value pairs
162−-- Key / value pairs are matched based on their key value,
154+-- are matched based on their key value.
163--
155--
164−-- @ text[] @: Delete multiple key / value pairs or string elements
156+-- @ text[] @: Delete multiple key/value pairs or string elements
165−-- from left operand. Key / value pairs are matched based on their key value,
157+-- from left operand. Key/value pairs are matched based on their key value.
166--
158--
167-- @ integer @: Delete the array element with specified index (Negative integers
159-- @ integer @: Delete the array element with specified index (Negative integers
168-- count from the end). Throws an error if top level container is not an array.
160-- count from the end). Throws an error if top level container is not an array.
169(.-.)
161(.-.)
170− :: key `In` '[ 'PGtext, 'PGvararray ('NotNull 'PGtext), 'PGint4, 'PGint2 ]
162+ :: (key `In` '[ 'PGtext, 'PGvararray ('NotNull 'PGtext), 'PGint4, 'PGint2 ]) -- hlint error without parens here
171 => Operator (null 'PGjsonb) (null key) (null 'PGjsonb)
163 => Operator (null 'PGjsonb) (null key) (null 'PGjsonb)
172infixl 6 .-.
164infixl 6 .-.
173(.-.) = unsafeBinaryOp "-"
165(.-.) = unsafeBinaryOp "-"
@@ -188,7 +180,7 @@ Table 9.45: JSON creation functions
188-- otherwise, a scalar value is produced. For any scalar type other than a
180-- 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
181-- 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.
182-- such a fashion that it is a valid json value.
191−toJson :: null ty --> null 'PGjson
183+toJson :: null ty :--> null 'PGjson
192toJson = unsafeFunction "to_json"
184toJson = unsafeFunction "to_json"
193
185
194-- | Returns the value as jsonb. Arrays and composites are converted
186-- | Returns the value as jsonb. Arrays and composites are converted
@@ -197,42 +189,48 @@ toJson = unsafeFunction "to_json"
197-- otherwise, a scalar value is produced. For any scalar type other than a
189-- 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
190-- 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.
191-- such a fashion that it is a valid jsonb value.
200−toJsonb :: null ty --> null 'PGjsonb
192+toJsonb :: null ty :--> null 'PGjsonb
201toJsonb = unsafeFunction "to_jsonb"
193toJsonb = unsafeFunction "to_jsonb"
202
194
203-- | Returns the array as a JSON array. A PostgreSQL multidimensional array
195-- | Returns the array as a JSON array. A PostgreSQL multidimensional array
204-- becomes a JSON array of arrays.
196-- becomes a JSON array of arrays.
205−arrayToJson :: null ('PGvararray ty) --> null 'PGjson
197+arrayToJson :: null ('PGvararray ty) :--> null 'PGjson
206arrayToJson = unsafeFunction "array_to_json"
198arrayToJson = unsafeFunction "array_to_json"
207
199
208-- | Returns the row as a JSON object.
200-- | Returns the row as a JSON object.
209−rowToJson :: null ('PGcomposite ty) --> null 'PGjson
201+rowToJson :: null ('PGcomposite ty) :--> null 'PGjson
210rowToJson = unsafeFunction "row_to_json"
202rowToJson = unsafeFunction "row_to_json"
211
203
212-- | Builds a possibly-heterogeneously-typed JSON array out of a variadic
204-- | Builds a possibly-heterogeneously-typed JSON array out of a variadic
213-- argument list.
205-- argument list.
214−jsonBuildArray :: SOP.SListI tuple => tuple ---> null 'PGjson
206+jsonBuildArray :: SOP.SListI tuple => FunctionN tuple (null 'PGjson)
215jsonBuildArray = unsafeFunctionN "json_build_array"
207jsonBuildArray = unsafeFunctionN "json_build_array"
216
208
217-- | Builds a possibly-heterogeneously-typed (binary) JSON array out of a
209-- | Builds a possibly-heterogeneously-typed (binary) JSON array out of a
218-- variadic argument list.
210-- variadic argument list.
219−jsonbBuildArray :: SOP.SListI tuple => tuple ---> null 'PGjsonb
211+jsonbBuildArray :: SOP.SListI tuple => FunctionN tuple (null 'PGjsonb)
220jsonbBuildArray = unsafeFunctionN "jsonb_build_array"
212jsonbBuildArray = unsafeFunctionN "jsonb_build_array"
221
213
214+class PGBuildObject tys where
215+instance PGBuildObject '[]
216+instance (PGBuildObject tys, key `In` PGJsonKey)
217+ => PGBuildObject ('NotNull key ': value ': tys)
218+
222-- | Builds a possibly-heterogeneously-typed JSON object out of a variadic
219-- | Builds a possibly-heterogeneously-typed JSON object out of a variadic
223-- argument list. The elements of the argument list must alternate between text
220-- argument list. The elements of the argument list must alternate between text
224-- and values.
221-- and values.
225−class SOP.SListI tys => JsonBuildObject tys where
222+jsonBuildObject
226−
223+ :: (SOP.SListI elems, PGBuildObject elems)
227− jsonBuildObject :: tys ---> null 'PGjson
224+ => FunctionN elems (null 'PGjson)
228− jsonBuildObject = unsafeFunctionN "json_build_object"
225+jsonBuildObject = unsafeFunctionN "json_build_object"
229−
226+
227+-- | Builds a possibly-heterogeneously-typed (binary) JSON object out of a
228+-- variadic argument list. The elements of the argument list must alternate
229+-- between keys and values.
230+jsonbBuildObject
231+ :: (SOP.SListI elems, PGBuildObject elems)
230− jsonbBuildObject :: tys ---> null 'PGjsonb
232+ => FunctionN elems (null 'PGjsonb)
231− jsonbBuildObject = unsafeFunctionN "jsonb_build_object"
233+jsonbBuildObject = unsafeFunctionN "jsonb_build_object"
232−
233−instance JsonBuildObject '[]
234−instance (JsonBuildObject tys, key `In` PGJsonKey)
235− => JsonBuildObject ('NotNull key ': value ': tys)
236
234
237-- | Builds a JSON object out of a text array.
235-- | Builds a JSON object out of a text array.
238-- The array must have two dimensions
236-- The array must have two dimensions
@@ -240,7 +238,7 @@ instance (JsonBuildObject tys, key `In` PGJsonKey)
240-- which are taken as a key/value pair.
238-- which are taken as a key/value pair.
241jsonObject
239jsonObject
242 :: null ('PGfixarray '[n,2] ('NotNull 'PGtext))
240 :: null ('PGfixarray '[n,2] ('NotNull 'PGtext))
243− --> null 'PGjson
241+ :--> null 'PGjson
244jsonObject = unsafeFunction "json_object"
242jsonObject = unsafeFunction "json_object"
245
243
246-- | Builds a binary JSON object out of a text array.
244-- | Builds a binary JSON object out of a text array.
@@ -249,24 +247,24 @@ jsonObject = unsafeFunction "json_object"
249-- which are taken as a key/value pair.
247-- which are taken as a key/value pair.
250jsonbObject
248jsonbObject
251 :: null ('PGfixarray '[n,2] ('NotNull 'PGtext))
249 :: null ('PGfixarray '[n,2] ('NotNull 'PGtext))
252− --> null 'PGjsonb
250+ :--> null 'PGjsonb
253jsonbObject = unsafeFunction "jsonb_object"
251jsonbObject = unsafeFunction "jsonb_object"
254
252
255-- | This is an alternate form of 'jsonObject' that takes two arrays; one for
253-- | 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.
254-- keys and one for values, that are zipped pairwise to create a JSON object.
257−jsonZipObject ::
255+jsonZipObject :: FunctionN
258 '[ null ('PGvararray ('NotNull 'PGtext))
256 '[ null ('PGvararray ('NotNull 'PGtext))
259 , null ('PGvararray ('NotNull 'PGtext)) ]
257 , null ('PGvararray ('NotNull 'PGtext)) ]
260− ---> null 'PGjson
258+ ( null 'PGjson )
261jsonZipObject = unsafeFunctionN "json_object"
259jsonZipObject = unsafeFunctionN "json_object"
262
260
263-- | This is an alternate form of 'jsonbObject' that takes two arrays; one for
261-- | 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
262-- keys and one for values, that are zipped pairwise to create a binary JSON
265-- object.
263-- object.
266−jsonbZipObject ::
264+jsonbZipObject :: FunctionN
267 '[ null ('PGvararray ('NotNull 'PGtext))
265 '[ null ('PGvararray ('NotNull 'PGtext))
268 , null ('PGvararray ('NotNull 'PGtext)) ]
266 , null ('PGvararray ('NotNull 'PGtext)) ]
269− ---> null 'PGjsonb
267+ ( null 'PGjsonb )
270jsonbZipObject = unsafeFunctionN "jsonb_object"
268jsonbZipObject = unsafeFunctionN "jsonb_object"
271
269
272{-----------------------------------------
270{-----------------------------------------
@@ -274,170 +272,215 @@ Table 9.46: JSON processing functions
274-----------------------------------------}
272-----------------------------------------}
275
273
276-- | Returns the number of elements in the outermost JSON array.
274-- | Returns the number of elements in the outermost JSON array.
277−jsonArrayLength :: null 'PGjson --> null 'PGint4
275+jsonArrayLength :: null 'PGjson :--> null 'PGint4
278jsonArrayLength = unsafeFunction "json_array_length"
276jsonArrayLength = unsafeFunction "json_array_length"
279
277
280-- | Returns the number of elements in the outermost binary JSON array.
278-- | Returns the number of elements in the outermost binary JSON array.
281−jsonbArrayLength :: null 'PGjsonb --> null 'PGint4
279+jsonbArrayLength :: null 'PGjsonb :--> null 'PGint4
282jsonbArrayLength = unsafeFunction "jsonb_array_length"
280jsonbArrayLength = unsafeFunction "jsonb_array_length"
283
281
282+-- | Returns JSON value pointed to by the given path (equivalent to #>
283+-- operator).
284+jsonExtractPath
285+ :: SOP.SListI elems
286+ => Expression outer commons grp schemas params from (null 'PGjson)
287+ -> NP (Expression outer commons grp schemas params from) elems
288+ -> Expression outer commons grp schemas params from (null 'PGjsonb)
289+jsonExtractPath x xs =
290+ unsafeFunctionN "json_extract_path" (x :* xs)
291+
292+-- | Returns JSON value pointed to by the given path (equivalent to #>
293+-- operator).
294+jsonbExtractPath
295+ :: SOP.SListI elems
296+ => Expression outer commons grp schemas params from (null 'PGjsonb)
297+ -> NP (Expression outer commons grp schemas params from) elems
298+ -> Expression outer commons grp schemas params from (null 'PGjsonb)
299+jsonbExtractPath x xs =
300+ unsafeFunctionN "jsonb_extract_path" (x :* xs)
301+
302+-- | Returns JSON value pointed to by the given path (equivalent to #>
303+-- operator), as text.
304+jsonExtractPathAsText
305+ :: SOP.SListI elems
306+ => Expression outer commons grp schemas params from (null 'PGjson)
307+ -> NP (Expression outer commons grp schemas params from) elems
308+ -> Expression outer commons grp schemas params from (null 'PGjson)
309+jsonExtractPathAsText x xs =
310+ unsafeFunctionN "json_extract_path_text" (x :* xs)
311+
312+-- | Returns JSON value pointed to by the given path (equivalent to #>
313+-- operator), as text.
314+jsonbExtractPathAsText
315+ :: SOP.SListI elems
316+ => Expression outer commons grp schemas params from (null 'PGjsonb)
317+ -> NP (Expression outer commons grp schemas params from) elems
318+ -> Expression outer commons grp schemas params from (null 'PGjsonb)
319+jsonbExtractPathAsText x xs =
320+ unsafeFunctionN "jsonb_extract_path_text" (x :* xs)
321+
284-- | Returns the type of the outermost JSON value as a text string. Possible
322-- | Returns the type of the outermost JSON value as a text string. Possible
285-- types are object, array, string, number, boolean, and null.
323-- types are object, array, string, number, boolean, and null.
286−jsonTypeof :: null 'PGjson --> null 'PGtext
324+jsonTypeof :: null 'PGjson :--> null 'PGtext
287jsonTypeof = unsafeFunction "json_typeof"
325jsonTypeof = unsafeFunction "json_typeof"
288
326
289-- | Returns the type of the outermost binary JSON value as a text string.
327-- | Returns the type of the outermost binary JSON value as a text string.
290-- Possible types are object, array, string, number, boolean, and null.
328-- Possible types are object, array, string, number, boolean, and null.
291−jsonbTypeof :: null 'PGjsonb --> null 'PGtext
329+jsonbTypeof :: null 'PGjsonb :--> null 'PGtext
292jsonbTypeof = unsafeFunction "jsonb_typeof"
330jsonbTypeof = unsafeFunction "jsonb_typeof"
293
331
294-- | Returns its argument with all object fields that have null values omitted.
332-- | Returns its argument with all object fields that have null values omitted.
295-- Other null values are untouched.
333-- Other null values are untouched.
296−jsonStripNulls :: null 'PGjson --> null 'PGjson
334+jsonStripNulls :: null 'PGjson :--> null 'PGjson
297jsonStripNulls = unsafeFunction "json_strip_nulls"
335jsonStripNulls = unsafeFunction "json_strip_nulls"
298
336
299-- | Returns its argument with all object fields that have null values omitted.
337-- | Returns its argument with all object fields that have null values omitted.
300-- Other null values are untouched.
338-- Other null values are untouched.
301−jsonbStripNulls :: null 'PGjsonb --> null 'PGjsonb
339+jsonbStripNulls :: null 'PGjsonb :--> null 'PGjsonb
302jsonbStripNulls = unsafeFunction "jsonb_strip_nulls"
340jsonbStripNulls = unsafeFunction "jsonb_strip_nulls"
303
341
304-- | @ jsonbSet target path new_value create_missing @
342-- | @ jsonbSet target path new_value create_missing @
305--
343--
306−-- Returns target with the section designated by path replaced by @new_value@,
344+-- Returns target with the section designated by path replaced by new_value,
307−-- or with @new_value@ added if create_missing is
345+-- or with new_value added if create_missing is true ( default is true) and the
308−-- `Squeal.PostgreSQL.Expression.Logic.true` and the
309-- item designated by path does not exist. As with the path orientated
346-- 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
347-- operators, negative integers that appear in path count from the end of JSON
311-- arrays.
348-- arrays.
312−jsonbSet ::
349+jsonbSet
350+ :: Expression outer commons grp schemas params from (null 'PGjsonb)
313− '[ null 'PGjsonb, null ('PGvararray ('NotNull 'PGtext))
351+ -> Expression outer commons grp schemas params from (null ('PGvararray ('NotNull 'PGtext)))
314− , null 'PGjsonb, null 'PGbool ] ---> null 'PGjsonb
352+ -> Expression outer commons grp schemas params from (null 'PGjsonb)
353+ -> Maybe (Expression outer commons grp schemas params from (null 'PGbool))
354+ -> Expression outer commons grp schemas params from (null 'PGjsonb)
355+jsonbSet tgt path val createMissing = case createMissing of
356+ Just m -> unsafeFunctionN "jsonb_set" (tgt :* path :* val :* m :* Nil)
315−jsonbSet = unsafeFunctionN "jsonbSet"
357+ Nothing -> unsafeFunctionN "jsonb_set" (tgt :* path :* val :* Nil)
316
358
317-- | @ jsonbInsert target path new_value insert_after @
359-- | @ jsonbInsert target path new_value insert_after @
318--
360--
319−-- Returns target with @new_value@ inserted. If target section designated by
361+-- Returns target with new_value inserted. If target section designated by
320−-- path is in a JSONB array, @new_value@ will be inserted before target or after
362+-- path is in a JSONB array, new_value will be inserted before target or after
321−-- if @insert_after@ is `Squeal.PostgreSQL.Expression.Logic.true`.
322−-- If target section designated by
363+-- if insert_after is true (default is false). If target section designated by
323−-- path is in JSONB object, @new_value@ will be inserted only if target does not
364+-- path is in JSONB object, new_value will be inserted only if target does not
324-- exist. As with the path orientated operators, negative integers that appear
365-- exist. As with the path orientated operators, negative integers that appear
325-- in path count from the end of JSON arrays.
366-- in path count from the end of JSON arrays.
326−jsonbInsert ::
367+jsonbInsert
368+ :: Expression outer commons grp schemas params from (null 'PGjsonb)
327− '[ null 'PGjsonb, null ('PGvararray ('NotNull 'PGtext))
369+ -> Expression outer commons grp schemas params from (null ('PGvararray ('NotNull 'PGtext)))
328− , null 'PGjsonb, null 'PGbool ] ---> null 'PGjsonb
370+ -> Expression outer commons grp schemas params from (null 'PGjsonb)
371+ -> Maybe (Expression outer commons grp schemas params from (null 'PGbool))
372+ -> Expression outer commons grp schemas params from (null 'PGjsonb)
373+jsonbInsert tgt path val insertAfter = case insertAfter of
374+ Just i -> unsafeFunctionN "jsonb_insert" (tgt :* path :* val :* i :* Nil)
329−jsonbInsert = unsafeFunctionN "jsonb_insert"
375+ Nothing -> unsafeFunctionN "jsonb_insert" (tgt :* path :* val :* Nil)
330
376
331-- | Returns its argument as indented JSON text.
377-- | Returns its argument as indented JSON text.
332−jsonbPretty :: null 'PGjsonb --> null 'PGtext
378+jsonbPretty :: null 'PGjsonb :--> null 'PGtext
333jsonbPretty = unsafeFunction "jsonb_pretty"
379jsonbPretty = unsafeFunction "jsonb_pretty"
334
380
335−{- | Expands the outermost JSON object into a set of key/value pairs.
336
381
382+-- | Expands the outermost JSON object into a set of key/value pairs.
383+-- >>> import Data.Aeson
337−>>> printSQL (select Star (from (jsonEach (literal (Json (object ["a" .= "foo", "b" .= "bar"]))))))
384+-- >>> printSQL (select Star (from (jsonEach (literal (Json (object ["a" .= "foo", "b" .= "bar"]))))))
338−SELECT * FROM json_each(('{"a":"foo","b":"bar"}' :: json))
385+-- SELECT * FROM json_each(('{"a":"foo","b":"bar"}' :: json))
339−-}
340−jsonEach :: SetFunction "json_each" (null 'PGjson)
386+jsonEach :: SetOfFunction "json_each" (null 'PGjson)
341 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGjson]
387 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGjson]
342−jsonEach = unsafeSetFunction
388+jsonEach = unsafeSetOfFunction #json_each
343
389
344−{- | Expands the outermost binary JSON object into a set of key/value pairs.
390+-- | Expands the outermost binary JSON object into a set of key/value pairs.
345−
391+-- >>> import Data.Aeson
346−>>> printSQL (select Star (from (jsonbEach (literal (Jsonb (object ["a" .= "foo", "b" .= "bar"]))))))
392+-- >>> printSQL (select Star (from (jsonbEach (literal (Jsonb (object ["a" .= "foo", "b" .= "bar"]))))))
347−SELECT * FROM jsonb_each(('{"a":"foo","b":"bar"}' :: jsonb))
393+-- SELECT * FROM jsonb_each(('{"a":"foo","b":"bar"}' :: jsonb))
348−-}
349jsonbEach
394jsonbEach
350− :: SetFunction "jsonb_each" (nullity 'PGjsonb)
395+ :: SetOfFunction "jsonb_each" (nullity 'PGjsonb)
351 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGjson]
396 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGjson]
352−jsonbEach = unsafeSetFunction
397+jsonbEach = unsafeSetOfFunction #jsonb_each
353
398
354−{- | Expands the outermost JSON object into a set of key/value pairs.
399+-- | Expands the outermost JSON object into a set of key/value pairs.-- | Expands the outermost binary JSON object into a set of key/value pairs.
355−
400+-- >>> import Data.Aeson
356−>>> printSQL (select Star (from (jsonEachText (literal (Json (object ["a" .= "foo", "b" .= "bar"]))))))
401+-- >>> printSQL (select Star (from (jsonEachText (literal (Json (object ["a" .= "foo", "b" .= "bar"]))))))
357−SELECT * FROM json_each_text(('{"a":"foo","b":"bar"}' :: json))
402+-- SELECT * FROM json_each_text(('{"a":"foo","b":"bar"}' :: json))
358−-}
359jsonEachText
403jsonEachText
360− :: SetFunction "json_each_text" (null 'PGjson)
404+ :: SetOfFunction "json_each_text" (null 'PGjson)
361 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGtext]
405 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGtext]
362−jsonEachText = unsafeSetFunction
406+jsonEachText = unsafeSetOfFunction #json_each_text
363−
364−{- | Expands the outermost binary JSON object into a set of key/value pairs.
365
407
408+-- | Expands the outermost binary JSON object into a set of key/value pairs.
409+-- >>> import Data.Aeson
366−>>> printSQL (select Star (from (jsonbEachText (literal (Jsonb (object ["a" .= "foo", "b" .= "bar"]))))))
410+-- >>> printSQL (select Star (from (jsonbEachText (literal (Jsonb (object ["a" .= "foo", "b" .= "bar"]))))))
367−SELECT * FROM jsonb_each_text(('{"a":"foo","b":"bar"}' :: jsonb))
411+-- SELECT * FROM jsonb_each_text(('{"a":"foo","b":"bar"}' :: jsonb))
368−-}
369jsonbEachText
412jsonbEachText
370− :: SetFunction "jsonb_each_text" (null 'PGjsonb)
413+ :: SetOfFunction "jsonb_each_text" (null 'PGjsonb)
371 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGtext]
414 '["key" ::: 'NotNull 'PGtext, "value" ::: 'NotNull 'PGtext]
372−jsonbEachText = unsafeSetFunction
415+jsonbEachText = unsafeSetOfFunction #jsonb_each_text
373−
374−{- | Returns set of keys in the outermost JSON object.
375
416
417+-- | Returns set of keys in the outermost JSON object.
418+-- >>> import Data.Aeson
376−>>> printSQL (jsonObjectKeys (literal (Json (object ["a" .= "foo", "b" .= "bar"]))))
419+-- >>> printSQL (jsonObjectKeys (literal (Json (object ["a" .= "foo", "b" .= "bar"]))))
377−json_object_keys(('{"a":"foo","b":"bar"}' :: json))
420+-- json_object_keys(('{"a":"foo","b":"bar"}' :: json))
378−-}
379jsonObjectKeys
421jsonObjectKeys
380− :: SetFunction "json_object_keys" (nullity 'PGjson)
422+ :: SetOfFunction "json_object_keys" (nullity 'PGjson)
381 '["json_object_keys" ::: 'NotNull 'PGtext]
423 '["json_object_keys" ::: 'NotNull 'PGtext]
382−jsonObjectKeys = unsafeSetFunction
424+jsonObjectKeys = unsafeSetOfFunction #json_object_keys
383−
384−{- | Returns set of keys in the outermost JSON object.
385
425
426+-- | Returns set of keys in the outermost JSON object.
427+-- >>> import Data.Aeson
386−>>> printSQL (jsonbObjectKeys (literal (Jsonb (object ["a" .= "foo", "b" .= "bar"]))))
428+-- >>> printSQL (jsonbObjectKeys (literal (Jsonb (object ["a" .= "foo", "b" .= "bar"]))))
387−jsonb_object_keys(('{"a":"foo","b":"bar"}' :: jsonb))
429+-- jsonb_object_keys(('{"a":"foo","b":"bar"}' :: jsonb))
388−-}
389jsonbObjectKeys
430jsonbObjectKeys
390− :: SetFunction "jsonb_object_keys" (null 'PGjsonb)
431+ :: SetOfFunction "jsonb_object_keys" (null 'PGjsonb)
391 '["jsonb_object_keys" ::: 'NotNull 'PGtext]
432 '["jsonb_object_keys" ::: 'NotNull 'PGtext]
392−jsonbObjectKeys = unsafeSetFunction
433+jsonbObjectKeys = unsafeSetOfFunction #jsonb_object_keys
393−
394−-- | Build rows from Json types.
395−type JsonPopulateFunction fun json
396− = forall schemas row outer commons params
397− . json `In` PGJsonType
398− => TypeExpression schemas ('NotNull ('PGcomposite row)) -- ^ row type
399− -> Expression outer commons 'Ungrouped schemas params '[] ('NotNull json)
400− -- ^ json type
401− -> FromClause outer commons schemas params '[fun ::: row]
402
434
403unsafePopulateFunction
435unsafePopulateFunction
404− :: forall fun ty
436+ :: forall fun schemas null outer commons params ty row
405− . KnownSymbol fun => Alias fun -> JsonPopulateFunction fun ty
437+ . KnownSymbol fun
438+ => Alias fun
439+ -> TypeExpression schemas (null ('PGcomposite row))
440+ -> Expression outer commons 'Ungrouped schemas params '[] ty
441+ -> FromClause outer commons schemas params '[fun ::: row]
406unsafePopulateFunction _fun ty expr = UnsafeFromClause $ renderSymbol @fun
442unsafePopulateFunction _fun ty expr = UnsafeFromClause $ renderSymbol @fun
407 <> parenthesized ("null::" <> renderSQL ty <> ", " <> renderSQL expr)
443 <> parenthesized ("null::" <> renderSQL ty <> ", " <> renderSQL expr)
408
444
409-- | Expands the JSON expression to a row whose columns match the record
445-- | Expands the JSON expression to a row whose columns match the record
410-- type defined by the given table.
446-- type defined by the given table.
411−jsonPopulateRecord :: JsonPopulateFunction "json_populate_record" 'PGjson
447+jsonPopulateRecord
448+ :: TypeExpression schemas (nullity ('PGcomposite row)) -- ^ row type
449+ -> Expression outer commons 'Ungrouped schemas params '[] (nullity 'PGjson) -- ^ json object
450+ -> FromClause outer commons schemas params '["json_populate_record" ::: row]
412jsonPopulateRecord = unsafePopulateFunction #json_populate_record
451jsonPopulateRecord = unsafePopulateFunction #json_populate_record
413
452
414-- | Expands the binary JSON expression to a row whose columns match the record
453-- | Expands the binary JSON expression to a row whose columns match the record
415-- type defined by the given table.
454-- type defined by the given table.
416−jsonbPopulateRecord :: JsonPopulateFunction "jsonb_populate_record" 'PGjsonb
455+jsonbPopulateRecord
456+ :: TypeExpression schemas (nullity ('PGcomposite row)) -- ^ row type
457+ -> Expression outer commons 'Ungrouped schemas params '[] (nullity 'PGjsonb) -- ^ jsonb object
458+ -> FromClause outer commons schemas params '["jsonb_populate_record" ::: row]
417jsonbPopulateRecord = unsafePopulateFunction #jsonb_populate_record
459jsonbPopulateRecord = unsafePopulateFunction #jsonb_populate_record
418
460
419-- | Expands the outermost array of objects in the given JSON expression to a
461-- | Expands the outermost array of objects in the given JSON expression to a
420-- set of rows whose columns match the record type defined by the given table.
462-- set of rows whose columns match the record type defined by the given table.
421−jsonPopulateRecordSet :: JsonPopulateFunction "json_populate_record_set" 'PGjson
463+jsonPopulateRecordSet
464+ :: TypeExpression schemas (nullity ('PGcomposite row)) -- ^ row type
465+ -> Expression outer commons 'Ungrouped schemas params '[] (nullity 'PGjson) -- ^ json array
466+ -> FromClause outer commons schemas params '["json_populate_record_set" ::: row]
422jsonPopulateRecordSet = unsafePopulateFunction #json_populate_record_set
467jsonPopulateRecordSet = unsafePopulateFunction #json_populate_record_set
423
468
424-- | Expands the outermost array of objects in the given binary JSON expression
469-- | Expands the outermost array of objects in the given binary JSON expression
425-- to a set of rows whose columns match the record type defined by the given
470-- to a set of rows whose columns match the record type defined by the given
426-- table.
471-- table.
427−jsonbPopulateRecordSet :: JsonPopulateFunction "jsonb_populate_record_set" 'PGjsonb
472+jsonbPopulateRecordSet
473+ :: TypeExpression schemas (nullity ('PGcomposite row)) -- ^ row type
474+ -> Expression outer commons 'Ungrouped schemas params '[] (nullity 'PGjsonb) -- ^ jsonb array
475+ -> FromClause outer commons schemas params '["jsonb_populate_record_set" ::: row]
428jsonbPopulateRecordSet = unsafePopulateFunction #jsonb_populate_record_set
476jsonbPopulateRecordSet = unsafePopulateFunction #jsonb_populate_record_set
429
477
430−-- | Build rows from Json types.
478+unsafeRecordFunction
431−type JsonToRecordFunction json
432− = forall outer commons schemas params tab row
433− . (SOP.SListI row, json `In` PGJsonType)
479+ :: (SOP.SListI record, json `In` PGJsonType)
480+ => ByteString
434− => Expression outer commons 'Ungrouped schemas params '[] ('NotNull json)
481+ -> Expression outer commons 'Ungrouped schemas params '[] (nullity json)
435− -- ^ json type
436− -> Aliased (NP (Aliased (TypeExpression schemas))) (tab ::: row)
482+ -> Aliased (NP (Aliased (TypeExpression schemas))) (tab ::: record)
437− -- ^ row type
438− -> FromClause outer commons schemas params '[tab ::: row]
483+ -> FromClause outer commons schemas params '[tab ::: record]
439−
440−unsafeRecordFunction :: ByteString -> JsonToRecordFunction json
441unsafeRecordFunction fun expr (types `As` tab) = UnsafeFromClause $
484unsafeRecordFunction fun expr (types `As` tab) = UnsafeFromClause $
442 fun <> parenthesized (renderSQL expr) <+> "AS" <+> renderSQL tab
485 fun <> parenthesized (renderSQL expr) <+> "AS" <+> renderSQL tab
443 <> parenthesized (renderCommaSeparated renderTy types)
486 <> parenthesized (renderCommaSeparated renderTy types)
@@ -446,17 +489,33 @@ unsafeRecordFunction fun expr (types `As` tab) = UnsafeFromClause $
446 renderTy (ty `As` alias) = renderSQL alias <+> renderSQL ty
489 renderTy (ty `As` alias) = renderSQL alias <+> renderSQL ty
447
490
448-- | Builds an arbitrary record from a JSON object.
491-- | Builds an arbitrary record from a JSON object.
449−jsonToRecord :: JsonToRecordFunction 'PGjson
492+jsonToRecord
493+ :: SOP.SListI record
494+ => Expression outer commons 'Ungrouped schemas params '[] (nullity 'PGjson) -- ^ json object
495+ -> Aliased (NP (Aliased (TypeExpression schemas))) (tab ::: record)
496+ -> FromClause outer commons schemas params '[tab ::: record]
450jsonToRecord = unsafeRecordFunction "json_to_record"
497jsonToRecord = unsafeRecordFunction "json_to_record"
451
498
452-- | Builds an arbitrary record from a binary JSON object.
499-- | Builds an arbitrary record from a binary JSON object.
453−jsonbToRecord :: JsonToRecordFunction 'PGjsonb
500+jsonbToRecord
501+ :: SOP.SListI record
502+ => Expression outer commons 'Ungrouped schemas params '[] (nullity 'PGjsonb) -- ^ jsonb object
503+ -> Aliased (NP (Aliased (TypeExpression schemas))) (tab ::: record)
504+ -> FromClause outer commons schemas params '[tab ::: record]
454jsonbToRecord = unsafeRecordFunction "jsonb_to_record"
505jsonbToRecord = unsafeRecordFunction "jsonb_to_record"
455
506
456-- | Builds an arbitrary set of records from a JSON array of objects.
507-- | Builds an arbitrary set of records from a JSON array of objects.
457−jsonToRecordSet :: JsonToRecordFunction 'PGjson
508+jsonToRecordSet
509+ :: SOP.SListI record
510+ => Expression outer commons 'Ungrouped schemas params '[] (nullity 'PGjson) -- ^ json array
511+ -> Aliased (NP (Aliased (TypeExpression schemas))) (tab ::: record)
512+ -> FromClause outer commons schemas params '[tab ::: record]
458jsonToRecordSet = unsafeRecordFunction "json_to_record_set"
513jsonToRecordSet = unsafeRecordFunction "json_to_record_set"
459
514
460-- | Builds an arbitrary set of records from a binary JSON array of objects.
515-- | Builds an arbitrary set of records from a binary JSON array of objects.
461−jsonbToRecordSet :: JsonToRecordFunction 'PGjsonb
516+jsonbToRecordSet
517+ :: SOP.SListI record
518+ => Expression outer commons 'Ungrouped schemas params '[] (nullity 'PGjsonb) -- ^ jsonb array
519+ -> Aliased (NP (Aliased (TypeExpression schemas))) (tab ::: record)
520+ -> FromClause outer commons schemas params '[tab ::: record]
462jsonbToRecordSet = unsafeRecordFunction "jsonb_to_record_set"
521jsonbToRecordSet = unsafeRecordFunction "jsonb_to_record_set"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Logic.hs+2−2
@@ -47,8 +47,8 @@ false = UnsafeExpression "FALSE"
47
47
48-- | >>> printSQL $ not_ true
48-- | >>> printSQL $ not_ true
49-- (NOT TRUE)
49-- (NOT TRUE)
50−not_ :: null 'PGbool --> null 'PGbool
50+not_ :: null 'PGbool :--> null 'PGbool
51−not_ = unsafeLeftOp "NOT"
51+not_ = unsafeUnaryOpL "NOT"
52
52
53-- | >>> printSQL $ true .&& false
53-- | >>> printSQL $ true .&& false
54-- (TRUE AND FALSE)
54-- (TRUE AND FALSE)
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Math.hs+7−4
@@ -29,6 +29,7 @@ import Squeal.PostgreSQL.Schema
29
29
30-- $setup
30-- $setup
31-- >>> import Squeal.PostgreSQL
31-- >>> import Squeal.PostgreSQL
32+-- >>> import Squeal.PostgreSQL.Render
32
33
33-- | >>> :{
34-- | >>> :{
34-- let
35-- let
@@ -37,7 +38,9 @@ import Squeal.PostgreSQL.Schema
37-- in printSQL expression
38-- in printSQL expression
38-- :}
39-- :}
39-- atan2(pi(), 2)
40-- atan2(pi(), 2)
41+atan2_
42+ :: float `In` PGFloating
40−atan2_ :: float `In` PGFloating => '[ null float, null float] ---> null float
43+ => FunctionN '[ null float, null float] (null float)
41atan2_ = unsafeFunctionN "atan2"
44atan2_ = unsafeFunctionN "atan2"
42
45
43
46
@@ -76,7 +79,7 @@ rem_ = unsafeBinaryOp "%"
76-- in printSQL expression
79-- in printSQL expression
77-- :}
80-- :}
78-- trunc(pi())
81-- trunc(pi())
79−trunc :: frac `In` PGFloating => null frac --> null frac
82+trunc :: frac `In` PGFloating => null frac :--> null frac
80trunc = unsafeFunction "trunc"
83trunc = unsafeFunction "trunc"
81
84
82-- | >>> :{
85-- | >>> :{
@@ -86,7 +89,7 @@ trunc = unsafeFunction "trunc"
86-- in printSQL expression
89-- in printSQL expression
87-- :}
90-- :}
88-- round(pi())
91-- round(pi())
89−round_ :: frac `In` PGFloating => null frac --> null frac
92+round_ :: frac `In` PGFloating => null frac :--> null frac
90round_ = unsafeFunction "round"
93round_ = unsafeFunction "round"
91
94
92-- | >>> :{
95-- | >>> :{
@@ -96,5 +99,5 @@ round_ = unsafeFunction "round"
96-- in printSQL expression
99-- in printSQL expression
97-- :}
100-- :}
98-- ceiling(pi())
101-- ceiling(pi())
99−ceiling_ :: frac `In` PGFloating => null frac --> null frac
102+ceiling_ :: frac `In` PGFloating => null frac :--> null frac
100ceiling_ = unsafeFunction "ceiling"
103ceiling_ = unsafeFunction "ceiling"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Null.hs+4−4
@@ -44,7 +44,7 @@ null_ = UnsafeExpression "NULL"
44--
44--
45-- >>> printSQL $ notNull true
45-- >>> printSQL $ notNull true
46-- TRUE
46-- TRUE
47−notNull :: 'NotNull ty --> 'Null ty
47+notNull :: 'NotNull ty :--> 'Null ty
48notNull = UnsafeExpression . renderSQL
48notNull = UnsafeExpression . renderSQL
49
49
50-- | return the leftmost value which is not NULL
50-- | return the leftmost value which is not NULL
@@ -69,12 +69,12 @@ fromNull notNullx nullx = coalesce [nullx] notNullx
69
69
70-- | >>> printSQL $ null_ & isNull
70-- | >>> printSQL $ null_ & isNull
71-- NULL IS NULL
71-- NULL IS NULL
72−isNull :: 'Null ty --> null 'PGbool
72+isNull :: 'Null ty :--> null 'PGbool
73isNull x = UnsafeExpression $ renderSQL x <+> "IS NULL"
73isNull x = UnsafeExpression $ renderSQL x <+> "IS NULL"
74
74
75-- | >>> printSQL $ null_ & isNotNull
75-- | >>> printSQL $ null_ & isNotNull
76-- NULL IS NOT NULL
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"
78isNotNull x = UnsafeExpression $ renderSQL x <+> "IS NOT NULL"
79
79
80-- | analagous to `maybe` using @IS NULL@
80-- | analagous to `maybe` using @IS NULL@
@@ -100,5 +100,5 @@ matchNull y f x = ifThenElse (isNull x) y
100>>> printSQL expr
100>>> printSQL expr
101NULLIF(FALSE, ($1 :: bool))
101NULLIF(FALSE, ($1 :: bool))
102-}
102-}
103−nullIf :: '[ 'NotNull ty, 'NotNull ty] ---> 'Null ty
103+nullIf :: FunctionN '[ 'NotNull ty, 'NotNull ty] ('Null ty)
104nullIf = unsafeFunctionN "NULLIF"
104nullIf = unsafeFunctionN "NULLIF"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Range.hsdeleted−230
@@ -1,230 +0,0 @@
1−{-|
2−Module: Squeal.PostgreSQL.Expression.Range
3−Description: range types and functions
4−Copyright: (c) Eitan Chatav, 2019
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Range types and functions
9−-}
10−
11−{-# LANGUAGE
12− AllowAmbiguousTypes
13− , DataKinds
14− , DeriveAnyClass
15− , DeriveGeneric
16− , DeriveFoldable
17− , DerivingStrategies
18− , DeriveTraversable
19− , FlexibleContexts
20− , FlexibleInstances
21− , LambdaCase
22− , MultiParamTypeClasses
23− , OverloadedLabels
24− , OverloadedStrings
25− , PatternSynonyms
26− , RankNTypes
27− , ScopedTypeVariables
28− , TypeApplications
29− , TypeFamilies
30− , TypeOperators
31− , UndecidableInstances
32−#-}
33−
34−module Squeal.PostgreSQL.Expression.Range
35− ( range
36− , Range (..)
37− , (<=..<=), (<..<), (<=..<), (<..<=)
38− , moreThan, atLeast, lessThan, atMost
39− , singleton, whole
40− , Bound (..)
41− , (.<@)
42− , (@>.)
43− , (<<@)
44− , (@>>)
45− , (&<)
46− , (&>)
47− , (-|-)
48− , (@+)
49− , (@*)
50− , (@-)
51− , lowerBound
52− , upperBound
53− , isEmpty
54− , lowerInc
55− , lowerInf
56− , upperInc
57− , upperInf
58− , rangeMerge
59− ) where
60−
61−import BinaryParser
62−import ByteString.StrictBuilder
63−import Data.Bits
64−import qualified GHC.Generics as GHC
65−import qualified Generics.SOP as SOP
66−import qualified PostgreSQL.Binary.Decoding as Decoding
67−
68−import Squeal.PostgreSQL.Binary
69−import Squeal.PostgreSQL.Expression
70−import Squeal.PostgreSQL.Expression.Type hiding (bool)
71−import Squeal.PostgreSQL.PG
72−import Squeal.PostgreSQL.Render
73−import Squeal.PostgreSQL.Schema
74−
75−-- $setup
76−-- >>> import Squeal.PostgreSQL
77−
78−-- | Construct a `range`
79−--
80−-- >>> printSQL $ range tstzrange (atLeast now)
81−-- tstzrange(now(), NULL, '[)')
82−-- >>> printSQL $ range numrange (0 <=..< 2*pi)
83−-- numrange(0, (2 * pi()), '[)')
84−-- >>> printSQL $ range int4range Empty
85−-- ('empty' :: int4range)
86−range
87− :: TypeExpression schemas (null ('PGrange ty))
88− -> Range (Expression outer commons grp schemas params from ('NotNull ty))
89− -> Expression outer commons grp schemas params from (null ('PGrange ty))
90−range ty = \case
91− Empty -> UnsafeExpression $ parenthesized
92− (emp <+> "::" <+> renderSQL ty)
93− NonEmpty l u -> UnsafeExpression $ renderSQL ty <> parenthesized
94− (commaSeparated (args l u))
95− where
96− emp = singleQuote <> "empty" <> singleQuote
97− args l u = [arg l, arg u, singleQuote <> bra l <> ket u <> singleQuote]
98− singleQuote = "\'"
99− arg = \case
100− Infinite -> "NULL"; Closed x -> renderSQL x; Open x -> renderSQL x
101− bra = \case Infinite -> "("; Closed _ -> "["; Open _ -> "("
102− ket = \case Infinite -> ")"; Closed _ -> "]"; Open _ -> ")"
103−
104−data Bound x = Infinite | Closed x | Open x
105− deriving
106− ( Eq, Ord, Show, Read, GHC.Generic
107− , Functor, Foldable, Traversable )
108−
109−data Range x = Empty | NonEmpty (Bound x) (Bound x)
110− deriving
111− ( Eq, Ord, Show, Read, GHC.Generic
112− , Functor, Foldable, Traversable )
113− deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
114−type instance PG (Range x) = 'PGrange (PG x)
115−instance ToParam x pg => ToParam (Range x) ('PGrange pg) where
116− toParam rng = K $
117− word8 (setFlags rng 0) <>
118− case rng of
119− Empty -> mempty
120− NonEmpty lower upper -> putBound lower <> putBound upper
121− where
122− putBound = \case
123− Infinite -> mempty
124− Closed value -> putValue (unK (toParam @x @pg value))
125− Open value -> putValue (unK (toParam @x @pg value))
126− putValue value = int32BE (fromIntegral (builderLength value)) <> value
127− setFlags = \case
128− Empty -> (`setBit` 0)
129− NonEmpty lower upper ->
130− setLowerFlags lower . setUpperFlags upper
131− setLowerFlags = \case
132− Infinite -> (`setBit` 3)
133− Closed _ -> (`setBit` 1)
134− Open _ -> id
135− setUpperFlags = \case
136− Infinite -> (`setBit` 4)
137− Closed _ -> (`setBit` 2)
138− Open _ -> id
139−instance FromValue pg y => FromValue ('PGrange pg) (Range y) where
140− fromValue = do
141− flag <- byte
142− if testBit flag 0 then return Empty else do
143− lower <-
144− if testBit flag 3
145− then return Infinite
146− else do
147− len <- sized 4 Decoding.int
148− l <- sized len (fromValue @pg)
149− return $ if testBit flag 1 then Closed l else Open l
150− upper <-
151− if testBit flag 4
152− then return Infinite
153− else do
154− len <- sized 4 Decoding.int
155− l <- sized len (fromValue @pg)
156− return $ if testBit flag 2 then Closed l else Open l
157− return $ NonEmpty lower upper
158−
159−(<=..<=), (<..<), (<=..<), (<..<=) :: x -> x -> Range x
160−infix 4 <=..<=, <..<, <=..<, <..<=
161−x <=..<= y = NonEmpty (Closed x) (Closed y)
162−x <..< y = NonEmpty (Open x) (Open y)
163−x <=..< y = NonEmpty (Closed x) (Open y)
164−x <..<= y = NonEmpty (Open x) (Closed y)
165−
166−moreThan, atLeast, lessThan, atMost :: x -> Range x
167−moreThan x = NonEmpty (Open x) Infinite
168−atLeast x = NonEmpty (Closed x) Infinite
169−lessThan x = NonEmpty Infinite (Open x)
170−atMost x = NonEmpty Infinite (Closed x)
171−
172−singleton :: x -> Range x
173−singleton x = x <=..<= x
174−
175−whole :: Range x
176−whole = NonEmpty Infinite Infinite
177−
178−(.<@) :: Operator ('NotNull ty) (null ('PGrange ty)) ('Null 'PGbool)
179−(.<@) = unsafeBinaryOp "<@"
180−
181−(@>.) :: Operator (null ('PGrange ty)) ('NotNull ty) ('Null 'PGbool)
182−(@>.) = unsafeBinaryOp "<@"
183−
184−(<<@) :: Operator (null ('PGrange ty)) (null ('PGrange ty)) ('Null 'PGbool)
185−(<<@) = unsafeBinaryOp "<<"
186−
187−(@>>) :: Operator (null ('PGrange ty)) (null ('PGrange ty)) ('Null 'PGbool)
188−(@>>) = unsafeBinaryOp ">>"
189−
190−(&<) :: Operator (null ('PGrange ty)) (null ('PGrange ty)) ('Null 'PGbool)
191−(&<) = unsafeBinaryOp "&<"
192−
193−(&>) :: Operator (null ('PGrange ty)) (null ('PGrange ty)) ('Null 'PGbool)
194−(&>) = unsafeBinaryOp "&>"
195−
196−(-|-) :: Operator (null ('PGrange ty)) (null ('PGrange ty)) ('Null 'PGbool)
197−(-|-) = unsafeBinaryOp "-|-"
198−
199−(@+) :: Operator (null ('PGrange ty)) (null ('PGrange ty)) (null ('PGrange ty))
200−(@+) = unsafeBinaryOp "+"
201−
202−(@*) :: Operator (null ('PGrange ty)) (null ('PGrange ty)) (null ('PGrange ty))
203−(@*) = unsafeBinaryOp "*"
204−
205−(@-) :: Operator (null ('PGrange ty)) (null ('PGrange ty)) (null ('PGrange ty))
206−(@-) = unsafeBinaryOp "-"
207−
208−lowerBound :: null ('PGrange ty) --> 'Null ty
209−lowerBound = unsafeFunction "lower"
210−
211−upperBound :: null ('PGrange ty) --> 'Null ty
212−upperBound = unsafeFunction "upper"
213−
214−isEmpty :: null ('PGrange ty) --> 'Null 'PGbool
215−isEmpty = unsafeFunction "isempty"
216−
217−lowerInc :: null ('PGrange ty) --> 'Null 'PGbool
218−lowerInc = unsafeFunction "lower_inc"
219−
220−lowerInf :: null ('PGrange ty) --> 'Null 'PGbool
221−lowerInf = unsafeFunction "lower_inf"
222−
223−upperInc :: null ('PGrange ty) --> 'Null 'PGbool
224−upperInc = unsafeFunction "upper_inc"
225−
226−upperInf :: null ('PGrange ty) --> 'Null 'PGbool
227−upperInf = unsafeFunction "upper_inf"
228−
229−rangeMerge :: '[null ('PGrange ty), null ('PGrange ty)] ---> null ('PGrange ty)
230−rangeMerge = unsafeFunctionN "range_merge"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Set.hsdeleted−139
@@ -1,139 +0,0 @@
1−{-|
2−Module: Squeal.PostgreSQL.Expression.Set
3−Description: Set returning functions
4−Copyright: (c) Eitan Chatav, 2019
5−Maintainer: eitan@morphism.tech
6−Stability: experimental
7−
8−Set returning functions
9−-}
10−
11−{-# LANGUAGE
12− AllowAmbiguousTypes
13− , DataKinds
14− , FlexibleContexts
15− , OverloadedStrings
16− , PolyKinds
17− , RankNTypes
18− , ScopedTypeVariables
19− , TypeApplications
20− , TypeOperators
21−#-}
22−
23−module Squeal.PostgreSQL.Expression.Set
24− ( generateSeries
25− , generateSeriesStep
26− , generateSeriesTimestamp
27− , SetFunction
28− , unsafeSetFunction
29− , SetFunctionDB
30− , setFunction
31− , SetFunctionN
32− , unsafeSetFunctionN
33− , SetFunctionNDB
34− , setFunctionN
35− ) where
36−
37−import GHC.TypeLits
38−
39−import qualified Generics.SOP as SOP
40−
41−import Squeal.PostgreSQL.Alias
42−import Squeal.PostgreSQL.Expression
43−import Squeal.PostgreSQL.List
44−import Squeal.PostgreSQL.Render
45−import Squeal.PostgreSQL.Query
46−import Squeal.PostgreSQL.Schema
47−
48−{- |
49−A @RankNType@ for set returning functions with 1 argument.
50−-}
51−type SetFunction fun ty row
52− = forall outer commons schemas params
53− . Expression outer commons 'Ungrouped schemas params '[] ty
54− -- ^ input
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]
63− -- ^ output
64−
65−-- | Escape hatch for a set returning function with 1 argument.
66−unsafeSetFunction
67− :: forall fun ty row. KnownSymbol fun
68− => SetFunction fun ty row -- ^ set returning function
69−unsafeSetFunction x = UnsafeFromClause $
70− renderSymbol @fun <> parenthesized (renderSQL x)
71−
72−setFunction
73− :: ( Has sch schemas schema
74− , Has fun schema ('Function ('[ty] :=> 'ReturnsTable row)) )
75− => QualifiedAlias sch fun
76− -> SetFunctionDB fun schemas ty row
77−setFunction _ = unsafeSetFunction
78−
79−{- |
80−A @RankNType@ for set returning functions with multiple argument.
81−-}
82−type SetFunctionN fun tys row
83− = forall outer commons schemas params
84− . NP (Expression outer commons 'Ungrouped schemas params '[]) tys
85− -- ^ inputs
86− -> FromClause outer commons schemas params '[fun ::: row]
87− -- ^ output
88−
89−-- | Escape hatch for a set returning function with multiple argument.
90−unsafeSetFunctionN
91− :: forall fun tys row. (SOP.SListI tys, KnownSymbol fun)
92− => SetFunctionN fun tys row -- ^ set returning function
93−unsafeSetFunctionN xs = UnsafeFromClause $
94− renderSymbol @fun <> parenthesized (renderCommaSeparated renderSQL xs)
95−
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
104− :: ( Has sch schemas schema
105− , Has fun schema ('Function (tys :=> 'ReturnsTable row))
106− , SOP.SListI tys )
107− => QualifiedAlias sch fun
108− -> SetFunctionNDB fun schemas tys row
109−setFunctionN _ = unsafeSetFunctionN
110−
111−{- | @generateSeries (start *: stop)@
112−
113−Generate a series of values, from @start@ to @stop@ with a step size of one
114−-}
115−generateSeries
116− :: ty `In` '[ 'PGint4, 'PGint8, 'PGnumeric]
117− => SetFunctionN "generate_series" '[ null ty, null ty]
118− '["generate_series" ::: null ty] -- ^ set returning function
119−generateSeries = unsafeSetFunctionN
120−
121−{- | @generateSeries (start :* stop *: step)@
122−
123−Generate a series of values, from @start@ to @stop@ with a step size of @step@
124−-}
125−generateSeriesStep
126− :: ty `In` '[ 'PGint4, 'PGint8, 'PGnumeric]
127− => SetFunctionN "generate_series" '[null ty, null ty, null ty]
128− '["generate_series" ::: null ty] -- ^ set returning function
129−generateSeriesStep = unsafeSetFunctionN
130−
131−{- | @generateSeries (start :* stop *: step)@
132−
133−Generate a series of values, from @start@ to @stop@ with a step size of @step@
134−-}
135−generateSeriesTimestamp
136− :: ty `In` '[ 'PGtimestamp, 'PGtimestamptz]
137− => SetFunctionN "generate_series" '[null ty, null ty, null 'PGinterval]
138− '["generate_series" ::: null ty] -- ^ set returning function
139−generateSeriesTimestamp = unsafeSetFunctionN
squeal-postgresql/src/Squeal/PostgreSQL/Expression/SetOf.hsnew file+103
@@ -0,0 +1,103 @@
1+{-|
2+Module: Squeal.PostgreSQL.Expression.SetOf
3+Description: Set returning functions
4+Copyright: (c) Eitan Chatav, 2019
5+Maintainer: eitan@morphism.tech
6+Stability: experimental
7+
8+Set returning functions
9+-}
10+
11+{-# LANGUAGE
12+ AllowAmbiguousTypes
13+ , DataKinds
14+ , FlexibleContexts
15+ , OverloadedStrings
16+ , PolyKinds
17+ , RankNTypes
18+ , ScopedTypeVariables
19+ , TypeApplications
20+ , TypeOperators
21+#-}
22+
23+module Squeal.PostgreSQL.Expression.SetOf
24+ ( generateSeries
25+ , generateSeriesStep
26+ , generateSeriesTimestamp
27+ , SetOfFunction
28+ , unsafeSetOfFunction
29+ , SetOfFunctionN
30+ , unsafeSetOfFunctionN
31+ ) where
32+
33+import Data.ByteString (ByteString)
34+import GHC.TypeLits
35+
36+import qualified Generics.SOP as SOP
37+
38+import Squeal.PostgreSQL.Alias
39+import Squeal.PostgreSQL.Expression
40+import Squeal.PostgreSQL.List
41+import Squeal.PostgreSQL.Render
42+import Squeal.PostgreSQL.Query
43+import Squeal.PostgreSQL.Schema
44+
45+{- |
46+A @RankNType@ for set returning functions with 1 argument.
47+-}
48+type SetOfFunction fun ty setof
49+ = forall outer commons schemas params
50+ . Expression outer commons 'Ungrouped schemas params '[] ty
51+ -> FromClause outer commons schemas params '[fun ::: setof]
52+
53+-- | Escape hatch for a set returning function with 1 argument.
54+unsafeSetOfFunction
55+ :: forall fun ty setof
56+ . KnownSymbol fun
57+ => Alias fun
58+ -> SetOfFunction fun ty setof
59+unsafeSetOfFunction _fun x = UnsafeFromClause $
60+ renderSymbol @fun <> parenthesized (renderSQL x)
61+
62+{- |
63+A @RankNType@ for set returning functions with multiple argument.
64+-}
65+type SetOfFunctionN tys setof
66+ = forall outer commons schemas params
67+ . NP (Expression outer commons 'Ungrouped schemas params '[]) tys
68+ -> FromClause outer commons schemas params setof
69+
70+-- | Escape hatch for a set returning function with multiple argument.
71+unsafeSetOfFunctionN
72+ :: SOP.SListI tys
73+ => ByteString
74+ -> SetOfFunctionN tys setof
75+unsafeSetOfFunctionN fun xs = UnsafeFromClause $
76+ fun <> parenthesized (renderCommaSeparated renderSQL xs)
77+
78+{- | @generateSeries (start *: stop)@
79+Generate a series of values, from @start@ to @stop@ with a step size of one
80+-}
81+generateSeries
82+ :: ty `In` '[ 'PGint4, 'PGint8, 'PGnumeric]
83+ => SetOfFunctionN '[ null ty, null ty]
84+ '["generate_series" ::: '["generate_series" ::: '[null ty]]]
85+generateSeries = unsafeSetOfFunctionN "generate_series"
86+
87+{- | @generateSeries (start :* stop *: step)@
88+Generate a series of values, from @start@ to @stop@ with a step size of @step@
89+-}
90+generateSeriesStep
91+ :: ty `In` '[ 'PGint4, 'PGint8, 'PGnumeric]
92+ => SetOfFunctionN '[null ty, null ty, null ty]
93+ '["generate_series" ::: '["generate_series" ::: '[null ty]]]
94+generateSeriesStep = unsafeSetOfFunctionN "generate_series"
95+
96+{- | @generateSeries (start :* stop *: step)@
97+Generate a series of values, from @start@ to @stop@ with a step size of @step@
98+-}
99+generateSeriesTimestamp
100+ :: ty `In` '[ 'PGtimestamp, 'PGtimestamptz]
101+ => SetOfFunctionN '[null ty, null ty, null 'PGinterval]
102+ '["generate_series" ::: '["generate_series" ::: '[null ty]]]
103+generateSeriesTimestamp = unsafeSetOfFunctionN "generate_series"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Subquery.hs+3−2
@@ -33,6 +33,7 @@ import Squeal.PostgreSQL.Schema
33
33
34-- $setup
34-- $setup
35-- >>> import Squeal.PostgreSQL
35-- >>> import Squeal.PostgreSQL
36+-- >>> import Squeal.PostgreSQL.Render
36
37
37{- |
38{- |
38The argument of `exists` is an arbitrary subquery. The subquery is evaluated
39The argument of `exists` is an arbitrary subquery. The subquery is evaluated
@@ -80,8 +81,8 @@ using the given `Operator`, which must yield a Boolean result. The result of `su
80if any `true` result is obtained. The result is `false` if no true result is found
81if any `true` result is obtained. The result is `false` if no true result is found
81(including the case where the subquery returns no rows).
82(including the case where the subquery returns no rows).
82
83
83−>>> printSQL $ subAny "foo" like (values_ ("foobar" `as` #foo))
84+>>> printSQL $ subAll "foo" like (values_ ("foobar" `as` #foo))
84−(E'foo' LIKE ANY (SELECT * FROM (VALUES (E'foobar')) AS t ("foo")))
85+(E'foo' LIKE ALL (SELECT * FROM (VALUES (E'foobar')) AS t ("foo")))
85-}
86-}
86subAny
87subAny
87 :: Expression outer commons grp schemas params from ty1 -- ^ expression
88 :: Expression outer commons grp schemas params from ty1 -- ^ expression
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Text.hs+4−3
@@ -27,20 +27,21 @@ import Squeal.PostgreSQL.Schema
27
27
28-- $setup
28-- $setup
29-- >>> import Squeal.PostgreSQL
29-- >>> import Squeal.PostgreSQL
30+-- >>> import Squeal.PostgreSQL.Render
30
31
31-- | >>> printSQL $ lower "ARRRGGG"
32-- | >>> printSQL $ lower "ARRRGGG"
32-- lower(E'ARRRGGG')
33-- lower(E'ARRRGGG')
33−lower :: null 'PGtext --> null 'PGtext
34+lower :: null 'PGtext :--> null 'PGtext
34lower = unsafeFunction "lower"
35lower = unsafeFunction "lower"
35
36
36-- | >>> printSQL $ upper "eeee"
37-- | >>> printSQL $ upper "eeee"
37-- upper(E'eeee')
38-- upper(E'eeee')
38−upper :: null 'PGtext --> null 'PGtext
39+upper :: null 'PGtext :--> null 'PGtext
39upper = unsafeFunction "upper"
40upper = unsafeFunction "upper"
40
41
41-- | >>> printSQL $ charLength "four"
42-- | >>> printSQL $ charLength "four"
42-- char_length(E'four')
43-- char_length(E'four')
43−charLength :: null 'PGtext --> null 'PGint4
44+charLength :: null 'PGtext :--> null 'PGint4
44charLength = unsafeFunction "char_length"
45charLength = unsafeFunction "char_length"
45
46
46-- | The `like` expression returns true if the @string@ matches
47-- | The `like` expression returns true if the @string@ matches
squeal-postgresql/src/Squeal/PostgreSQL/Expression/TextSearch.hs+21−20
@@ -55,8 +55,8 @@ import Squeal.PostgreSQL.Schema
55(.|) = unsafeBinaryOp "||"
55(.|) = unsafeBinaryOp "||"
56
56
57-- | negate a `Squeal.PostgreSQL.Expression.Type.tsquery`
57-- | negate a `Squeal.PostgreSQL.Expression.Type.tsquery`
58−(.!) :: null 'PGtsquery --> null 'PGtsquery
58+(.!) :: null 'PGtsquery :--> null 'PGtsquery
59−(.!) = unsafeLeftOp "!!"
59+(.!) = unsafeUnaryOpL "!!"
60
60
61-- | `Squeal.PostgreSQL.Expression.Type.tsquery` followed by
61-- | `Squeal.PostgreSQL.Expression.Type.tsquery` followed by
62-- `Squeal.PostgreSQL.Expression.Type.tsquery`
62-- `Squeal.PostgreSQL.Expression.Type.tsquery`
@@ -66,50 +66,51 @@ import Squeal.PostgreSQL.Schema
66-- | convert array of lexemes to `Squeal.PostgreSQL.Expression.Type.tsvector`
66-- | convert array of lexemes to `Squeal.PostgreSQL.Expression.Type.tsvector`
67arrayToTSvector
67arrayToTSvector
68 :: null ('PGvararray ('NotNull 'PGtext))
68 :: null ('PGvararray ('NotNull 'PGtext))
69− --> null 'PGtsvector
69+ :--> null 'PGtsvector
70arrayToTSvector = unsafeFunction "array_to_tsvector"
70arrayToTSvector = unsafeFunction "array_to_tsvector"
71
71
72-- | number of lexemes in `Squeal.PostgreSQL.Expression.Type.tsvector`
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"
74tsvectorLength = unsafeFunction "length"
75
75
76-- | number of lexemes plus operators in `Squeal.PostgreSQL.Expression.Type.tsquery`
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"
78numnode = unsafeFunction "numnode"
79
79
80-- | produce `Squeal.PostgreSQL.Expression.Type.tsquery` ignoring punctuation
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"
82plainToTSquery = unsafeFunction "plainto_tsquery"
83
83
84-- | produce `Squeal.PostgreSQL.Expression.Type.tsquery` that searches for a phrase,
84-- | produce `Squeal.PostgreSQL.Expression.Type.tsquery` that searches for a phrase,
85-- ignoring punctuation
85-- ignoring punctuation
86−phraseToTSquery :: null 'PGtext --> null 'PGtsquery
86+phraseToTSquery :: null 'PGtext :--> null 'PGtsquery
87phraseToTSquery = unsafeFunction "phraseto_tsquery"
87phraseToTSquery = unsafeFunction "phraseto_tsquery"
88
88
89-- | produce `Squeal.PostgreSQL.Expression.Type.tsquery` from a web search style query
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"
91websearchToTSquery = unsafeFunction "websearch_to_tsquery"
92
92
93-- | get indexable part of a `Squeal.PostgreSQL.Expression.Type.tsquery`
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"
95queryTree = unsafeFunction "query_tree"
96
96
97-- | normalize words and convert to `Squeal.PostgreSQL.Expression.Type.tsquery`
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"
99toTSquery = unsafeFunction "to_tsquery"
100
100
101-- | reduce document text to `Squeal.PostgreSQL.Expression.Type.tsvector`
101-- | reduce document text to `Squeal.PostgreSQL.Expression.Type.tsvector`
102toTSvector
102toTSvector
103 :: ty `In` '[ 'PGtext, 'PGjson, 'PGjsonb]
103 :: ty `In` '[ 'PGtext, 'PGjson, 'PGjsonb]
104− => null ty --> null 'PGtsvector
104+ => null ty :--> null 'PGtsvector
105toTSvector = unsafeFunction "to_tsvector"
105toTSvector = unsafeFunction "to_tsvector"
106
106
107-- | assign weight to each element of `Squeal.PostgreSQL.Expression.Type.tsvector`
107-- | assign weight to each element of `Squeal.PostgreSQL.Expression.Type.tsvector`
108+setWeight
108−setWeight :: '[null 'PGtsvector, null ('PGchar 1)] ---> null 'PGtsvector
109+ :: FunctionN '[null 'PGtsvector, null ('PGchar 1)] (null 'PGtsvector)
109setWeight = unsafeFunctionN "set_weight"
110setWeight = unsafeFunctionN "set_weight"
110
111
111-- | remove positions and weights from `Squeal.PostgreSQL.Expression.Type.tsvector`
112-- | remove positions and weights from `Squeal.PostgreSQL.Expression.Type.tsvector`
112−strip :: null 'PGtsvector --> null 'PGtsvector
113+strip :: null 'PGtsvector :--> null 'PGtsvector
113strip = unsafeFunction "strip"
114strip = unsafeFunction "strip"
114
115
115-- | @jsonToTSvector (document *: filter)@
116-- | @jsonToTSvector (document *: filter)@
@@ -122,7 +123,7 @@ strip = unsafeFunction "strip"
122-- "boolean" (to include all Boolean values in the string format "true"/"false"),
123-- "boolean" (to include all Boolean values in the string format "true"/"false"),
123-- "key" (to include all keys) or "all" (to include all above).
124-- "key" (to include all keys) or "all" (to include all above).
124-- These values can be combined together to include, e.g. all string and numeric values.
125-- These values can be combined together to include, e.g. all string and numeric values.
125−jsonToTSvector :: '[null 'PGjson, null 'PGjson] ---> null 'PGtsvector
126+jsonToTSvector :: FunctionN '[null 'PGjson, null 'PGjson] (null 'PGtsvector)
126jsonToTSvector = unsafeFunctionN "json_to_tsvector"
127jsonToTSvector = unsafeFunctionN "json_to_tsvector"
127
128
128-- | @jsonbToTSvector (document *: filter)@
129-- | @jsonbToTSvector (document *: filter)@
@@ -135,23 +136,23 @@ jsonToTSvector = unsafeFunctionN "json_to_tsvector"
135-- "boolean" (to include all Boolean values in the string format "true"/"false"),
136-- "boolean" (to include all Boolean values in the string format "true"/"false"),
136-- "key" (to include all keys) or "all" (to include all above).
137-- "key" (to include all keys) or "all" (to include all above).
137-- These values can be combined together to include, e.g. all string and numeric values.
138-- These values can be combined together to include, e.g. all string and numeric values.
138−jsonbToTSvector :: '[null 'PGjsonb, null 'PGjsonb] ---> null 'PGtsvector
139+jsonbToTSvector :: FunctionN '[null 'PGjsonb, null 'PGjsonb] (null 'PGtsvector)
139jsonbToTSvector = unsafeFunctionN "jsonb_to_tsvector"
140jsonbToTSvector = unsafeFunctionN "jsonb_to_tsvector"
140
141
141-- | remove given lexeme from `Squeal.PostgreSQL.Expression.Type.tsvector`
142-- | remove given lexeme from `Squeal.PostgreSQL.Expression.Type.tsvector`
142−tsDelete ::
143+tsDelete :: FunctionN
143 '[null 'PGtsvector, null ('PGvararray ('NotNull 'PGtext))]
144 '[null 'PGtsvector, null ('PGvararray ('NotNull 'PGtext))]
144− ---> null 'PGtsvector
145+ (null 'PGtsvector)
145tsDelete = unsafeFunctionN "ts_delete"
146tsDelete = unsafeFunctionN "ts_delete"
146
147
147-- | select only elements with given weights from `Squeal.PostgreSQL.Expression.Type.tsvector`
148-- | select only elements with given weights from `Squeal.PostgreSQL.Expression.Type.tsvector`
148−tsFilter ::
149+tsFilter :: FunctionN
149 '[null 'PGtsvector, null ('PGvararray ('NotNull ('PGchar 1)))]
150 '[null 'PGtsvector, null ('PGvararray ('NotNull ('PGchar 1)))]
150− ---> null 'PGtsvector
151+ (null 'PGtsvector)
151tsFilter = unsafeFunctionN "ts_filter"
152tsFilter = unsafeFunctionN "ts_filter"
152
153
153-- | display a `Squeal.PostgreSQL.Expression.Type.tsquery` match
154-- | display a `Squeal.PostgreSQL.Expression.Type.tsquery` match
154tsHeadline
155tsHeadline
155 :: document `In` '[ 'PGtext, 'PGjson, 'PGjsonb]
156 :: document `In` '[ 'PGtext, 'PGjson, 'PGjsonb]
156− => '[null document, null 'PGtsquery] ---> null 'PGtext
157+ => FunctionN '[null document, null 'PGtsquery] (null 'PGtext)
157tsHeadline = unsafeFunctionN "ts_headline"
158tsHeadline = unsafeFunctionN "ts_headline"
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Time.hs+12−7
@@ -17,7 +17,6 @@ Date/Time functions and operators
17 , OverloadedStrings
17 , OverloadedStrings
18 , PolyKinds
18 , PolyKinds
19 , RankNTypes
19 , RankNTypes
20− , TypeOperators
21#-}
20#-}
22
21
23module Squeal.PostgreSQL.Expression.Time
22module Squeal.PostgreSQL.Expression.Time
@@ -86,7 +85,9 @@ Create date from year, month and day fields
86>>> printSQL (makeDate (1984 :* 7 *: 3))
85>>> printSQL (makeDate (1984 :* 7 *: 3))
87make_date(1984, 7, 3)
86make_date(1984, 7, 3)
88-}
87-}
88+makeDate :: FunctionN
89−makeDate :: '[ null 'PGint4, null 'PGint4, null 'PGint4 ] ---> null 'PGdate
89+ '[ null 'PGint4, null 'PGint4, null 'PGint4 ]
90+ ( null 'PGdate )
90makeDate = unsafeFunctionN "make_date"
91makeDate = unsafeFunctionN "make_date"
91
92
92{-|
93{-|
@@ -95,7 +96,9 @@ Create time from hour, minute and seconds fields
95>>> printSQL (makeTime (8 :* 15 *: 23.5))
96>>> printSQL (makeTime (8 :* 15 *: 23.5))
96make_time(8, 15, 23.5)
97make_time(8, 15, 23.5)
97-}
98-}
99+makeTime :: FunctionN
98−makeTime :: '[ null 'PGint4, null 'PGint4, null 'PGfloat8 ] ---> null 'PGtime
100+ '[ null 'PGint4, null 'PGint4, null 'PGfloat8 ]
101+ ( null 'PGtime )
99makeTime = unsafeFunctionN "make_time"
102makeTime = unsafeFunctionN "make_time"
100
103
101{-|
104{-|
@@ -104,9 +107,10 @@ Create timestamp from year, month, day, hour, minute and seconds fields
104>>> printSQL (makeTimestamp (2013 :* 7 :* 15 :* 8 :* 15 *: 23.5))
107>>> printSQL (makeTimestamp (2013 :* 7 :* 15 :* 8 :* 15 *: 23.5))
105make_timestamp(2013, 7, 15, 8, 15, 23.5)
108make_timestamp(2013, 7, 15, 8, 15, 23.5)
106-}
109-}
107−makeTimestamp ::
110+makeTimestamp :: FunctionN
108 '[ null 'PGint4, null 'PGint4, null 'PGint4
111 '[ null 'PGint4, null 'PGint4, null 'PGint4
109− , null 'PGint4, null 'PGint4, null 'PGfloat8 ] ---> null 'PGtimestamp
112+ , null 'PGint4, null 'PGint4, null 'PGfloat8 ]
113+ ( null 'PGtimestamp )
110makeTimestamp = unsafeFunctionN "make_timestamp"
114makeTimestamp = unsafeFunctionN "make_timestamp"
111
115
112{-|
116{-|
@@ -117,9 +121,10 @@ the current time zone is used
117>>> printSQL (makeTimestamptz (2013 :* 7 :* 15 :* 8 :* 15 *: 23.5))
121>>> printSQL (makeTimestamptz (2013 :* 7 :* 15 :* 8 :* 15 *: 23.5))
118make_timestamptz(2013, 7, 15, 8, 15, 23.5)
122make_timestamptz(2013, 7, 15, 8, 15, 23.5)
119-}
123-}
120−makeTimestamptz ::
124+makeTimestamptz :: FunctionN
121 '[ null 'PGint4, null 'PGint4, null 'PGint4
125 '[ null 'PGint4, null 'PGint4, null 'PGint4
122− , null 'PGint4, null 'PGint4, null 'PGfloat8 ] ---> null 'PGtimestamptz
126+ , null 'PGint4, null 'PGint4, null 'PGfloat8 ]
127+ ( null 'PGtimestamptz )
123makeTimestamptz = unsafeFunctionN "make_timestamptz"
128makeTimestamptz = unsafeFunctionN "make_timestamptz"
124
129
125{-|
130{-|
squeal-postgresql/src/Squeal/PostgreSQL/Expression/Type.hs+5−168
@@ -23,16 +23,12 @@ Type expressions.
23 , ScopedTypeVariables
23 , ScopedTypeVariables
24 , TypeApplications
24 , TypeApplications
25 , TypeOperators
25 , TypeOperators
26− , UndecidableInstances
27#-}
26#-}
28
27
29module Squeal.PostgreSQL.Expression.Type
28module Squeal.PostgreSQL.Expression.Type
30− ( -- * type casting
29+ ( TypeExpression (..)
31− cast
30+ , cast
32− , astype
31+ , PGTyped (..)
33− , inferredtype
34− -- * type expressions
35− , TypeExpression (..)
36 , typedef
32 , typedef
37 , typetable
33 , typetable
38 , typeview
34 , typeview
@@ -58,11 +54,9 @@ module Squeal.PostgreSQL.Expression.Type
58 , bytea
54 , bytea
59 , timestamp
55 , timestamp
60 , timestampWithTimeZone
56 , timestampWithTimeZone
61− , timestamptz
62 , date
57 , date
63 , time
58 , time
64 , timeWithTimeZone
59 , timeWithTimeZone
65− , timetz
66 , interval
60 , interval
67 , uuid
61 , uuid
68 , inet
62 , inet
@@ -72,29 +66,6 @@ module Squeal.PostgreSQL.Expression.Type
72 , fixarray
66 , fixarray
73 , tsvector
67 , tsvector
74 , tsquery
68 , tsquery
75− , oid
76− , int4range
77− , int8range
78− , numrange
79− , tsrange
80− , tstzrange
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 (..)
98 ) where
69 ) where
99
70
100import Control.DeepSeq
71import Control.DeepSeq
@@ -108,7 +79,6 @@ import qualified Generics.SOP as SOP
108
79
109import Squeal.PostgreSQL.Alias
80import Squeal.PostgreSQL.Alias
110import Squeal.PostgreSQL.Expression
81import Squeal.PostgreSQL.Expression
111−import Squeal.PostgreSQL.PG
112import Squeal.PostgreSQL.Render
82import Squeal.PostgreSQL.Render
113import Squeal.PostgreSQL.Schema
83import Squeal.PostgreSQL.Schema
114
84
@@ -130,29 +100,6 @@ cast
130cast ty x = UnsafeExpression $ parenthesized $
100cast ty x = UnsafeExpression $ parenthesized $
131 renderSQL x <+> "::" <+> renderSQL ty
101 renderSQL x <+> "::" <+> renderSQL ty
132
102
133−-- | A safe version of `cast` which just matches a value with its type.
134−--
135−-- >>> printSQL (1 & astype int)
136−-- (1 :: int)
137−astype
138− :: TypeExpression schemas ty
139− -- ^ type to specify as
140− -> Expression outer commons grp schemas params from ty
141− -- ^ value
142− -> Expression outer commons grp schemas params from ty
143−astype = cast
144−
145−-- | `inferredtype` will add a type annotation to an `Expression`
146−-- which can be useful for fixing the storage type of a value.
147−--
148−-- >>> printSQL (inferredtype true)
149−-- (TRUE :: bool)
150−inferredtype
151− :: PGTyped schemas ty
152− => Expression outer common grp schemas params from ty
153− -- ^ value
154− -> Expression outer common grp schemas params from ty
155−inferredtype = astype pgtype
156
103
157{-----------------------------------------
104{-----------------------------------------
158type expressions
105type expressions
@@ -170,7 +117,6 @@ instance RenderSQL (TypeExpression schemas ty) where
170typedef
117typedef
171 :: (Has sch schemas schema, Has td schema ('Typedef ty))
118 :: (Has sch schemas schema, Has td schema ('Typedef ty))
172 => QualifiedAlias sch td
119 => QualifiedAlias sch td
173− -- ^ type alias
174 -> TypeExpression schemas (null ty)
120 -> TypeExpression schemas (null ty)
175typedef = UnsafeTypeExpression . renderSQL
121typedef = UnsafeTypeExpression . renderSQL
176
122
@@ -179,7 +125,6 @@ typedef = UnsafeTypeExpression . renderSQL
179typetable
125typetable
180 :: (Has sch schemas schema, Has tab schema ('Table table))
126 :: (Has sch schemas schema, Has tab schema ('Table table))
181 => QualifiedAlias sch tab
127 => QualifiedAlias sch tab
182− -- ^ table alias
183 -> TypeExpression schemas (null ('PGcomposite (TableToRow table)))
128 -> TypeExpression schemas (null ('PGcomposite (TableToRow table)))
184typetable = UnsafeTypeExpression . renderSQL
129typetable = UnsafeTypeExpression . renderSQL
185
130
@@ -188,7 +133,6 @@ typetable = UnsafeTypeExpression . renderSQL
188typeview
133typeview
189 :: (Has sch schemas schema, Has vw schema ('View view))
134 :: (Has sch schemas schema, Has vw schema ('View view))
190 => QualifiedAlias sch vw
135 => QualifiedAlias sch vw
191− -- ^ view alias
192 -> TypeExpression schemas (null ('PGcomposite view))
136 -> TypeExpression schemas (null ('PGcomposite view))
193typeview = UnsafeTypeExpression . renderSQL
137typeview = UnsafeTypeExpression . renderSQL
194
138
@@ -245,9 +189,8 @@ bytea = UnsafeTypeExpression "bytea"
245timestamp :: TypeExpression schemas (null 'PGtimestamp)
189timestamp :: TypeExpression schemas (null 'PGtimestamp)
246timestamp = UnsafeTypeExpression "timestamp"
190timestamp = UnsafeTypeExpression "timestamp"
247-- | date and time, including time zone
191-- | date and time, including time zone
248−timestampWithTimeZone, timestamptz :: TypeExpression schemas (null 'PGtimestamptz)
192+timestampWithTimeZone :: TypeExpression schemas (null 'PGtimestamptz)
249timestampWithTimeZone = UnsafeTypeExpression "timestamp with time zone"
193timestampWithTimeZone = UnsafeTypeExpression "timestamp with time zone"
250−timestamptz = UnsafeTypeExpression "timestamptz"
251-- | calendar date (year, month, day)
194-- | calendar date (year, month, day)
252date :: TypeExpression schemas (null 'PGdate)
195date :: TypeExpression schemas (null 'PGdate)
253date = UnsafeTypeExpression "date"
196date = UnsafeTypeExpression "date"
@@ -255,9 +198,8 @@ date = UnsafeTypeExpression "date"
255time :: TypeExpression schemas (null 'PGtime)
198time :: TypeExpression schemas (null 'PGtime)
256time = UnsafeTypeExpression "time"
199time = UnsafeTypeExpression "time"
257-- | time of day, including time zone
200-- | time of day, including time zone
258−timeWithTimeZone, timetz :: TypeExpression schemas (null 'PGtimetz)
201+timeWithTimeZone :: TypeExpression schemas (null 'PGtimetz)
259timeWithTimeZone = UnsafeTypeExpression "time with time zone"
202timeWithTimeZone = UnsafeTypeExpression "time with time zone"
260−timetz = UnsafeTypeExpression "timetz"
261-- | time span
203-- | time span
262interval :: TypeExpression schemas (null 'PGinterval)
204interval :: TypeExpression schemas (null 'PGinterval)
263interval = UnsafeTypeExpression "interval"
205interval = UnsafeTypeExpression "interval"
@@ -304,28 +246,6 @@ tsvector = UnsafeTypeExpression "tsvector"
304-- | text search document
246-- | text search document
305tsquery :: TypeExpression schemas (null 'PGtsquery)
247tsquery :: TypeExpression schemas (null 'PGtsquery)
306tsquery = UnsafeTypeExpression "tsquery"
248tsquery = UnsafeTypeExpression "tsquery"
307−-- | Object identifiers (OIDs) are used internally by PostgreSQL
308−-- as primary keys for various system tables.
309−oid :: TypeExpression schemas (null 'PGoid)
310−oid = UnsafeTypeExpression "oid"
311−-- | Range of integer
312−int4range :: TypeExpression schemas (null ('PGrange 'PGint4))
313−int4range = UnsafeTypeExpression "int4range"
314−-- | Range of bigint
315−int8range :: TypeExpression schemas (null ('PGrange 'PGint8))
316−int8range = UnsafeTypeExpression "int8range"
317−-- | Range of numeric
318−numrange :: TypeExpression schemas (null ('PGrange 'PGnumeric))
319−numrange = UnsafeTypeExpression "numrange"
320−-- | Range of timestamp without time zone
321−tsrange :: TypeExpression schemas (null ('PGrange 'PGtimestamp))
322−tsrange = UnsafeTypeExpression "tsrange"
323−-- | Range of timestamp with time zone
324−tstzrange :: TypeExpression schemas (null ('PGrange 'PGtimestamptz))
325−tstzrange = UnsafeTypeExpression "tstzrange"
326−-- | Range of date
327−daterange :: TypeExpression schemas (null ('PGrange 'PGdate))
328−daterange = UnsafeTypeExpression "daterange"
329
249
330-- | `pgtype` is a demoted version of a `PGType`
250-- | `pgtype` is a demoted version of a `PGType`
331class PGTyped schemas (ty :: NullityType) where
251class PGTyped schemas (ty :: NullityType) where
@@ -361,86 +281,3 @@ instance (SOP.All KnownNat dims, PGTyped schemas ty)
361 pgtype = fixarray @dims (pgtype @schemas @ty)
281 pgtype = fixarray @dims (pgtype @schemas @ty)
362instance PGTyped schemas (null 'PGtsvector) where pgtype = tsvector
282instance PGTyped schemas (null 'PGtsvector) where pgtype = tsvector
363instance PGTyped schemas (null 'PGtsquery) where pgtype = tsquery
283instance PGTyped schemas (null 'PGtsquery) where pgtype = tsquery
364−instance 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−
372−-- | Lift `PGTyped` to a field
373−class FieldTyped schemas ty where
374− fieldtype :: Aliased (TypeExpression schemas) ty
375−instance (KnownSymbol alias, PGTyped schemas ty)
376− => FieldTyped schemas (alias ::: ty) where
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/Expression/Window.hs+6−21
@@ -23,8 +23,9 @@ Window functions and definitions
23#-}
23#-}
24
24
25module Squeal.PostgreSQL.Expression.Window
25module Squeal.PostgreSQL.Expression.Window
26− ( -- * functions
26+ ( WindowDefinition (..)
27− partitionBy
27+ , partitionBy
28+ , WindowFunction (..)
28 , rank
29 , rank
29 , rowNumber
30 , rowNumber
30 , denseRank
31 , denseRank
@@ -36,11 +37,6 @@ module Squeal.PostgreSQL.Expression.Window
36 , firstValue
37 , firstValue
37 , lastValue
38 , lastValue
38 , nthValue
39 , nthValue
39− , unsafeWindowFunction1
40− , unsafeWindowFunctionN
41− -- * types
42− , WindowFunction (..)
43− , WindowDefinition (..)
44 , WinFun0
40 , WinFun0
45 , WinFun1
41 , WinFun1
46 , WinFunN
42 , WinFunN
@@ -97,15 +93,14 @@ instance Aggregate
97 varPop = unsafeWindowFunction1 "var_pop"
93 varPop = unsafeWindowFunction1 "var_pop"
98 varSamp = unsafeWindowFunction1 "var_samp"
94 varSamp = unsafeWindowFunction1 "var_samp"
99
95
96+
100-- | A `WindowDefinition` is a set of table rows that are somehow related
97-- | A `WindowDefinition` is a set of table rows that are somehow related
101-- to the current row
98-- to the current row
102data WindowDefinition outer commons grp schemas params from where
99data WindowDefinition outer commons grp schemas params from where
103 WindowDefinition
100 WindowDefinition
104 :: SOP.SListI bys
101 :: SOP.SListI bys
105 => NP (Expression outer commons grp schemas params from) bys
102 => NP (Expression outer commons grp schemas params from) bys
106− -- ^ `partitionBy` clause
107 -> [SortExpression outer commons grp schemas params from]
103 -> [SortExpression outer commons grp schemas params from]
108− -- ^ `Squeal.PostgreSQL.Expression.Sort.orderBy` clause
109 -> WindowDefinition outer commons grp schemas params from
104 -> WindowDefinition outer commons grp schemas params from
110
105
111instance OrderBy WindowDefinition where
106instance OrderBy WindowDefinition where
@@ -132,7 +127,7 @@ the same partition as the current row.
132-}
127-}
133partitionBy
128partitionBy
134 :: SOP.SListI bys
129 :: SOP.SListI bys
135− => NP (Expression outer commons grp schemas params from) bys -- ^ partitions
130+ => NP (Expression outer commons grp schemas params from) bys
136 -> WindowDefinition outer commons grp schemas params from
131 -> WindowDefinition outer commons grp schemas params from
137partitionBy bys = WindowDefinition bys []
132partitionBy bys = WindowDefinition bys []
138
133
@@ -189,18 +184,15 @@ type WinFunN xs y
189 -> WindowFunction outer commons grp schemas params from y
184 -> WindowFunction outer commons grp schemas params from y
190 -- ^ output
185 -- ^ output
191
186
192−-- | escape hatch for defining window functions
193unsafeWindowFunction1 :: ByteString -> WinFun1 x y
187unsafeWindowFunction1 :: ByteString -> WinFun1 x y
194unsafeWindowFunction1 fun x
188unsafeWindowFunction1 fun x
195 = UnsafeWindowFunction $ fun <> parenthesized (renderSQL x)
189 = UnsafeWindowFunction $ fun <> parenthesized (renderSQL x)
196
190
197−-- | escape hatch for defining multi-argument window functions
198unsafeWindowFunctionN :: SOP.SListI xs => ByteString -> WinFunN xs y
191unsafeWindowFunctionN :: SOP.SListI xs => ByteString -> WinFunN xs y
199unsafeWindowFunctionN fun xs = UnsafeWindowFunction $ fun <>
192unsafeWindowFunctionN fun xs = UnsafeWindowFunction $ fun <>
200 parenthesized (renderCommaSeparated renderSQL xs)
193 parenthesized (renderCommaSeparated renderSQL xs)
201
194
202{- | rank of the current row with gaps; same as `rowNumber` of its first peer
195{- | rank of the current row with gaps; same as `rowNumber` of its first peer
203−
204>>> printSQL rank
196>>> printSQL rank
205rank()
197rank()
206-}
198-}
@@ -208,7 +200,6 @@ rank :: WinFun0 ('NotNull 'PGint8)
208rank = UnsafeWindowFunction "rank()"
200rank = UnsafeWindowFunction "rank()"
209
201
210{- | number of the current row within its partition, counting from 1
202{- | number of the current row within its partition, counting from 1
211−
212>>> printSQL rowNumber
203>>> printSQL rowNumber
213row_number()
204row_number()
214-}
205-}
@@ -216,7 +207,6 @@ rowNumber :: WinFun0 ('NotNull 'PGint8)
216rowNumber = UnsafeWindowFunction "row_number()"
207rowNumber = UnsafeWindowFunction "row_number()"
217
208
218{- | rank of the current row without gaps; this function counts peer groups
209{- | rank of the current row without gaps; this function counts peer groups
219−
220>>> printSQL denseRank
210>>> printSQL denseRank
221dense_rank()
211dense_rank()
222-}
212-}
@@ -224,7 +214,6 @@ denseRank :: WinFun0 ('NotNull 'PGint8)
224denseRank = UnsafeWindowFunction "dense_rank()"
214denseRank = UnsafeWindowFunction "dense_rank()"
225
215
226{- | relative rank of the current row: (rank - 1) / (total partition rows - 1)
216{- | relative rank of the current row: (rank - 1) / (total partition rows - 1)
227−
228>>> printSQL percentRank
217>>> printSQL percentRank
229percent_rank()
218percent_rank()
230-}
219-}
@@ -233,7 +222,6 @@ percentRank = UnsafeWindowFunction "percent_rank()"
233
222
234{- | cumulative distribution: (number of partition rows
223{- | cumulative distribution: (number of partition rows
235preceding or peer with current row) / total partition rows
224preceding or peer with current row) / total partition rows
236−
237>>> printSQL cumeDist
225>>> printSQL cumeDist
238cume_dist()
226cume_dist()
239-}
227-}
@@ -242,9 +230,6 @@ cumeDist = UnsafeWindowFunction "cume_dist()"
242
230
243{- | integer ranging from 1 to the argument value,
231{- | integer ranging from 1 to the argument value,
244dividing the partition as equally as possible
232dividing the partition as equally as possible
245−
246−>>> printSQL $ ntile 5
247−ntile(5)
248-}
233-}
249ntile :: WinFun1 ('NotNull 'PGint4) ('NotNull 'PGint4)
234ntile :: WinFun1 ('NotNull 'PGint4) ('NotNull 'PGint4)
250ntile = unsafeWindowFunction1 "ntile"
235ntile = unsafeWindowFunction1 "ntile"
@@ -263,7 +248,7 @@ row within the partition; if there is no such row, instead return default
263evaluated with respect to the current row.
248evaluated with respect to the current row.
264-}
249-}
265lead :: WinFunN '[ty, 'NotNull 'PGint4, ty] ty
250lead :: WinFunN '[ty, 'NotNull 'PGint4, ty] ty
266−lead = unsafeWindowFunctionN "lead"
251+lead = unsafeWindowFunctionN "lag"
267
252
268{- | returns value evaluated at the row that is the
253{- | returns value evaluated at the row that is the
269first row of the window frame
254first row of the window frame
squeal-postgresql/src/Squeal/PostgreSQL/List.hs+50−21
@@ -32,17 +32,17 @@ module Squeal.PostgreSQL.List
32 , (*:)
32 , (*:)
33 , Join
33 , Join
34 , disjoin
34 , disjoin
35− , Additional (..)
35+ , Additionally (..)
36− , Path (..)
36+ , AlignedList (..)
37− , CFunctor (..)
37+ , single
38− , CFoldable (..)
38+ , extractList
39− , CFree (..)
39+ , mapAligned
40 , Elem
40 , Elem
41 , In
41 , In
42 , Length
42 , Length
43 ) where
43 ) where
44
44
45−import Control.Category.Free
45+import Control.Category
46import Data.Function ((&))
46import Data.Function ((&))
47import Data.Kind
47import Data.Kind
48import Data.Type.Bool
48import Data.Type.Bool
@@ -50,6 +50,8 @@ import GHC.TypeLits
50
50
51import Generics.SOP as SOP
51import Generics.SOP as SOP
52
52
53+import Squeal.PostgreSQL.Render
54+
53-- | `Join` is simply promoted `++` and is used in @JOIN@s in
55-- | `Join` is simply promoted `++` and is used in @JOIN@s in
54-- `Squeal.PostgreSQL.Query.FromClause`s.
56-- `Squeal.PostgreSQL.Query.FromClause`s.
55type family Join xs ys where
57type family Join xs ys where
@@ -66,16 +68,52 @@ disjoin = case sList @xs of
66 SCons -> \(x :* xsys) ->
68 SCons -> \(x :* xsys) ->
67 case disjoin xsys of (xs,ys) -> (x :* xs, ys)
69 case disjoin xsys of (xs,ys) -> (x :* xs, ys)
68
70
69−-- | The `Additional` class is for appending
71+-- | The `Additionally` class is for appending
70-- type-level list parameterized constructors such as `NP`,
72-- type-level list parameterized constructors such as `NP`,
71-- `Squeal.PostgreSQL.Query.Selection`, and `Squeal.PostgreSQL.Query.FromClause`.
73-- `Squeal.PostgreSQL.Query.Selection`, and `Squeal.PostgreSQL.Query.FromClause`.
72−class Additional expr where
74+class Additionally expr where
73 also :: expr ys -> expr xs -> expr (Join xs ys)
75 also :: expr ys -> expr xs -> expr (Join xs ys)
74−instance Additional (NP expr) where
76+instance Additionally (NP expr) where
75 also ys = \case
77 also ys = \case
76 Nil -> ys
78 Nil -> ys
77 x :* xs -> x :* (xs & also ys)
79 x :* xs -> x :* (xs & also ys)
78
80
81+-- | An `AlignedList` is a type-aligned list or free category.
82+data AlignedList p x0 x1 where
83+ Done :: AlignedList p x x
84+ (:>>) :: p x0 x1 -> AlignedList p x1 x2 -> AlignedList p x0 x2
85+infixr 7 :>>
86+instance Category (AlignedList p) where
87+ id = Done
88+ (.) list = \case
89+ Done -> list
90+ step :>> steps -> step :>> (steps >>> list)
91+instance (forall t0 t1. RenderSQL (p t0 t1))
92+ => RenderSQL (AlignedList p x0 x1) where
93+ renderSQL = \case
94+ Done -> ""
95+ step :>> Done -> renderSQL step
96+ step :>> steps -> renderSQL step <> ", " <> renderSQL steps
97+
98+-- | `extractList` turns an `AlignedList` into a standard list.
99+extractList :: (forall a0 a1. p a0 a1 -> b) -> AlignedList p x0 x1 -> [b]
100+extractList f = \case
101+ Done -> []
102+ step :>> steps -> (f step):extractList f steps
103+
104+-- | `mapAligned` applies a function to each element of an `AlignedList`.
105+mapAligned
106+ :: (forall z0 z1. p z0 z1 -> q z0 z1)
107+ -> AlignedList p x0 x1
108+ -> AlignedList q x0 x1
109+mapAligned f = \case
110+ Done -> Done
111+ x :>> xs -> f x :>> mapAligned f xs
112+
113+-- | A `single` step.
114+single :: p x0 x1 -> AlignedList p x0 x1
115+single step = step :>> Done
116+
79-- | A useful operator for ending an `NP` list of length at least 2 without `Nil`.
117-- | A useful operator for ending an `NP` list of length at least 2 without `Nil`.
80(*:) :: f x -> f y -> NP f '[x,y]
118(*:) :: f x -> f y -> NP f '[x,y]
81x *: y = x :* y :* Nil
119x *: y = x :* y :* Nil
@@ -84,18 +122,13 @@ infixl 9 *:
84-- | @Elem@ is a promoted `Data.List.elem`.
122-- | @Elem@ is a promoted `Data.List.elem`.
85type family Elem x xs where
123type family Elem x xs where
86 Elem x '[] = 'False
124 Elem x '[] = 'False
87− Elem x (x ': _) = 'True
125+ 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
126 Elem x (_ ': xs) = Elem x xs
94
127
95-- | @In x xs@ is a constraint that proves that @x@ is in @xs@.
128-- | @In x xs@ is a constraint that proves that @x@ is in @xs@.
96type family In x xs :: Constraint where
129type family In x xs :: Constraint where
97 In x xs = If (Elem x xs) (() :: Constraint)
130 In x xs = If (Elem x xs) (() :: Constraint)
98− (TypeError ('ShowType x ':<>: 'Text " is not in " ':<>: 'ShowType xs))
131+ (TypeError ('ShowType x ':<>: 'Text "is not in " ':<>: 'ShowType xs))
99
132
100{- | Calculate the `Length` of a type level list
133{- | Calculate the `Length` of a type level list
101
134
@@ -104,9 +137,5 @@ Length '[Char,String,Bool,Double] :: Nat
104= 4
137= 4
105-}
138-}
106type family Length (xs :: [k]) :: Nat where
139type 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
140+ Length (x : xs) = 1 + Length xs
112 Length '[] = 0
141 Length '[] = 0
squeal-postgresql/src/Squeal/PostgreSQL/Manipulation.hs+153−155
@@ -18,7 +18,6 @@ Squeal data manipulation language.
18 , MultiParamTypeClasses
18 , MultiParamTypeClasses
19 , OverloadedStrings
19 , OverloadedStrings
20 , PatternSynonyms
20 , PatternSynonyms
21− , QuantifiedConstraints
22 , RankNTypes
21 , RankNTypes
23 , ScopedTypeVariables
22 , ScopedTypeVariables
24 , TypeApplications
23 , TypeApplications
@@ -30,9 +29,19 @@ Squeal data manipulation language.
30
29
31module Squeal.PostgreSQL.Manipulation
30module Squeal.PostgreSQL.Manipulation
32 ( -- * Manipulation
31 ( -- * Manipulation
33− Manipulation_
32+ Manipulation (..)
34− , Manipulation (..)
33+ , Manipulation_
35 , queryStatement
34 , queryStatement
35+ , QueryClause (..)
36+ , pattern Values_
37+ , DefaultAliasable (..)
38+ , ColumnExpression (..)
39+ , ReturningClause (..)
40+ , pattern Returning_
41+ , ConflictClause (..)
42+ , ConflictTarget (..)
43+ , ConflictAction (..)
44+ , UsingClause (..)
36 -- * Insert
45 -- * Insert
37 , insertInto
46 , insertInto
38 , insertInto_
47 , insertInto_
@@ -42,21 +51,12 @@ module Squeal.PostgreSQL.Manipulation
42 -- * Delete
51 -- * Delete
43 , deleteFrom
52 , deleteFrom
44 , deleteFrom_
53 , deleteFrom_
45− -- * Clauses
46− , Optional (..)
47− , QueryClause (..)
48− , pattern Values_
49− , ReturningClause (..)
50− , pattern Returning_
51− , ConflictClause (..)
52− , ConflictTarget (..)
53− , ConflictAction (..)
54− , UsingClause (..)
55 ) where
54 ) where
56
55
57import Control.DeepSeq
56import Control.DeepSeq
58import Data.ByteString hiding (foldr)
57import Data.ByteString hiding (foldr)
59import Data.Kind (Type)
58import Data.Kind (Type)
59+import GHC.TypeLits (KnownSymbol)
60
60
61import qualified Generics.SOP as SOP
61import qualified Generics.SOP as SOP
62import qualified GHC.Generics as GHC
62import qualified GHC.Generics as GHC
@@ -72,65 +72,21 @@ import Squeal.PostgreSQL.Schema
72
72
73-- $setup
73-- $setup
74-- >>> import Squeal.PostgreSQL
74-- >>> import Squeal.PostgreSQL
75−-- >>> import Data.Int
76−-- >>> import Data.Time
77
75
78{- |
76{- |
79A `Manipulation` is a statement which may modify data in the database,
77A `Manipulation` is a statement which may modify data in the database,
80but does not alter its schemas. Examples are inserts, updates and deletes.
78but does not alter its schemas. Examples are inserts, updates and deletes.
81A `Query` is also considered a `Manipulation` even though it does not modify data.
79A `Query` is also considered a `Manipulation` even though it does not modify data.
82
80
83−The general `Manipulation` type is parameterized by
84−
85−* @commons :: FromType@ - scope for all `common` table expressions,
86−* @schemas :: SchemasType@ - scope for all `table`s and `view`s,
87−* @params :: [NullityType]@ - scope for all `Squeal.Expression.Parameter.parameter`s,
88−* @row :: RowType@ - return type of the `Query`.
89−-}
90−newtype Manipulation
91− (commons :: FromType)
92− (schemas :: SchemasType)
93− (params :: [NullityType])
94− (columns :: RowType)
95− = UnsafeManipulation { renderManipulation :: ByteString }
96− deriving (GHC.Generic,Show,Eq,Ord,NFData)
97−instance RenderSQL (Manipulation commons schemas params columns) where
98− renderSQL = renderManipulation
99−instance With Manipulation where
100− with Done manip = manip
101− with ctes manip = UnsafeManipulation $
102− "WITH" <+> commaSeparated (ctoList renderSQL ctes) <+> renderSQL manip
103−
104−{- |
105−The top level `Manipulation_` type is parameterized by a @schemas@ `SchemasType`,
106−against which the query is type-checked, an input @parameters@ Haskell `Type`,
107−and an ouput row Haskell `Type`.
108−
109−A top-level `Manipulation_` can be run
110−using `Squeal.PostgreSQL.PQ.manipulateParams`, or if @parameters = ()@
111−using `Squeal.PostgreSQL.PQ.manipulate`.
112−
113−Generally, @parameters@ will be a Haskell tuple or record whose entries
114−may be referenced using positional
115−`Squeal.PostgreSQL.Expression.Parameter.parameter`s and @row@ will be a
116−Haskell record, whose entries will be targeted using overloaded labels.
117−
118−>>> :set -XDeriveAnyClass -XDerivingStrategies
119−>>> :{
120−data Row a b = Row { col1 :: a, col2 :: b }
121− deriving stock (GHC.Generic)
122− deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
123−:}
124−
125simple insert:
81simple insert:
126
82
127>>> type Columns = '["col1" ::: 'NoDef :=> 'Null 'PGint4, "col2" ::: 'Def :=> 'NotNull 'PGint4]
83>>> type Columns = '["col1" ::: 'NoDef :=> 'Null 'PGint4, "col2" ::: 'Def :=> 'NotNull 'PGint4]
128>>> type Schema = '["tab" ::: 'Table ('[] :=> Columns)]
84>>> type Schema = '["tab" ::: 'Table ('[] :=> Columns)]
129>>> :{
85>>> :{
130let
86let
131− manipulation :: Manipulation_ (Public Schema) () ()
87+ manipulation :: Manipulation '[] (Public Schema) '[] '[]
132 manipulation =
88 manipulation =
133− insertInto_ #tab (Values_ (Set 2 `as` #col1 :* Default `as` #col2))
89+ insertInto_ #tab (Values_ (2 `as` #col1 :* defaultAs #col2))
134in printSQL manipulation
90in printSQL manipulation
135:}
91:}
136INSERT INTO "tab" ("col1", "col2") VALUES (2, DEFAULT)
92INSERT INTO "tab" ("col1", "col2") VALUES (2, DEFAULT)
@@ -141,9 +97,9 @@ parameterized insert:
141>>> type Schema = '["tab" ::: 'Table ('[] :=> Columns)]
97>>> type Schema = '["tab" ::: 'Table ('[] :=> Columns)]
142>>> :{
98>>> :{
143let
99let
144− manipulation :: Manipulation_ (Public Schema) (Int32, Int32) ()
100+ manipulation :: Manipulation '[] (Public Schema) '[ 'NotNull 'PGint4, 'NotNull 'PGint4 ] '[]
145 manipulation =
101 manipulation =
146− insertInto_ #tab (Values_ (Set (param @1) `as` #col1 :* Set (param @2) `as` #col2))
102+ insertInto_ #tab (Values_ (param @1 `as` #col1 :* param @2 `as` #col2))
147in printSQL manipulation
103in printSQL manipulation
148:}
104:}
149INSERT INTO "tab" ("col1", "col2") VALUES (($1 :: int4), ($2 :: int4))
105INSERT INTO "tab" ("col1", "col2") VALUES (($1 :: int4), ($2 :: int4))
@@ -152,9 +108,9 @@ returning insert:
152
108
153>>> :{
109>>> :{
154let
110let
155− manipulation :: Manipulation_ (Public Schema) () (Only Int32)
111+ manipulation :: Manipulation '[] (Public Schema) '[] '["fromOnly" ::: 'NotNull 'PGint4]
156 manipulation =
112 manipulation =
157− insertInto #tab (Values_ (Set 2 `as` #col1 :* Set 3 `as` #col2))
113+ insertInto #tab (Values_ (2 `as` #col1 :* 3 `as` #col2))
158 OnConflictDoRaise (Returning (#col1 `as` #fromOnly))
114 OnConflictDoRaise (Returning (#col1 `as` #fromOnly))
159in printSQL manipulation
115in printSQL manipulation
160:}
116:}
@@ -167,12 +123,12 @@ upsert:
167>>> type CustomersSchema = '["customers" ::: 'Table (CustomersConstraints :=> CustomersColumns)]
123>>> type CustomersSchema = '["customers" ::: 'Table (CustomersConstraints :=> CustomersColumns)]
168>>> :{
124>>> :{
169let
125let
170− manipulation :: Manipulation_ (Public CustomersSchema) () ()
126+ manipulation :: Manipulation '[] (Public CustomersSchema) '[] '[]
171 manipulation =
127 manipulation =
172 insertInto #customers
128 insertInto #customers
173− (Values_ (Set "John Smith" `as` #name :* Set "john@smith.com" `as` #email))
129+ (Values_ ("John Smith" `as` #name :* "john@smith.com" `as` #email))
174 (OnConflict (OnConstraint #uq)
130 (OnConflict (OnConstraint #uq)
175− (DoUpdate (Set (#excluded ! #email <> "; " <> #customers ! #email) `as` #email) []))
131+ (DoUpdate (((#excluded ! #email) <> "; " <> (#customers ! #email)) `as` #email) []))
176 (Returning_ Nil)
132 (Returning_ Nil)
177in printSQL manipulation
133in printSQL manipulation
178:}
134:}
@@ -182,7 +138,7 @@ query insert:
182
138
183>>> :{
139>>> :{
184let
140let
185− manipulation :: Manipulation_ (Public Schema) () ()
141+ manipulation :: Manipulation '[] (Public Schema) '[] '[]
186 manipulation = insertInto_ #tab (Subquery (select Star (from (table #tab))))
142 manipulation = insertInto_ #tab (Subquery (select Star (from (table #tab))))
187in printSQL manipulation
143in printSQL manipulation
188:}
144:}
@@ -192,8 +148,8 @@ update:
192
148
193>>> :{
149>>> :{
194let
150let
195− manipulation :: Manipulation_ (Public Schema) () ()
151+ manipulation :: Manipulation '[] (Public Schema) '[] '[]
196− manipulation = update_ #tab (Set 2 `as` #col1) (#col1 ./= #col2)
152+ manipulation = update_ #tab (2 `as` #col1) (#col1 ./= #col2)
197in printSQL manipulation
153in printSQL manipulation
198:}
154:}
199UPDATE "tab" SET "col1" = 2 WHERE ("col1" <> "col2")
155UPDATE "tab" SET "col1" = 2 WHERE ("col1" <> "col2")
@@ -202,7 +158,9 @@ delete:
202
158
203>>> :{
159>>> :{
204let
160let
205− manipulation :: Manipulation_ (Public Schema) () (Row Int32 Int32)
161+ manipulation :: Manipulation '[] (Public Schema) '[]
162+ '[ "col1" ::: 'NotNull 'PGint4
163+ , "col2" ::: 'NotNull 'PGint4 ]
206 manipulation = deleteFrom #tab NoUsing (#col1 .== #col2) (Returning Star)
164 manipulation = deleteFrom #tab NoUsing (#col1 .== #col2) (Returning Star)
207in printSQL manipulation
165in printSQL manipulation
208:}
166:}
@@ -213,13 +171,13 @@ delete and using clause:
213>>> :{
171>>> :{
214type Schema3 =
172type Schema3 =
215 '[ "tab" ::: 'Table ('[] :=> Columns)
173 '[ "tab" ::: 'Table ('[] :=> Columns)
216− , "other_tab" ::: 'Table ('[] :=> Columns)
174+ , "other_tab" ::: 'Table ('[] :=> Columns)
217− , "third_tab" ::: 'Table ('[] :=> Columns) ]
175+ , "third_tab" ::: 'Table ('[] :=> Columns) ]
218:}
176:}
219
177
220>>> :{
178>>> :{
221let
179let
222− manipulation :: Manipulation_ (Public Schema3) () ()
180+ manipulation :: Manipulation '[] (Public Schema3) '[] '[]
223 manipulation =
181 manipulation =
224 deleteFrom #tab (Using (table #other_tab & also (table #third_tab)))
182 deleteFrom #tab (Using (table #other_tab & also (table #third_tab)))
225 ( (#tab ! #col2 .== #other_tab ! #col2)
183 ( (#tab ! #col2 .== #other_tab ! #col2)
@@ -235,7 +193,7 @@ with manipulation:
235>>> type ProductsSchema = '["products" ::: 'Table ('[] :=> ProductsColumns), "products_deleted" ::: 'Table ('[] :=> ProductsColumns)]
193>>> type ProductsSchema = '["products" ::: 'Table ('[] :=> ProductsColumns), "products_deleted" ::: 'Table ('[] :=> ProductsColumns)]
236>>> :{
194>>> :{
237let
195let
238− manipulation :: Manipulation_ (Public ProductsSchema) (Only Day) ()
196+ manipulation :: Manipulation '[] (Public ProductsSchema) '[ 'NotNull 'PGdate] '[]
239 manipulation = with
197 manipulation = with
240 (deleteFrom #products NoUsing (#date .< param @1) (Returning Star) `as` #del)
198 (deleteFrom #products NoUsing (#date .< param @1) (Returning Star) `as` #del)
241 (insertInto_ #products_deleted (Subquery (select Star (from (common #del)))))
199 (insertInto_ #products_deleted (Subquery (select Star (from (common #del)))))
@@ -243,13 +201,26 @@ in printSQL manipulation
243:}
201:}
244WITH "del" AS (DELETE FROM "products" WHERE ("date" < ($1 :: date)) RETURNING *) INSERT INTO "products_deleted" SELECT * FROM "del" AS "del"
202WITH "del" AS (DELETE FROM "products" WHERE ("date" < ($1 :: date)) RETURNING *) INSERT INTO "products_deleted" SELECT * FROM "del" AS "del"
245-}
203-}
204+newtype Manipulation
205+ (commons :: FromType)
206+ (schemas :: SchemasType)
207+ (params :: [NullityType])
208+ (columns :: RowType)
209+ = UnsafeManipulation { renderManipulation :: ByteString }
210+ deriving (GHC.Generic,Show,Eq,Ord,NFData)
211+instance RenderSQL (Manipulation commons schemas params columns) where
212+ renderSQL = renderManipulation
213+instance With Manipulation where
214+ with Done manip = manip
215+ with ctes manip = UnsafeManipulation $
216+ "WITH" <+> renderSQL ctes <+> renderSQL manip
217+
246type family Manipulation_ (schemas :: SchemasType) (params :: Type) (row :: Type) where
218type family Manipulation_ (schemas :: SchemasType) (params :: Type) (row :: Type) where
247 Manipulation_ schemas params row = Manipulation '[] schemas (TuplePG params) (RowPG row)
219 Manipulation_ schemas params row = Manipulation '[] schemas (TuplePG params) (RowPG row)
248
220
249-- | Convert a `Query` into a `Manipulation`.
221-- | Convert a `Query` into a `Manipulation`.
250queryStatement
222queryStatement
251 :: Query '[] commons schemas params columns
223 :: Query '[] commons schemas params columns
252− -- ^ `Query` to embed as a `Manipulation`
253 -> Manipulation commons schemas params columns
224 -> Manipulation commons schemas params columns
254queryStatement q = UnsafeManipulation $ renderSQL q
225queryStatement q = UnsafeManipulation $ renderSQL q
255
226
@@ -272,13 +243,9 @@ insertInto
272 , SOP.SListI columns
243 , SOP.SListI columns
273 , SOP.SListI row1 )
244 , SOP.SListI row1 )
274 => QualifiedAlias sch tab
245 => QualifiedAlias sch tab
275− -- ^ table
276 -> QueryClause commons schemas params columns
246 -> QueryClause commons schemas params columns
277− -- ^ what to insert
278 -> ConflictClause tab commons schemas params table
247 -> ConflictClause tab commons schemas params table
279− -- ^ what to do in case of conflict
280 -> ReturningClause commons schemas params '[tab ::: row0] row1
248 -> ReturningClause commons schemas params '[tab ::: row0] row1
281− -- ^ what to return
282 -> Manipulation commons schemas params row1
249 -> Manipulation commons schemas params row1
283insertInto tab qry conflict ret = UnsafeManipulation $
250insertInto tab qry conflict ret = UnsafeManipulation $
284 "INSERT" <+> "INTO" <+> renderSQL tab
251 "INSERT" <+> "INTO" <+> renderSQL tab
@@ -286,7 +253,6 @@ insertInto tab qry conflict ret = UnsafeManipulation $
286 <> renderSQL conflict
253 <> renderSQL conflict
287 <> renderSQL ret
254 <> renderSQL ret
288
255
289−-- | Like `insertInto` but with `OnConflictDoRaise` and `no` `ReturningClause`.
290insertInto_
256insertInto_
291 :: ( Has sch schemas schema
257 :: ( Has sch schemas schema
292 , Has tab schema ('Table table)
258 , Has tab schema ('Table table)
@@ -294,33 +260,25 @@ insertInto_
294 , row ~ TableToRow table
260 , row ~ TableToRow table
295 , SOP.SListI columns )
261 , SOP.SListI columns )
296 => QualifiedAlias sch tab
262 => QualifiedAlias sch tab
297− -- ^ table
298 -> QueryClause commons schemas params columns
263 -> QueryClause commons schemas params columns
299− -- ^ what to insert
300 -> Manipulation commons schemas params '[]
264 -> Manipulation commons schemas params '[]
301insertInto_ tab qry =
265insertInto_ tab qry =
302 insertInto tab qry OnConflictDoRaise (Returning_ Nil)
266 insertInto tab qry OnConflictDoRaise (Returning_ Nil)
303
267
304−-- | A `QueryClause` describes what to `insertInto` a table.
305data QueryClause commons schemas params columns where
268data QueryClause commons schemas params columns where
306 Values
269 Values
307 :: SOP.SListI columns
270 :: SOP.SListI columns
308− => NP (Aliased (Optional (Expression '[] commons 'Ungrouped schemas params '[]))) columns
271+ => NP (ColumnExpression 'Ungrouped schemas params '[]) columns
309− -- ^ row of values
310− -> [NP (Aliased (Optional (Expression '[] commons 'Ungrouped schemas params '[]))) columns]
272+ -> [NP (ColumnExpression 'Ungrouped schemas params '[]) columns]
311− -- ^ additional rows of values
312 -> QueryClause commons schemas params columns
273 -> QueryClause commons schemas params columns
313 Select
274 Select
314 :: SOP.SListI columns
275 :: SOP.SListI columns
315− => NP (Aliased (Optional (Expression '[] commons grp schemas params from))) columns
276+ => NP (ColumnExpression grp schemas params from) columns
316− -- ^ row of values
317 -> TableExpression '[] commons grp schemas params from
277 -> TableExpression '[] commons grp schemas params from
318− -- ^ from a table expression
319 -> QueryClause commons schemas params columns
278 -> QueryClause commons schemas params columns
320 Subquery
279 Subquery
321 :: ColumnsToRow columns ~ row
280 :: ColumnsToRow columns ~ row
322 => Query '[] commons schemas params row
281 => Query '[] commons schemas params row
323− -- ^ subquery to insert
324 -> QueryClause commons schemas params columns
282 -> QueryClause commons schemas params columns
325
283
326instance RenderSQL (QueryClause commons schemas params columns) where
284instance RenderSQL (QueryClause commons schemas params columns) where
@@ -339,41 +297,109 @@ instance RenderSQL (QueryClause commons schemas params columns) where
339 Subquery qry -> renderQuery qry
297 Subquery qry -> renderQuery qry
340 where
298 where
341 renderSQLPartMaybe, renderValuePartMaybe
299 renderSQLPartMaybe, renderValuePartMaybe
342− :: Aliased (Optional (Expression '[] commons grp schemas params from)) column
300+ :: ColumnExpression grp schemas params from column -> Maybe ByteString
343− -> Maybe ByteString
344 renderSQLPartMaybe = \case
301 renderSQLPartMaybe = \case
345− Default `As` _ -> Nothing
302+ DefaultAs _ -> Nothing
346− Set _ `As` name -> Just $ renderSQL name
303+ Specific (_ `As` name) -> Just $ renderSQL name
347 renderValuePartMaybe = \case
304 renderValuePartMaybe = \case
348− Default `As` _ -> Nothing
305+ DefaultAs _ -> Nothing
349− Set value `As` _ -> Just $ renderExpression value
306+ Specific (value `As` _) -> Just $ renderExpression value
350 renderSQLPart, renderValuePart
307 renderSQLPart, renderValuePart
351− :: Aliased (Optional (Expression '[] commons grp schemas params from)) column
308+ :: ColumnExpression grp schemas params from column -> ByteString
352− -> ByteString
309+ renderSQLPart = \case
310+ DefaultAs name -> renderSQL name
353− renderSQLPart (_ `As` name) = renderSQL name
311+ Specific (_ `As` name) -> renderSQL name
354− renderValuePart (value `As` _) = renderSQL value
312+ renderValuePart = \case
313+ DefaultAs _ -> "DEFAULT"
314+ Specific (value `As` _) -> renderExpression value
355
315
356−-- | `Values_` describes a single `NP` list of `Aliased` `Optional` `Expression`s
357−-- whose `ColumnsType` must match the tables'.
358pattern Values_
316pattern Values_
359 :: SOP.SListI columns
317 :: SOP.SListI columns
360− => NP (Aliased (Optional (Expression '[] commons 'Ungrouped schemas params '[]))) columns
318+ => NP (ColumnExpression 'Ungrouped schemas params '[]) columns
361− -- ^ row of values
362 -> QueryClause commons schemas params columns
319 -> QueryClause commons schemas params columns
363pattern Values_ vals = Values vals []
320pattern Values_ vals = Values vals []
364
321
365−-- | `Optional` is either `Default` or a value, parameterized by an appropriate
322+data ColumnExpression grp schemas params from column where
366−-- `ColumnConstraint`.
323+ DefaultAs
367−data Optional expr ty where
324+ :: KnownSymbol col
368− -- | Use the `Default` value for a column.
325+ => Alias col
369− Default :: Optional expr ('Def :=> ty)
326+ -> ColumnExpression grp schemas params from (col ::: 'Def :=> ty)
370− -- | `Set` a value for a column.
327+ Specific
371− Set :: expr ty -> Optional expr (def :=> ty)
328+ :: Aliased (Expression '[] '[] grp schemas params from) (col ::: ty)
372−
329+ -> ColumnExpression grp schemas params from (col ::: defness :=> ty)
373−instance (forall x. RenderSQL (expr x)) => RenderSQL (Optional expr ty) where
330+
331+instance (KnownSymbol col, column ~ (col ::: defness :=> ty))
332+ => Aliasable col
333+ (Expression '[] '[] grp schemas params from ty)
334+ (ColumnExpression grp schemas params from column) where
335+ expression `as` col = Specific (expression `As` col)
336+instance (KnownSymbol col, columns ~ '[col ::: defness :=> ty])
337+ => Aliasable col
338+ (Expression '[] '[] grp schemas params from ty)
339+ (NP (ColumnExpression grp schemas params from) columns) where
340+ expression `as` col = expression `as` col :* Nil
341+instance (KnownSymbol col, column ~ (col ::: 'Def :=> ty))
342+ => DefaultAliasable col (ColumnExpression grp schemas params from column) where
343+ defaultAs = DefaultAs
344+instance (KnownSymbol col, columns ~ '[col ::: 'Def :=> ty])
345+ => DefaultAliasable col (NP (ColumnExpression grp schemas params from) columns) where
346+ defaultAs col = defaultAs col :* Nil
347+
348+instance (HasUnique tab from row, Has col row ty, column ~ (col ::: defness :=> ty))
349+ => IsLabel col (ColumnExpression 'Ungrouped schemas params from column) where
350+ fromLabel = fromLabel @col `as` Alias
351+instance (HasUnique tab from row, Has col row ty, columns ~ '[col ::: defness :=> ty])
352+ => IsLabel col
353+ (NP (ColumnExpression 'Ungrouped schemas params from) columns) where
354+ fromLabel = fromLabel @col `as` Alias
355+
356+instance (Has tab from row, Has col row ty, column ~ (col ::: defness :=> ty))
357+ => IsQualified tab col (ColumnExpression 'Ungrouped schemas params from column) where
358+ tab ! col = tab ! col `as` col
359+instance (Has tab from row, Has col row ty, columns ~ '[col ::: defness :=> ty])
360+ => IsQualified tab col (NP (ColumnExpression 'Ungrouped schemas params from) columns) where
361+ tab ! col = tab ! col `as` col
362+
363+instance
364+ ( HasUnique tab from row
365+ , Has col row ty
366+ , GroupedBy tab col bys
367+ , column ~ (col ::: defness :=> ty)
368+ ) => IsLabel col
369+ (ColumnExpression ('Grouped bys) schemas params from column) where
370+ fromLabel = fromLabel @col `as` Alias
371+instance
372+ ( HasUnique tab from row
373+ , Has col row ty
374+ , GroupedBy tab col bys
375+ , columns ~ '[col ::: defness :=> ty]
376+ ) => IsLabel col
377+ (NP (ColumnExpression ('Grouped bys) schemas params from) columns) where
378+ fromLabel = fromLabel @col `as` Alias
379+
380+instance
381+ ( Has tab from row
382+ , Has col row ty
383+ , GroupedBy tab col bys
384+ , column ~ (col ::: defness :=> ty)
385+ ) => IsQualified tab col
386+ (ColumnExpression ('Grouped bys) schemas params from column) where
387+ tab ! col = tab ! col `as` col
388+instance
389+ ( Has tab from row
390+ , Has col row ty
391+ , GroupedBy tab col bys
392+ , columns ~ '[col ::: defness :=> ty]
393+ ) => IsQualified tab col
394+ (NP (ColumnExpression ('Grouped bys) schemas params from) columns) where
395+ tab ! col = tab ! col :* Nil
396+
397+instance RenderSQL (ColumnExpression grp schemas params from column) where
374 renderSQL = \case
398 renderSQL = \case
399+ DefaultAs col ->
375− Default -> "DEFAULT"
400+ renderSQL col <+> "=" <+> "DEFAULT"
376− Set expr -> renderSQL expr
401+ Specific (expression `As` col) ->
402+ renderSQL col <+> "=" <+> renderSQL expression
377
403
378-- | A `ReturningClause` computes and return value(s) based
404-- | A `ReturningClause` computes and return value(s) based
379-- on each row actually inserted, updated or deleted. This is primarily
405-- on each row actually inserted, updated or deleted. This is primarily
@@ -383,7 +409,7 @@ instance (forall x. RenderSQL (expr x)) => RenderSQL (Optional expr ty) where
383-- deleted will be returned. For example, if a row was locked
409-- deleted will be returned. For example, if a row was locked
384-- but not updated because an `OnConflict` `DoUpdate` condition was not satisfied,
410-- but not updated because an `OnConflict` `DoUpdate` condition was not satisfied,
385-- the row will not be returned. `Returning` `Star` will return all columns
411-- the row will not be returned. `Returning` `Star` will return all columns
386−-- in the row. Use `Returning` `Nil` in the common case where no return
412+-- in the row. Use @Returning Nil@ in the common case where no return
387-- values are desired.
413-- values are desired.
388newtype ReturningClause commons schemas params from row =
414newtype ReturningClause commons schemas params from row =
389 Returning (Selection '[] commons 'Ungrouped schemas params from row)
415 Returning (Selection '[] commons 'Ungrouped schemas params from row)
@@ -393,11 +419,9 @@ instance RenderSQL (ReturningClause commons schemas params from row) where
393 Returning (List Nil) -> ""
419 Returning (List Nil) -> ""
394 Returning selection -> " RETURNING" <+> renderSQL selection
420 Returning selection -> " RETURNING" <+> renderSQL selection
395
421
396−-- | `Returning` a `List`
397pattern Returning_
422pattern Returning_
398 :: SOP.SListI row
423 :: SOP.SListI row
399 => NP (Aliased (Expression '[] commons 'Ungrouped schemas params from)) row
424 => NP (Aliased (Expression '[] commons 'Ungrouped schemas params from)) row
400− -- ^ row of values
401 -> ReturningClause commons schemas params from row
425 -> ReturningClause commons schemas params from row
402pattern Returning_ list = Returning (List list)
426pattern Returning_ list = Returning (List list)
403
427
@@ -410,9 +434,7 @@ data ConflictClause tab commons schemas params table where
410 OnConflictDoRaise :: ConflictClause tab commons schemas params table
434 OnConflictDoRaise :: ConflictClause tab commons schemas params table
411 OnConflict
435 OnConflict
412 :: ConflictTarget constraints
436 :: ConflictTarget constraints
413− -- ^ conflict target
414 -> ConflictAction tab commons schemas params columns
437 -> ConflictAction tab commons schemas params columns
415− -- ^ conflict action
416 -> ConflictClause tab commons schemas params (constraints :=> columns)
438 -> ConflictClause tab commons schemas params (constraints :=> columns)
417
439
418-- | Render a `ConflictClause`.
440-- | Render a `ConflictClause`.
@@ -423,17 +445,6 @@ instance SOP.SListI (TableToColumns table)
423 OnConflict target action -> " ON CONFLICT"
445 OnConflict target action -> " ON CONFLICT"
424 <+> renderSQL target <+> renderSQL action
446 <+> renderSQL target <+> renderSQL action
425
447
426−{- |
427−`ConflictAction` specifies an alternative `OnConflict` action.
428−It can be either `DoNothing`, or a `DoUpdate` clause specifying
429−the exact details of the `update` action to be performed in case of a conflict.
430−The `Set` and WHERE `Condition`s in `OnConflict` `DoUpdate` have access to the
431−existing row using the table's name (or an alias), and to rows proposed
432−for insertion using the special @#excluded@ table.
433−`OnConflict` `DoNothing` simply avoids inserting a row as its alternative action.
434−`OnConflict` `DoUpdate` updates the existing row that conflicts
435−with the row proposed for insertion as its alternative action.
436−-}
437data ConflictAction tab commons schemas params columns where
448data ConflictAction tab commons schemas params columns where
438 DoNothing :: ConflictAction tab commons schemas params columns
449 DoNothing :: ConflictAction tab commons schemas params columns
439 DoUpdate
450 DoUpdate
@@ -442,9 +453,8 @@ data ConflictAction tab commons schemas params columns where
442 , columns ~ (col0 ': cols)
453 , columns ~ (col0 ': cols)
443 , SOP.All (HasIn columns) subcolumns
454 , SOP.All (HasIn columns) subcolumns
444 , AllUnique subcolumns )
455 , AllUnique subcolumns )
445− => NP (Aliased (Optional (Expression '[] commons 'Ungrouped schemas params '[tab ::: row, "excluded" ::: row]))) subcolumns
456+ => NP (ColumnExpression 'Ungrouped schemas params '[tab ::: row, "excluded" ::: row]) subcolumns
446 -> [Condition '[] commons 'Ungrouped schemas params '[tab ::: row, "excluded" ::: row]]
457 -> [Condition '[] commons 'Ungrouped schemas params '[tab ::: row, "excluded" ::: row]]
447− -- ^ WHERE `Condition`s
448 -> ConflictAction tab commons schemas params columns
458 -> ConflictAction tab commons schemas params columns
449
459
450instance RenderSQL (ConflictAction tab commons schemas params columns) where
460instance RenderSQL (ConflictAction tab commons schemas params columns) where
@@ -452,17 +462,11 @@ instance RenderSQL (ConflictAction tab commons schemas params columns) where
452 DoNothing -> "DO NOTHING"
462 DoNothing -> "DO NOTHING"
453 DoUpdate updates whs'
463 DoUpdate updates whs'
454 -> "DO UPDATE SET"
464 -> "DO UPDATE SET"
455− <+> renderCommaSeparated renderUpdate updates
465+ <+> renderCommaSeparated renderSQL updates
456 <> case whs' of
466 <> case whs' of
457 [] -> ""
467 [] -> ""
458 wh:whs -> " WHERE" <+> renderSQL (foldr (.&&) wh whs)
468 wh:whs -> " WHERE" <+> renderSQL (foldr (.&&) wh whs)
459
469
460−renderUpdate
461− :: (forall x. RenderSQL (expr x))
462− => Aliased (Optional expr) ty
463− -> ByteString
464−renderUpdate (expr `As` col) = renderSQL col <+> "=" <+> renderSQL expr
465−
466-- | A `ConflictTarget` specifies the constraint violation that triggers a
470-- | A `ConflictTarget` specifies the constraint violation that triggers a
467-- `ConflictAction`.
471-- `ConflictAction`.
468data ConflictTarget constraints where
472data ConflictTarget constraints where
@@ -485,6 +489,7 @@ UPDATE statements
485update
489update
486 :: ( SOP.SListI columns
490 :: ( SOP.SListI columns
487 , SOP.SListI row1
491 , SOP.SListI row1
492+ , db ~ (commons :=> schemas)
488 , Has sch schemas schema
493 , Has sch schemas schema
489 , Has tab schema ('Table table)
494 , Has tab schema ('Table table)
490 , row0 ~ TableToRow table
495 , row0 ~ TableToRow table
@@ -492,7 +497,7 @@ update
492 , SOP.All (HasIn columns) subcolumns
497 , SOP.All (HasIn columns) subcolumns
493 , AllUnique subcolumns )
498 , AllUnique subcolumns )
494 => QualifiedAlias sch tab -- ^ table to update
499 => QualifiedAlias sch tab -- ^ table to update
495− -> NP (Aliased (Optional (Expression '[] '[] 'Ungrouped schemas params '[tab ::: row0]))) subcolumns
500+ -> NP (ColumnExpression 'Ungrouped schemas params '[tab ::: row0]) subcolumns
496 -- ^ modified values to replace old values
501 -- ^ modified values to replace old values
497 -> Condition '[] commons 'Ungrouped schemas params '[tab ::: row0]
502 -> Condition '[] commons 'Ungrouped schemas params '[tab ::: row0]
498 -- ^ condition under which to perform update on a row
503 -- ^ condition under which to perform update on a row
@@ -502,13 +507,14 @@ update tab columns wh returning = UnsafeManipulation $
502 "UPDATE"
507 "UPDATE"
503 <+> renderSQL tab
508 <+> renderSQL tab
504 <+> "SET"
509 <+> "SET"
505− <+> renderCommaSeparated renderUpdate columns
510+ <+> renderCommaSeparated renderSQL columns
506 <+> "WHERE" <+> renderSQL wh
511 <+> "WHERE" <+> renderSQL wh
507 <> renderSQL returning
512 <> renderSQL returning
508
513
509-- | Update a row returning `Nil`.
514-- | Update a row returning `Nil`.
510update_
515update_
511 :: ( SOP.SListI columns
516 :: ( SOP.SListI columns
517+ , db ~ (commons :=> schemas)
512 , Has sch schemas schema
518 , Has sch schemas schema
513 , Has tab schema ('Table table)
519 , Has tab schema ('Table table)
514 , row ~ TableToRow table
520 , row ~ TableToRow table
@@ -516,7 +522,7 @@ update_
516 , SOP.All (HasIn columns) subcolumns
522 , SOP.All (HasIn columns) subcolumns
517 , AllUnique subcolumns )
523 , AllUnique subcolumns )
518 => QualifiedAlias sch tab -- ^ table to update
524 => QualifiedAlias sch tab -- ^ table to update
519− -> NP (Aliased (Optional (Expression '[] '[] 'Ungrouped schemas params '[tab ::: row]))) subcolumns
525+ -> NP (ColumnExpression 'Ungrouped schemas params '[tab ::: row]) subcolumns
520 -- ^ modified values to replace old values
526 -- ^ modified values to replace old values
521 -> Condition '[] commons 'Ungrouped schemas params '[tab ::: row]
527 -> Condition '[] commons 'Ungrouped schemas params '[tab ::: row]
522 -- ^ condition under which to perform update on a row
528 -- ^ condition under which to perform update on a row
@@ -527,25 +533,16 @@ update_ tab columns wh = update tab columns wh (Returning_ Nil)
527DELETE statements
533DELETE statements
528-----------------------------------------}
534-----------------------------------------}
529
535
530−-- | Specify additional tables with `Using`
531−-- an `also` list of table expressions, allowing columns
532−-- from other tables to appear in the WHERE condition.
533−-- This is similar to the list of tables that can be specified
534−-- in the FROM Clause of a SELECT statement;
535−-- for example, an alias for the table name can be specified.
536−-- Do not repeat the target table in the `Using` list,
537−-- unless you wish to set up a self-join.
538−-- `NoUsing` if no additional tables are to be used.
539data UsingClause commons schemas params from where
536data UsingClause commons schemas params from where
540 NoUsing :: UsingClause commons schemas params '[]
537 NoUsing :: UsingClause commons schemas params '[]
541 Using
538 Using
542 :: FromClause '[] commons schemas params from
539 :: FromClause '[] commons schemas params from
543− -- ^ what to use
544 -> UsingClause commons schemas params from
540 -> UsingClause commons schemas params from
545
541
546-- | Delete rows from a table.
542-- | Delete rows from a table.
547deleteFrom
543deleteFrom
548 :: ( SOP.SListI row1
544 :: ( SOP.SListI row1
545+ , db ~ (commons :=> schemas)
549 , Has sch schemas schema
546 , Has sch schemas schema
550 , Has tab schema ('Table table)
547 , Has tab schema ('Table table)
551 , row0 ~ TableToRow table
548 , row0 ~ TableToRow table
@@ -567,7 +564,8 @@ deleteFrom tab using wh returning = UnsafeManipulation $
567
564
568-- | Delete rows returning `Nil`.
565-- | Delete rows returning `Nil`.
569deleteFrom_
566deleteFrom_
567+ :: ( db ~ (commons :=> schemas)
570− :: ( Has sch schemas schema
568+ , Has sch schemas schema
571 , Has tab schema ('Table table)
569 , Has tab schema ('Table table)
572 , row ~ TableToRow table
570 , row ~ TableToRow table
573 , columns ~ TableToColumns table )
571 , columns ~ TableToColumns table )
squeal-postgresql/src/Squeal/PostgreSQL/Migration.hs+57−53
@@ -66,7 +66,7 @@ let
66 }
66 }
67:}
67:}
68
68
69−Now that we have a couple migrations we can chain them together into a `Path`.
69+Now that we have a couple migrations we can chain them together into an `AlignedList`.
70
70
71>>> let migrations = makeUsers :>> makeEmails :>> Done
71>>> let migrations = makeUsers :>> makeEmails :>> Done
72
72
@@ -156,6 +156,7 @@ import Data.Function ((&))
156import Data.List ((\\))
156import Data.List ((\\))
157import Data.Text (Text)
157import Data.Text (Text)
158import Data.Time (UTCTime)
158import Data.Time (UTCTime)
159+import Generics.SOP (K (..))
159import Prelude hiding ((.), id)
160import Prelude hiding ((.), id)
160import System.Environment
161import System.Environment
161import UnliftIO (MonadIO (..))
162import UnliftIO (MonadIO (..))
@@ -164,21 +165,7 @@ import qualified Data.Text.IO as Text (putStrLn)
164import qualified Generics.SOP as SOP
165import qualified Generics.SOP as SOP
165import qualified GHC.Generics as GHC
166import qualified GHC.Generics as GHC
166
167
167−import Squeal.PostgreSQL.Alias
168+import Squeal.PostgreSQL
168−import Squeal.PostgreSQL.Binary
169−import Squeal.PostgreSQL.Definition
170−import Squeal.PostgreSQL.Definition.Table
171−import Squeal.PostgreSQL.Definition.Table.Constraint
172−import Squeal.PostgreSQL.Expression.Comparison
173−import Squeal.PostgreSQL.Expression.Parameter
174−import Squeal.PostgreSQL.Expression.Time
175−import Squeal.PostgreSQL.Expression.Type
176−import Squeal.PostgreSQL.List
177−import Squeal.PostgreSQL.Manipulation
178−import Squeal.PostgreSQL.PQ
179−import Squeal.PostgreSQL.Query
180−import Squeal.PostgreSQL.Schema
181−import Squeal.PostgreSQL.Transaction
182
169
183-- | A `Migration` is a named "isomorphism" over a given category.
170-- | A `Migration` is a named "isomorphism" over a given category.
184-- It should contain an inverse pair of `up` and `down`
171-- It should contain an inverse pair of `up` and `down`
@@ -192,34 +179,34 @@ data Migration p schemas0 schemas1 = Migration
192
179
193{- |
180{- |
194A `Migratory` @p@ is a `Category` for which one can execute or rewind
181A `Migratory` @p@ is a `Category` for which one can execute or rewind
195−a `Path` of `Migration`s over @p@. This includes the category of pure
182+an `AlignedList` of `Migration`s over @p@. This includes the category of pure
196SQL `Definition`s and the category of impure `Terminally` `PQ` `IO` actions.
183SQL `Definition`s and the category of impure `Terminally` `PQ` `IO` actions.
197-}
184-}
198class Category p => Migratory p where
185class Category p => Migratory p where
199
186
200 {- |
187 {- |
201− Run a `Path` of `Migration`s.
188+ Run an `AlignedList` of `Migration`s.
202 Create the `MigrationsTable` as @public.schema_migrations@ if it does not already exist.
189 Create the `MigrationsTable` as @public.schema_migrations@ if it does not already exist.
203− In one transaction, for each each `Migration` query to see if the `Migration` has been executed;
190+ In a transaction for each each `Migration`, query to see if the `Migration` has been executed;
204− if not, `up` the `Migration` and insert its `name` in the `MigrationsTable`.
191+ if not, execute the `Migration` and insert a row in the `MigrationsTable`.
205 -}
192 -}
206 migrateUp
193 migrateUp
207− :: Path (Migration p) schemas0 schemas1
194+ :: AlignedList (Migration p) schemas0 schemas1
208 -> PQ schemas0 schemas1 IO ()
195 -> PQ schemas0 schemas1 IO ()
209
196
210 {- |
197 {- |
211− Rewind a `Path` of `Migration`s.
198+ Rewind an `AlignedList` of `Migration`s.
212 Create the `MigrationsTable` as @public.schema_migrations@ if it does not already exist.
199 Create the `MigrationsTable` as @public.schema_migrations@ if it does not already exist.
213− In one transaction, for each each `Migration` query to see if the `Migration` has been executed;
200+ In a transaction for each each `Migration`, query to see if the `Migration` has been executed;
214− if so, `down` the `Migration` and delete its `name` in the `MigrationsTable`.
201+ if so, rewind the `Migration` and delete its row in the `MigrationsTable`.
215 -}
202 -}
216 migrateDown
203 migrateDown
217− :: Path (Migration p) schemas0 schemas1
204+ :: AlignedList (Migration p) schemas0 schemas1
218 -> PQ schemas1 schemas0 IO ()
205 -> PQ schemas1 schemas0 IO ()
219
206
220instance Migratory Definition where
207instance Migratory Definition where
221− migrateUp = migrateUp . cmap pureMigration
208+ migrateUp = migrateUp . mapAligned pureMigration
222− migrateDown = migrateDown . cmap pureMigration
209+ migrateDown = migrateDown . mapAligned pureMigration
223
210
224{- | `Terminally` turns an indexed monad transformer and the monad it transforms
211{- | `Terminally` turns an indexed monad transformer and the monad it transforms
225into a category by restricting the return type to @()@ and permuting the type variables.
212into a category by restricting the return type to @()@ and permuting the type variables.
@@ -251,8 +238,8 @@ terminally = Terminally . void
251-- | A `pureMigration` turns a `Migration` involving only pure SQL
238-- | A `pureMigration` turns a `Migration` involving only pure SQL
252-- `Definition`s into a `Migration` that may be combined with arbitrary `IO`.
239-- `Definition`s into a `Migration` that may be combined with arbitrary `IO`.
253pureMigration
240pureMigration
254− :: Migration Definition schemas0 schemas1
241+ :: Migration Definition schema0 schema1
255− -> Migration (Terminally PQ IO) schemas0 schemas1
242+ -> Migration (Terminally PQ IO) schema0 schema1
256pureMigration migration = Migration
243pureMigration migration = Migration
257 { name = name migration
244 { name = name migration
258 , up = terminally . define $ up migration
245 , up = terminally . define $ up migration
@@ -261,64 +248,81 @@ pureMigration migration = Migration
261
248
262instance Migratory (Terminally PQ IO) where
249instance Migratory (Terminally PQ IO) where
263
250
264− migrateUp migration = unsafePQ . transactionally_ $ do
251+ migrateUp migration = unsafePQ $
265 define createMigrations
252 define createMigrations
253+ & pqBind okResult
266− upMigrations migration
254+ & pqThen (transactionallySchema_ (upMigrations migration))
267
255
268 where
256 where
269
257
270 upMigrations
258 upMigrations
271− :: Path (Migration (Terminally PQ IO)) schemas0 schemas1
259+ :: AlignedList (Migration (Terminally PQ IO)) schemas0 schemas1
272 -> PQ MigrationsSchemas MigrationsSchemas IO ()
260 -> PQ MigrationsSchemas MigrationsSchemas IO ()
273 upMigrations = \case
261 upMigrations = \case
274 Done -> return ()
262 Done -> return ()
275− step :>> steps -> upMigration step >> upMigrations steps
263+ step :>> steps -> upMigration step & pqThen (upMigrations steps)
276
264
277 upMigration
265 upMigration
278 :: Migration (Terminally PQ IO) schemas0 schemas1
266 :: Migration (Terminally PQ IO) schemas0 schemas1
279 -> PQ MigrationsSchemas MigrationsSchemas IO ()
267 -> PQ MigrationsSchemas MigrationsSchemas IO ()
280− upMigration step = do
268+ upMigration step =
281− executed <- queryExecuted step
269+ queryExecuted step
282− unless (executed == 1) $ do
270+ & pqBind ( \ executed -> unless (executed == 1)
283− unsafePQ . runTerminally $ up step
271+ $ unsafePQ (runTerminally (up step))
284− manipulateParams_ insertMigration (Only (name step))
272+ & pqThen (manipulateParams insertMigration (Only (name step)))
273+ -- insert execution record
274+ & pqBind okResult )
285
275
286 queryExecuted
276 queryExecuted
287 :: Migration (Terminally PQ IO) schemas0 schemas1
277 :: Migration (Terminally PQ IO) schemas0 schemas1
288 -> PQ MigrationsSchemas MigrationsSchemas IO Row
278 -> PQ MigrationsSchemas MigrationsSchemas IO Row
289 queryExecuted step = do
279 queryExecuted step = do
290 result <- runQueryParams selectMigration (Only (name step))
280 result <- runQueryParams selectMigration (Only (name step))
281+ okResult result
291 ntuples result
282 ntuples result
292
283
293− migrateDown migrations = unsafePQ . transactionally_ $ do
284+ migrateDown migrations = unsafePQ $
294 define createMigrations
285 define createMigrations
286+ & pqBind okResult
295− downMigrations migrations
287+ & pqThen (transactionallySchema_ (downMigrations migrations))
296
288
297 where
289 where
298
290
299 downMigrations
291 downMigrations
300− :: Path (Migration (Terminally PQ IO)) schemas0 schemas1
292+ :: AlignedList (Migration (Terminally PQ IO)) schemas0 schemas1
301 -> PQ MigrationsSchemas MigrationsSchemas IO ()
293 -> PQ MigrationsSchemas MigrationsSchemas IO ()
302 downMigrations = \case
294 downMigrations = \case
303 Done -> return ()
295 Done -> return ()
304− step :>> steps -> downMigrations steps >> downMigration step
296+ step :>> steps -> downMigrations steps & pqThen (downMigration step)
305
297
306 downMigration
298 downMigration
307 :: Migration (Terminally PQ IO) schemas0 schemas1
299 :: Migration (Terminally PQ IO) schemas0 schemas1
308 -> PQ MigrationsSchemas MigrationsSchemas IO ()
300 -> PQ MigrationsSchemas MigrationsSchemas IO ()
309− downMigration step = do
301+ downMigration step =
310− executed <- queryExecuted step
302+ queryExecuted step
311− unless (executed == 0) $ do
303+ & pqBind ( \ executed -> unless (executed == 0)
312− unsafePQ . runTerminally $ down step
304+ $ unsafePQ (runTerminally (down step))
313− manipulateParams_ deleteMigration (Only (name step))
305+ & pqThen (manipulateParams deleteMigration (Only (name step)))
306+ -- delete execution record
307+ & pqBind okResult )
314
308
315 queryExecuted
309 queryExecuted
316 :: Migration (Terminally PQ IO) schemas0 schemas1
310 :: Migration (Terminally PQ IO) schemas0 schemas1
317 -> PQ MigrationsSchemas MigrationsSchemas IO Row
311 -> PQ MigrationsSchemas MigrationsSchemas IO Row
318 queryExecuted step = do
312 queryExecuted step = do
319 result <- runQueryParams selectMigration (Only (name step))
313 result <- runQueryParams selectMigration (Only (name step))
314+ okResult result
320 ntuples result
315 ntuples result
321
316
317+okResult :: K Result results -> PQ schema schema IO ()
318+okResult result = do
319+ status <- resultStatus result
320+ when (not (status `elem` [CommandOk, TuplesOk])) $ do
321+ errorMessageMaybe <- resultErrorMessage result
322+ case errorMessageMaybe of
323+ Nothing -> error "migration: unknown error"
324+ Just msg -> error ("migration: " <> show msg)
325+
322unsafePQ :: (Functor m) => PQ db0 db1 m x -> PQ db0' db1' m x
326unsafePQ :: (Functor m) => PQ db0 db1 m x -> PQ db0' db1' m x
323unsafePQ (PQ pq) = PQ $ fmap (SOP.K . SOP.unK) . pq . SOP.K . SOP.unK
327unsafePQ (PQ pq) = PQ $ fmap (SOP.K . SOP.unK) . pq . SOP.K . SOP.unK
324
328
@@ -353,7 +357,7 @@ createMigrations =
353-- the time at which it was inserted.
357-- the time at which it was inserted.
354insertMigration :: Manipulation_ MigrationsSchemas (Only Text) ()
358insertMigration :: Manipulation_ MigrationsSchemas (Only Text) ()
355insertMigration = insertInto_ #schema_migrations
359insertMigration = insertInto_ #schema_migrations
356− (Values_ (Set (param @1) `as` #name :* Default `as` #executed_at))
360+ (Values_ ((param @1) `as` #name :* defaultAs #executed_at))
357
361
358-- | Deletes a `Migration` from the `MigrationsTable`, returning
362-- | Deletes a `Migration` from the `MigrationsTable`, returning
359-- the time at which it was inserted.
363-- the time at which it was inserted.
@@ -363,8 +367,8 @@ deleteMigration = deleteFrom_ #schema_migrations (#name .== param @1)
363-- | Selects a `Migration` from the `MigrationsTable`, returning
367-- | Selects a `Migration` from the `MigrationsTable`, returning
364-- the time at which it was inserted.
368-- the time at which it was inserted.
365selectMigration
369selectMigration
366− :: Query_ MigrationsSchemas (Only Text) (Only UTCTime)
370+ :: Query_ MigrationsSchemas (Only Text) (P ("executed_at" ::: UTCTime))
367−selectMigration = select_ (#executed_at `as` #fromOnly)
371+selectMigration = select_ #executed_at
368 $ from (table (#schema_migrations))
372 $ from (table (#schema_migrations))
369 & where_ (#name .== param @1)
373 & where_ (#name .== param @1)
370
374
@@ -384,7 +388,7 @@ defaultMain
384 :: Migratory p
388 :: Migratory p
385 => ByteString
389 => ByteString
386 -- ^ connection string
390 -- ^ connection string
387− -> Path (Migration p) db0 db1
391+ -> AlignedList (Migration p) db0 db1
388 -- ^ migrations
392 -- ^ migrations
389 -> IO ()
393 -> IO ()
390defaultMain connectTo migrations = do
394defaultMain connectTo migrations = do
@@ -405,12 +409,12 @@ defaultMain connectTo migrations = do
405 migrateStatus :: PQ schema schema IO ()
409 migrateStatus :: PQ schema schema IO ()
406 migrateStatus = unsafePQ $ do
410 migrateStatus = unsafePQ $ do
407 runNames <- getRunMigrationNames
411 runNames <- getRunMigrationNames
408− let names = ctoList name migrations
412+ let names = extractList name migrations
409 unrunNames = names \\ runNames
413 unrunNames = names \\ runNames
410 liftIO $ displayRunned runNames >> displayUnrunned unrunNames
414 liftIO $ displayRunned runNames >> displayUnrunned unrunNames
411
415
412 suppressNotices :: PQ schema schema IO ()
416 suppressNotices :: PQ schema schema IO ()
413− suppressNotices = manipulate_ $
417+ suppressNotices = void . manipulate $
414 UnsafeManipulation "SET client_min_messages TO WARNING;"
418 UnsafeManipulation "SET client_min_messages TO WARNING;"
415
419
416 readCommandFromArgs :: IO (Maybe MigrateCommand)
420 readCommandFromArgs :: IO (Maybe MigrateCommand)
squeal-postgresql/src/Squeal/PostgreSQL/PG.hs+42−41
@@ -10,20 +10,18 @@ Stability: experimental
10-}
10-}
11{-# LANGUAGE
11{-# LANGUAGE
12 AllowAmbiguousTypes
12 AllowAmbiguousTypes
13− , DeriveAnyClass
14 , DeriveFoldable
13 , DeriveFoldable
15 , DeriveFunctor
14 , DeriveFunctor
16 , DeriveGeneric
15 , DeriveGeneric
17 , DeriveTraversable
16 , DeriveTraversable
18− , DerivingStrategies
19 , DefaultSignatures
17 , DefaultSignatures
20 , FlexibleContexts
18 , FlexibleContexts
21 , FlexibleInstances
19 , FlexibleInstances
22 , FunctionalDependencies
20 , FunctionalDependencies
23 , GADTs
21 , GADTs
24 , LambdaCase
22 , LambdaCase
25− , MultiParamTypeClasses
26 , OverloadedStrings
23 , OverloadedStrings
24+ , MultiParamTypeClasses
27 , ScopedTypeVariables
25 , ScopedTypeVariables
28 , TypeApplications
26 , TypeApplications
29 , TypeFamilies
27 , TypeFamilies
@@ -47,7 +45,7 @@ module Squeal.PostgreSQL.PG
47 , Enumerated (..)
45 , Enumerated (..)
48 , VarArray (..)
46 , VarArray (..)
49 , FixArray (..)
47 , FixArray (..)
50− , LibPQ.Oid (..)
48+ , SOP.P (..)
51 -- * Type families
49 -- * Type families
52 , LabelsPG
50 , LabelsPG
53 , DimPG
51 , DimPG
@@ -66,6 +64,7 @@ import Data.Int (Int16, Int32, Int64)
66import Data.Scientific (Scientific)
64import Data.Scientific (Scientific)
67import Data.Time (Day, DiffTime, LocalTime, TimeOfDay, TimeZone, UTCTime)
65import Data.Time (Day, DiffTime, LocalTime, TimeOfDay, TimeZone, UTCTime)
68import Data.Vector (Vector)
66import Data.Vector (Vector)
67+import Data.Word (Word16, Word32, Word64)
69import Data.UUID.Types (UUID)
68import Data.UUID.Types (UUID)
70import GHC.TypeLits
69import GHC.TypeLits
71import Network.IP.Addr (NetAddr, IP)
70import Network.IP.Addr (NetAddr, IP)
@@ -74,13 +73,13 @@ import qualified Data.ByteString.Lazy as Lazy (ByteString)
74import qualified Data.ByteString as Strict (ByteString)
73import qualified Data.ByteString as Strict (ByteString)
75import qualified Data.Text.Lazy as Lazy (Text)
74import qualified Data.Text.Lazy as Lazy (Text)
76import qualified Data.Text as Strict (Text)
75import qualified Data.Text as Strict (Text)
77−import qualified Database.PostgreSQL.LibPQ as LibPQ
78import qualified GHC.Generics as GHC
76import qualified GHC.Generics as GHC
79import qualified Generics.SOP as SOP
77import qualified Generics.SOP as SOP
80import qualified Generics.SOP.Record as SOP
78import qualified Generics.SOP.Record as SOP
81import qualified Generics.SOP.Type.Metadata as Type
79import qualified Generics.SOP.Type.Metadata as Type
82
80
83import Squeal.PostgreSQL.Alias
81import Squeal.PostgreSQL.Alias
82+import Squeal.PostgreSQL.List
84import Squeal.PostgreSQL.Schema
83import Squeal.PostgreSQL.Schema
85
84
86-- $setup
85-- $setup
@@ -108,7 +107,11 @@ type instance PG Int32 = 'PGint4
108-- | `PGint8`
107-- | `PGint8`
109type instance PG Int64 = 'PGint8
108type instance PG Int64 = 'PGint8
110-- | `PGint2`
109-- | `PGint2`
111−type instance PG LibPQ.Oid = 'PGoid
110+type instance PG Word16 = 'PGint2
111+-- | `PGint4`
112+type instance PG Word32 = 'PGint4
113+-- | `PGint8`
114+type instance PG Word64 = 'PGint8
112-- | `PGnumeric`
115-- | `PGnumeric`
113type instance PG Scientific = 'PGnumeric
116type instance PG Scientific = 'PGnumeric
114-- | `PGfloat4`
117-- | `PGfloat4`
@@ -172,22 +175,37 @@ have `SOP.Generic` and `SOP.HasDatatypeInfo` instances;
172>>> :kind! RowPG Person
175>>> :kind! RowPG Person
173RowPG Person :: [(Symbol, NullityType)]
176RowPG Person :: [(Symbol, NullityType)]
174= '["name" ::: 'NotNull 'PGtext, "age" ::: 'NotNull 'PGint4]
177= '["name" ::: 'NotNull 'PGtext, "age" ::: 'NotNull 'PGint4]
178+
179+Or to tuples of `SOP.P` types;
180+
181+>>> :kind! RowPG (SOP.P ("id" ::: Int32), SOP.P ("foreign_id" ::: Int32))
182+RowPG (SOP.P ("id" ::: Int32), SOP.P ("foreign_id" ::: Int32)) :: [(Symbol,
183+ NullityType)]
184+= '[ '("id", 'NotNull 'PGint4), "foreign_id" ::: 'NotNull 'PGint4]
185+
186+Or to tuples which mix `SOP.P` types and record types.
187+
188+>>> :kind! RowPG (SOP.P ("id" ::: Int32), Person, SOP.P ("foreign_id" ::: Int32))
189+RowPG (SOP.P ("id" ::: Int32), Person, SOP.P ("foreign_id" ::: Int32)) :: [(Symbol,
190+ NullityType)]
191+= '[ '("id", 'NotNull 'PGint4), '("name", 'NotNull 'PGtext),
192+ '("age", 'NotNull 'PGint4), "foreign_id" ::: 'NotNull 'PGint4]
175-}
193-}
176type family RowPG (hask :: Type) :: RowType where
194type family RowPG (hask :: Type) :: RowType where
195+ RowPG (hask1, hask2) = Join (RowPG hask1) (RowPG hask2)
196+ RowPG (hask1, hask2, hask3) =
197+ Join (RowPG hask1) (RowPG (hask2, hask3))
198+ RowPG (hask1, hask2, hask3, hask4) =
199+ Join (RowPG hask1) (RowPG (hask2, hask3, hask4))
200+ RowPG (hask1, hask2, hask3, hask4, hask5) =
201+ Join (RowPG hask1) (RowPG (hask2, hask3, hask4, hask5))
202+ RowPG (SOP.P (col ::: ty)) = '[col ::: NullPG ty]
177 RowPG hask = RowOf (SOP.RecordCodeOf hask)
203 RowPG hask = RowOf (SOP.RecordCodeOf hask)
178
204
179-- | `RowOf` applies `NullPG` to the fields of a list.
205-- | `RowOf` applies `NullPG` to the fields of a list.
180type family RowOf (record :: [(Symbol, Type)]) :: RowType where
206type 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 '[] = '[]
207 RowOf '[] = '[]
208+ RowOf (col ::: ty ': record) = col ::: NullPG ty ': RowOf record
191
209
192{- | `NullPG` turns a Haskell type into a `NullityType`.
210{- | `NullPG` turns a Haskell type into a `NullityType`.
193
211
@@ -214,17 +232,8 @@ type family TuplePG (hask :: Type) :: [NullityType] where
214
232
215-- | `TupleOf` turns a list of Haskell `Type`s into a list of `NullityType`s.
233-- | `TupleOf` turns a list of Haskell `Type`s into a list of `NullityType`s.
216type family TupleOf (tuple :: [Type]) :: [NullityType] where
234type 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 '[] = '[]
235 TupleOf '[] = '[]
236+ TupleOf (hask ': tuple) = NullPG hask ': TupleOf tuple
228
237
229-- | `TupleCodeOf` takes the `SOP.Code` of a haskell `Type`
238-- | `TupleCodeOf` takes the `SOP.Code` of a haskell `Type`
230-- and if it's a simple product returns it, otherwise giving a `TypeError`.
239-- and if it's a simple product returns it, otherwise giving a `TypeError`.
@@ -311,7 +320,7 @@ let
311>>> let input = Only (Money 20020)
320>>> let input = Only (Money 20020)
312
321
313>>> :{
322>>> :{
314−withConnection "host=localhost port=5432 dbname=exampledb" $ do
323+void . withConnection "host=localhost port=5432 dbname=exampledb" $ do
315 result <- runQueryParams roundTrip input
324 result <- runQueryParams roundTrip input
316 Just output <- firstRow result
325 Just output <- firstRow result
317 liftIO . print $ input == output
326 liftIO . print $ input == output
@@ -319,8 +328,7 @@ withConnection "host=localhost port=5432 dbname=exampledb" $ do
319True
328True
320-}
329-}
321newtype Money = Money { cents :: Int64 }
330newtype Money = Money { cents :: Int64 }
322− deriving stock (Eq, Ord, Show, Read, GHC.Generic)
331+ deriving (Eq, Ord, Show, Read, GHC.Generic)
323− deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)
324-- | `PGmoney`
332-- | `PGmoney`
325type instance PG Money = 'PGmoney
333type instance PG Money = 'PGmoney
326
334
@@ -328,8 +336,7 @@ type instance PG Money = 'PGmoney
328type it's applied to should be stored as a `PGjson`.
336type it's applied to should be stored as a `PGjson`.
329-}
337-}
330newtype Json hask = Json {getJson :: hask}
338newtype Json hask = Json {getJson :: hask}
331− deriving stock (Eq, Ord, Show, Read, GHC.Generic)
339+ deriving (Eq, Ord, Show, Read, GHC.Generic)
332− deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)
333-- | `PGjson`
340-- | `PGjson`
334type instance PG (Json hask) = 'PGjson
341type instance PG (Json hask) = 'PGjson
335
342
@@ -337,8 +344,7 @@ type instance PG (Json hask) = 'PGjson
337type it's applied to should be stored as a `PGjsonb`.
344type it's applied to should be stored as a `PGjsonb`.
338-}
345-}
339newtype Jsonb hask = Jsonb {getJsonb :: hask}
346newtype Jsonb hask = Jsonb {getJsonb :: hask}
340− deriving stock (Eq, Ord, Show, Read, GHC.Generic)
347+ deriving (Eq, Ord, Show, Read, GHC.Generic)
341− deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)
342-- | `PGjsonb`
348-- | `PGjsonb`
343type instance PG (Jsonb hask) = 'PGjsonb
349type instance PG (Jsonb hask) = 'PGjsonb
344
350
@@ -346,8 +352,7 @@ type instance PG (Jsonb hask) = 'PGjsonb
346type it's applied to should be stored as a `PGcomposite`.
352type it's applied to should be stored as a `PGcomposite`.
347-}
353-}
348newtype Composite record = Composite {getComposite :: record}
354newtype Composite record = Composite {getComposite :: record}
349− deriving stock (Eq, Ord, Show, Read, GHC.Generic)
355+ deriving (Eq, Ord, Show, Read, GHC.Generic)
350− deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)
351-- | `PGcomposite` @(@`RowPG` @hask)@
356-- | `PGcomposite` @(@`RowPG` @hask)@
352type instance PG (Composite hask) = 'PGcomposite (RowPG hask)
357type instance PG (Composite hask) = 'PGcomposite (RowPG hask)
353
358
@@ -355,8 +360,7 @@ type instance PG (Composite hask) = 'PGcomposite (RowPG hask)
355type it's applied to should be stored as a `PGenum`.
360type it's applied to should be stored as a `PGenum`.
356-}
361-}
357newtype Enumerated enum = Enumerated {getEnumerated :: enum}
362newtype Enumerated enum = Enumerated {getEnumerated :: enum}
358− deriving stock (Eq, Ord, Show, Read, GHC.Generic)
363+ deriving (Eq, Ord, Show, Read, GHC.Generic)
359− deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)
360-- | `PGenum` @(@`LabelsPG` @hask)@
364-- | `PGenum` @(@`LabelsPG` @hask)@
361type instance PG (Enumerated hask) = 'PGenum (LabelsPG hask)
365type instance PG (Enumerated hask) = 'PGenum (LabelsPG hask)
362
366
@@ -368,11 +372,9 @@ PG (VarArray (Vector Double)) :: PGType
368= 'PGvararray ('NotNull 'PGfloat8)
372= 'PGvararray ('NotNull 'PGfloat8)
369-}
373-}
370newtype VarArray arr = VarArray {getVarArray :: arr}
374newtype VarArray arr = VarArray {getVarArray :: arr}
371− deriving stock (Eq, Ord, Show, Read, GHC.Generic)
375+ deriving (Eq, Ord, Show, Read, GHC.Generic)
372− deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)
373-- | `PGvararray` @(@`NullPG` @hask)@
376-- | `PGvararray` @(@`NullPG` @hask)@
374type instance PG (VarArray (Vector hask)) = 'PGvararray (NullPG hask)
377type instance PG (VarArray (Vector hask)) = 'PGvararray (NullPG hask)
375−type instance PG (VarArray [hask]) = 'PGvararray (NullPG hask)
376
378
377{- | The `FixArray` newtype is an indication that the Haskell
379{- | The `FixArray` newtype is an indication that the Haskell
378type it's applied to should be stored as a `PGfixarray`.
380type it's applied to should be stored as a `PGfixarray`.
@@ -382,7 +384,6 @@ PG (FixArray ((Double, Double), (Double, Double))) :: PGType
382= 'PGfixarray '[2, 2] ('NotNull 'PGfloat8)
384= 'PGfixarray '[2, 2] ('NotNull 'PGfloat8)
383-}
385-}
384newtype FixArray arr = FixArray {getFixArray :: arr}
386newtype FixArray arr = FixArray {getFixArray :: arr}
385− deriving stock (Eq, Ord, Show, Read, GHC.Generic)
387+ deriving (Eq, Ord, Show, Read, GHC.Generic)
386− deriving anyclass (SOP.HasDatatypeInfo, SOP.Generic)
387-- | `PGfixarray` @(@`DimPG` @hask) (@`FixPG` @hask)@
388-- | `PGfixarray` @(@`DimPG` @hask) (@`FixPG` @hask)@
388type instance PG (FixArray hask) = 'PGfixarray (DimPG hask) (FixPG hask)
389type instance PG (FixArray hask) = 'PGfixarray (DimPG hask) (FixPG hask)
squeal-postgresql/src/Squeal/PostgreSQL/PQ.hs+40−96
@@ -64,21 +64,17 @@ module Squeal.PostgreSQL.PQ
64 , resultErrorCode
64 , resultErrorCode
65 -- * Exceptions
65 -- * Exceptions
66 , SquealException (..)
66 , SquealException (..)
67− , PQState (..)
68− , okResult
69 , catchSqueal
67 , catchSqueal
70 , handleSqueal
68 , handleSqueal
71− , trySqueal
72 ) where
69 ) where
73
70
74import Control.Exception (Exception, throw)
71import Control.Exception (Exception, throw)
75import Control.Monad.Except
72import Control.Monad.Except
76import Control.Monad.Morph
73import Control.Monad.Morph
77−import UnliftIO (MonadUnliftIO (..), bracket, catch, handle, try)
74+import UnliftIO (MonadUnliftIO (..), bracket, catch, handle)
78import Data.ByteString (ByteString)
75import Data.ByteString (ByteString)
79import Data.Foldable
76import Data.Foldable
80import Data.Function ((&))
77import Data.Function ((&))
81−import Data.Functor ((<&>))
82import Data.Kind
78import Data.Kind
83import Data.Text (pack, Text)
79import Data.Text (pack, Text)
84import Data.Traversable
80import Data.Traversable
@@ -87,7 +83,6 @@ import PostgreSQL.Binary.Encoding (encodingBytes)
87
83
88import qualified Control.Monad.Fail as Fail
84import qualified Control.Monad.Fail as Fail
89import qualified Database.PostgreSQL.LibPQ as LibPQ
85import qualified Database.PostgreSQL.LibPQ as LibPQ
90−import qualified PostgreSQL.Binary.Encoding as Encoding
91
86
92import Squeal.PostgreSQL.Binary
87import Squeal.PostgreSQL.Binary
93import Squeal.PostgreSQL.Definition
88import Squeal.PostgreSQL.Definition
@@ -248,16 +243,13 @@ class IndexedMonadTransPQ pq where
248 -> x -> pq schemas0 schemas2 m z
243 -> x -> pq schemas0 schemas2 m z
249 pqAndThen g f x = pqBind g (f x)
244 pqAndThen g f x = pqBind g (f x)
250
245
251− -- | Run a `Definition` with `LibPQ.exec`.
246+ -- | Run a `Definition` with `LibPQ.exec`, we expect that libpq obeys the law
252 --
247 --
253− -- It should be functorial in effect.
254− --
255− -- @define id = return ()@
256− -- @define (statement1 >>> statement2) = define statement1 & pqThen (define statement2)@
248+ -- @define statement1 & pqThen (define statement2) = define (statement1 >>> statement2)@
257 define
249 define
258 :: MonadIO io
250 :: MonadIO io
259 => Definition schemas0 schemas1
251 => Definition schemas0 schemas1
260− -> pq schemas0 schemas1 io ()
252+ -> pq schemas0 schemas1 io (K LibPQ.Result '[])
261
253
262instance IndexedMonadTransPQ PQ where
254instance IndexedMonadTransPQ PQ where
263
255
@@ -275,7 +267,7 @@ instance IndexedMonadTransPQ PQ where
275 case resultMaybe of
267 case resultMaybe of
276 Nothing -> throw $ ResultException
268 Nothing -> throw $ ResultException
277 "define: LibPQ.exec returned no results"
269 "define: LibPQ.exec returned no results"
278− Just result -> K <$> okResult_ result
270+ Just result -> return $ K (K result)
279
271
280{- | `MonadPQ` is an @mtl@ style constraint, similar to
272{- | `MonadPQ` is an @mtl@ style constraint, similar to
281`Control.Monad.State.Class.MonadState`, for using `Database.PostgreSQL.LibPQ` to
273`Control.Monad.State.Class.MonadState`, for using `Database.PostgreSQL.LibPQ` to
@@ -284,12 +276,8 @@ instance IndexedMonadTransPQ PQ where
284 with a `ToParams` constraint. It calls `LibPQ.execParams` and
276 with a `ToParams` constraint. It calls `LibPQ.execParams` and
285 doesn't afraid of anything.
277 doesn't afraid of anything.
286
278
287−* `manipulateParams_` is like `manipulateParams` for a returning-free statement.
288−
289* `manipulate` is like `manipulateParams` for a parameter-free statement.
279* `manipulate` is like `manipulateParams` for a parameter-free statement.
290
280
291−* `manipulate_` is like `manipulate` for a returning-free statement.
292−
293* `runQueryParams` is like `manipulateParams` for query statements.
281* `runQueryParams` is like `manipulateParams` for query statements.
294
282
295* `runQuery` is like `runQueryParams` for a parameter-free statement.
283* `runQuery` is like `runQueryParams` for a parameter-free statement.
@@ -303,7 +291,7 @@ instance IndexedMonadTransPQ PQ where
303* `forPrepared` is a flipped `traversePrepared`
291* `forPrepared` is a flipped `traversePrepared`
304
292
305* `traversePrepared_` is like `traversePrepared` but works on `Foldable`
293* `traversePrepared_` is like `traversePrepared` but works on `Foldable`
306− containers for a returning-free statement.
294+ containers and returns unit.
307
295
308* `forPrepared_` is a flipped `traversePrepared_`.
296* `forPrepared_` is a flipped `traversePrepared_`.
309
297
@@ -317,34 +305,24 @@ a default instance.
317-}
305-}
318class Monad pq => MonadPQ schemas pq | pq -> schemas where
306class Monad pq => MonadPQ schemas pq | pq -> schemas where
319 manipulateParams
307 manipulateParams
320− :: (ToParams x params, All OidOfParam params)
308+ :: ToParams x params
321 => Manipulation '[] schemas params ys
309 => Manipulation '[] schemas params ys
322 -- ^ `insertInto`, `update` or `deleteFrom`
310 -- ^ `insertInto`, `update` or `deleteFrom`
323 -> x -> pq (K LibPQ.Result ys)
311 -> x -> pq (K LibPQ.Result ys)
324 default manipulateParams
312 default manipulateParams
325 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)
313 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)
326− => (ToParams x params, All OidOfParam params)
314+ => ToParams x params
327 => Manipulation '[] schemas params ys
315 => Manipulation '[] schemas params ys
328 -- ^ `insertInto`, `update` or `deleteFrom`
316 -- ^ `insertInto`, `update` or `deleteFrom`
329 -> x -> pq (K LibPQ.Result ys)
317 -> x -> pq (K LibPQ.Result ys)
330 manipulateParams manipulation params = lift $
318 manipulateParams manipulation params = lift $
331 manipulateParams manipulation params
319 manipulateParams manipulation params
332
320
333− manipulateParams_
334− :: (ToParams x params, All OidOfParam params)
335− => Manipulation '[] schemas params '[]
336− -- ^ `insertInto`, `update` or `deleteFrom`
337− -> x -> pq ()
338− manipulateParams_ q x = void $ manipulateParams q x
339−
340 manipulate :: Manipulation '[] schemas '[] ys -> pq (K LibPQ.Result ys)
321 manipulate :: Manipulation '[] schemas '[] ys -> pq (K LibPQ.Result ys)
341 manipulate statement = manipulateParams statement ()
322 manipulate statement = manipulateParams statement ()
342
323
343− manipulate_ :: Manipulation '[] schemas '[] '[] -> pq ()
344− manipulate_ = void . manipulate
345−
346 runQueryParams
324 runQueryParams
347− :: (ToParams x params, All OidOfParam params)
325+ :: ToParams x params
348 => Query '[] '[] schemas params ys
326 => Query '[] '[] schemas params ys
349 -- ^ `select` and friends
327 -- ^ `select` and friends
350 -> x -> pq (K LibPQ.Result ys)
328 -> x -> pq (K LibPQ.Result ys)
@@ -357,19 +335,19 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where
357 runQuery q = runQueryParams q ()
335 runQuery q = runQueryParams q ()
358
336
359 traversePrepared
337 traversePrepared
360− :: (ToParams x params, Traversable list, All OidOfParam params)
338+ :: (ToParams x params, Traversable list)
361 => Manipulation '[] schemas params ys
339 => Manipulation '[] schemas params ys
362 -- ^ `insertInto`, `update`, or `deleteFrom`, and friends
340 -- ^ `insertInto`, `update`, or `deleteFrom`, and friends
363 -> list x -> pq (list (K LibPQ.Result ys))
341 -> list x -> pq (list (K LibPQ.Result ys))
364 default traversePrepared
342 default traversePrepared
365 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)
343 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)
366− => (ToParams x params, Traversable list, All OidOfParam params)
344+ => (ToParams x params, Traversable list)
367 => Manipulation '[] schemas params ys -> list x -> pq (list (K LibPQ.Result ys))
345 => Manipulation '[] schemas params ys -> list x -> pq (list (K LibPQ.Result ys))
368 traversePrepared manipulation params = lift $
346 traversePrepared manipulation params = lift $
369 traversePrepared manipulation params
347 traversePrepared manipulation params
370
348
371 forPrepared
349 forPrepared
372− :: (ToParams x params, Traversable list, All OidOfParam params)
350+ :: (ToParams x params, Traversable list)
373 => list x
351 => list x
374 -> Manipulation '[] schemas params ys
352 -> Manipulation '[] schemas params ys
375 -- ^ `insertInto`, `update` or `deleteFrom`
353 -- ^ `insertInto`, `update` or `deleteFrom`
@@ -377,13 +355,13 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where
377 forPrepared = flip traversePrepared
355 forPrepared = flip traversePrepared
378
356
379 traversePrepared_
357 traversePrepared_
380− :: (ToParams x params, Foldable list, All OidOfParam params)
358+ :: (ToParams x params, Foldable list)
381 => Manipulation '[] schemas params '[]
359 => Manipulation '[] schemas params '[]
382 -- ^ `insertInto`, `update` or `deleteFrom`
360 -- ^ `insertInto`, `update` or `deleteFrom`
383 -> list x -> pq ()
361 -> list x -> pq ()
384 default traversePrepared_
362 default traversePrepared_
385 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)
363 :: (MonadTrans t, MonadPQ schemas pq1, pq ~ t pq1)
386− => (ToParams x params, Foldable list, All OidOfParam params)
364+ => (ToParams x params, Foldable list)
387 => Manipulation '[] schemas params '[]
365 => Manipulation '[] schemas params '[]
388 -- ^ `insertInto`, `update` or `deleteFrom`
366 -- ^ `insertInto`, `update` or `deleteFrom`
389 -> list x -> pq ()
367 -> list x -> pq ()
@@ -391,7 +369,7 @@ class Monad pq => MonadPQ schemas pq | pq -> schemas where
391 traversePrepared_ manipulation params
369 traversePrepared_ manipulation params
392
370
393 forPrepared_
371 forPrepared_
394− :: (ToParams x params, Foldable list, All OidOfParam params)
372+ :: (ToParams x params, Foldable list)
395 => list x
373 => list x
396 -> Manipulation '[] schemas params '[]
374 -> Manipulation '[] schemas params '[]
397 -- ^ `insertInto`, `update` or `deleteFrom`
375 -- ^ `insertInto`, `update` or `deleteFrom`
@@ -411,76 +389,54 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)
411 (UnsafeManipulation q :: Manipulation '[] schemas ps ys) (params :: x) =
389 (UnsafeManipulation q :: Manipulation '[] schemas ps ys) (params :: x) =
412 PQ $ \ (K conn) -> do
390 PQ $ \ (K conn) -> do
413 let
391 let
414− paramSet
392+ 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)
393+ (LibPQ.invalidOid, encodingBytes encoding, LibPQ.Binary)
421− params'
422− = hcollapse
423− . hcmap (Proxy @OidOfParam) paramSet
424− $ toParams @x @ps params
394+ params' = fmap (fmap toParam') (hcollapse (toParams @x @ps params))
425 q' = q <> ";"
395 q' = q <> ";"
426 resultMaybe <- liftIO $ LibPQ.execParams conn q' params' LibPQ.Binary
396 resultMaybe <- liftIO $ LibPQ.execParams conn q' params' LibPQ.Binary
427 case resultMaybe of
397 case resultMaybe of
428 Nothing -> throw $ ResultException
398 Nothing -> throw $ ResultException
429 "manipulateParams: LibPQ.execParams returned no results"
399 "manipulateParams: LibPQ.execParams returned no results"
430 Just result -> do
400 Just result -> do
431− okResult_ result
401+ tryResult result
432 return $ K (K result)
402 return $ K (K result)
433
403
434 traversePrepared
404 traversePrepared
435 (UnsafeManipulation q :: Manipulation '[] schemas xs ys) (list :: list x) =
405 (UnsafeManipulation q :: Manipulation '[] schemas xs ys) (list :: list x) =
436 PQ $ \ (K conn) -> liftIO $ do
406 PQ $ \ (K conn) -> liftIO $ do
437− let
438− temp = "temporary_statement"
407+ 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')
408+ prepResultMaybe <- LibPQ.prepare conn temp q Nothing
446 case prepResultMaybe of
409 case prepResultMaybe of
447 Nothing -> throw $ ResultException
410 Nothing -> throw $ ResultException
448 "traversePrepared: LibPQ.prepare returned no results"
411 "traversePrepared: LibPQ.prepare returned no results"
449− Just prepResult -> okResult_ prepResult
412+ Just prepResult -> tryResult prepResult
450 results <- for list $ \ params -> do
413 results <- for list $ \ params -> do
451 let
414 let
452− toParam' encoding = (encodingBytes encoding, LibPQ.Binary)
415+ toParam' encoding = (encodingBytes encoding,LibPQ.Binary)
453 params' = fmap (fmap toParam') (hcollapse (toParams @x @xs params))
416 params' = fmap (fmap toParam') (hcollapse (toParams @x @xs params))
454 resultMaybe <- LibPQ.execPrepared conn temp params' LibPQ.Binary
417 resultMaybe <- LibPQ.execPrepared conn temp params' LibPQ.Binary
455 case resultMaybe of
418 case resultMaybe of
456 Nothing -> throw $ ResultException
419 Nothing -> throw $ ResultException
457 "traversePrepared: LibPQ.execParams returned no results"
420 "traversePrepared: LibPQ.execParams returned no results"
458 Just result -> do
421 Just result -> do
459− okResult_ result
422+ tryResult result
460 return $ K result
423 return $ K result
461 deallocResultMaybe <- LibPQ.exec conn ("DEALLOCATE " <> temp <> ";")
424 deallocResultMaybe <- LibPQ.exec conn ("DEALLOCATE " <> temp <> ";")
462 case deallocResultMaybe of
425 case deallocResultMaybe of
463 Nothing -> throw $ ResultException
426 Nothing -> throw $ ResultException
464 "traversePrepared: LibPQ.exec DEALLOCATE returned no results"
427 "traversePrepared: LibPQ.exec DEALLOCATE returned no results"
465− Just deallocResult -> okResult_ deallocResult
428+ Just deallocResult -> tryResult deallocResult
466 return (K results)
429 return (K results)
467
430
468 traversePrepared_
431 traversePrepared_
469 (UnsafeManipulation q :: Manipulation '[] schemas xs '[]) (list :: list x) =
432 (UnsafeManipulation q :: Manipulation '[] schemas xs '[]) (list :: list x) =
470 PQ $ \ (K conn) -> liftIO $ do
433 PQ $ \ (K conn) -> liftIO $ do
471− let
472− temp = "temporary_statement"
434+ 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')
435+ prepResultMaybe <- LibPQ.prepare conn temp q Nothing
480 case prepResultMaybe of
436 case prepResultMaybe of
481 Nothing -> throw $ ResultException
437 Nothing -> throw $ ResultException
482 "traversePrepared_: LibPQ.prepare returned no results"
438 "traversePrepared_: LibPQ.prepare returned no results"
483− Just prepResult -> okResult_ prepResult
439+ Just prepResult -> tryResult prepResult
484 for_ list $ \ params -> do
440 for_ list $ \ params -> do
485 let
441 let
486 toParam' encoding = (encodingBytes encoding, LibPQ.Binary)
442 toParam' encoding = (encodingBytes encoding, LibPQ.Binary)
@@ -489,12 +445,12 @@ instance (MonadIO io, schemas0 ~ schemas, schemas1 ~ schemas)
489 case resultMaybe of
445 case resultMaybe of
490 Nothing -> throw $ ResultException
446 Nothing -> throw $ ResultException
491 "traversePrepared_: LibPQ.execParams returned no results"
447 "traversePrepared_: LibPQ.execParams returned no results"
492− Just result -> okResult_ result
448+ Just result -> tryResult result
493 deallocResultMaybe <- LibPQ.exec conn ("DEALLOCATE " <> temp <> ";")
449 deallocResultMaybe <- LibPQ.exec conn ("DEALLOCATE " <> temp <> ";")
494 case deallocResultMaybe of
450 case deallocResultMaybe of
495 Nothing -> throw $ ResultException
451 Nothing -> throw $ ResultException
496 "traversePrepared: LibPQ.exec DEALLOCATE returned no results"
452 "traversePrepared: LibPQ.exec DEALLOCATE returned no results"
497− Just deallocResult -> okResult_ deallocResult
453+ Just deallocResult -> tryResult deallocResult
498 return (K ())
454 return (K ())
499
455
500 liftPQ pq = PQ $ \ (K conn) -> do
456 liftPQ pq = PQ $ \ (K conn) -> do
@@ -657,24 +613,24 @@ resultErrorCode
657 -> io (Maybe ByteString)
613 -> io (Maybe ByteString)
658resultErrorCode = liftResult (flip LibPQ.resultErrorField LibPQ.DiagSqlstate)
614resultErrorCode = liftResult (flip LibPQ.resultErrorField LibPQ.DiagSqlstate)
659
615
660−-- | the state of LibPQ
616+-- | `Exception`s that can be thrown by Squeal.
661−data PQState = PQState
617+data SquealException
618+ = PQException
662 { sqlExecStatus :: LibPQ.ExecStatus
619 { sqlExecStatus :: LibPQ.ExecStatus
663 , sqlStateCode :: Maybe ByteString
620 , sqlStateCode :: Maybe ByteString
664 -- ^ https://www.postgresql.org/docs/current/static/errcodes-appendix.html
621 -- ^ https://www.postgresql.org/docs/current/static/errcodes-appendix.html
665 , sqlErrorMessage :: Maybe ByteString
622 , sqlErrorMessage :: Maybe ByteString
666− } deriving (Eq, Show)
623+ }
667−
668−-- | `Exception`s that can be thrown by Squeal.
669−data SquealException
670− = PQException PQState
671 | ResultException Text
624 | ResultException Text
672 | ParseException Text
625 | ParseException Text
673 deriving (Eq, Show)
626 deriving (Eq, Show)
674instance Exception SquealException
627instance Exception SquealException
675
628
629+tryResult
630+ :: MonadIO io
676−okResult_ :: MonadIO io => LibPQ.Result -> io ()
631+ => LibPQ.Result
632+ -> io ()
677−okResult_ result = liftIO $ do
633+tryResult result = liftIO $ do
678 status <- LibPQ.resultStatus result
634 status <- LibPQ.resultStatus result
679 case status of
635 case status of
680 LibPQ.CommandOk -> return ()
636 LibPQ.CommandOk -> return ()
@@ -682,12 +638,7 @@ okResult_ result = liftIO $ do
682 _ -> do
638 _ -> do
683 stateCode <- LibPQ.resultErrorField result LibPQ.DiagSqlstate
639 stateCode <- LibPQ.resultErrorField result LibPQ.DiagSqlstate
684 msg <- LibPQ.resultErrorMessage result
640 msg <- LibPQ.resultErrorMessage result
685− throw . PQException $ PQState status stateCode msg
641+ throw $ PQException status stateCode msg
686−
687−-- | Check if a `LibPQ.Result`'s status is either `LibPQ.CommandOk`
688−-- or `LibPQ.TuplesOk` otherwise `throw` a `PQException`.
689−okResult :: MonadIO io => K LibPQ.Result row -> io ()
690−okResult = okResult_ . unK
691
642
692-- | Catch `SquealException`s.
643-- | Catch `SquealException`s.
693catchSqueal
644catchSqueal
@@ -703,10 +654,3 @@ handleSqueal
703 => (SquealException -> io a) -- ^ handler
654 => (SquealException -> io a) -- ^ handler
704 -> io a -> io a
655 -> io a -> io a
705handleSqueal = handle
656handleSqueal = handle
706−
707−-- | `Either` return a `SquealException` or a result.
708−trySqueal
709− :: MonadUnliftIO io
710− => io a
711− -> io (Either SquealException a)
712−trySqueal = try
squeal-postgresql/src/Squeal/PostgreSQL/Pool.hs+99−67
@@ -1,33 +1,11 @@
1{-|
1{-|
2−Module: Squeal.PostgreSQL.Pool
2+Module: Squeal.PostgreSQL.Definition
3−Description: Connection pools
3+Description: Pooled connections
4Copyright: (c) Eitan Chatav, 2017
4Copyright: (c) Eitan Chatav, 2017
5Maintainer: eitan@morphism.tech
5Maintainer: eitan@morphism.tech
6Stability: experimental
6Stability: experimental
7
7
8−Connection pools.
8+A `MonadPQ` for pooled connections.
9−
10−Typical use case would be to create your pool using `createConnectionPool`
11−and run anything that requires the pool connection with `usingConnectionPool`.
12−
13−Here's a simplified example:
14−
15−>>> import Squeal.PostgreSQL
16−
17−>>> :{
18−do
19− let
20− query :: Query_ (Public '[]) () (Only Char)
21− query = values_ (literal 'a' `as` #fromOnly)
22− pool <- createConnectionPool "host=localhost port=5432 dbname=exampledb" 1 0.5 10
23− chr <- usingConnectionPool pool $ do
24− result <- runQuery query
25− Just (Only a) <- firstRow result
26− return a
27− destroyConnectionPool pool
28− putChar chr
29−:}
30−a
31-}
9-}
32
10
33{-# LANGUAGE
11{-# LANGUAGE
@@ -45,19 +23,51 @@ a
45
23
46module Squeal.PostgreSQL.Pool
24module Squeal.PostgreSQL.Pool
47 ( -- * Pools
25 ( -- * Pools
48− Pool
26+ PoolPQ (..)
49 , createConnectionPool
27 , createConnectionPool
50− , usingConnectionPool
28+ , Pool
51− , destroyConnectionPool
29+ , destroyAllResources
52 ) where
30 ) where
53
31
32+import Control.Monad.Trans
54import Data.ByteString
33import Data.ByteString
55import Data.Time
34import Data.Time
56−import Generics.SOP (K(..), unK)
35+import Generics.SOP (K(..))
57import UnliftIO (MonadUnliftIO (..))
36import UnliftIO (MonadUnliftIO (..))
58import UnliftIO.Pool (Pool, createPool, destroyAllResources, withResource)
37import UnliftIO.Pool (Pool, createPool, destroyAllResources, withResource)
59
38
39+import qualified Control.Monad.Fail as Fail
40+
60import Squeal.PostgreSQL.PQ
41import Squeal.PostgreSQL.PQ
42+import Squeal.PostgreSQL.Schema
43+
44+{- | `PoolPQ` @schemas@ should be a drop-in replacement for `PQ` @schemas schemas@.
45+
46+Typical use case would be to create your pool using `createConnectionPool` and run anything that requires the pool connection with it.
47+
48+Here's a simplified example:
49+
50+>>> import Squeal.PostgreSQL
51+>>> :{
52+do
53+ let
54+ query :: Query_ (Public '[]) () (Only Char)
55+ query = values_ $ literal 'a' `as` #fromOnly
56+ session :: PoolPQ (Public '[]) IO Char
57+ session = do
58+ result <- runQuery query
59+ Just (Only chr) <- firstRow result
60+ return chr
61+ pool <- createConnectionPool "host=localhost port=5432 dbname=exampledb" 1 0.5 10
62+ chr <- runPoolPQ session pool
63+ destroyAllResources pool
64+ putChar chr
65+:}
66+a
67+-}
68+newtype PoolPQ (schemas :: SchemasType) m x =
69+ PoolPQ { runPoolPQ :: Pool (K Connection schemas) -> m x }
70+ deriving Functor
61
71
62-- | Create a striped pool of connections.
72-- | Create a striped pool of connections.
63-- Although the garbage collector will destroy all idle connections when the pool is garbage collected it's recommended to manually `destroyAllResources` when you're done with the pool so that the connections are freed up as soon as possible.
73-- Although the garbage collector will destroy all idle connections when the pool is garbage collected it's recommended to manually `destroyAllResources` when you're done with the pool so that the connections are freed up as soon as possible.
@@ -82,41 +92,63 @@ createConnectionPool
82createConnectionPool conninfo stripes idle maxResrc =
92createConnectionPool conninfo stripes idle maxResrc =
83 createPool (connectdb conninfo) finish stripes idle maxResrc
93 createPool (connectdb conninfo) finish stripes idle maxResrc
84
94
85−{-|
95+-- | `Applicative` instance for `PoolPQ`.
86−Temporarily take a connection from a `Pool`, perform an action with it,
96+instance Monad m => Applicative (PoolPQ schemas m) where
87−and return it to the pool afterwards.
97+ pure x = PoolPQ $ \ _ -> pure x
88−
98+ PoolPQ f <*> PoolPQ x = PoolPQ $ \ pool -> do
89−If the pool has an idle connection available, it is used immediately.
99+ f' <- f pool
90−Otherwise, if the maximum number of connections has not yet been reached,
100+ x' <- x pool
91−a new connection is created and used.
101+ return $ f' x'
92−If the maximum number of connections has been reached, this function blocks
102+
93−until a connection becomes available.
103+-- | `Monad` instance for `PoolPQ`.
94−-}
104+instance Monad m => Monad (PoolPQ schemas m) where
95−usingConnectionPool
105+ return = pure
96− :: MonadUnliftIO io
106+ PoolPQ x >>= f = PoolPQ $ \ pool -> do
97− => Pool (K Connection schemas) -- ^ pool
107+ x' <- x pool
98− -> PQ schemas schemas io x -- ^ session
108+ runPoolPQ (f x') pool
99− -> io x
109+
100−usingConnectionPool pool (PQ session) = unK <$> withResource pool session
110+-- | `Fail.MonadFail` instance for `PoolPQ`.
101−
111+instance Monad m => Fail.MonadFail (PoolPQ schemas m) where
102−{- |
112+ fail = Fail.fail
103−Destroy all connections in all stripes in the pool.
113+
104−Note that this will ignore any exceptions in the destroy function.
114+-- | `MonadTrans` instance for `PoolPQ`.
105−
115+instance MonadTrans (PoolPQ schemas) where
106−This function is useful when you detect that all connections
116+ lift m = PoolPQ $ \ _pool -> m
107−in the pool are broken. For example after a database has been
117+
108−restarted all connections opened before the restart will be broken.
118+-- | `MonadPQ` instance for `PoolPQ`.
109−In that case it's better to close those connections so that
119+instance MonadUnliftIO io => MonadPQ schemas (PoolPQ schemas io) where
110−`usingConnectionPool` won't take a broken connection from the pool
120+ manipulateParams manipulation params = PoolPQ $ \ pool -> do
111−but will open a new connection instead.
121+ withResource pool $ \ conn -> do
112−
122+ (K result :: K (K Result ys) schemas) <- flip unPQ conn $
113−Another use-case for this function is that when you know you are done
123+ manipulateParams manipulation params
114−with the pool you can destroy all idle connections immediately
124+ return result
115−instead of waiting on the garbage collector to destroy them,
125+ traversePrepared manipulation params = PoolPQ $ \ pool ->
116−thus freeing up those connections sooner.
126+ withResource pool $ \ conn -> do
117−-}
127+ (K result :: K (list (K Result ys)) schemas) <- flip unPQ conn $
118−destroyConnectionPool
128+ traversePrepared manipulation params
129+ return result
130+ traversePrepared_ manipulation params = PoolPQ $ \ pool -> do
131+ withResource pool $ \ conn -> do
132+ (_ :: K () schemas) <- flip unPQ conn $
133+ traversePrepared_ manipulation params
134+ return ()
135+ liftPQ m = PoolPQ $ \ pool ->
136+ withResource pool $ \ conn -> do
137+ (K result :: K result schemas) <- flip unPQ conn $
138+ liftPQ m
139+ return result
140+
141+-- | 'MonadIO' instance for 'PoolPQ'.
142+instance (MonadIO m)
143+ => MonadIO (PoolPQ schemas m) where
144+ liftIO = lift . liftIO
145+
119− :: MonadUnliftIO io
146+-- | 'MonadUnliftIO' instance for 'PoolPQ'.
120− => Pool (K Connection schemas) -- ^ pool
147+instance (MonadUnliftIO m)
121− -> io ()
148+ => MonadUnliftIO (PoolPQ schemas m) where
122−destroyConnectionPool = destroyAllResources
149+ withRunInIO
150+ :: ((forall a . PoolPQ schemas m a -> IO a) -> IO b)
151+ -> PoolPQ schemas m b
152+ withRunInIO inner = PoolPQ $ \pool ->
153+ withRunInIO $ \(run :: (forall x . m x -> IO x)) ->
154+ inner (\poolpq -> run $ runPoolPQ poolpq pool)
squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+93−235
@@ -32,15 +32,13 @@ Squeal queries.
32
32
33module Squeal.PostgreSQL.Query
33module Squeal.PostgreSQL.Query
34 ( -- * Queries
34 ( -- * Queries
35− Query_
35+ Query (..)
36− , Query (..)
36+ , Query_
37 -- ** Select
37 -- ** Select
38 , select
38 , select
39 , select_
39 , select_
40 , selectDistinct
40 , selectDistinct
41 , selectDistinct_
41 , selectDistinct_
42− , selectDistinctOn
43− , selectDistinctOn_
44 , Selection (..)
42 , Selection (..)
45 -- ** Values
43 -- ** Values
46 , values
44 , values
@@ -55,7 +53,6 @@ module Squeal.PostgreSQL.Query
55 -- ** With
53 -- ** With
56 , With (..)
54 , With (..)
57 , CommonTableExpression (..)
55 , CommonTableExpression (..)
58− , withRecursive
59 -- * Table Expressions
56 -- * Table Expressions
60 , TableExpression (..)
57 , TableExpression (..)
61 , from
58 , from
@@ -103,55 +100,10 @@ import Squeal.PostgreSQL.Schema
103
100
104-- $setup
101-- $setup
105-- >>> import Squeal.PostgreSQL
102-- >>> import Squeal.PostgreSQL
106−-- >>> import Data.Int (Int32, Int64)
107−-- >>> import Data.Monoid (Sum (..))
108−-- >>> import Data.Text (Text)
109−-- >>> import qualified Generics.SOP as SOP
110
103
111{- |
104{- |
112−The process of retrieving or the command to retrieve data from
105+The process of retrieving or the command to retrieve data from a database
113−a database is called a `Query`.
114−
115−The general `Query` type is parameterized by
116−
117−* @outer :: FromType@ - outer scope for a correlated subquery,
118−* @commons :: FromType@ - scope for all `common` table expressions,
119−* @schemas :: SchemasType@ - scope for all `table`s and `view`s,
120−* @params :: [NullityType]@ - scope for all `Squeal.Expression.Parameter.parameter`s,
121−* @row :: RowType@ - return type of the `Query`.
122−-}
123−newtype Query
124− (outer :: FromType)
125− (commons :: FromType)
126− (schemas :: SchemasType)
127− (params :: [NullityType])
128− (row :: RowType)
129− = UnsafeQuery { renderQuery :: ByteString }
130− deriving (GHC.Generic,Show,Eq,Ord,NFData)
131−instance RenderSQL (Query outer commons schemas params row) where renderSQL = renderQuery
132−
133−{- |
134−The top level `Query_` type is parameterized by a @schemas@ `SchemasType`,
135−against which the query is type-checked, an input @parameters@ Haskell `Type`,
136−and an ouput row Haskell `Type`.
137−
138−A top-level query can be run
139−using `Squeal.PostgreSQL.PQ.runQueryParams`, or if @parameters = ()@
140−using `Squeal.PostgreSQL.PQ.runQuery`.
141−
142−Generally, @parameters@ will be a Haskell tuple or record whose entries
143−may be referenced using positional
144−`Squeal.PostgreSQL.Expression.Parameter.parameter`s and @row@ will be a
145−Haskell record, whose entries will be targeted using overloaded labels.
146−
147−Let's see some examples of queries.
106+is called a `Query`. Let's see some examples of queries.
148−
149−>>> :set -XDeriveAnyClass -XDerivingStrategies
150−>>> :{
151−data Row a b = Row { col1 :: a, col2 :: b }
152− deriving stock (GHC.Generic)
153− deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
154−:}
155
107
156simple query:
108simple query:
157
109
@@ -159,7 +111,7 @@ simple query:
159>>> type Schema = '["tab" ::: 'Table ('[] :=> Columns)]
111>>> type Schema = '["tab" ::: 'Table ('[] :=> Columns)]
160>>> :{
112>>> :{
161let
113let
162− query :: Query_ (Public Schema) () (Row Int32 Int32)
114+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
163 query = select Star (from (table #tab))
115 query = select Star (from (table #tab))
164in printSQL query
116in printSQL query
165:}
117:}
@@ -169,21 +121,21 @@ restricted query:
169
121
170>>> :{
122>>> :{
171let
123let
172− query :: Query_ (Public Schema) () (Row Int32 Int32)
124+ query :: Query '[] '[] (Public Schema) '[] '["sum" ::: 'NotNull 'PGint4, "col1" ::: 'NotNull 'PGint4]
173 query =
125 query =
174− select_ ((#col1 + #col2) `as` #col1 :* #col1 `as` #col2)
126+ select_ ((#col1 + #col2) `as` #sum :* #col1)
175 ( from (table #tab)
127 ( from (table #tab)
176 & where_ (#col1 .> #col2)
128 & where_ (#col1 .> #col2)
177 & where_ (#col2 .> 0) )
129 & where_ (#col2 .> 0) )
178in printSQL query
130in printSQL query
179:}
131:}
180−SELECT ("col1" + "col2") AS "col1", "col1" AS "col2" FROM "tab" AS "tab" WHERE (("col1" > "col2") AND ("col2" > 0))
132+SELECT ("col1" + "col2") AS "sum", "col1" AS "col1" FROM "tab" AS "tab" WHERE (("col1" > "col2") AND ("col2" > 0))
181
133
182subquery:
134subquery:
183
135
184>>> :{
136>>> :{
185let
137let
186− query :: Query_ (Public Schema) () (Row Int32 Int32)
138+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
187 query = select Star (from (subquery (select Star (from (table #tab)) `as` #sub)))
139 query = select Star (from (subquery (select Star (from (table #tab)) `as` #sub)))
188in printSQL query
140in printSQL query
189:}
141:}
@@ -193,7 +145,7 @@ limits and offsets:
193
145
194>>> :{
146>>> :{
195let
147let
196− query :: Query_ (Public Schema) () (Row Int32 Int32)
148+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
197 query = select Star (from (table #tab) & limit 100 & offset 2 & limit 50 & offset 2)
149 query = select Star (from (table #tab) & limit 100 & offset 2 & limit 50 & offset 2)
198in printSQL query
150in printSQL query
199:}
151:}
@@ -203,7 +155,7 @@ parameterized query:
203
155
204>>> :{
156>>> :{
205let
157let
206− query :: Query_ (Public Schema) (Only Int32) (Row Int32 Int32)
158+ query :: Query '[] '[] (Public Schema) '[ 'NotNull 'PGint4] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
207 query = select Star (from (table #tab) & where_ (#col1 .> param @1))
159 query = select Star (from (table #tab) & where_ (#col1 .> param @1))
208in printSQL query
160in printSQL query
209:}
161:}
@@ -213,21 +165,21 @@ aggregation query:
213
165
214>>> :{
166>>> :{
215let
167let
216− query :: Query_ (Public Schema) () (Row Int64 Int32)
168+ query :: Query '[] '[] (Public Schema) '[] '["sum" ::: 'NotNull 'PGint4, "col1" ::: 'NotNull 'PGint4 ]
217 query =
169 query =
218− select_ ((fromNull 0 (sum_ (All #col2))) `as` #col1 :* #col1 `as` #col2)
170+ select_ (sum_ (All #col2) `as` #sum :* #col1)
219 ( from (table (#tab `as` #table1))
171 ( from (table (#tab `as` #table1))
220 & groupBy #col1
172 & groupBy #col1
221− & having (sum_ (Distinct #col2) .> 1) )
173+ & having (#col1 + sum_ (Distinct #col2) .> 1) )
222in printSQL query
174in printSQL query
223:}
175:}
224−SELECT COALESCE(sum(ALL "col2"), 0) AS "col1", "col1" AS "col2" FROM "tab" AS "table1" GROUP BY "col1" HAVING (sum(DISTINCT "col2") > 1)
176+SELECT sum(ALL "col2") AS "sum", "col1" AS "col1" FROM "tab" AS "table1" GROUP BY "col1" HAVING (("col1" + sum(DISTINCT "col2")) > 1)
225
177
226sorted query:
178sorted query:
227
179
228>>> :{
180>>> :{
229let
181let
230− query :: Query_ (Public Schema) () (Row Int32 Int32)
182+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
231 query = select Star (from (table #tab) & orderBy [#col1 & Asc])
183 query = select Star (from (table #tab) & orderBy [#col1 & Asc])
232in printSQL query
184in printSQL query
233:}
185:}
@@ -235,12 +187,14 @@ SELECT * FROM "tab" AS "tab" ORDER BY "col1" ASC
235
187
236joins:
188joins:
237
189
190+>>> :set -XFlexibleContexts
238>>> :{
191>>> :{
239type OrdersColumns =
192type OrdersColumns =
240 '[ "id" ::: 'NoDef :=> 'NotNull 'PGint4
193 '[ "id" ::: 'NoDef :=> 'NotNull 'PGint4
241− , "price" ::: 'NoDef :=> 'NotNull 'PGfloat4
194+ , "price" ::: 'NoDef :=> 'NotNull 'PGfloat4
242− , "customer_id" ::: 'NoDef :=> 'NotNull 'PGint4
195+ , "customer_id" ::: 'NoDef :=> 'NotNull 'PGint4
243− , "shipper_id" ::: 'NoDef :=> 'NotNull 'PGint4 ]
196+ , "shipper_id" ::: 'NoDef :=> 'NotNull 'PGint4
197+ ]
244:}
198:}
245
199
246>>> :{
200>>> :{
@@ -256,27 +210,22 @@ type OrdersConstraints =
256>>> :{
210>>> :{
257type OrdersSchema =
211type OrdersSchema =
258 '[ "orders" ::: 'Table (OrdersConstraints :=> OrdersColumns)
212 '[ "orders" ::: 'Table (OrdersConstraints :=> OrdersColumns)
259− , "customers" ::: 'Table (CustomersConstraints :=> NamesColumns)
213+ , "customers" ::: 'Table (CustomersConstraints :=> NamesColumns)
260− , "shippers" ::: 'Table (ShippersConstraints :=> NamesColumns) ]
214+ , "shippers" ::: 'Table (ShippersConstraints :=> NamesColumns) ]
261−:}
262−
263−>>> :{
264−data Order = Order
265− { price :: Float
266− , customerName :: Text
267− , shipperName :: Text
268− } deriving GHC.Generic
269−instance SOP.Generic Order
270−instance SOP.HasDatatypeInfo Order
271:}
215:}
272
216
273>>> :{
217>>> :{
274let
218let
275− query :: Query_ (Public OrdersSchema) () Order
219+ query :: Query '[] '[] (Public OrdersSchema)
220+ '[]
221+ '[ "order_price" ::: 'NotNull 'PGfloat4
222+ , "customer_name" ::: 'NotNull 'PGtext
223+ , "shipper_name" ::: 'NotNull 'PGtext
224+ ]
276 query = select_
225 query = select_
277− ( #o ! #price `as` #price :*
226+ ( #o ! #price `as` #order_price :*
278− #c ! #name `as` #customerName :*
227+ #c ! #name `as` #customer_name :*
279− #s ! #name `as` #shipperName )
228+ #s ! #name `as` #shipper_name )
280 ( from (table (#orders `as` #o)
229 ( from (table (#orders `as` #o)
281 & innerJoin (table (#customers `as` #c))
230 & innerJoin (table (#customers `as` #c))
282 (#o ! #customer_id .== #c ! #id)
231 (#o ! #customer_id .== #c ! #id)
@@ -284,16 +233,14 @@ let
284 (#o ! #shipper_id .== #s ! #id)) )
233 (#o ! #shipper_id .== #s ! #id)) )
285in printSQL query
234in printSQL query
286:}
235:}
287−SELECT "o"."price" AS "price", "c"."name" AS "customerName", "s"."name" AS "shipperName" FROM "orders" AS "o" INNER JOIN "customers" AS "c" ON ("o"."customer_id" = "c"."id") INNER JOIN "shippers" AS "s" ON ("o"."shipper_id" = "s"."id")
236+SELECT "o"."price" AS "order_price", "c"."name" AS "customer_name", "s"."name" AS "shipper_name" FROM "orders" AS "o" INNER JOIN "customers" AS "c" ON ("o"."customer_id" = "c"."id") INNER JOIN "shippers" AS "s" ON ("o"."shipper_id" = "s"."id")
288
237
289self-join:
238self-join:
290
239
291>>> :{
240>>> :{
292let
241let
293− query :: Query_ (Public Schema) () (Row Int32 Int32)
242+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
294− query = select
295− (#t1 & DotStar)
296− (from (table (#tab `as` #t1) & crossJoin (table (#tab `as` #t2))))
243+ query = select (#t1 & DotStar) (from (table (#tab `as` #t1) & crossJoin (table (#tab `as` #t2))))
297in printSQL query
244in printSQL query
298:}
245:}
299SELECT "t1".* FROM "tab" AS "t1" CROSS JOIN "tab" AS "t2"
246SELECT "t1".* FROM "tab" AS "t1" CROSS JOIN "tab" AS "t2"
@@ -302,19 +249,17 @@ value queries:
302
249
303>>> :{
250>>> :{
304let
251let
305− query :: Query_ schemas () (Row String Bool)
252+ query :: Query '[] commons schemas '[] '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
306− query = values
253+ query = values (1 `as` #foo :* true `as` #bar) [2 `as` #foo :* false `as` #bar]
307− ("true" `as` #col1 :* true `as` #col2)
308− ["false" `as` #col1 :* false `as` #col2]
309in printSQL query
254in printSQL query
310:}
255:}
311−SELECT * FROM (VALUES (E'true', TRUE), (E'false', FALSE)) AS t ("col1", "col2")
256+SELECT * FROM (VALUES (1, TRUE), (2, FALSE)) AS t ("foo", "bar")
312
257
313set operations:
258set operations:
314
259
315>>> :{
260>>> :{
316let
261let
317− query :: Query_ (Public Schema) () (Row Int32 Int32)
262+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
318 query = select Star (from (table #tab)) `unionAll` select Star (from (table #tab))
263 query = select Star (from (table #tab)) `unionAll` select Star (from (table #tab))
319in printSQL query
264in printSQL query
320:}
265:}
@@ -324,7 +269,7 @@ with queries:
324
269
325>>> :{
270>>> :{
326let
271let
327− query :: Query_ (Public Schema) () (Row Int32 Int32)
272+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
328 query = with (
273 query = with (
329 select Star (from (table #tab)) `as` #cte1 :>>
274 select Star (from (table #tab)) `as` #cte1 :>>
330 select Star (from (common #cte1)) `as` #cte2
275 select Star (from (common #cte1)) `as` #cte2
@@ -337,35 +282,40 @@ window function queries
337
282
338>>> :{
283>>> :{
339let
284let
340− query :: Query_ (Public Schema) () (Row Int32 Int64)
285+ query :: Query '[] '[] (Public Schema) '[] ["col1" ::: 'NotNull 'PGint4, "rank" ::: 'NotNull 'PGint8]
341 query = select
286 query = select
342− (#col1 & Also (rank `as` #col2 `Over` (partitionBy #col1 & orderBy [#col2 & Asc])))
287+ (#col1 & Also (rank `as` #rank `Over` (partitionBy #col1 & orderBy [#col2 & Asc])))
343 (from (table #tab))
288 (from (table #tab))
344in printSQL query
289in printSQL query
345:}
290:}
346−SELECT "col1" AS "col1", rank() OVER (PARTITION BY "col1" ORDER BY "col2" ASC) AS "col2" FROM "tab" AS "tab"
291+SELECT "col1" AS "col1", rank() OVER (PARTITION BY "col1" ORDER BY "col2" ASC) AS "rank" FROM "tab" AS "tab"
347
292
348correlated subqueries
293correlated subqueries
349
294
350>>> :{
295>>> :{
351let
296let
352− query :: Query_ (Public Schema) () (Only Int32)
297+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4]
353 query =
298 query =
354− select (#col1 `as` #fromOnly) (from (table (#tab `as` #t1))
299+ select #col1 (from (table (#tab `as` #t1))
355 & where_ (exists (
300 & where_ (exists (
356 select Star (from (table (#tab `as` #t2))
301 select Star (from (table (#tab `as` #t2))
357 & where_ (#t2 ! #col2 .== #t1 ! #col1)))))
302 & where_ (#t2 ! #col2 .== #t1 ! #col1)))))
358in printSQL query
303in printSQL query
359:}
304:}
360−SELECT "col1" AS "fromOnly" FROM "tab" AS "t1" WHERE EXISTS (SELECT * FROM "tab" AS "t2" WHERE ("t2"."col2" = "t1"."col1"))
305+SELECT "col1" AS "col1" FROM "tab" AS "t1" WHERE EXISTS (SELECT * FROM "tab" AS "t2" WHERE ("t2"."col2" = "t1"."col1"))
361−
362-}
306-}
363−type family Query_
307+newtype Query
308+ (outer :: FromType)
309+ (commons :: FromType)
364 (schemas :: SchemasType)
310 (schemas :: SchemasType)
365− (parameters :: Type)
311+ (params :: [NullityType])
366− (row :: Type) where
312+ (row :: RowType)
367− Query_ schemas params row =
313+ = UnsafeQuery { renderQuery :: ByteString }
314+ deriving (GHC.Generic,Show,Eq,Ord,NFData)
315+instance RenderSQL (Query outer commons schemas params row) where renderSQL = renderQuery
316+
317+type family Query_ (schemas :: SchemasType) (params :: Type) (row :: Type) where
368− Query '[] '[] schemas (TuplePG params) (RowPG row)
318+ Query_ schemas params row = Query '[] '[] schemas (TuplePG params) (RowPG row)
369
319
370-- | The results of two queries can be combined using the set operation
320-- | The results of two queries can be combined using the set operation
371-- `union`. Duplicate rows are eliminated.
321-- `union`. Duplicate rows are eliminated.
@@ -437,39 +387,28 @@ q1 `exceptAll` q2 = UnsafeQuery $
437SELECT queries
387SELECT queries
438-----------------------------------------}
388-----------------------------------------}
439
389
440−{- | The simplest kinds of `Selection` are `Star` and `DotStar` which
441−emits all columns that a `TableExpression` produces. A select `List`
442−is a list of `Expression`s. A `Selection` could be a list of
443−`WindowFunction`s `Over` `WindowDefinition`. `Additional` `Selection`s can
444−be selected with `Also`.
445−-}
446data Selection outer commons grp schemas params from row where
390data Selection outer commons grp schemas params from row where
391+ List
392+ :: SListI row
393+ => NP (Aliased (Expression outer commons grp schemas params from)) row
394+ -> Selection outer commons grp schemas params from row
447 Star
395 Star
448 :: HasUnique tab from row
396 :: HasUnique tab from row
449 => Selection outer commons 'Ungrouped schemas params from row
397 => Selection outer commons 'Ungrouped schemas params from row
450− -- ^ `HasUnique` table in the `FromClause`
451 DotStar
398 DotStar
452 :: Has tab from row
399 :: Has tab from row
453 => Alias tab
400 => Alias tab
454− -- ^ `Has` table with `Alias`
455 -> Selection outer commons 'Ungrouped schemas params from row
401 -> Selection outer commons 'Ungrouped schemas params from row
456− List
402+ Also
457− :: SListI row
458− => NP (Aliased (Expression outer commons grp schemas params from)) row
403+ :: Selection outer commons grp schemas params from right
459− -- ^ `NP` list of `Aliased` `Expression`s
404+ -> Selection outer commons grp schemas params from left
460− -> Selection outer commons grp schemas params from row
405+ -> Selection outer commons grp schemas params from (Join left right)
461 Over
406 Over
462 :: SListI row
407 :: SListI row
463 => NP (Aliased (WindowFunction outer commons grp schemas params from)) row
408 => NP (Aliased (WindowFunction outer commons grp schemas params from)) row
464− -- ^ `NP` list of `Aliased` `WindowFunction`s
465 -> WindowDefinition outer commons grp schemas params from
409 -> WindowDefinition outer commons grp schemas params from
466 -> Selection outer commons grp schemas params from row
410 -> Selection outer commons grp schemas params from row
467− Also
468− :: Selection outer commons grp schemas params from right
469− -- ^ `Additional` `Selection`
470− -> Selection outer commons grp schemas params from left
471− -> Selection outer commons grp schemas params from (Join left right)
472−instance Additional (Selection outer commons grp schemas params from) where
411+instance Additionally (Selection outer commons grp schemas params from) where
473 also = Also
412 also = Also
474instance (KnownSymbol col, row ~ '[col ::: ty])
413instance (KnownSymbol col, row ~ '[col ::: ty])
475 => Aliasable col
414 => Aliasable col
@@ -530,7 +469,7 @@ instance IsString
530select
469select
531 :: (SListI row, row ~ (x ': xs))
470 :: (SListI row, row ~ (x ': xs))
532 => Selection outer commons grp schemas params from row
471 => Selection outer commons grp schemas params from row
533− -- ^ selection
472+ -- ^ select list
534 -> TableExpression outer commons grp schemas params from
473 -> TableExpression outer commons grp schemas params from
535 -- ^ intermediate virtual table
474 -- ^ intermediate virtual table
536 -> Query outer commons schemas params row
475 -> Query outer commons schemas params row
@@ -539,24 +478,20 @@ select selection tabexpr = UnsafeQuery $
539 <+> renderSQL selection
478 <+> renderSQL selection
540 <+> renderSQL tabexpr
479 <+> renderSQL tabexpr
541
480
542−-- | Like `select` but takes an `NP` list of `Expression`s instead
543−-- of a general `Selection`.
544select_
481select_
545 :: (SListI row, row ~ (x ': xs))
482 :: (SListI row, row ~ (x ': xs))
546 => NP (Aliased (Expression outer commons grp schemas params from)) row
483 => NP (Aliased (Expression outer commons grp schemas params from)) row
547− -- ^ select list
548 -> TableExpression outer commons grp schemas params from
484 -> TableExpression outer commons grp schemas params from
549− -- ^ intermediate virtual table
550 -> Query outer commons schemas params row
485 -> Query outer commons schemas params row
551−select_ = select . List
486+select_ list = select (List list)
552
487
553-- | After the select list has been processed, the result table can
488-- | After the select list has been processed, the result table can
554-- be subject to the elimination of duplicate rows using `selectDistinct`.
489-- be subject to the elimination of duplicate rows using `selectDistinct`.
555selectDistinct
490selectDistinct
556 :: (SListI columns, columns ~ (col ': cols))
491 :: (SListI columns, columns ~ (col ': cols))
557− => Selection outer commons grp schemas params from columns
492+ => Selection outer commons 'Ungrouped schemas params from columns
558− -- ^ selection
493+ -- ^ select list
559− -> TableExpression outer commons grp schemas params from
494+ -> TableExpression outer commons 'Ungrouped schemas params from
560 -- ^ intermediate virtual table
495 -- ^ intermediate virtual table
561 -> Query outer commons schemas params columns
496 -> Query outer commons schemas params columns
562selectDistinct selection tabexpr = UnsafeQuery $
497selectDistinct selection tabexpr = UnsafeQuery $
@@ -564,65 +499,14 @@ selectDistinct selection tabexpr = UnsafeQuery $
564 <+> renderSQL selection
499 <+> renderSQL selection
565 <+> renderSQL tabexpr
500 <+> renderSQL tabexpr
566
501
567−-- | Like `selectDistinct` but takes an `NP` list of `Expression`s instead
568−-- of a general `Selection`.
569selectDistinct_
502selectDistinct_
570 :: (SListI columns, columns ~ (col ': cols))
503 :: (SListI columns, columns ~ (col ': cols))
571− => NP (Aliased (Expression outer commons grp schemas params from)) columns
504+ => NP (Aliased (Expression outer commons 'Ungrouped schemas params from)) columns
572 -- ^ select list
505 -- ^ select list
573− -> TableExpression outer commons grp schemas params from
506+ -> TableExpression outer commons 'Ungrouped schemas params from
574− -- ^ intermediate virtual table
575− -> Query outer commons schemas params columns
576−selectDistinct_ = selectDistinct . List
577−
578−{-|
579−`selectDistinctOn` keeps only the first row of each set of rows where
580−the given expressions evaluate to equal. The DISTINCT ON expressions are
581−interpreted using the same rules as for ORDER BY. ORDER BY is used to
582−ensure 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−-}
591−selectDistinctOn
592− :: (SListI columns, columns ~ (col ': cols))
593− => [SortExpression outer commons grp schemas params from]
594− -- ^ DISTINCT ON expression(s) and prepended to ORDER BY clause
595− -> Selection outer commons grp schemas params from columns
596− -- ^ selection
597− -> TableExpression outer commons grp schemas params from
598− -- ^ intermediate virtual table
599− -> Query outer commons schemas params columns
600−selectDistinctOn distincts selection tab = UnsafeQuery $
601− "SELECT DISTINCT ON"
602− <+> parenthesized (commaSeparated (renderDistinctOn <$> distincts))
603− <+> renderSQL selection
604− <+> renderSQL (tab {orderByClause = distincts <> orderByClause tab})
605− where
606− renderDistinctOn = \case
607− Asc expression -> renderSQL expression
608− Desc expression -> renderSQL expression
609− AscNullsFirst expression -> renderSQL expression
610− DescNullsFirst expression -> renderSQL expression
611− AscNullsLast expression -> renderSQL expression
612− DescNullsLast expression -> renderSQL expression
613−
614−-- | Like `selectDistinctOn` but takes an `NP` list of `Expression`s instead
615−-- of a general `Selection`.
616−selectDistinctOn_
617− :: (SListI columns, columns ~ (col ': cols))
618− => [SortExpression outer commons grp schemas params from]
619− -- ^ distinct on and return the first row in ordering
620− -> NP (Aliased (Expression outer commons grp schemas params from)) columns
621− -- ^ selection
622− -> TableExpression outer commons grp schemas params from
623 -- ^ intermediate virtual table
507 -- ^ intermediate virtual table
624 -> Query outer commons schemas params columns
508 -> Query outer commons schemas params columns
625−selectDistinctOn_ distincts = selectDistinctOn distincts . List
509+selectDistinct_ list = select (List list)
626
510
627-- | `values` computes a row value or set of row values
511-- | `values` computes a row value or set of row values
628-- specified by value expressions. It is most commonly used
512-- specified by value expressions. It is most commonly used
@@ -757,7 +641,7 @@ instance RenderSQL (TableExpression outer commons grp schemas params from) where
757from
641from
758 :: FromClause outer commons schemas params from -- ^ table reference
642 :: FromClause outer commons schemas params from -- ^ table reference
759 -> TableExpression outer commons 'Ungrouped schemas params from
643 -> TableExpression outer commons 'Ungrouped schemas params from
760−from tab = TableExpression tab [] noGroups NoHaving [] [] []
644+from tab = TableExpression tab [] NoGroups NoHaving [] [] []
761
645
762-- | A `where_` is an endomorphism of `TableExpression`s which adds a
646-- | A `where_` is an endomorphism of `TableExpression`s which adds a
763-- search condition to the `whereClause`.
647-- search condition to the `whereClause`.
@@ -778,7 +662,7 @@ groupBy
778groupBy bys rels = TableExpression
662groupBy bys rels = TableExpression
779 { fromClause = fromClause rels
663 { fromClause = fromClause rels
780 , whereClause = whereClause rels
664 , whereClause = whereClause rels
781− , groupByClause = group bys
665+ , groupByClause = Group bys
782 , havingClause = Having []
666 , havingClause = Having []
783 , orderByClause = []
667 , orderByClause = []
784 , limitClause = limitClause rels
668 , limitClause = limitClause rels
@@ -857,7 +741,7 @@ common
857common (cte `As` alias) = UnsafeFromClause $
741common (cte `As` alias) = UnsafeFromClause $
858 renderSQL cte <+> "AS" <+> renderSQL alias
742 renderSQL cte <+> "AS" <+> renderSQL alias
859
743
860−instance Additional (FromClause outer commons schemas params) where
744+instance Additionally (FromClause outer commons schemas params) where
861 also right left = UnsafeFromClause $
745 also right left = UnsafeFromClause $
862 renderSQL left <> ", " <> renderSQL right
746 renderSQL left <> ", " <> renderSQL right
863
747
@@ -992,20 +876,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
876-- done on @NoGroups@ while all output `Expression`s must be aggregated
993-- in @Group Nil@. In general, all output `Expression`s in the
877-- in @Group Nil@. In general, all output `Expression`s in the
994-- complement of @bys@ must be aggregated in @Group bys@.
878-- complement of @bys@ must be aggregated in @Group bys@.
995−newtype GroupByClause grp from = UnsafeGroupByClause
879+data GroupByClause grp from where
996− { renderGroupByClause :: ByteString }
880+ NoGroups :: GroupByClause 'Ungrouped from
997− deriving (GHC.Generic,Show,Eq,Ord,NFData)
881+ Group
882+ :: SListI bys
883+ => NP (By from) bys
884+ -> GroupByClause ('Grouped bys) from
885+
886+-- | Renders a `GroupByClause`.
998instance RenderSQL (GroupByClause grp from) where
887instance RenderSQL (GroupByClause grp from) where
999− renderSQL = renderGroupByClause
888+ renderSQL = \case
1000−noGroups :: GroupByClause 'Ungrouped from
889+ 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 -> ""
890+ Group Nil -> ""
1008− bys' -> " GROUP BY" <+> renderCommaSeparated renderSQL bys'
891+ Group bys -> " GROUP BY" <+> renderCommaSeparated renderSQL bys
1009
892
1010-- | A `HavingClause` is used to eliminate groups that are not of interest.
893-- | A `HavingClause` is used to eliminate groups that are not of interest.
1011-- An `Ungrouped` `TableExpression` may only use `NoHaving` while a `Grouped`
894-- An `Ungrouped` `TableExpression` may only use `NoHaving` while a `Grouped`
@@ -1049,8 +932,8 @@ instance
1049 , commons1 ~ (cte ::: common ': commons)
932 , commons1 ~ (cte ::: common ': commons)
1050 ) => Aliasable cte
933 ) => Aliasable cte
1051 (statement commons schemas params common)
934 (statement commons schemas params common)
1052− (Path (CommonTableExpression statement schemas params) commons commons1) where
935+ (AlignedList (CommonTableExpression statement schemas params) commons commons1) where
1053− statement `as` cte = csingleton (statement `as` cte)
936+ statement `as` cte = single (statement `as` cte)
1054
937
1055instance (forall c s p r. RenderSQL (statement c s p r)) => RenderSQL
938instance (forall c s p r. RenderSQL (statement c s p r)) => RenderSQL
1056 (CommonTableExpression statement schemas params commons0 commons1) where
939 (CommonTableExpression statement schemas params commons0 commons1) where
@@ -1062,7 +945,7 @@ instance (forall c s p r. RenderSQL (statement c s p r)) => RenderSQL
1062-- defining temporary tables that exist just for one query.
945-- defining temporary tables that exist just for one query.
1063class With statement where
946class With statement where
1064 with
947 with
1065− :: Path (CommonTableExpression statement schemas params) commons0 commons1
948+ :: AlignedList (CommonTableExpression statement schemas params) commons0 commons1
1066 -- ^ common table expressions
949 -- ^ common table expressions
1067 -> statement commons1 schemas params row
950 -> statement commons1 schemas params row
1068 -- ^ larger query
951 -- ^ larger query
@@ -1070,29 +953,4 @@ class With statement where
1070instance With (Query outer) where
953instance With (Query outer) where
1071 with Done query = query
954 with Done query = query
1072 with ctes query = UnsafeQuery $
955 with ctes query = UnsafeQuery $
1073− "WITH" <+> commaSeparated (ctoList renderSQL ctes) <+> renderSQL query
1074−
1075−{- |
1076−>>> import Data.Monoid (Sum (..))
1077−>>> import Data.Int (Int64)
1078−>>> :{
1079− let
1080− query :: Query_ schema () (Sum Int64)
1081− query = withRecursive
1082− ( values_ ((1 & astype int) `as` #n)
1083− `unionAll`
1084− select_ ((#n + 1) `as` #n)
1085− (from (common #t) & where_ (#n .< 100)) `as` #t )
1086− ( select_ (fromNull 0 (sum_ (All #n)) `as` #getSum) (from (common #t) & groupBy Nil))
1087− in printSQL query
1088−:}
1089−WITH RECURSIVE "t" AS ((SELECT * FROM (VALUES ((1 :: int))) AS t ("n")) UNION ALL (SELECT ("n" + 1) AS "n" FROM "t" AS "t" WHERE ("n" < 100))) SELECT COALESCE(sum(ALL "n"), 0) AS "getSum" FROM "t" AS "t"
1090−-}
1091−withRecursive
1092− :: Aliased (Query outer (recursive ': commons) schemas params) recursive
1093− -> Query outer (recursive ': commons) schemas params row
1094− -> Query outer commons schemas params row
1095−withRecursive (recursive `As` cte) query = UnsafeQuery $
1096− "WITH RECURSIVE" <+> renderSQL cte
1097− <+> "AS" <+> parenthesized (renderSQL recursive)
1098− <+> renderSQL query
956+ "WITH" <+> renderSQL ctes <+> renderSQL query
squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+60−161
@@ -44,10 +44,6 @@ module Squeal.PostgreSQL.Schema
44 , ColumnsType
44 , ColumnsType
45 , TableType
45 , TableType
46 , SchemumType (..)
46 , SchemumType (..)
47− , IndexType (..)
48− , FunctionType
49− , OperatorType (..)
50− , ReturnsType (..)
51 , SchemaType
47 , SchemaType
52 , SchemasType
48 , SchemasType
53 , Public
49 , Public
@@ -62,21 +58,15 @@ module Squeal.PostgreSQL.Schema
62 , PGlabel (..)
58 , PGlabel (..)
63 -- * Data Definitions
59 -- * Data Definitions
64 , Create
60 , Create
65− , CreateIfNotExists
66− , CreateOrReplace
67 , Drop
61 , Drop
68− , DropSchemum
69− , DropIfExists
70− , DropSchemumIfExists
71 , Alter
62 , Alter
72− , AlterIfExists
73 , Rename
63 , Rename
74− , RenameIfExists
75 , ConstraintInvolves
64 , ConstraintInvolves
76 , DropIfConstraintsInvolve
65 , DropIfConstraintsInvolve
77 , IsNotElem
66 , IsNotElem
78 , AllUnique
67 , AllUnique
79 -- * Type Classifications
68 -- * Type Classifications
69+ , HasOid (..)
80 , PGNum
70 , PGNum
81 , PGIntegral
71 , PGIntegral
82 , PGFloating
72 , PGFloating
@@ -100,19 +90,17 @@ import Control.Category
100import Data.Kind
90import Data.Kind
101import Data.Monoid hiding (All)
91import Data.Monoid hiding (All)
102import Data.Type.Bool
92import Data.Type.Bool
93+import Data.Word (Word32)
103import Generics.SOP
94import Generics.SOP
104import GHC.TypeLits
95import GHC.TypeLits
105import Prelude hiding (id, (.))
96import Prelude hiding (id, (.))
106
97
107import Squeal.PostgreSQL.Alias
98import Squeal.PostgreSQL.Alias
108−import Squeal.PostgreSQL.List
109import Squeal.PostgreSQL.Render
99import Squeal.PostgreSQL.Render
110
100
111−-- $setup
112−-- >>> import Squeal.PostgreSQL
113−
114-- | `PGType` is the promoted datakind of PostgreSQL types.
101-- | `PGType` is the promoted datakind of PostgreSQL types.
115--
102--
103+-- >>> import Squeal.PostgreSQL.Schema
116-- >>> :kind 'PGbool
104-- >>> :kind 'PGbool
117-- 'PGbool :: PGType
105-- 'PGbool :: PGType
118data PGType
106data PGType
@@ -143,11 +131,37 @@ data PGType
143 | PGenum [Symbol] -- ^ enumerated (enum) types are data types that comprise a static, ordered set of values.
131 | PGenum [Symbol] -- ^ enumerated (enum) types are data types that comprise a static, ordered set of values.
144 | PGcomposite RowType -- ^ a composite type represents the structure of a row or record; it is essentially just a list of field names and their data types.
132 | PGcomposite RowType -- ^ a composite type represents the structure of a row or record; it is essentially just a list of field names and their data types.
145 | PGtsvector -- ^ A tsvector value is a sorted list of distinct lexemes, which are words that have been normalized to merge different variants of the same word.
133 | PGtsvector -- ^ A tsvector value is a sorted list of distinct lexemes, which are words that have been normalized to merge different variants of the same word.
146− | PGtsquery -- ^ A tsquery value stores lexemes that are to be searched for.
134+ | PGtsquery -- ^ A tsquery value stores lexemes that are to be searched for
147− | PGoid -- Object identifiers (OIDs) are used internally by PostgreSQL as primary keys for various system tables.
148− | PGrange PGType -- ^ Range types are data types representing a range of values of some element type (called the range's subtype).
149 | UnsafePGType Symbol -- ^ an escape hatch for unsupported PostgreSQL types
135 | UnsafePGType Symbol -- ^ an escape hatch for unsupported PostgreSQL types
150
136
137+-- | The object identifier of a `PGType`.
138+--
139+-- >>> :set -XTypeApplications
140+-- >>> oid @'PGbool
141+-- 16
142+class HasOid (ty :: PGType) where oid :: Word32
143+instance HasOid 'PGbool where oid = 16
144+instance HasOid 'PGint2 where oid = 21
145+instance HasOid 'PGint4 where oid = 23
146+instance HasOid 'PGint8 where oid = 20
147+instance HasOid 'PGnumeric where oid = 1700
148+instance HasOid 'PGfloat4 where oid = 700
149+instance HasOid 'PGfloat8 where oid = 701
150+instance HasOid ('PGchar n) where oid = 18
151+instance HasOid ('PGvarchar n) where oid = 1043
152+instance HasOid 'PGtext where oid = 25
153+instance HasOid 'PGbytea where oid = 17
154+instance HasOid 'PGtimestamp where oid = 1114
155+instance HasOid 'PGtimestamptz where oid = 1184
156+instance HasOid 'PGdate where oid = 1082
157+instance HasOid 'PGtime where oid = 1083
158+instance HasOid 'PGtimetz where oid = 1266
159+instance HasOid 'PGinterval where oid = 1186
160+instance HasOid 'PGuuid where oid = 2950
161+instance HasOid 'PGinet where oid = 869
162+instance HasOid 'PGjson where oid = 114
163+instance HasOid 'PGjsonb where oid = 3802
164+
151-- | `NullityType` encodes the potential presence or definite absence of a
165-- | `NullityType` encodes the potential presence or definite absence of a
152-- @NULL@ allowing operations which are sensitive to such to be well typed.
166-- @NULL@ allowing operations which are sensitive to such to be well typed.
153--
167--
@@ -260,19 +274,9 @@ type FromType = [(Symbol,RowType)]
260
274
261-- | `ColumnsToRow` removes column constraints.
275-- | `ColumnsToRow` removes column constraints.
262type family ColumnsToRow (columns :: ColumnsType) :: RowType where
276type 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 '[] = '[]
277 ColumnsToRow '[] = '[]
278+ ColumnsToRow (column ::: constraint :=> ty ': columns) =
279+ column ::: ty ': ColumnsToRow columns
276
280
277-- | `TableToColumns` removes table constraints.
281-- | `TableToColumns` removes table constraints.
278type family TableToColumns (table :: TableType) :: ColumnsType where
282type family TableToColumns (table :: TableType) :: ColumnsType where
@@ -282,6 +286,15 @@ type family TableToColumns (table :: TableType) :: ColumnsType where
282type family TableToRow (table :: TableType) :: RowType where
286type family TableToRow (table :: TableType) :: RowType where
283 TableToRow tab = ColumnsToRow (TableToColumns tab)
287 TableToRow tab = ColumnsToRow (TableToColumns tab)
284
288
289+-- | @Elem@ is a promoted `Data.List.elem`.
290+type family Elem x xs where
291+ Elem x '[] = 'False
292+ Elem x (x ': xs) = 'True
293+ Elem x (_ ': xs) = Elem x xs
294+
295+-- | @In x xs@ is a constraint that proves that @x@ is in @xs@.
296+type family In x xs :: Constraint where In x xs = Elem x xs ~ 'True
297+
285-- | Numeric Postgres types.
298-- | Numeric Postgres types.
286type PGNum =
299type PGNum =
287 '[ 'PGint2, 'PGint4, 'PGint8, 'PGnumeric, 'PGfloat4, 'PGfloat8]
300 '[ 'PGint2, 'PGint4, 'PGint8, 'PGnumeric, 'PGfloat4, 'PGfloat8]
@@ -305,24 +318,14 @@ instance ty0 ~ ty1 => SamePGType
305
318
306-- | `AllNotNull` is a constraint that proves a `ColumnsType` has no @NULL@s.
319-- | `AllNotNull` is a constraint that proves a `ColumnsType` has no @NULL@s.
307type family AllNotNull (columns :: ColumnsType) :: Constraint where
320type 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 '[] = ()
321 AllNotNull '[] = ()
322+ AllNotNull (column ::: def :=> 'NotNull ty ': columns) = AllNotNull columns
315
323
316-- | `NotAllNull` is a constraint that proves a `ColumnsType` has some
324-- | `NotAllNull` is a constraint that proves a `ColumnsType` has some
317-- @NOT NULL@.
325-- @NOT NULL@.
318type family NotAllNull (columns :: ColumnsType) :: Constraint where
326type family NotAllNull (columns :: ColumnsType) :: Constraint where
319− NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()
327+ 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
328+ NotAllNull (column ::: def :=> 'Null ty ': columns) = NotAllNull columns
326
329
327-- | `NullifyType` is an idempotent that nullifies a `NullityType`.
330-- | `NullifyType` is an idempotent that nullifies a `NullityType`.
328type family NullifyType (ty :: NullityType) :: NullityType where
331type family NullifyType (ty :: NullityType) :: NullityType where
@@ -331,37 +334,17 @@ type family NullifyType (ty :: NullityType) :: NullityType where
331
334
332-- | `NullifyRow` is an idempotent that nullifies a `RowType`.
335-- | `NullifyRow` is an idempotent that nullifies a `RowType`.
333type family NullifyRow (columns :: RowType) :: RowType where
336type family NullifyRow (columns :: RowType) :: RowType where
334− NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': column5 ::: ty5 ': columns) =
337+ 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) =
338 NullifyRow (column ::: ty ': columns) =
345 column ::: NullifyType ty ': NullifyRow columns
339 column ::: NullifyType ty ': NullifyRow columns
346− NullifyRow '[] = '[]
347
340
348-- | `NullifyFrom` is an idempotent that nullifies a `FromType`
341-- | `NullifyFrom` is an idempotent that nullifies a `FromType`
349-- used to nullify the left or right hand side of an outer join
342-- used to nullify the left or right hand side of an outer join
350-- in a `Squeal.PostgreSQL.Query.FromClause`.
343-- in a `Squeal.PostgreSQL.Query.FromClause`.
351type family NullifyFrom (tables :: FromType) :: FromType where
344type family NullifyFrom (tables :: FromType) :: FromType where
352− NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': table4 ::: columns4 ': table5 ::: columns5 ': tables) =
345+ 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) =
346 NullifyFrom (table ::: columns ': tables) =
363 table ::: NullifyRow columns ': NullifyFrom tables
347 table ::: NullifyRow columns ': NullifyFrom tables
364− NullifyFrom '[] = '[]
365
348
366-- | @Create alias x xs@ adds @alias ::: x@ to the end of @xs@ and is used in
349-- | @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@
350-- `Squeal.PostgreSQL.Definition.createTable` statements and in @ALTER TABLE@
@@ -371,101 +354,30 @@ type family Create alias x xs where
371 Create alias x (alias ::: y ': xs) = TypeError
354 Create alias x (alias ::: y ': xs) = TypeError
372 ('Text "Create: alias "
355 ('Text "Create: alias "
373 ':<>: 'ShowType alias
356 ':<>: 'ShowType alias
374− ':<>: 'Text "already exists")
357+ ':<>: 'Text "already in use")
375 Create alias y (x ': xs) = x ': Create alias y xs
358 Create alias y (x ': xs) = x ': Create alias y xs
376
359
377−type family CreateIfNotExists alias x xs where
378− CreateIfNotExists alias x '[] = '[alias ::: x]
379− CreateIfNotExists alias x (alias ::: y ': xs) = alias ::: y ': xs
380− CreateIfNotExists alias y (x ': xs) = x ': CreateIfNotExists alias y xs
381−
382−type family CreateOrReplace alias x xs where
383− CreateOrReplace alias x '[] = '[alias ::: x]
384− CreateOrReplace alias x (alias ::: x ': xs) = alias ::: x ': xs
385− CreateOrReplace alias x (alias ::: y ': xs) = TypeError
386− ('Text "CreateOrReplace: expected type "
387− ':<>: 'ShowType x
388− ':<>: 'Text " but alias "
389− ':<>: 'ShowType alias
390− ':<>: 'Text " has type "
391− ':<>: 'ShowType y)
392− CreateOrReplace alias y (x ': xs) = x ': CreateOrReplace alias y xs
393−
394-- | @Drop alias xs@ removes the type associated with @alias@ in @xs@
360-- | @Drop alias xs@ removes the type associated with @alias@ in @xs@
395-- and is used in `Squeal.PostgreSQL.Definition.dropTable` statements
361-- and is used in `Squeal.PostgreSQL.Definition.dropTable` statements
396-- and in @ALTER TABLE@ `Squeal.PostgreSQL.Definition.dropColumn` statements.
362-- and in @ALTER TABLE@ `Squeal.PostgreSQL.Definition.dropColumn` statements.
397type family Drop alias xs where
363type family Drop alias xs where
398− Drop alias '[] = TypeError
399− ('Text "Drop: alias "
400− ':<>: 'ShowType alias
401− ':<>: 'Text " does not exist" )
402− Drop alias (alias ::: x ': xs) = xs
364+ Drop alias ((alias ::: x) ': xs) = xs
403 Drop alias (x ': xs) = x ': Drop alias xs
365 Drop alias (x ': xs) = x ': Drop alias xs
404
366
405−type family DropSchemum alias sch xs where
406− DropSchemum alias sch '[] = TypeError
407− ('Text "DropSchemum: alias "
408− ':<>: 'ShowType alias
409− ':<>: 'Text " does not exist" )
410− DropSchemum alias sch (alias ::: sch x ': xs) = xs
411− DropSchemum alias sch0 (alias ::: sch1 x ': xs) = TypeError
412− ('Text "DropSchemum: expected schemum "
413− ':<>: 'ShowType sch0
414− ':<>: 'Text " but alias "
415− ':<>: 'ShowType alias
416− ':<>: 'Text " has schemum "
417− ':<>: 'ShowType sch1)
418− DropSchemum alias sch (x ': xs) = x ': DropSchemum alias sch xs
419−
420−type family DropIfExists alias xs where
421− DropIfExists alias '[] = '[]
422− DropIfExists alias (alias ::: x ': xs) = xs
423− DropIfExists alias (x ': xs) = x ': DropIfExists alias xs
424−
425−type family DropSchemumIfExists alias sch xs where
426− DropSchemumIfExists alias sch '[] = '[]
427− DropSchemumIfExists alias sch (alias ::: sch x ': xs) = xs
428− DropSchemumIfExists alias sch0 (alias ::: sch1 x ': xs) = TypeError
429− ('Text "DropSchemumIfExists: expected schemum "
430− ':<>: 'ShowType sch1
431− ':<>: 'Text " but alias "
432− ':<>: 'ShowType alias
433− ':<>: 'Text " has schemum "
434− ':<>: 'ShowType sch0)
435− DropSchemumIfExists alias sch (x ': xs) = x ': DropSchemumIfExists alias sch xs
436−
437-- | @Alter alias x xs@ replaces the type associated with an @alias@ in @xs@
367-- | @Alter alias x xs@ replaces the type associated with an @alias@ in @xs@
438-- with the type @x@ and is used in `Squeal.PostgreSQL.Definition.alterTable`
368-- with the type @x@ and is used in `Squeal.PostgreSQL.Definition.alterTable`
439-- and `Squeal.PostgreSQL.Definition.alterColumn`.
369-- and `Squeal.PostgreSQL.Definition.alterColumn`.
440type family Alter alias x xs where
370type 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
371 Alter alias x1 (alias ::: x0 ': xs) = alias ::: x1 ': xs
446 Alter alias x1 (x0 ': xs) = x0 ': Alter alias x1 xs
372 Alter alias x1 (x0 ': xs) = x0 ': Alter alias x1 xs
447
373
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@
374-- | @Rename alias0 alias1 xs@ replaces the alias @alias0@ by @alias1@ in @xs@
454-- and is used in `Squeal.PostgreSQL.Definition.alterTableRename` and
375-- and is used in `Squeal.PostgreSQL.Definition.alterTableRename` and
455-- `Squeal.PostgreSQL.Definition.renameColumn`.
376-- `Squeal.PostgreSQL.Definition.renameColumn`.
456type family Rename alias0 alias1 xs where
377type 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
378 Rename alias0 alias1 ((alias0 ::: x0) ': xs) = (alias1 ::: x0) ': xs
462 Rename alias0 alias1 (x ': xs) = x ': Rename alias0 alias1 xs
379 Rename alias0 alias1 (x ': xs) = x ': Rename alias0 alias1 xs
463
380
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
381-- | Check if a `TableConstraint` involves a column
470type family ConstraintInvolves column constraint where
382type family ConstraintInvolves column constraint where
471 ConstraintInvolves column ('Check columns) = column `Elem` columns
383 ConstraintInvolves column ('Check columns) = column `Elem` columns
@@ -482,35 +394,22 @@ type family DropIfConstraintsInvolve column constraints where
482 (DropIfConstraintsInvolve column constraints)
394 (DropIfConstraintsInvolve column constraints)
483 (alias ::: constraint ': DropIfConstraintsInvolve column constraints)
395 (alias ::: constraint ': DropIfConstraintsInvolve column constraints)
484
396
397+{- | Calculate the `Length` of a type level list
398+
399+>>> :kind! Length '[Char,String,Bool,Double]
400+Length '[Char,String,Bool,Double] :: Nat
401+= 4
402+-}
403+type family Length (xs :: [k]) :: Nat where
404+ Length (x : xs) = 1 + Length xs
405+ Length '[] = 0
406+
485-- | A `SchemumType` is a user-defined type, either a `Table`,
407-- | A `SchemumType` is a user-defined type, either a `Table`,
486-- `View` or `Typedef`.
408-- `View` or `Typedef`.
487data SchemumType
409data SchemumType
488 = Table TableType
410 = Table TableType
489 | View RowType
411 | View RowType
490 | Typedef PGType
412 | Typedef PGType
491− | Index IndexType
492− | Function FunctionType
493− | Operator OperatorType
494− | UnsafeSchemum Symbol
495−
496−type FunctionType = ([NullityType], ReturnsType)
497−
498−data IndexType
499− = Btree
500− | Hash
501− | Gist
502− | Spgist
503− | Gin
504− | Brin
505−
506−data ReturnsType
507− = Returns NullityType
508− | ReturnsTable RowType
509−
510−data OperatorType
511− = BinaryOp NullityType NullityType NullityType
512− | LeftOp NullityType NullityType
513− | RightOp NullityType NullityType
514
413
515{- | The schema of a database consists of a list of aliased,
414{- | The schema of a database consists of a list of aliased,
516user-defined `SchemumType`s.
415user-defined `SchemumType`s.
squeal-postgresql/src/Squeal/PostgreSQL/Transaction.hs+44−76
@@ -1,7 +1,7 @@
1{-|
1{-|
2Module: Squeal.PostgreSQL.Transaction
2Module: Squeal.PostgreSQL.Transaction
3Description: Squeal transaction control language
3Description: Squeal transaction control language
4−Copyright: (c) Eitan Chatav, 2019
4+Copyright: (c) Eitan Chatav, 2017
5Maintainer: eitan@morphism.tech
5Maintainer: eitan@morphism.tech
6Stability: experimental
6Stability: experimental
7
7
@@ -20,12 +20,11 @@ module Squeal.PostgreSQL.Transaction
20 ( -- * Transaction
20 ( -- * Transaction
21 transactionally
21 transactionally
22 , transactionally_
22 , transactionally_
23− , transactionallyRetry
24− , ephemerally
25− , ephemerally_
26 , begin
23 , begin
27 , commit
24 , commit
28 , rollback
25 , rollback
26+ , transactionallySchema
27+ , transactionallySchema_
29 -- * Transaction Mode
28 -- * Transaction Mode
30 , TransactionMode (..)
29 , TransactionMode (..)
31 , defaultMode
30 , defaultMode
@@ -35,99 +34,68 @@ module Squeal.PostgreSQL.Transaction
35 , DeferrableMode (..)
34 , DeferrableMode (..)
36 ) where
35 ) where
37
36
38−import UnliftIO
37+import Generics.SOP
38+import UnliftIO (MonadUnliftIO, liftIO, mask, onException)
39+
40+import qualified Database.PostgreSQL.LibPQ as LibPQ
39
41
40import Squeal.PostgreSQL.Manipulation
42import Squeal.PostgreSQL.Manipulation
41import Squeal.PostgreSQL.Render
43import Squeal.PostgreSQL.Render
42import Squeal.PostgreSQL.PQ
44import Squeal.PostgreSQL.PQ
45+import Squeal.PostgreSQL.Schema
43
46
44−{- | Run a computation `transactionally`;
47+-- | Run a schema invariant computation `transactionally`.
45−first `begin`,
46−then run the computation,
47−`onException` `rollback` and rethrow the exception,
48−otherwise `commit` and `return` the result.
49−-}
50transactionally
48transactionally
51 :: (MonadUnliftIO tx, MonadPQ schemas tx)
49 :: (MonadUnliftIO tx, MonadPQ schemas tx)
52 => TransactionMode
50 => TransactionMode
53 -> tx x -- ^ run inside a transaction
51 -> tx x -- ^ run inside a transaction
54 -> tx x
52 -> tx x
55transactionally mode tx = mask $ \restore -> do
53transactionally mode tx = mask $ \restore -> do
56− manipulate_ $ begin mode
54+ _ <- begin mode
57− result <- restore tx `onException` (manipulate_ rollback)
55+ result <- restore tx `onException` rollback
58− manipulate_ commit
56+ _ <- commit
59 return result
57 return result
60
58
61−-- | Run a computation `transactionally_`, in `defaultMode`.
59+-- | Run a schema invariant computation `transactionally_` in `defaultMode`.
62transactionally_
60transactionally_
63 :: (MonadUnliftIO tx, MonadPQ schemas tx)
61 :: (MonadUnliftIO tx, MonadPQ schemas tx)
64 => tx x -- ^ run inside a transaction
62 => tx x -- ^ run inside a transaction
65 -> tx x
63 -> tx x
66transactionally_ = transactionally defaultMode
64transactionally_ = transactionally defaultMode
67
65
68−{- |
69−`transactionallyRetry` a computation;
70−
71−* first `begin`,
72−* then `try` the computation,
73− - if it raises a serialization failure then `rollback` and restart the transaction,
74− - if it raises any other exception then `rollback` and rethrow the exception,
75− - otherwise `commit` and `return` the result.
76−-}
77−transactionallyRetry
78− :: (MonadUnliftIO tx, MonadPQ schemas tx)
79− => TransactionMode
80− -> tx x -- ^ run inside a transaction
81− -> tx x
82−transactionallyRetry mode tx = mask $ \restore ->
83− loop . try $ do
84− x <- restore tx
85− manipulate_ commit
86− return x
87− where
88− loop attempt = do
89− manipulate_ $ begin mode
90− attempt >>= \case
91− Left (PQException (PQState _ (Just "40001") _)) -> do
92− manipulate_ rollback
93− loop attempt
94− Left err -> do
95− manipulate_ rollback
96− throwIO err
97− Right x -> return x
98−
99−{- | Run a computation `ephemerally`;
100−Like `transactionally` but always `rollback`, useful in testing.
101−-}
102−ephemerally
103− :: (MonadUnliftIO tx, MonadPQ schemas tx)
104− => TransactionMode
105− -> tx x -- ^ run inside an ephemeral transaction
106− -> tx x
107−ephemerally mode tx = mask $ \restore -> do
108− manipulate_ $ begin mode
109− result <- restore tx `onException` (manipulate_ rollback)
110− manipulate_ rollback
111− return result
112−
113−{- | Run a computation `ephemerally` in `defaultMode`. -}
114−ephemerally_
115− :: (MonadUnliftIO tx, MonadPQ schemas tx)
116− => tx x -- ^ run inside an ephemeral transaction
117− -> tx x
118−ephemerally_ = ephemerally defaultMode
119−
120-- | @BEGIN@ a transaction.
66-- | @BEGIN@ a transaction.
121−begin :: TransactionMode -> Manipulation_ schemas () ()
67+begin :: MonadPQ schemas tx => TransactionMode -> tx (K Result ('[] :: RowType))
122−begin mode = UnsafeManipulation $ "BEGIN" <+> renderSQL mode
68+begin mode = manipulate . UnsafeManipulation $
69+ "BEGIN" <+> renderSQL mode <> ";"
123
70
124−-- | @COMMIT@ a transaction.
71+-- | @COMMIT@ a schema invariant transaction.
125−commit :: Manipulation_ schemas () ()
72+commit :: MonadPQ schemas tx => tx (K Result ('[] :: RowType))
126−commit = UnsafeManipulation "COMMIT"
73+commit = manipulate $ UnsafeManipulation "COMMIT;"
127
74
128−-- | @ROLLBACK@ a transaction.
75+-- | @ROLLBACK@ a schema invariant transaction.
129−rollback :: Manipulation_ schemas () ()
76+rollback :: MonadPQ schemas tx => tx (K Result ('[] :: RowType))
130−rollback = UnsafeManipulation "ROLLBACK"
77+rollback = manipulate $ UnsafeManipulation "ROLLBACK;"
78+
79+-- | Run a schema changing computation `transactionallySchema`.
80+transactionallySchema
81+ :: MonadUnliftIO io
82+ => TransactionMode
83+ -> PQ schemas0 schemas1 io x
84+ -> PQ schemas0 schemas1 io x
85+transactionallySchema mode u = PQ $ \ conn -> mask $ \ restore -> do
86+ _ <- liftIO . LibPQ.exec (unK conn) $
87+ "BEGIN" <+> renderSQL mode <> ";"
88+ x <- restore (unPQ u conn)
89+ `onException` (liftIO (LibPQ.exec (unK conn) "ROLLBACK"))
90+ _ <- liftIO $ LibPQ.exec (unK conn) "COMMIT"
91+ return x
92+
93+-- | Run a schema changing computation `transactionallySchema_` in `defaultMode`.
94+transactionallySchema_
95+ :: MonadUnliftIO io
96+ => PQ schemas0 schemas1 io x
97+ -> PQ schemas0 schemas1 io x
98+transactionallySchema_ = transactionallySchema defaultMode
131
99
132-- | The available transaction characteristics are the transaction `IsolationLevel`,
100-- | The available transaction characteristics are the transaction `IsolationLevel`,
133-- the transaction `AccessMode` (`ReadWrite` or `ReadOnly`), and the `DeferrableMode`.
101-- the transaction `AccessMode` (`ReadWrite` or `ReadOnly`), and the `DeferrableMode`.
@@ -140,7 +108,7 @@ data TransactionMode = TransactionMode
140-- | `TransactionMode` with a `Serializable` `IsolationLevel`,
108-- | `TransactionMode` with a `Serializable` `IsolationLevel`,
141-- `ReadWrite` `AccessMode` and `NotDeferrable` `DeferrableMode`.
109-- `ReadWrite` `AccessMode` and `NotDeferrable` `DeferrableMode`.
142defaultMode :: TransactionMode
110defaultMode :: TransactionMode
143−defaultMode = TransactionMode ReadCommitted ReadWrite NotDeferrable
111+defaultMode = TransactionMode Serializable ReadWrite NotDeferrable
144
112
145-- | `TransactionMode` with a `Serializable` `IsolationLevel`,
113-- | `TransactionMode` with a `Serializable` `IsolationLevel`,
146-- `ReadOnly` `AccessMode` and `Deferrable` `DeferrableMode`.
114-- `ReadOnly` `AccessMode` and `Deferrable` `DeferrableMode`.
squeal-postgresql/src/Squeal/PostgreSQL/Tutorial.hsnew file+39
@@ -0,0 +1,39 @@
1+{-|
2+Module: Squeal.PostgreSQL.Tutorail
3+Description: Squeal tutorial module
4+Copyright: (c) Eitan Chatav, 2017
5+Maintainer: eitan@morphism.tech
6+Stability: experimental
7+
8+== `P` records
9+
10+A `P` record is an ad-hoc, anonymous record constructed
11+as a tuple of `P`s, a datatype from `Generics.SOP.Record`, like so:
12+
13+>>> type Rec = (P ("foo" ::: Double), P ("bar" ::: Char))
14+
15+Let's see what the image of `Rec` is under the `RowPG` type family.
16+
17+>>> :kind! RowPG Rec
18+RowPG Rec :: [(Symbol, NullityType)]
19+= '[ '("foo", 'NotNull 'PGfloat8), "bar" ::: 'NotNull ('PGchar 1)]
20+
21+`P` records are ad-hoc, anonymous records so unlike Haskell records
22+you don't have to define them outside of their use site, for instance
23+in the row type parameter of a `Query_` type family.
24+
25+>>> :{
26+let
27+ query :: Query_ schemas () (P ("foo" ::: Double))
28+ query = values_ (1 `as` #foo)
29+in printSQL query
30+:}
31+SELECT * FROM (VALUES (1)) AS t ("foo")
32+
33+You can even mix `P` records with normal Haskell records, which is very
34+useful for creating entity types, Haskell records with associated ids.
35+
36+>>> data Row = Row {foo :: Double, bar :: Char} deriving (GHC.Generic)
37+-}
38+
39+module Squeal.PostgreSQL.Tutorial where
squeal-postgresql/test/Doc.hsdeleted−6
@@ -1,6 +0,0 @@
1−module Main (main) where
2−
3−import Test.DocTest
4−
5−main :: IO ()
6−main = doctest [ "-isrc", "src" ]
squeal-postgresql/test/DocTest.hsnew file+18
@@ -0,0 +1,18 @@
1+module Main (main) where
2+
3+import Test.DocTest
4+
5+main :: IO ()
6+main = doctest
7+ [ "-isrc"
8+ , "src/Squeal/PostgreSQL.hs"
9+ , "src/Squeal/PostgreSQL/Binary.hs"
10+ , "src/Squeal/PostgreSQL/Definition.hs"
11+ , "src/Squeal/PostgreSQL/Manipulation.hs"
12+ , "src/Squeal/PostgreSQL/Query.hs"
13+ , "src/Squeal/PostgreSQL/Expression.hs"
14+ , "src/Squeal/PostgreSQL/PQ.hs"
15+ , "src/Squeal/PostgreSQL/Migration.hs"
16+ , "src/Squeal/PostgreSQL/Transaction.hs"
17+ , "src/Squeal/PostgreSQL/Pool.hs"
18+ ]
squeal-postgresql/test/Property.hsdeleted−166
@@ -1,166 +0,0 @@
1−{-# LANGUAGE
2− DataKinds
3− , GADTs
4− , LambdaCase
5− , OverloadedLabels
6− , OverloadedStrings
7− , TypeApplications
8− , TypeOperators
9−#-}
10−
11−module Main (main) where
12−
13−import Control.Monad.Trans
14−import Data.ByteString (ByteString)
15−import Data.ByteString.Char8 (unpack)
16−import Data.Scientific (fromFloatDigits)
17−import Data.Fixed (Fixed(MkFixed), Micro, Pico)
18−import Data.String (IsString(fromString))
19−import Data.Time
20−import Squeal.PostgreSQL hiding (check, defaultMain, Group)
21−import Hedgehog hiding (Range)
22−import qualified Hedgehog.Gen as Gen
23−import qualified Hedgehog.Main as Main
24−import qualified Hedgehog.Range as Range
25−
26−main :: IO ()
27−main = Main.defaultMain [checkSequential roundtrips]
28−
29−roundtrips :: Group
30−roundtrips = Group "roundtrips"
31− [ roundtrip int2 genInt16
32− , roundtrip int4 genInt32
33− , roundtrip int8 genInt64
34− , roundtrip bool Gen.bool
35− , roundtrip numeric genScientific
36− , roundtrip float4 genFloat
37− , roundtrip float8 genDouble
38− , roundtripOn normalizeTimeOfDay time genTimeOfDay
39− -- , roundtrip timetz genTimeWithZone normalizeTimeWithZone
40− , roundtripOn normalizeLocalTime timestamp genLocalTime
41− , roundtrip timestamptz genUTCTime
42− , roundtrip date genDay
43− , roundtrip interval genDiffTime
44− , roundtripOn normalizeIntRange int4range (genRange genInt32)
45− , roundtripOn normalizeIntRange int8range (genRange genInt64)
46− , roundtrip numrange (genRange genScientific)
47− , roundtripOn (fmap normalizeLocalTime) tsrange (genRange genLocalTime)
48− , roundtrip tstzrange (genRange genUTCTime)
49− , roundtripOn normalizeIntRange daterange (genRange genDay)
50− ]
51− where
52− genInt16 = Gen.int16 Range.exponentialBounded
53− genInt32 = Gen.int32 Range.exponentialBounded
54− genInt64 = Gen.int64 Range.exponentialBounded
55− genScientific = fromFloatDigits <$> genFloat
56− genPosFloat = Gen.float
57− (Range.exponentialFloatFrom 1 minPosFloat maxPosFloat)
58− genFloat = Gen.prune $ Gen.choice
59− [ genPosFloat
60− , negate <$> genPosFloat
61− , Gen.element [0,1/0] ]
62− genPosDouble = Gen.double
63− (Range.exponentialFloatFrom 1 minPosFloat maxPosFloat)
64− genDouble = Gen.prune $ Gen.choice
65− [ genPosDouble
66− , negate <$> genPosDouble
67− , Gen.element [0,1/0] ]
68− genRange gen = do
69− lb <- gen
70− ub <- Gen.filter (lb <) gen
71− Gen.element
72− [ Empty, singleton lb, whole
73− , lb <=..<= ub , lb <=..< ub, lb <..<= ub, lb <..< ub
74− , atLeast lb, moreThan lb, atMost ub, lessThan ub ]
75− genDay = do
76− y <- toInteger <$> Gen.int (Range.constant 2000 2019)
77− m <- Gen.int (Range.constant 1 12)
78− d <- Gen.int (Range.constant 1 28)
79− return $ fromGregorian y m d
80− genDiffTime = secondsToDiffTime . toInteger <$>
81− Gen.int (Range.constant 0 86401)
82− genUTCTime = UTCTime <$> genDay <*> genDiffTime
83− genTimeOfDay = do
84− h <- Gen.int (Range.constant 0 23)
85− m <- Gen.int (Range.constant 0 59)
86− s <- MkFixed . toInteger <$> Gen.int (Range.constant 0 59)
87− return $ TimeOfDay h m s
88− genLocalTime = LocalTime <$> genDay <*> genTimeOfDay
89− -- genTimeZone = Gen.element $ map (read @TimeZone)
90− -- [ "UTC", "UT", "GMT", "EST", "EDT", "CST"
91− -- , "CDT", "MST", "MDT", "PST", "PDT" ]
92− -- genTimeWithZone = (,) <$> genTimeOfDay <*> genTimeZone
93−
94−roundtrip
95− :: (OidOf ty, ToParam x ty, FromValue ty x, Show x, Eq x)
96− => TypeExpression schemas ('NotNull ty)
97− -> Gen x
98− -> (PropertyName, Property)
99−roundtrip = roundtripOn id
100−
101−roundtripOn
102− :: (OidOf ty, ToParam x ty, FromValue ty x, Show x, Eq x)
103− => (x -> x)
104− -> TypeExpression schemas ('NotNull ty)
105− -> Gen x
106− -> (PropertyName, Property)
107−roundtripOn norm ty gen = propertyWithName $ do
108− x <- forAll gen
109− Just (Only y) <- lift . withConnection connectionString $
110− firstRow =<< runQueryParams
111− (values_ (parameter @1 ty `as` #fromOnly)) (Only x)
112− norm x === y
113− where
114− propertyWithName prop =
115− (fromString (unpack (renderSQL ty)), property prop)
116−
117−maxPosFloat :: RealFloat a => a
118−maxPosFloat = x
119− where
120− n = floatDigits x
121− b = floatRadix x
122− (_, u) = floatRange x
123− x = encodeFloat (b^n - 1) (u - n)
124−
125−minPosFloat :: RealFloat a => a
126−minPosFloat = x
127− where
128− n = floatDigits x
129− b = floatRadix x
130− (l, _) = floatRange x
131− x = encodeFloat (b^n - 1) (l - n - 1)
132−
133−connectionString :: ByteString
134−connectionString = "host=localhost port=5432 dbname=exampledb"
135−
136−normalizeIntRange :: (Enum int, Ord int) => Range int -> Range int
137−normalizeIntRange = \case
138− Empty -> Empty
139− NonEmpty l u ->
140− let
141− l' = normalizeL l
142− u' = normalizeU u
143− in if emptyNormalized l' u' then Empty else NonEmpty l' u'
144− where
145− normalizeL = \case
146− Open l -> Closed (succ l)
147− normalized -> normalized
148− normalizeU = \case
149− Closed u -> Open (succ u)
150− normalized -> normalized
151− emptyNormalized (Closed l) (Open u) = l >= u
152− emptyNormalized _ _ = False
153−
154−normalizeTimeOfDay :: TimeOfDay -> TimeOfDay
155−normalizeTimeOfDay (TimeOfDay h m s) = TimeOfDay h m
156− . fromRational @Pico
157− . toRational @Micro
158− . fromRational @Micro
159− . toRational @Pico
160− $ s
161−
162−normalizeLocalTime :: LocalTime -> LocalTime
163−normalizeLocalTime (LocalTime d t) = LocalTime d (normalizeTimeOfDay t)
164−
165−-- normalizeTimeWithZone :: (TimeOfDay, TimeZone) -> (TimeOfDay, TimeZone)
166−-- normalizeTimeWithZone (t, z) = (normalizeTimeOfDay t, z)
squeal-postgresql/test/Spec.hsdeleted−136
@@ -1,136 +0,0 @@
1−{-# LANGUAGE
2− DataKinds
3− , DeriveAnyClass
4− , DeriveGeneric
5− , DerivingStrategies
6− , DuplicateRecordFields
7− , FlexibleContexts
8− , OverloadedLabels
9− , OverloadedLists
10− , OverloadedStrings
11− , TypeApplications
12− , TypeFamilies
13− , TypeInType
14− , TypeOperators
15−#-}
16−
17−module Main (main) where
18−
19−import Control.Concurrent.Async (replicateConcurrently)
20−import Data.ByteString (ByteString)
21−import Data.Int (Int32)
22−import Data.Text (Text)
23−import Test.Hspec
24−
25−import qualified Generics.SOP as SOP
26−import qualified GHC.Generics as GHC
27−
28−import Squeal.PostgreSQL
29−
30−main :: IO ()
31−main = hspec spec
32−
33−type Schemas = Public
34− '[ "users" ::: 'Table (
35− '[ "pk_users" ::: 'PrimaryKey '["id"]
36− , "unique_names" ::: 'Unique '["name"]
37− ] :=>
38− '[ "id" ::: 'Def :=> 'NotNull 'PGint4
39− , "name" ::: 'NoDef :=> 'NotNull 'PGtext ] ) ]
40−
41−data User = User
42− { userName :: Text
43− } deriving stock (Eq, Show, GHC.Generic)
44− deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
45−
46−insertUser :: Manipulation_ Schemas User ()
47−insertUser = insertInto_ #users
48− (Values_ (Default `as` #id :* Set (param @1) `as` #name))
49−
50−setup :: Definition (Public '[]) Schemas
51−setup =
52− createTable #users
53− ( serial `as` #id :*
54− notNullable text `as` #name )
55− ( primaryKey #id `as` #pk_users :*
56− unique #name `as` #unique_names )
57−
58−teardown :: Definition Schemas (Public '[])
59−teardown = dropTable #users
60−
61−silence :: MonadPQ schemas pq => pq ()
62−silence = manipulate_ $
63− UnsafeManipulation "SET client_min_messages TO WARNING;"
64−
65−setupDB :: IO ()
66−setupDB = withConnection connectionString $
67− silence & pqThen (define setup)
68−
69−dropDB :: IO ()
70−dropDB = withConnection connectionString $
71− silence & pqThen (define teardown)
72−
73−connectionString :: ByteString
74−connectionString = "host=localhost port=5432 dbname=exampledb"
75−
76−spec :: Spec
77−spec = before_ setupDB . after_ dropDB $ do
78−
79− describe "Exceptions" $ do
80−
81− let
82− testUser = User "TestUser"
83− newUser = manipulateParams_ insertUser
84− insertUserTwice = newUser testUser >> newUser testUser
85− err23505 = PQException $ PQState FatalError (Just "23505")
86− (Just "ERROR: duplicate key value violates unique constraint \"unique_names\"\nDETAIL: Key (name)=(TestUser) already exists.\n")
87−
88− it "should be thrown for constraint violation" $
89− withConnection connectionString insertUserTwice
90− `shouldThrow` (== err23505)
91−
92− it "should be rethrown for constraint violation in a transaction" $
93− withConnection connectionString (transactionally_ insertUserTwice)
94− `shouldThrow` (== err23505)
95−
96− describe "Pools" $
97−
98− it "should manage concurrent transactions" $ do
99− pool <- createConnectionPool
100− "host=localhost port=5432 dbname=exampledb" 1 0.5 10
101− let
102− query :: Query_ (Public '[]) () (Only Char)
103− query = values_ (literal 'a' `as` #fromOnly)
104− session = usingConnectionPool pool . transactionally_ $ do
105− result <- runQuery query
106− Just (Only chr) <- firstRow result
107− return chr
108− chrs <- replicateConcurrently 10 session
109− chrs `shouldSatisfy` all (== 'a')
110−
111− describe "Ranges" $
112−
113− it "should correctly decode ranges" $ do
114−
115− rangesOut <- withConnection connectionString $ do
116− let
117− query :: Query_ (Public '[]) () (Only (Range Int32))
118− query = values
119− ( range int4range (atLeast 3) `as` #fromOnly )
120− [ range int4range (3 <=..< 5) `as` #fromOnly
121− , range int4range Empty `as` #fromOnly
122− , range int4range whole `as` #fromOnly ]
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
squeal-postgresql/test/Specs/ExceptionHandling.hsnew file+126
@@ -0,0 +1,126 @@
1+{-# LANGUAGE DataKinds #-}
2+{-# LANGUAGE DeriveGeneric #-}
3+{-# LANGUAGE DuplicateRecordFields #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE OverloadedLabels #-}
6+{-# LANGUAGE OverloadedLists #-}
7+{-# LANGUAGE OverloadedStrings #-}
8+{-# LANGUAGE TypeApplications #-}
9+{-# LANGUAGE TypeFamilies #-}
10+{-# LANGUAGE TypeInType #-}
11+{-# LANGUAGE TypeOperators #-}
12+module ExceptionHandling
13+ ( specs
14+ , User (..)
15+ )
16+where
17+
18+import Control.Monad (void)
19+import Control.Monad.IO.Class (MonadIO (..))
20+import qualified Data.ByteString.Char8 as Char8
21+import Data.Int (Int16)
22+import Data.Text (Text)
23+import Data.Vector (Vector)
24+import qualified Generics.SOP as SOP
25+import qualified GHC.Generics as GHC
26+import Squeal.PostgreSQL
27+import Squeal.PostgreSQL.Migration
28+import Test.Hspec
29+
30+type Schema =
31+ '[ "users" ::: 'Table (
32+ '[ "pk_users" ::: 'PrimaryKey '["id"]
33+ , "unique_names" ::: 'Unique '["name"]
34+ ] :=>
35+ '[ "id" ::: 'Def :=> 'NotNull 'PGint4
36+ , "name" ::: 'NoDef :=> 'NotNull 'PGtext
37+ , "vec" ::: 'NoDef :=> 'NotNull ('PGvararray ('Null 'PGint2))
38+ ])
39+ , "emails" ::: 'Table (
40+ '[ "pk_emails" ::: 'PrimaryKey '["id"]
41+ , "fk_user_id" ::: 'ForeignKey '["user_id"] "users" '["id"]
42+ ] :=>
43+ '[ "id" ::: 'Def :=> 'NotNull 'PGint4
44+ , "user_id" ::: 'NoDef :=> 'NotNull 'PGint4
45+ , "email" ::: 'NoDef :=> 'Null 'PGtext
46+ ])
47+ ]
48+
49+type Schemas = Public Schema
50+
51+data User =
52+ User { userName :: Text
53+ , userEmail :: Maybe Text
54+ , userVec :: VarArray (Vector (Maybe Int16)) }
55+ deriving (Show, GHC.Generic)
56+instance SOP.Generic User
57+instance SOP.HasDatatypeInfo User
58+
59+insertUser :: Manipulation '[] Schemas '[ 'NotNull 'PGtext, 'NotNull ('PGvararray ('Null 'PGint2))]
60+ '[ "fromOnly" ::: 'NotNull 'PGint4 ]
61+insertUser = insertInto #users
62+ (Values_ (defaultAs #id :* param @1 `as` #name :* param @2 `as` #vec))
63+ OnConflictDoRaise (Returning (#id `as` #fromOnly))
64+
65+setup :: Definition (Public '[]) Schemas
66+setup =
67+ createTable #users
68+ ( serial `as` #id :*
69+ (text & notNullable) `as` #name :*
70+ (vararray int2 & notNullable) `as` #vec )
71+ ( primaryKey #id `as` #pk_users
72+ :* unique #name `as` #unique_names )
73+ >>>
74+ createTable #emails
75+ ( serial `as` #id :*
76+ (int & notNullable) `as` #user_id :*
77+ (text & nullable) `as` #email )
78+ ( primaryKey #id `as` #pk_emails :*
79+ foreignKey #user_id #users #id
80+ OnDeleteCascade OnUpdateCascade `as` #fk_user_id )
81+
82+teardown :: Definition Schemas (Public '[])
83+teardown = dropTable #emails >>> dropTable #users
84+
85+migration :: Migration Definition (Public '[]) Schemas
86+migration = Migration { name = "test"
87+ , up = setup
88+ , down = teardown }
89+
90+setupDB :: IO ()
91+setupDB = void . withConnection connectionString $
92+ manipulate (UnsafeManipulation "SET client_min_messages TO WARNING;")
93+ & pqThen (migrateUp (single migration))
94+
95+dropDB :: IO ()
96+dropDB = void . withConnection connectionString $
97+ manipulate (UnsafeManipulation "SET client_min_messages TO WARNING;")
98+ & pqThen (migrateDown (single migration))
99+
100+connectionString :: Char8.ByteString
101+connectionString = "host=localhost port=5432 dbname=exampledb"
102+
103+testUser :: User
104+testUser = User "TestUser" Nothing (VarArray [])
105+
106+newUser :: (MonadIO m, MonadPQ Schemas m) => User -> m ()
107+newUser u = void $ manipulateParams insertUser (userName u, userVec u)
108+
109+insertUserTwice :: (MonadIO m, MonadPQ Schemas m) => m ()
110+insertUserTwice = newUser testUser >> newUser testUser
111+
112+specs :: SpecWith ()
113+specs = before_ setupDB $ after_ dropDB $
114+ describe "Exceptions" $ do
115+
116+ let
117+ dupKeyErr = PQException FatalError (Just "23505")
118+ (Just "ERROR: duplicate key value violates unique constraint \"unique_names\"\nDETAIL: Key (name)=(TestUser) already exists.\n")
119+
120+ it "should be thrown for unique constraint violation in a manipulation" $
121+ withConnection connectionString insertUserTwice
122+ `shouldThrow` (== dupKeyErr)
123+
124+ it "should be rethrown for unique constraint violation in a manipulation by a transaction" $
125+ withConnection connectionString (transactionally_ insertUserTwice)
126+ `shouldThrow` (== dupKeyErr)
squeal-postgresql/test/Specs/Specs.hsnew file+7
@@ -0,0 +1,7 @@
1+module Specs where
2+
3+import Test.Hspec
4+import qualified ExceptionHandling
5+
6+main :: IO ()
7+main = hspec ExceptionHandling.specs
stack.yaml+1−3
@@ -1,8 +1,6 @@
1−resolver: nightly-2019-07-14
1+resolver: lts-13.8
2packages:
2packages:
3- squeal-postgresql
3- squeal-postgresql
4
4
5extra-deps:
5extra-deps:
6- unliftio-pool-0.2.1.0
6- unliftio-pool-0.2.1.0
7−- github: morphismtech/free-categories
8− commit: c0e555fbefb5c21619e532264c4dfeac556d0630