git.iko.soy/rel8
on 89ec060 help sign in
6c038ec
swap
0 ahead, 166 behind
154 files changed+6639−6457
since splitsnapshots
unifiedsplit
.github/workflows/build.yaml+3−3 Changelog.md−159 LICENSE+1−1 README.md−4 cabal.project+5 cabal.project.haskell-nix+6 default.nix+5−5 docs/concepts/dbtype.rst+17−18 docs/concepts/expr.rst+2−2 docs/concepts/insert.rst−181 docs/concepts/queries.rst+9−9 docs/cookbook.rst+8−10 docs/index.rst+1−2 docs/tutorial.rst+47−64 nix/sources.json+9−9 nix/sources.nix+20−66 rel8.cabal+27−50 shell.nix+1−1 src/Rel8.hs+50−334 src/Rel8/Aggregate.hs+128−42 src/Rel8/Aggregate/Legacy.hs+129 src/Rel8/Column.hs+13−9 src/Rel8/Column/ADT.hs+70−3 src/Rel8/Column/Either.hs+153−7 src/Rel8/Column/Field.hs+110 src/Rel8/Column/Lift.hs+69−3 src/Rel8/Column/List.hs+131−8 src/Rel8/Column/Maybe.hs+111−7 src/Rel8/Column/NonEmpty.hs+132−9 src/Rel8/Column/Null.hs−26 src/Rel8/Column/These.hs+155−8 src/Rel8/Expr.hs+47−17 src/Rel8/Expr.hs-boot+8−6 src/Rel8/Expr/Aggregate.hs+115−53 src/Rel8/Expr/Array.hs+6−6 src/Rel8/Expr/Default.hs−35 src/Rel8/Expr/Eq.hs+1−1 src/Rel8/Expr/Num.hs+6−39 src/Rel8/Expr/Opaleye.hs+5−19 src/Rel8/Expr/Sequence.hs−22 src/Rel8/Expr/Text.hs+4−24 src/Rel8/Expr/Time.hs+2−2 src/Rel8/Expr/Window.hs−121 src/Rel8/FCF.hs+3−3 src/Rel8/Generic/Construction.hs+330−151 src/Rel8/Generic/Construction/ADT.hs+69−47 src/Rel8/Generic/Construction/Record.hs+28−15 src/Rel8/Generic/Map.hs+64−20 src/Rel8/Generic/Record.hs−2 src/Rel8/Generic/Reify.hs+24 src/Rel8/Generic/Rel8able.hs+81−188 tests/Rel8/Generic/Rel8able/Test.hs → src/Rel8/Generic/Rel8able/Test.hs+17−48 src/Rel8/Generic/Table.hs+109−24 src/Rel8/Generic/Table/ADT.hs+203−61 src/Rel8/Generic/Table/Record.hs+99−74 src/Rel8/Kind/Context.hs+41−8 src/Rel8/Kind/Labels.hs+57 src/Rel8/Kind/Necessity.hs+38 src/Rel8/Order.hs+9−2 src/Rel8/Query.hs+7−181 src/Rel8/Query.hs-boot+1−3 src/Rel8/Query/Aggregate.hs+2−22 src/Rel8/Query/Distinct.hs+9−4 src/Rel8/Query/Each.hs+3−3 src/Rel8/Query/Either.hs+17−27 src/Rel8/Query/Evaluate.hs−49 src/Rel8/Query/Exists.hs+16−14 src/Rel8/Query/Indexed.hs−21 src/Rel8/Query/List.hs+20−83 src/Rel8/Query/Maybe.hs+45−26 src/Rel8/Query/Null.hs−15 src/Rel8/Query/Opaleye.hs+5−41 src/Rel8/Query/Rebind.hs−27 src/Rel8/Query/SQL.hs+59−6 src/Rel8/Query/Set.hs+6−6 src/Rel8/Query/These.hs+45−52 src/Rel8/Query/Window.hs−26 src/Rel8/Schema/Context.hs+20 src/Rel8/Schema/Context/Label.hs+60 src/Rel8/Schema/Context/Nullify.hs+149−105 src/Rel8/Schema/Field.hs−50 src/Rel8/Schema/HTable.hs+24−51 src/Rel8/Schema/HTable/Either.hs+4−2 src/Rel8/Schema/HTable/Identity.hs+29−16 src/Rel8/Schema/HTable/Label.hs+50−37 src/Rel8/Schema/HTable/MapTable.hs+12−22 src/Rel8/Schema/HTable/Maybe.hs+4−2 src/Rel8/Schema/HTable/Nullify.hs+33−47 src/Rel8/Schema/HTable/These.hs+4−2 src/Rel8/Schema/HTable/Vectorize.hs+50−40 src/Rel8/Schema/Insert.hs+167 src/Rel8/Schema/Kind.hs+15−6 src/Rel8/Schema/Name.hs+54−34 src/Rel8/Schema/Reify.hs+74 src/Rel8/Schema/Result.hs+42−20 src/Rel8/Schema/Spec.hs+45−17 src/Rel8/Schema/Spec/ConstrainDBType.hs+89 src/Rel8/Schema/Spec/ConstrainType.hs+31 src/Rel8/Schema/Table.hs−20 src/Rel8/Statement/Delete.hs+48−35 src/Rel8/Statement/Insert.hs+60−60 src/Rel8/Statement/OnConflict.hs−106 src/Rel8/Statement/Returning.hs+10−114 src/Rel8/Statement/SQL.hs−29 src/Rel8/Statement/Select.hs+35−120 src/Rel8/Statement/Set.hs−33 src/Rel8/Statement/Update.hs+60−38 src/Rel8/Statement/Using.hs−36 src/Rel8/Statement/View.hs+28−43 src/Rel8/Statement/Where.hs−31 src/Rel8/Table.hs+252−88 src/Rel8/Table/ADT.hs+80−36 src/Rel8/Table/Aggregate.hs+36−37 src/Rel8/Table/Bool.hs+6−5 src/Rel8/Table/Cols.hs−50 src/Rel8/Table/Either.hs+152−147 src/Rel8/Table/Eq.hs+39−12 src/Rel8/Table/HKD.hs+120−68 src/Rel8/Table/Insert.hs+51 src/Rel8/Table/List.hs+62−72 src/Rel8/Table/Maybe.hs+139−121 src/Rel8/Table/Name.hs+22−36 src/Rel8/Table/NonEmpty.hs+61−73 src/Rel8/Table/Null.hs−147 src/Rel8/Table/Nullify.hs−211 src/Rel8/Table/Opaleye.hs+75−84 src/Rel8/Table/Ord.hs+45−16 src/Rel8/Table/Order.hs+16−13 src/Rel8/Table/Projection.hs−73 src/Rel8/Table/Recontextualize.hs+87 src/Rel8/Table/Rel8able.hs+85−29 src/Rel8/Table/Serialize.hs+119−24 src/Rel8/Table/Tag.hs+97 src/Rel8/Table/These.hs+164−201 src/Rel8/Table/Transpose.hs−46 src/Rel8/Table/Undefined.hs+5−5 src/Rel8/Table/Unreify.hs+106 src/Rel8/Table/Window.hs−43 src/Rel8/Tabulate.hs+246−530 src/Rel8/Type.hs+8−9 src/Rel8/Type/Array.hs+26−46 src/Rel8/Type/Array1D.hs+139 src/Rel8/Type/Composite.hs+19−34 src/Rel8/Type/Enum.hs−8 src/Rel8/Type/JSONBEncoded.hs−4 src/Rel8/Type/JSONEncoded.hs−4 src/Rel8/Type/Monoid.hs+2−2 src/Rel8/Type/Num.hs+1−4 src/Rel8/Type/Ord.hs+2 src/Rel8/Type/ReadShow.hs−3 src/Rel8/Type/Semigroup.hs+7−4 src/Rel8/Type/Tag.hs+1−2 src/Rel8/Window.hs−97 tests/Main.hs+159−323
.github/workflows/build.yaml+3−3
@@ -9,14 +9,14 @@ jobs:
99 persist-credentials: false
1010 submodules: true
1111
12− - uses: cachix/install-nix-action@v14.1
12+ - uses: cachix/install-nix-action@v12
1313 with:
1414 nix_path: nixpkgs=channel:nixos-unstable
1515 extra_nix_config: |
1616 trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
17− substituters = https://cache.nixos.org/ https://cache.iog.io
17+ substituters = https://cache.nixos.org/ https://hydra.iohk.io
1818
19− - uses: cachix/cachix-action@v10
19+ - uses: cachix/cachix-action@v8
2020 with:
2121 name: rel8
2222 authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
Changelog.mddeleted−159
@@ -1,159 +0,0 @@
1−# 1.4.0.0 (2002-08-17)
2−
3−## Breaking changes
4−
5−* The behavior of `greatest`/`least` has been corrected, and was previously flipped. ([#183](https://github.com/circuithub/rel8/pull/183))
6−
7−## New features
8−
9−* `NullTable`/`HNull` have been added. This is an alternative to `MaybeTable` that doesn't use a tag columns. It's less flexible (no `Functor` or `Applicative` instance) and is meaningless when used with a table that has no non-nullable columns (so nesting `NullTable` is redundant). But in situations where the underlying `Table` does have non-nullable columns, it can losslessly converted to and from `MaybeTable`. It is useful for embedding into a base table when you don't want to store the extra tag column in your schema. ([#173](https://github.com/circuithub/rel8/pull/173))
10−* Add `fromMaybeTable`. ([#179](https://github.com/circuithub/rel8/pull/179))
11−* Add `alignMaybeTable`. ([#196](https://github.com/circuithub/rel8/pull/196))
12−
13−## Improvements
14−
15−* Optimize implementation of `AltTable` for `Tabulation` ([#178](https://github.com/circuithub/rel8/pull/178))
16−
17−## Other
18−
19−* Documentation improvements for `HADT`. ([#177](https://github.com/circuithub/rel8/pull/177))
20−* Document example usage of `groupBy`. ([#184](https://github.com/circuithub/rel8/pull/184))
21−* Build with and require Opaleye >= 0.9.3.3. ([#190](https://github.com/circuithub/rel8/pull/190))
22−* Build with `hasql` 1.6. ([#195](https://github.com/circuithub/rel8/pull/195))
23−
24−# 1.3.1.0 (2022-01-20)
25−
26−## Other
27−
28−* Rel8 now requires Opaleye >= 0.9.1. ([#165](https://github.com/circuithub/rel8/pull/165))
29−
30−# 1.3.0.0 (2022-01-31)
31−
32−## Breaking changes
33−
34−* `div` and `mod` have been changed to match Haskell semantics. If you need the PostgreSQL `div()` and `mod()` functions, use `quot` and `rem`. While this is not an API change, we feel this is a breaking change in semantics and have bumped the major version number. ([#155](https://github.com/circuithub/rel8/pull/155))
35−
36−## New features
37−
38−* `divMod` and `quotRem` functions have been added, matching Haskell's `Prelude` functions. ([#155](https://github.com/circuithub/rel8/pull/155))
39−* `avg` and `mode` aggregation functions to find the mean value of an expression, or the most common row in a query, respectively. ([#152](https://github.com/circuithub/rel8/pull/152))
40−* The full `EqTable` and `OrdTable` classes have been exported, allowing for instances to be manually created. ([#157](https://github.com/circuithub/rel8/pull/157))
41−* Added `like` and `ilike` (for the `LIKE` and `ILIKE` operators). ([#146](https://github.com/circuithub/rel8/pull/146))
42−
43−## Other
44−
45−* Rel8 now requires Opaleye 0.9. ([#158](https://github.com/circuithub/rel8/pull/158))
46−* Rel8's test suite supports Hedgehog 1.1. ([#160](https://github.com/circuithub/rel8/pull/160))
47−* The documentation for binary operations has been corrected. ([#162](https://github.com/circuithub/rel8/pull/162))
48−
49−# 1.2.2.0 (2021-11-21)
50−
51−## Other
52−
53−* Support GHC 9.2 ([#145](https://github.com/circuithub/rel8/pull/145))
54−* Correct the documentation for `except` ([#147](https://github.com/circuithub/rel8/pull/147))
55−* Support `hasql` 1.5 ([#149](https://github.com/circuithub/rel8/pull/149))
56−
57−# 1.2.1.0 (2021-11-21)
58−
59−## New features
60−
61−* `castTable` has been added, which casts all columns selected from in `Query` according to the types of columns. This can occasionally be useful when using `many`/`some` on older PostgreSQL versions. ([#137](https://github.com/circuithub/rel8/pull/137))
62−
63−* Added `<:`, `<=:`, `>:`, `>=:`, `greatest` and `least`, which sort all columns in a table lexicographically. These operators are like the `<.` operators which operate on `Expr`s, but the `<:` operate on entire tables. ([#139](https://github.com/circuithub/rel8/pull/139))
64−
65−## Other
66−
67−* Support opaleye-0.8 ([#142](https://github.com/circuithub/rel8/pull/142))
68−
69−# 1.2.0.0 (2021-10-22)
70−
71−## New features
72−
73−* New `$*` and `$+` operators for projecting out of `ListTable` and `NonEmptyTable` respectively (analogous to the existing `$?` for `MaybeTable`). ([#125](https://github.com/circuithub/rel8/pull/125))
74−
75−## Bug fixes
76−
77−* Fix `UPSERT` support (and add tests), which was broken due to a typo inside Rel8 that made it impossible to construct `Projection`s which are needed by `UPSERT`. ([#134](https://github.com/circuithub/rel8/pull/134))
78−
79−* Remove `DBMin` and `DBMax` instances for `Bool`, which are invalid as far as Postgres is concerned. `and` and `or` can be used to achieve the same thing. ([#126](https://github.com/circuithub/rel8/pull/126))
80−
81−* Fix `aggregateMaybeTable`, `aggregateEitherTable` and `aggregateTheseTable`, which generated invalid SQL previously. ([#127](https://github.com/circuithub/rel8/pull/127))
82−
83−## Breaking changes
84−
85−* `rebind` now takes an additional argument for the "name" of the binding. ([#128](https://github.com/circuithub/rel8/pull/128))
86−
87−# 1.1.0.0 (2021-07-16)
88−
89−## New features
90−
91−* You can derive `Rel8able` for "vanilla" higher-kinded data types - data types that don't use the `Column` type family. For example, the following is now possible:
92−
93− ```haskell
94− data MyTable f = MyTable
95− { myTableX :: f Int32
96− , myTableY :: f Text
97− } deriving (Generic, Rel8able)
98− ```
99−
100−* The `Projectable` and `Biprojectable` type classes have been introduced. These classes model a type of functors and bifunctors (respectively) on tables, where the mapping function is only able to rearrange columns. For example, the following is now possible:
101−
102− ```haskell
103− x <- project myTableX <$> many ...
104− ```
105−
106−* `Insert`'s `onConflict` field now has a new option - `DoUpdate`. This maps to PostgreSQL's `ON CONFLICT DO UPDATE` syntax, which provides upsert support. ([#85](https://github.com/circuithub/rel8/pull/85))
107−
108−* `Insert`, `Update` and `Delete` has all been expanded to work with `Query`s. In particular:
109−
110− * `Delete` now supports a `USING` sub-query
111− * `Update` now supports a `FROM` sub-query
112− * `Insert` can delete the result of any arbitrary `Query` (providing the types match)
113−
114−* The new `Rel8.Tabulate` module has been added, which gives a `Map`-esque interface to writing and composing queries. ([#70](https://github.com/circuithub/rel8/pull/70))
115−
116−* The new `indexed` `Query -> Query` function was added. This function augments each row in a query with it's 0-based index. ([#117](https://github.com/circuithub/rel8/pull/117))
117−
118−## Breaking changes
119−
120−* `Insert`, `Delete` and `Update` have all changed. In particular, for `Insert` users should now replace `rows = xs` with `rows = values xs`. ([#85](https://github.com/circuithub/rel8/pull/85))
121−
122−* Rename `whereExists` and `whereNotExists` to `present` and `absent` respectively. ([#57](https://github.com/circuithub/rel8/pull/57))
123−
124−* Simplify `evaluate` to run directly inside the `Query` monad, rendering the `Evaluate` monad unnecessary. ([#56](https://github.com/circuithub/rel8/pull/56))
125−
126−* The `Labelable` type class has been removed as it's no longer necessary. This class was mostly internal, though was visible in some public API functions. ([#76](https://github.com/circuithub/rel8/pull/76))
127−
128−* `EitherTable`, `ListTable`, `MaybeTable`, `NonEmptyTable` and `TheseTable` now all have an extra parameter which tracks the context of the table. If you manually specified any types before, you need to provide this parameter - usually `Expr` will be the correct choice. ([#101](https://github.com/circuithub/rel8/pull/101))
129−
130−* We've done a lot of work to simplify the internals of Rel8, but some of these are breaking changes. However, most of these API changes shouldn't affect users as they are mostly types used in type inference, or affect classes where users don't need to define their own instances.
131−
132− * The kind of a `Rel8able` is now `(Type -> Type) -> Type`. Previously it was `(X -> Type) -> Type`.
133− * `Table` has a new associated type - `FromExprs`. This was previously an open type family.
134− * `Table` has a new associated type - `Transpose` - and `Recontextualise` has been renamed to `Transposes`. This `Transposes` class now operates in terms of `Transpose`.
135−
136−* `select`, `insert`, `update` and `delete` now produce Hasql `Statement`s, rather than actually running the statement as IO. This allows Rel8 to be used with transaction/connection-managing monads like [`hasql-transaction`](https://hackage.haskell.org/package/hasql-transaction). ([#94](https://github.com/circuithub/rel8/pull/94))
137−
138−## Bug fixes
139−
140−* Fixes a bug where cartesian products of queries using `catListTable`, `catNonEmptyTable`, `catList` and `catNonEmpty` would incorrectly be zipped instead. ([#61](https://github.com/circuithub/rel8/pull/61))
141−
142−* Require Opaleye 0.7.3.0. This version has better support for lateral queries, which can improve query plans, especially in `optional`/`LEFT JOIN` ([#72](https://github.com/circuithub/rel8/pull/72))
143−
144−* Rel8 now compiles with GHC 9. ([#97](https://github.com/circuithub/rel8/pull/97))
145−
146−## Other changes
147−
148−* `exists` is now implemented in terms of the SQL `EXISTS` keyword. ([#69](https://github.com/circuithub/rel8/pull/69))
149−
150−* `alignBy` no longer requires `Table`s. ([#67](https://github.com/circuithub/rel8/pull/67))
151−
152−
153−# 1.0.0.1 (2021-06-21)
154−
155−This release contains various fixes for documentation.
156−
157−# 1.0.0.0 (2021-06-18)
158−
159−* Initial release.
LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright 2021 Oliver Charles
1+Copyright 2020 Oliver Charles
22
33All rights reserved.
44
README.md−4
@@ -10,8 +10,4 @@ The main objectives of Rel8 are:
1010
1111* *Familiar*: writing Rel8 queries should feel like normal Haskell programming.
1212
13−Rel8 was presented at ZuriHac 2021. If you want to have a brief overview of what Rel8 is, and a tour of the API - check out the video below:
14−
15−[![Rel8 presentation at ZuriHac 2021](https://img.youtube.com/vi/3uwrtjxiq6E/hqdefault.jpg)](http://www.youtube.com/watch?v=3uwrtjxiq6E)
16−
1713For more details, check out the [official documentation](https://rel8.readthedocs.io/en/latest/).
cabal.project+5
@@ -1 +1,6 @@
11packages: .
2+
3+allow-newer: generic-monoid:base
4+allow-newer: cryptohash-sha1:base
5+allow-newer: cryptohash-md5:base
6+allow-newer: entropy:Cabal
cabal.project.haskell-nix+6
@@ -2,3 +2,9 @@
22-- will interpret them as local packages, and try to build them when we cabal
33-- build. The only reason we have to specify these is for Haskell.nix to know to
44-- override these packages by fetching them rather than using Hackage.
5+
6+source-repository-package
7+ type: git
8+ location: git://github.com/jcpetruzza/barbies
9+ tag: f99b05454874192e3511bd133555dfb6cc6a6ecb
10+ --sha256: 0yy2i2jbllwavv5d2176rf8lmm4l1ws90lxkmdlfgvfzqxidx0gi
default.nix+5−5
@@ -1,15 +1,15 @@
1−let
1+let
22 haskellNix = import (import ./nix/sources.nix)."haskell.nix" {};
33
4− nixpkgsSrc = haskellNix.sources.nixpkgs-unstable;
4+ nixpkgsSrc = haskellNix.sources.nixpkgs-2009;
55
66 nixpkgsArgs = haskellNix.nixpkgsArgs;
77
8− compiler-nix-name = "ghc924";
8+ compiler-nix-name = "ghc8104";
99
1010 pkgs = import nixpkgsSrc nixpkgsArgs;
1111
12−in
12+in
1313pkgs.haskell-nix.project {
1414 inherit compiler-nix-name;
1515
@@ -20,7 +20,7 @@ pkgs.haskell-nix.project {
2020 src = ./.;
2121 };
2222
23− modules = [
23+ modules = [
2424 { packages.rel8 = {
2525 preCheck = ''
2626 export PATH="${pkgs.postgresql}/bin:${"$PATH"}"
docs/concepts/dbtype.rst+17−18
@@ -11,19 +11,18 @@ though most of these primitive ``DBType``\s should already be available.
1111Combining ``newtype`` and ``DBType``
1212------------------------------------
1313
14−You can define new instances of ``DBType`` by using Haskell "generalized
15−newtype deriving" strategy. This is useful when you have a common database
16−type, but need to interpret this type differently in different contexts. A very
17−common example here is with auto-incrementing ``id`` counters. In PostgreSQL,
18−it's common for a table to have a primary key that uses the ``serial`` type,
19−which means the key is an ``int8`` with a default value for ``INSERT``. In
20−Rel8, we could use ``Int64`` (as ``Int64`` is the ``DBType`` instance for
21−``int8``), but we can be even clearer if we make a ``newtype`` for each *type*
22−of id.
23−
24−If our database has users and orders, these tables might both have ids, but
25−they are clearly not meant to be treated as a common type. Instead, we can make
26−these types clearly different by writing::
14+You can define new instances of ``DBType`` by using Haskell "generalized newtype
15+deriving" strategy. This is useful when you have a common database type, but
16+need to interpret this type differently in different contexts. A very common
17+example here is with auto-incrementing ``id`` counters. In PostgreSQL, it's
18+common for a table to have a primary key that uses the ``serial`` type, which
19+means the key is an ``int8`` with a default value for ``INSERT``. In Rel8, we
20+could use ``Int64`` (as ``Int64`` is the ``DBType`` instance for ``int8``), but
21+we can be even clearer if we make a ``newtype`` for each *type* of id.
22+
23+If our database has users and orders, these tables might both have ids, but they
24+are clearly not meant to be treated as a common type. Instead, we can make these
25+types clearly different by writing::
2726
2827 newtype UserId = UserId { getUserId :: Int64 }
2928 deriving newtype DBType
@@ -58,8 +57,8 @@ In our PostgreSQL we have a few choices, but for now we'll assume that they are
5857stored as ``text`` values.
5958
6059In order to use this type in Rel8 queries, we need to write an instance of
61−``DBType`` for ``OrderStatus``. One approach is to use
62−``parseTypeInformation``, which allows you to refine an existing ``DBType``::
60+``DBType`` for ``OrderStatus``. One approach is to use ``parseTypeInformation``,
61+which allows you to refine an existing ``DBType``::
6362
6463 instance DBType OrderStatus where
6564 typeInformation = parseTypeInformation parser printer typeInformation
@@ -101,9 +100,9 @@ There usage is very similar to ``ReadShow`` - simply derive ``DBType via
101100JSONEncoded``, and Rel8 will use ``ToJSON`` and ``FromJSON`` instances (from
102101``aeson``) to serialize the given type.
103102
104−For example, a project might use event sourcing with a table of events. Each
105−row in this table is an event, but this event is stored as a JSON object. We
106−can use this type with Rel8 by writing::
103+For example, a project might use event sourcing with a table of events. Each row
104+in this table is an event, but this event is stored as a JSON object. We can use
105+this type with Rel8 by writing::
107106
108107 data Event = UserCreated UserCreatedData | OrderCreated OrderCreatedData
109108 deriving stock Generic
docs/concepts/expr.rst+2−2
@@ -58,7 +58,7 @@ Through the API reference documentation for Rel8, you might encounter the
5858``Sql`` type class. For example, if we look at the type of ``litExpr``, we
5959have::
6060
61− litExpr :: Sql DBType a => a -> Expr a
61+ litExpr :: Sql DBType a => a -> Expr a
6262
6363Here ``Sql DBType a`` means that ``a`` can either be literally a type that has
6464an instance of ``DBType`` (like ``UserId`` or ``Bool``), *or* that same type
@@ -69,6 +69,6 @@ Some functions work regardless of whether or not a value is null, and in these
6969cases you'll see ``Sql DBType a``. ``Sql`` can be used with any ``DBType``
7070subtype. For example, the type of ``div`` is::
7171
72− div :: Sql DBIntegral a => Expr a -> Expr a -> Expr a
72+ div :: Sql DBIntegral a => Expr a -> Expr a -> Expr a
7373
7474Which means ``div`` works on any ``DBIntegral a``, including ``Maybe a``.
docs/concepts/insert.rstdeleted−181
@@ -1,181 +0,0 @@
1−``INSERT``, ``UPDATE`` and ``DELETE``
2−=====================================
3−
4−While the majority of Rel8 is about building and executing ``SELECT``
5−statement, Rel8 also has support for ``INSERT``, ``UPDATE`` and ``DELETE``.
6−These statements are all executed using the ``insert``, ``update`` and
7−``delete`` functions, all of which take a record of parameters.
8−
9−.. note::
10−
11− This part of Rel8's API uses the ``DuplicateRecordFields`` language
12− extension. In code that needs to use this API, you should also enable this
13− language extension, or you may get errors about ambiguous field names.
14−
15−``DELETE``
16−----------
17−
18−To perform a ``DELETE`` statement, construct a ``Delete`` value and execute it
19−using ``delete``. ``Delete`` takes:
20−
21−``from``
22− The ``TableSchema`` for the table to delete rows from.
23−
24−``using``
25− This is a simple ``Query`` that forms the ``USING`` clause of the ``DELETE``
26− statement. This can be used to join against other tables, and the results
27− can be referenced in the ``deleteWhere`` parameter. For simple ``DELETE``\s
28− where you don't need to do this, you can set ``using = pure ()``.
29−
30−``deleteWhere``
31− The ``WHERE`` clause of the ``DELETE`` statement. This is a function that
32− takes two inputs: the result of the ``using`` query, and the current value
33− of the row.
34−
35−``returning``
36− What to return - see :ref:`returning`.
37−
38−``UPDATE``
39−----------
40−
41−To perform a ``UPDATE`` statement, construct a ``Update`` value and execute it
42−using ``update``. ``Update`` takes:
43−
44−``target``
45− The ``TableSchema`` for the table to update rows in.
46−
47−``from``
48− This is a simple ``Query`` that forms the ``FROM`` clause of the ``UPDATE``
49− statement. This can be used to join against other tables, and the results
50− can be referenced in the ``set`` and ``updateWhere`` parameters. For simple
51− ``UPDATE``\s where you don't need to do this, you can set ``from = pure ()``.
52−
53−``set``
54− A row to row transformation function, indicating how to update selected rows.
55− This function takes rows of the same shape as ``target`` but in the ``Expr``
56− context. One way to write this function is to use record update syntax::
57−
58− set = \from row -> row { rowName = "new name" }
59−
60−``updateWhere``
61− The ``WHERE`` clause of the ``UPDATE`` statement. This is a function that
62− takes two inputs: the result of the ``from`` query, and the current value of
63− the row.
64−
65−``returning``
66− What to return - see :ref:`returning`.
67−
68−``INSERT``
69−----------
70−
71−To perform a ``INSERT`` statement, construct a ``Insert`` value and execute it
72−using ``insert``. ``Insert`` takes:
73−
74−``into``
75− The ``TableSchema`` for the table to insert rows into.
76−
77−``rows``
78− The rows to insert. These are the same as ``into``, but in the ``Expr``
79− context. You can construct rows from their individual fields::
80−
81− rows = values [ MyTable { myTableA = lit "A", myTableB = lit 42 }
82−
83− or you can use ``lit`` on a table value in the ``Result`` context::
84−
85− rows = values [ lit MyTable { myTableA = "A", myTableB = 42 }
86−
87−``onConflict``
88− What should happen if an insert clashes with rows that already exist. This
89− corresponds to PostgreSQL's ``ON CONFLICT`` clause. You can specify:
90−
91− ``Abort``
92− PostgreSQL should abort the ``INSERT`` with an exception
93−
94− ``DoNothing``
95− PostgreSQL should not insert the duplicate rows.
96−
97− ``DoUpdate``
98− PostgreSQL should instead try to update any existing rows that conflict
99− with rows proposed for insertion.
100−
101−``returning``
102− What to return - see :ref:`returning`.
103−
104−.. _returning:
105−
106−``RETURNING``
107−-------------
108−
109−PostgreSQL has the ability to return extra information after a ``DELETE``,
110−``INSERT`` or ``UPDATE`` statement by attaching a ``RETURNING`` clause. A common
111−use of this clause is to return any automatically generated sequence values for
112−primary key columns. Rel8 supports ``RETURNING`` clauses by filling in the
113−``returning`` field and specifying a ``Projection``. A ``Projection`` is a row
114−to row transformation, allowing you to project out a subset of fields.
115−
116−For example, if we are inserting orders, we might want the order ids returned::
117−
118− insert Insert
119− { into = orderSchema
120− , rows = values [ order ]
121− , onConflict = Abort
122− , returning = Projection orderId
123− }
124−
125−If we don't want to return anything, we can use ``pure ()``::
126−
127− insert Insert
128− { into = orderSchema
129− , rows = values [ order ]
130− , onConflict = Abort
131− , returning = pure ()
132− }
133−
134−Default values
135−--------------
136−
137−It is fairly common to define tables with default values. While Rel8 does not
138−have specific functionality for ``DEFAULT``, there are a few options:
139−
140−``unsafeDefault``
141−~~~~~~~~~~~~~~~~~~~~~~~~~~~
142−
143−Rel8 does not have any special support for ``DEFAULT``. If you need to use
144−default column values in inserts, you can use ``unsafeDefault`` to
145−construct the ``DEFAULT`` expression::
146−
147− insert Insert
148− { into = orderSchema
149− , rows = values [ Order { orderId = unsafeDefault, ... } ]
150− , onConflict = Abort
151− , returning = Projection orderId
152− }
153−
154−.. warning::
155− As the name suggests, this is an unsafe operation. In particular, Rel8 is not
156− able to prove that this column does have a default value, so it may be
157− possible to introduce a runtime error. Furthermore, ``DEFAULT`` is fairly
158− special in SQL, and cannot be combined like other expressions. For example,
159− the innocuous expression::
160−
161− unsafeDefault + 1
162−
163− will lead to a runtime crash.
164−
165−Reimplement default values in Rel8
166−~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
167−
168−If you only need to access default values in Rel8, another option is to specify
169−them in Rel8, rather than in your database schema.
170−
171−.. hint::
172− A common default value for primary keys is to use `nextval` to obtain the
173− next value from a sequence. This can be done in Rel8 by using the ``nextval``
174− function::
175−
176− insert Insert
177− { into = orderSchema
178− , rows = values [ Order { orderId = nextval "order_id_seq", ... } ]
179− , onConflict = Abort
180− , returning = Projection orderId
181− }
docs/concepts/queries.rst+9−9
@@ -88,7 +88,7 @@ notation allows you to write these queries in a simpler form, where we don't
8888have to introduce functions. Expanding on the latter query, we could write::
8989
9090 do user <- getAllUsers
91− order <- getOrdersForUser user
91+ order <- getOrdersForUser (user)
9292 return (user, order)
9393
9494Now we have a query that, for each ``User``, fetches all orders for that user.
@@ -138,20 +138,20 @@ a query. The above query could thus be written as::
138138
139139``where_`` and ``filter`` allow you to filter rows based on an expression, but
140140sometimes we want to filter based on another query. For this, Rel8 offers
141−``present`` and ``absent``. For example, if all blog posts have a
142−list of tags, we could use ``present`` to find all blog posts that have been
141+``whereExists`` and ``whereNotExists``. For example, if all blog posts have a
142+list of tags, we could use ``whereExists`` to find all blog posts that have been
143143tagged as "Haskell"::
144144
145145 blogPost <- each blogPostSchema
146− present do
146+ whereExists do
147147 filter (("Haskell" ==.) . tagName) =<< tagFromBlogPost blogPost
148148
149−Notice that this example uses ``present`` with a query that itself uses
150−``filter``. For each blog post, ``present`` causes that row to be selected
149+Notice that this example uses ``whereExists`` with a query that itself uses
150+``filter``. For each blog post, ``whereExists`` causes that row to be selected
151151only if the associated query finds a tag for that blog post with the ``tagName``
152152"Haskell".
153153
154−Like ``filter`` there is also a chaining variant of ``present`` - ``with``.
154+Like ``filter`` there is also a chaining variant of ``whereExists`` - ``with``.
155155We could rewrite the above query using ``with`` as::
156156
157157 haskellBlogPost <-
@@ -194,11 +194,11 @@ and this query can be written in Rel8 as::
194194
195195 authorForBlogPost :: BlogPost Expr -> Query (Author Expr)
196196 authorForBlogPost blogPost =
197− filter ((blogPostAuthorId blogPost ==.) . authorId) =<<
197+ filter ((blogPostAuthorId blogPost ==.) authorId author) =<<
198198 each authorSchema
199199
200200 While this is a little more code over all, in our experience this style
201− dramatically increases the readability of queries using joins.
201+ dramatically increases the readabality of queries using joins.
202202
203203Left (outer) joins with ``optional``
204204------------------------------------
docs/cookbook.rst+8−10
@@ -72,7 +72,7 @@ can be written as::
7272 each myTableSchema
7373
7474Note that we use ``>$<`` (from ``Data.Functor.Contravariant``) to select table
75−columns, and we can use ``mconcat`` to combine orderings.
75+columns, and we can use `mconcat` to combine orderings.
7676
7777If all columns of a table have an ordering, you can also use ``ascTable`` and
7878``descTable``. For example::
@@ -142,25 +142,23 @@ rows, but can also return *tree*\s.
142142To understand what this means, we'll consider a small example query for blog
143143posts. We want our query to return:
144144
145−1. The latest 5 blog posts that have at least one tag each.
145+1. The latest 5 blog posts.
1461462. For each blog post, all tags.
147−3. For each blog post, the latest 3 comments if they exist.
147+3. For each blog post, the latest 3 comments.
148148
149149In Rel8, we can write this query as::
150150
151151 latestBlogPosts = do
152152 post <- each postSchema
153153
154− -- Returns a `NonEmptyTable a` which ends up as a `Data.List.NonEmpty a` after the query is run
155− tags <- some $ do
154+ tags <- aggregate do
156155 tag <- each tagSchema
157156 where_ (tagPostId tag ==. postId post)
158− return (tagName tag)
157+ return (listAgg (tagName tag))
159158
160− -- Returns a `ListTable a` which ends up as a `[a]` after the query is run
161− latestComments <-
162− many $
163− limit 3 $
159+ latestComments <-
160+ many $
161+ limit 3 $
164162 orderBy (commentCreatedAt >$< desc) do
165163 comment <- each commentSchema
166164 where_ (commentPostId comment ==. postId post)
docs/index.rst+1−2
@@ -30,7 +30,6 @@ The main objectives of Rel8 are:
3030 concepts/expr
3131 concepts/tables
3232 concepts/queries
33− concepts/insert
3433
3534.. toctree::
3635 :caption: Tips and tricks
@@ -50,4 +49,4 @@ More Resources
5049
5150* If you think you've found a bug, confusing behavior, or have a feature
5251 request, please raise an issue at `Rel8's issue tracker
53− <https://github.com/circuithub/rel8>`_.
52+ <https://github.com/circuithub/rel8>`_.
docs/tutorial.rst+47−64
@@ -5,25 +5,24 @@ Getting Started
55
66In this section, we'll take a look at using Rel8 to work with a small database
77for Haskell packages. We'll take a look at idiomatic usage of Rel8, mapping
8−tables to Haskell, and then look at writing some simple queries.
8+tables to Haskell, and then look at writing some simple queries.
99
1010Before we get started, we'll be using the following language extensions and
1111imports throughout this guide::
1212
13− {-# language BlockArguments #-}
14− {-# language DeriveAnyClass #-}
15− {-# language DeriveGeneric #-}
16− {-# language DerivingStrategies #-}
17− {-# language DerivingVia #-}
18− {-# language DuplicateRecordFields #-}
19− {-# language GeneralizedNewtypeDeriving #-}
20− {-# language OverloadedStrings #-}
21− {-# language StandaloneDeriving #-}
22− {-# language TypeApplications #-}
23− {-# language TypeFamilies #-}
13+ {-# language -XBlockArguments #-}
14+ {-# language -XDeriveAnyClass #-}
15+ {-# language -XDeriveGeneric #-}
16+ {-# language -XDerivingStrategies #-}
17+ {-# language -XDerivingVia #-}
18+ {-# language -XDuplicateRecordFields #-}
19+ {-# language -XGeneralizedNewtypeDeriving #-}
20+ {-# language -XOverloadedStrings #-}
21+ {-# language -XStandaloneDeriving #-}
22+ {-# language -XTypeApplications #-}
23+ {-# language -XTypeFamilies #-}
2424
2525 import Prelude
26− import Rel8
2726
2827The Example Schema
2928------------------
@@ -71,7 +70,7 @@ Following these steps for ``author``, we have::
7170 { authorId :: Column f Int64
7271 , name :: Column f Text
7372 , url :: Column f (Maybe Text)
74− }
73+ }
7574 deriving stock (Generic)
7675 deriving anyclass (Rel8able)
7776
@@ -82,7 +81,7 @@ in our project, it would be too easy to accidentally mix them up and create
8281nonsensical joins. As Haskell programmers, we often solve this problem by
8382creating ``newtype`` wrappers, and we can also use this technique with Rel8::
8483
85− newtype AuthorId = AuthorId { toInt64 :: Int64 }
84+ newtype AuthorId = AuthorId { toInt64 :: Int64 }
8685 deriving newtype (DBEq, DBType, Eq, Show)
8786
8887Now we can write our final schema mapping. First, the ``author`` table::
@@ -91,7 +90,7 @@ Now we can write our final schema mapping. First, the ``author`` table::
9190 { authorId :: Column f AuthorId
9291 , authorName :: Column f Text
9392 , authorUrl :: Column f (Maybe Text)
94− }
93+ }
9594 deriving stock (Generic)
9695 deriving anyclass (Rel8able)
9796
@@ -100,16 +99,16 @@ And similarly, the ``project`` table::
10099 data Project f = Project
101100 { projectAuthorId :: Column f AuthorId
102101 , projectName :: Column f Text
103− }
102+ }
104103 deriving stock (Generic)
105− deriving anyclass (Rel8able)
104+ deriving anyclass (Rel8able
106105
107106To show query results in this documentation, we'll also need ``Show`` instances:
108107Unfortunately these definitions look a bit scary, but they are essentially just
109108``deriving (Show)``::
110109
111− deriving stock instance f ~ Result => Show (Author f)
112− deriving stock instance f ~ Result => Show (Project f)
110+ deriving stock instance f ~ Identity => Show (Author f)
111+ deriving stock instance f ~ Identity => Show (Project f)
113112
114113These data types describe the structural mapping of the tables, but we also
115114need to specify a ``TableSchema`` for each table. A ``TableSchema`` contains
@@ -126,9 +125,9 @@ associated with the ``Author`` type::
126125
127126 authorSchema :: TableSchema (Author Name)
128127 authorSchema = TableSchema
129− { name = "author"
130− , schema = Nothing
131− , columns = Author
128+ { tableName = "author"
129+ , tableSchema = Nothing
130+ , tableColumns = Author
132131 { authorId = "author_id"
133132 , authorName = "name"
134133 , authorUrl = "url"
@@ -139,27 +138,14 @@ And likewise for ``project`` and ``Project``::
139138
140139 projectSchema :: TableSchema (Project Name)
141140 projectSchema = TableSchema
142− { name = "project"
143− , schema = Nothing
144− , columns = Project
141+ { tableName = "project"
142+ , tableSchema = Nothing
143+ , tableColumns = Project
145144 { projectAuthorId = "author_id"
146145 , projectName = "name"
147146 }
148147 }
149148
150−There is also some generics machinery available if you want to grab the field
151−information from your ``Rel8able`` type::
152−
153− projectSchema :: TableSchema (Project Name)
154− projectSchema = TableSchema
155− { name = "project"
156− , schema = Nothing
157− , columns = namesFromLabels @(Project Name)
158− }
159−
160−This will create a ``TableSchema`` for ``Project`` where every column name
161−corresponds exactly to the name of the field. If you need more flexibility, you
162−can use ``namesFromLabelsWith``, which takes a transformation function.
163149
164150.. note::
165151
@@ -183,7 +169,7 @@ database heavy applications.
183169
184170In Rel8, ``SELECT`` statements are built using the ``Query`` monad. You can
185171think of this monad like the ordinary ``[]`` (List) monad - but this isn't
186−required knowledge.
172+required knowledge.
187173
188174To start, we'll look at one of the simplest queries possible - a basic ``SELECT
189175* FROM`` statement. To select all rows from a table, we use ``each``, and
@@ -204,28 +190,25 @@ Recall we defined ``projectAuthorId`` as ``Column f AuthorId``. Now we have
204190We'll see more about ``Expr`` soon, but you can think of ``Expr a`` as "SQL
205191expressions of type ``a``\".
206192
207−To execute this ``Query``, we pass it to ``select``. This function takes both a
208−database connection (which can be obtained using hasql's ``acquire`` function),
209−and the ``Query`` to run::
193+To execute this ``Query``, we pass it to ``select``::
210194
211− >>> Right conn <- acquire "user=postgres"
212− >>> :t select conn (each projectSchema)
213− select conn (each projectSchema) :: MonadIO m => m [Project Result]
195+ >>> :t select c (each projectSchema)
196+ select c (each projectSchema) :: MonadIO m => m [Project Identity]
214197
215−When we ``select`` things containing ``Expr``\s, Rel8 builds a new response
216−table with the ``Result`` interpretation. This means you'll get back plain
198+When we ``select`` things containing ``Expr``s, Rel8 builds a new response
199+table with the ``Identity`` interpretation. This means you'll get back plain
217200Haskell values. Studying ``projectAuthorId`` again, we have::
218201
219− >>> let aProjectResult = undefined :: Project Result
220− >>> :t projectAuthorId aProjectResult
221− projectAuthorId aProjectResult :: AuthorId
202+ >>> let aProjectIdentity = undefined :: Project Identity
203+ >>> :t projectAuthorId aProjectIdentity
204+ projectAuthorId aProjectIdentity :: AuthorId
222205
223−Here ``Column Result AuthorId`` reduces to just ``AuthorId``, with no
206+Here ``Column Identity AuthorId`` reduces to just ``AuthorId``, with no
224207wrappping type at all.
225208
226209Putting this all together, we can run our first query::
227210
228− >>> select conn (each projectSchema) >>= mapM_ print
211+ >>> select c (each projectSchema) >>= mapM_ print
229212 Project {projectAuthorId = 1, projectName = "rel8"}
230213 Project {projectAuthorId = 2, projectName = "aeson"}
231214 Project {projectAuthorId = 2, projectName = "text"}
@@ -235,7 +218,7 @@ sometimes we're only interested in a subset of the columns of a table. To
235218restrict the returned columns, we can specify a projection by using ``Query``\s
236219``Functor`` instance::
237220
238− >>> select conn $ projectName <$> each projectSchema
221+ >>> select c $ projectName <$> each projectSchema
239222 ["rel8","aeson","text"]
240223
241224Joins
@@ -251,7 +234,7 @@ We can do this by simply calling ``each`` twice, and then returning a tuple of
251234their results::
252235
253236 >>> :{
254− mapM_ print =<< select conn do
237+ mapM_ print =<< select c do
255238 author <- each authorSchema
256239 project <- each projectSchema
257240 return (projectName project, authorName author)
@@ -270,7 +253,7 @@ This isn't quite right, though, as we have ended up pairing up the wrong
270253projects and authors. To fix this, we can use ``where_`` to restrict the
271254returned rows. We could write::
272255
273− select conn $ do
256+ select c $ do
274257 author <- each authorSchema
275258 project <- each projectSchema
276259 where_ $ projectAuthorId project ==. authorId author
@@ -287,7 +270,7 @@ for the particular joins in your database. In our case, this would be::
287270Our final query is then::
288271
289272 >>> :{
290− mapM_ print =<< select conn do
273+ mapM_ print =<< select c do
291274 author <- each authorSchema
292275 project <- projectsForAuthor author
293276 return (projectName project, authorName author)
@@ -306,7 +289,7 @@ transformer to allow for the possibility of the join to fail.
306289In our test database, we can see that there's another author who we haven't
307290seen yet::
308291
309− >>> select conn $ authorName <$> each authorSchema
292+ >>> select c $ authorName <$> each authorSchema
310293 ["Ollie","Bryan O'Sullivan","Emily Pillmore"]
311294
312295Emily wasn't returned in our earlier query because - in our database - she
@@ -314,7 +297,7 @@ doesn't have any registered projects. We can account for this partiality in our
314297original query by wrapping the ``projectsForAuthor`` call with ``optional``::
315298
316299 >>> :{
317− mapM_ print =<< select conn do
300+ mapM_ print =<< select c do
318301 author <- each authorSchema
319302 mproject <- optional $ projectsForAuthor author
320303 return (authorName author, projectName <$> mproject)
@@ -359,9 +342,9 @@ focus on the /type/ of that query::
359342 return (author, project)
360343 where
361344
362− >>> :t select conn authorsAndProjects
363− select conn authorsAndProjects
364− :: MonadIO m => m [(Author Result, Project Result)]
345+ >>> :t select c authorsAndProjects
346+ select c authorsAndProjects
347+ :: MonadIO m => m [(Author Identity, Project Identity)]
365348
366349
367350Our query gives us a single list of pairs of authors and projects. However,
@@ -369,7 +352,7 @@ with our domain knowledge of the schema, this isn't a great type - what we'd
369352rather have is a list of pairs of authors and /lists/ of projects. That is,
370353what we'd like is::
371354
372− [(Author Result, [Project Result])]
355+ [(Author Identity, [Project Identity])]
373356
374357This would be a much better type! Rel8 can produce a query with this type by
375358simply wrapping the call to ``projectsForAuthor`` with either ``some`` or
@@ -377,7 +360,7 @@ simply wrapping the call to ``projectsForAuthor`` with either ``some`` or
377360author to have no projects::
378361
379362 >>> :{
380− mapM_ print =<< select conn do
363+ mapM_ print =<< select c do
381364 author <- each authorSchema
382365 projectNames <- many $ projectName <$> projectsForAuthor author
383366 return (authorName author, projectNames)
nix/sources.json+9−9
@@ -5,10 +5,10 @@
55 "homepage": "https://input-output-hk.github.io/haskell.nix",
66 "owner": "input-output-hk",
77 "repo": "haskell.nix",
8− "rev": "0837156c56cb5350dd9bd84eb424187e00aa1e8a",
9− "sha256": "1djmv5a0vfj78csw2cad6nicrs8iqrp928b9b3v4h7lwwhhzliwl",
8+ "rev": "5b5a18e442df6e27ad8549d69b8868b62adb08c3",
9+ "sha256": "055mk7kmjppng66ppnb8kr96v4wwc8pcxfsls5gl77129hsz9aph",
1010 "type": "tarball",
11− "url": "https://github.com/input-output-hk/haskell.nix/archive/0837156c56cb5350dd9bd84eb424187e00aa1e8a.tar.gz",
11+ "url": "https://github.com/input-output-hk/haskell.nix/archive/5b5a18e442df6e27ad8549d69b8868b62adb08c3.tar.gz",
1212 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313 },
1414 "niv": {
@@ -17,10 +17,10 @@
1717 "homepage": "https://github.com/nmattia/niv",
1818 "owner": "nmattia",
1919 "repo": "niv",
20− "rev": "acdb1726783637852c01e0ad639ac9cbec28d8c8",
21− "sha256": "1wszl8q70z6wfgkh2dvgmhhry6qp9nar421qq2ifd17hq2jj9ck3",
20+ "rev": "af958e8057f345ee1aca714c1247ef3ba1c15f5e",
21+ "sha256": "1qjavxabbrsh73yck5dcq8jggvh3r2jkbr6b5nlz5d9yrqm9255n",
2222 "type": "tarball",
23− "url": "https://github.com/nmattia/niv/archive/acdb1726783637852c01e0ad639ac9cbec28d8c8.tar.gz",
23+ "url": "https://github.com/nmattia/niv/archive/af958e8057f345ee1aca714c1247ef3ba1c15f5e.tar.gz",
2424 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2525 },
2626 "nixpkgs": {
@@ -29,10 +29,10 @@
2929 "homepage": null,
3030 "owner": "nixos",
3131 "repo": "nixpkgs",
32− "rev": "1c1f5649bb9c1b0d98637c8c365228f57126f361",
33− "sha256": "0f2nvdijyxfgl5kwyb4465pppd5vkhqxddx6v40k2s0z9jfhj0xl",
32+ "rev": "a6847cb5460b47241eb35d1a6588652411642066",
33+ "sha256": "0wb5hwgffr4in66qng22sfvbascwnq078q81ziwwayvmnkn73rrm",
3434 "type": "tarball",
35− "url": "https://github.com/nixos/nixpkgs/archive/1c1f5649bb9c1b0d98637c8c365228f57126f361.tar.gz",
35+ "url": "https://github.com/nixos/nixpkgs/archive/a6847cb5460b47241eb35d1a6588652411642066.tar.gz",
3636 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737 }
3838}
nix/sources.nix+20−66
@@ -6,53 +6,25 @@ let
66 # The fetchers. fetch_<type> fetches specs of type <type>.
77 #
88
9− fetch_file = pkgs: name: spec:
10− let
11− name' = sanitizeName name + "-src";
12− in
13− if spec.builtin or true then
14− builtins_fetchurl { inherit (spec) url sha256; name = name'; }
15− else
16− pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
9+ fetch_file = pkgs: spec:
10+ if spec.builtin or true then
11+ builtins_fetchurl { inherit (spec) url sha256; }
12+ else
13+ pkgs.fetchurl { inherit (spec) url sha256; };
1714
1815 fetch_tarball = pkgs: name: spec:
1916 let
20− name' = sanitizeName name + "-src";
17+ ok = str: ! builtins.isNull (builtins.match "[a-zA-Z0-9+-._?=]" str);
18+ # sanitize the name, though nix will still fail if name starts with period
19+ name' = stringAsChars (x: if ! ok x then "-" else x) "${name}-src";
2120 in
2221 if spec.builtin or true then
2322 builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
2423 else
2524 pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
2625
27− fetch_git = name: spec:
28− let
29− ref =
30− if spec ? ref then spec.ref else
31− if spec ? branch then "refs/heads/${spec.branch}" else
32− if spec ? tag then "refs/tags/${spec.tag}" else
33− abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
34− submodules = if spec ? submodules then spec.submodules else false;
35− submoduleArg =
36− let
37− nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
38− emptyArgWithWarning =
39− if submodules == true
40− then
41− builtins.trace
42− (
43− "The niv input \"${name}\" uses submodules "
44− + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
45− + "does not support them"
46− )
47− {}
48− else {};
49− in
50− if nixSupportsSubmodules
51− then { inherit submodules; }
52− else emptyArgWithWarning;
53− in
54− builtins.fetchGit
55− ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
26+ fetch_git = spec:
27+ builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
5628
5729 fetch_local = spec: spec.path;
5830
@@ -68,21 +40,11 @@ let
6840 # Various helpers
6941 #
7042
71− # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
72− sanitizeName = name:
73− (
74− concatMapStrings (s: if builtins.isList s then "-" else s)
75− (
76− builtins.split "[^[:alnum:]+._?=-]+"
77− ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
78− )
79− );
80−
8143 # The set of packages used when specs are fetched using non-builtins.
82− mkPkgs = sources: system:
44+ mkPkgs = sources:
8345 let
8446 sourcesNixpkgs =
85− import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
47+ import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
8648 hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
8749 hasThisAsNixpkgsPath = <nixpkgs> == ./.;
8850 in
@@ -102,9 +64,9 @@ let
10264
10365 if ! builtins.hasAttr "type" spec then
10466 abort "ERROR: niv spec ${name} does not have a 'type' attribute"
105− else if spec.type == "file" then fetch_file pkgs name spec
67+ else if spec.type == "file" then fetch_file pkgs spec
10668 else if spec.type == "tarball" then fetch_tarball pkgs name spec
107− else if spec.type == "git" then fetch_git name spec
69+ else if spec.type == "git" then fetch_git spec
10870 else if spec.type == "local" then fetch_local spec
10971 else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
11072 else if spec.type == "builtin-url" then fetch_builtin-url name
@@ -118,10 +80,7 @@ let
11880 saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
11981 ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
12082 in
121− if ersatz == "" then drv else
122− # this turns the string into an actual Nix path (for both absolute and
123− # relative paths)
124− if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
83+ if ersatz == "" then drv else ersatz;
12584
12685 # Ports of functions for older nix versions
12786
@@ -139,29 +98,25 @@ let
13998
14099 # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
141100 stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
142− concatMapStrings = f: list: concatStrings (map f list);
143101 concatStrings = builtins.concatStringsSep "";
144102
145− # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
146− optionalAttrs = cond: as: if cond then as else {};
147−
148103 # fetchTarball version that is compatible between all the versions of Nix
149− builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
104+ builtins_fetchTarball = { url, name, sha256 }@attrs:
150105 let
151106 inherit (builtins) lessThan nixVersion fetchTarball;
152107 in
153108 if lessThan nixVersion "1.12" then
154− fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
109+ fetchTarball { inherit name url; }
155110 else
156111 fetchTarball attrs;
157112
158113 # fetchurl version that is compatible between all the versions of Nix
159− builtins_fetchurl = { url, name ? null, sha256 }@attrs:
114+ builtins_fetchurl = { url, sha256 }@attrs:
160115 let
161116 inherit (builtins) lessThan nixVersion fetchurl;
162117 in
163118 if lessThan nixVersion "1.12" then
164− fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
119+ fetchurl { inherit url; }
165120 else
166121 fetchurl attrs;
167122
@@ -180,8 +135,7 @@ let
180135 mkConfig =
181136 { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
182137 , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
183− , system ? builtins.currentSystem
184− , pkgs ? mkPkgs sources system
138+ , pkgs ? mkPkgs sources
185139 }: rec {
186140 # The sources, i.e. the attribute set of spec name to spec
187141 inherit sources;
rel8.cabal+27−50
@@ -1,36 +1,23 @@
11cabal-version: 2.0
22name: rel8
3−version: 1.4.0.0
3+version: 0.1.0.0
44synopsis: Hey! Hey! Can u rel8?
55license: BSD3
66license-file: LICENSE
77author: Oliver Charles
88maintainer: ollie@ocharles.org.uk
9−homepage: https://github.com/circuithub/rel8
10−bug-reports: https://github.com/circuithub/rel8/issues
119build-type: Simple
12−extra-doc-files:
13− README.md
14− Changelog.md
15−
16−source-repository head
17− type: git
18− location: https://github.com/circuithub/rel8
1910
2011library
2112 build-depends:
2213 aeson
23− , base ^>= 4.14 || ^>=4.15 || ^>=4.16
24− , bifunctors
14+ , base ^>= 4.14 || ^>=4.15
2515 , bytestring
2616 , case-insensitive
27− , comonad
2817 , contravariant
29− , hasql ^>= 1.4.5.1 || ^>= 1.5.0.0 || ^>= 1.6.0.0
30− , opaleye ^>= 0.9.6.1
31− , pretty
18+ , hasql ^>= 1.4.5.1
19+ , opaleye ^>= 0.7.1.0
3220 , profunctors
33− , product-profunctors
3421 , scientific
3522 , semialign
3623 , semigroupoids
@@ -41,12 +28,10 @@ library
4128 default-language:
4229 Haskell2010
4330 ghc-options:
44− -Werror=missing-methods -Werror=incomplete-patterns -Werror=missing-fields
4531 -Weverything -Wno-unsafe -Wno-safe -Wno-missing-safe-haskell-mode
4632 -Wno-missing-import-lists -Wno-prepositive-qualified-module
4733 -Wno-monomorphism-restriction
48− -Wno-missing-local-signatures
49− -Wno-missing-kind-signatures
34+ -Wno-missing-local-signatures
5035 hs-source-dirs:
5136 src
5237 exposed-modules:
@@ -56,45 +41,49 @@ library
5641 Rel8.Expr.Time
5742 Rel8.Tabulate
5843
44+ -- deprecated
45+ Rel8.Aggregate.Legacy
46+
5947 other-modules:
6048 Rel8.Aggregate
6149
6250 Rel8.Column
6351 Rel8.Column.ADT
6452 Rel8.Column.Either
53+ Rel8.Column.Field
6554 Rel8.Column.Lift
6655 Rel8.Column.List
6756 Rel8.Column.Maybe
6857 Rel8.Column.NonEmpty
69− Rel8.Column.Null
7058 Rel8.Column.These
7159
7260 Rel8.Expr
7361 Rel8.Expr.Aggregate
7462 Rel8.Expr.Array
7563 Rel8.Expr.Bool
76− Rel8.Expr.Default
7764 Rel8.Expr.Eq
7865 Rel8.Expr.Function
7966 Rel8.Expr.Null
8067 Rel8.Expr.Opaleye
8168 Rel8.Expr.Ord
8269 Rel8.Expr.Order
83− Rel8.Expr.Sequence
8470 Rel8.Expr.Serialize
85− Rel8.Expr.Window
8671
8772 Rel8.FCF
8873
8974 Rel8.Kind.Algebra
9075 Rel8.Kind.Context
76+ Rel8.Kind.Labels
77+ Rel8.Kind.Necessity
9178
9279 Rel8.Generic.Construction
9380 Rel8.Generic.Construction.ADT
9481 Rel8.Generic.Construction.Record
9582 Rel8.Generic.Map
9683 Rel8.Generic.Record
84+ Rel8.Generic.Reify
9785 Rel8.Generic.Rel8able
86+ Rel8.Generic.Rel8able.Test
9887 Rel8.Generic.Table
9988 Rel8.Generic.Table.ADT
10089 Rel8.Generic.Table.Record
@@ -106,26 +95,23 @@ library
10695 Rel8.Query.Distinct
10796 Rel8.Query.Each
10897 Rel8.Query.Either
109− Rel8.Query.Evaluate
11098 Rel8.Query.Exists
11199 Rel8.Query.Filter
112− Rel8.Query.Indexed
113100 Rel8.Query.Limit
114101 Rel8.Query.List
115102 Rel8.Query.Maybe
116103 Rel8.Query.Null
117104 Rel8.Query.Opaleye
118105 Rel8.Query.Order
119− Rel8.Query.Rebind
120106 Rel8.Query.Set
121107 Rel8.Query.SQL
122108 Rel8.Query.These
123109 Rel8.Query.Values
124− Rel8.Query.Window
125110
111+ Rel8.Schema.Context
112+ Rel8.Schema.Context.Label
126113 Rel8.Schema.Context.Nullify
127114 Rel8.Schema.Dict
128− Rel8.Schema.Field
129115 Rel8.Schema.HTable
130116 Rel8.Schema.HTable.Either
131117 Rel8.Schema.HTable.Identity
@@ -138,53 +124,51 @@ library
138124 Rel8.Schema.HTable.Product
139125 Rel8.Schema.HTable.These
140126 Rel8.Schema.HTable.Vectorize
127+ Rel8.Schema.Insert
141128 Rel8.Schema.Kind
142129 Rel8.Schema.Name
143130 Rel8.Schema.Null
131+ Rel8.Schema.Reify
144132 Rel8.Schema.Result
145133 Rel8.Schema.Spec
134+ Rel8.Schema.Spec.ConstrainDBType
135+ Rel8.Schema.Spec.ConstrainType
146136 Rel8.Schema.Table
147137
148138 Rel8.Statement.Delete
149139 Rel8.Statement.Insert
150− Rel8.Statement.OnConflict
151140 Rel8.Statement.Returning
152141 Rel8.Statement.Select
153− Rel8.Statement.Set
154− Rel8.Statement.SQL
155142 Rel8.Statement.Update
156− Rel8.Statement.Using
157143 Rel8.Statement.View
158− Rel8.Statement.Where
159144
160145 Rel8.Table
161146 Rel8.Table.ADT
162147 Rel8.Table.Aggregate
163148 Rel8.Table.Alternative
164149 Rel8.Table.Bool
165− Rel8.Table.Cols
166150 Rel8.Table.Either
167151 Rel8.Table.Eq
168152 Rel8.Table.HKD
153+ Rel8.Table.Insert
169154 Rel8.Table.List
170155 Rel8.Table.Maybe
171156 Rel8.Table.Name
172157 Rel8.Table.NonEmpty
173− Rel8.Table.Null
174− Rel8.Table.Nullify
175158 Rel8.Table.Opaleye
176159 Rel8.Table.Ord
177160 Rel8.Table.Order
178− Rel8.Table.Projection
161+ Rel8.Table.Recontextualize
179162 Rel8.Table.Rel8able
180163 Rel8.Table.Serialize
164+ Rel8.Table.Tag
181165 Rel8.Table.These
182− Rel8.Table.Transpose
183166 Rel8.Table.Undefined
184− Rel8.Table.Window
167+ Rel8.Table.Unreify
185168
186169 Rel8.Type
187170 Rel8.Type.Array
171+ Rel8.Type.Array1D
188172 Rel8.Type.Composite
189173 Rel8.Type.Eq
190174 Rel8.Type.Enum
@@ -200,9 +184,6 @@ library
200184 Rel8.Type.Sum
201185 Rel8.Type.Tag
202186
203− Rel8.Window
204−
205−
206187test-suite tests
207188 type: exitcode-stdio-1.0
208189 build-depends:
@@ -211,9 +192,9 @@ test-suite tests
211192 , case-insensitive
212193 , containers
213194 , hasql
214− , hasql-transaction
215− , hedgehog ^>= 1.0 || ^>= 1.1
216− , mmorph
195+ , hedgehog ^>=1.0.2
196+ , lifted-base ^>=0.2.3.12
197+ , monad-control ^>=1.0.2.3
217198 , rel8
218199 , scientific
219200 , tasty
@@ -221,12 +202,8 @@ test-suite tests
221202 , text
222203 , time
223204 , tmp-postgres ^>=1.34.1.0
224− , transformers
225205 , uuid
226206
227− other-modules:
228− Rel8.Generic.Rel8able.Test
229−
230207 main-is: Main.hs
231208 hs-source-dirs: tests
232209 default-language: Haskell2010
shell.nix+1−1
@@ -1,6 +1,6 @@
11let
22 sources = import ./nix/sources.nix;
3− pkgs = import sources.nixpkgs {overlays = [];};
3+ pkgs = import sources.nixpkgs {};
44 hsPkgs = import ./default.nix;
55in
66 hsPkgs.shellFor {
src/Rel8.hs+50−334
@@ -32,37 +32,34 @@ module Rel8
3232
3333 -- * Tables and higher-kinded tables
3434 , Rel8able, KRel8able
35− , Column
35+ , Column, Field, Necessity( Required, Optional )
36+ , Default
3637 , HADT
3738 , HEither
3839 , HMaybe
3940 , HList
4041 , HNonEmpty
41− , HNull
4242 , HThese
4343 , Lift
4444
4545 , Table(..)
46− , HTable
47− , Transposes
4846 , AltTable((<|>:))
49− , AlternativeTable( emptyTable )
50− , EqTable(..), (==:), (/=:)
51− , OrdTable(..), (<:), (<=:), (>:), (>=:), ascTable, descTable, greatest, least
47+ , EqTable, (==:), (/=:)
48+ , OrdTable, ascTable, descTable
5249 , lit
5350 , bool
5451 , case_
55− , castTable
5652
5753 -- ** @MaybeTable@
5854 , MaybeTable
5955 , maybeTable, ($?), nothingTable, justTable
6056 , isNothingTable, isJustTable
61− , fromMaybeTable
6257 , optional
6358 , catMaybeTable
59+ , bindMaybeTable
6460 , traverseMaybeTable
6561 , aggregateMaybeTable
62+ , insertMaybeTable
6663 , nameMaybeTable
6764
6865 -- ** @EitherTable@
@@ -71,8 +68,10 @@ module Rel8
7168 , isLeftTable, isRightTable
7269 , keepLeftTable
7370 , keepRightTable
71+ , bindEitherTable
7472 , bitraverseEitherTable
7573 , aggregateEitherTable
74+ , insertEitherTable
7675 , nameEitherTable
7776
7877 -- ** @TheseTable@
@@ -81,71 +80,49 @@ module Rel8
8180 , isThisTable, isThatTable, isThoseTable
8281 , hasHereTable, hasThereTable
8382 , justHereTable, justThereTable
84− , alignMaybeTable
8583 , alignBy
8684 , keepHereTable, loseHereTable
8785 , keepThereTable, loseThereTable
8886 , keepThisTable, loseThisTable
8987 , keepThatTable, loseThatTable
9088 , keepThoseTable, loseThoseTable
89+ , bindTheseTable
9190 , bitraverseTheseTable
9291 , aggregateTheseTable
92+ , insertTheseTable
9393 , nameTheseTable
9494
9595 -- ** @ListTable@
9696 , ListTable
97− , listTable, ($*)
97+ , listTable
98+ , insertListTable
9899 , nameListTable
99100 , many
100101 , manyExpr
101− , catListTable
102− , catList
103102
104103 -- ** @NonEmptyTable@
105104 , NonEmptyTable
106− , nonEmptyTable, ($+)
105+ , nonEmptyTable
106+ , insertNonEmptyTable
107107 , nameNonEmptyTable
108108 , some
109109 , someExpr
110− , catNonEmptyTable
111− , catNonEmpty
112−
113− -- ** @NullTable@
114− , NullTable
115− , nullableTable, nullTable, nullifyTable
116− , isNullTable, isNonNullTable
117− , catNullTable
118− , nameNullTable
119− , toNullTable, toMaybeTable
120−
121− -- ** Algebraic data types / sum types
122− -- $adts
123−
124− -- *** Naming of ADTs
125− -- $naming
126− , NameADT, nameADT
127− , ADT, ADTable
128110
129− -- *** Deconstruction of ADTs
130− -- $deconstruction
131− , DeconstructADT, deconstructADT
132−
133− -- *** Construction of ADTs
134− -- $construction
111+ -- ** @ADT@
112+ , ADT, ADTable, fromADT, toADT
135113 , BuildADT, buildADT
136114 , ConstructADT, constructADT
137−
138− -- *** Other ADT operations
115+ , DeconstructADT, deconstructADT
116+ , InsertADT, insertADT
117+ , NameADT, nameADT
139118 , AggregateADT, aggregateADT
140119
141− -- *** Miscellaneous notes
142− -- $misc-notes
143−
144120 -- ** @HKD@
145− , HKD, HKDable
121+ , HKD, HKDable, fromHKD, toHKD
146122 , BuildHKD, buildHKD
147123 , ConstructHKD, constructHKD
148124 , DeconstructHKD, deconstructHKD
125+ , InsertHKD, insertHKD
149126 , NameHKD, nameHKD
150127 , AggregateHKD, aggregateHKD
151128
@@ -160,12 +137,8 @@ module Rel8
160137 , Sql
161138 , litExpr
162139 , unsafeCastExpr
163− , unsafeLiteral
164140
165141 -- ** @null@
166− , NotNull
167− , Nullable
168− , Homonullable
169142 , null
170143 , nullify
171144 , nullable
@@ -184,7 +157,6 @@ module Rel8
184157 , (==.), (/=.), (==?), (/=?)
185158 , in_
186159 , boolExpr, caseExpr
187− , like, ilike
188160
189161 -- ** Ordering
190162 , DBOrd
@@ -202,13 +174,6 @@ module Rel8
202174 , Query
203175 , showQuery
204176
205− -- ** Projection
206− , Projection
207− , Projectable( project )
208− , Biprojectable( biproject )
209− , Projecting
210− , Field
211−
212177 -- ** Selecting rows
213178 , Selects
214179 , each
@@ -217,8 +182,8 @@ module Rel8
217182 -- ** Filtering
218183 , filter
219184 , where_
220− , present
221− , absent
185+ , whereExists
186+ , whereNotExists
222187 , distinct
223188 , distinctOn
224189 , distinctOnBy
@@ -248,16 +213,15 @@ module Rel8
248213
249214 -- ** Aggregation
250215 , Aggregate
251− , Aggregates
252216 , aggregate
253217 , countRows
218+ , array1DAggExpr
219+ , listAgg, listAggWithOrder, listAggExpr
220+ , nonEmptyAgg, nonEmptyAggWithOrder, nonEmptyAggExpr
254221 , groupBy
255− , listAgg, listAggExpr
256− , mode
257− , nonEmptyAgg, nonEmptyAggExpr
258222 , DBMax, max
259223 , DBMin, min
260− , DBSum, sum, sumWhere, avg
224+ , DBSum, sum, sumWhere
261225 , DBString, stringAgg
262226 , count
263227 , countStar
@@ -274,71 +238,48 @@ module Rel8
274238 , nullsFirst
275239 , nullsLast
276240
277− -- ** Window functions
278− , Window
279− , window
280− , Partition
281− , over
282− , partitionBy
283− , orderPartitionBy
284− , cumulative
285− , cumulative_
286− , currentRow
287− , rowNumber
288− , rank
289− , denseRank
290− , percentRank
291− , cumeDist
292− , ntile
293− , lag
294− , lead
295− , firstValue
296− , lastValue
297− , nthValue
298− , indexed
299−
300− -- ** Bindings
301− , rebind
302−
303241 -- * IO
304242 , Serializable
305− , ToExprs
306− , Result
307243
308244 -- * Running statements
309− -- $running
310−
311245 -- ** @SELECT@
312246 , select
313247
314248 -- ** @INSERT@
315249 , Insert(..)
316250 , OnConflict(..)
317− , Upsert(..)
318251 , insert
319− , unsafeDefault
320− , showInsert
252+ , toInsert
253+ , toInsertDefaults
321254
322255 -- ** @DELETE@
323256 , Delete(..)
324257 , delete
325− , showDelete
326258
327259 -- ** @UPDATE@
328− , Update(..)
329260 , update
330− , showUpdate
261+ , Update(..)
331262
332263 -- ** @.. RETURNING@
333264 , Returning(..)
334265
335266 -- ** @CREATE VIEW@
336267 , createView
337− , createOrReplaceView
338268
339− -- ** Sequences
340− , nextval
341− , evaluate
269+ -- * TODO
270+ -- TODO
271+ -- These need organizing, but are reachable from Rel8's documentation so we
272+ -- do need to export and document them.
273+ , Array1D( Array1D )
274+ , NotArray
275+ , Nullable
276+ , NotNull
277+ , HTable
278+ , Labelable
279+ , ToExprs(..)
280+ , FromExprs
281+ , Result
282+ , HKDT(..)
342283 ) where
343284
344285-- base
@@ -349,49 +290,42 @@ import Rel8.Aggregate
349290import Rel8.Column
350291import Rel8.Column.ADT
351292import Rel8.Column.Either
293+import Rel8.Column.Field
352294import Rel8.Column.Lift
353295import Rel8.Column.List
354296import Rel8.Column.Maybe
355297import Rel8.Column.NonEmpty
356−import Rel8.Column.Null
357298import Rel8.Column.These
358299import Rel8.Expr
359300import Rel8.Expr.Aggregate
360301import Rel8.Expr.Bool
361−import Rel8.Expr.Default
362302import Rel8.Expr.Eq
363303import Rel8.Expr.Function
364304import Rel8.Expr.Null
365−import Rel8.Expr.Opaleye (unsafeCastExpr, unsafeLiteral)
305+import Rel8.Expr.Opaleye (unsafeCastExpr)
366306import Rel8.Expr.Ord
367307import Rel8.Expr.Order
368308import Rel8.Expr.Serialize
369−import Rel8.Expr.Sequence
370−import Rel8.Expr.Text ( like, ilike )
371−import Rel8.Expr.Window hiding ( cumulative )
372309import Rel8.Generic.Rel8able ( KRel8able, Rel8able )
310+import Rel8.Kind.Necessity
373311import Rel8.Order
374312import Rel8.Query
375313import Rel8.Query.Aggregate
376314import Rel8.Query.Distinct
377315import Rel8.Query.Each
378316import Rel8.Query.Either
379−import Rel8.Query.Evaluate
380317import Rel8.Query.Exists
381318import Rel8.Query.Filter
382−import Rel8.Query.Indexed
383319import Rel8.Query.Limit
384320import Rel8.Query.List
385321import Rel8.Query.Maybe
386322import Rel8.Query.Null
387323import Rel8.Query.Order
388−import Rel8.Query.Rebind
389324import Rel8.Query.SQL (showQuery)
390325import Rel8.Query.Set
391326import Rel8.Query.These
392327import Rel8.Query.Values
393−import Rel8.Query.Window
394−import Rel8.Schema.Field
328+import Rel8.Schema.Context.Label
395329import Rel8.Schema.HTable
396330import Rel8.Schema.Name
397331import Rel8.Schema.Null hiding ( nullable )
@@ -399,10 +333,8 @@ import Rel8.Schema.Result ( Result )
399333import Rel8.Schema.Table
400334import Rel8.Statement.Delete
401335import Rel8.Statement.Insert
402−import Rel8.Statement.OnConflict
403336import Rel8.Statement.Returning
404337import Rel8.Statement.Select
405−import Rel8.Statement.SQL
406338import Rel8.Statement.Update
407339import Rel8.Statement.View
408340import Rel8.Table
@@ -413,21 +345,18 @@ import Rel8.Table.Bool
413345import Rel8.Table.Either
414346import Rel8.Table.Eq
415347import Rel8.Table.HKD
348+import Rel8.Table.Insert
416349import Rel8.Table.List
417350import Rel8.Table.Maybe
418351import Rel8.Table.Name
419352import Rel8.Table.NonEmpty
420−import Rel8.Table.Null
421−import Rel8.Table.Opaleye ( castTable )
422353import Rel8.Table.Ord
423354import Rel8.Table.Order
424−import Rel8.Table.Projection
425355import Rel8.Table.Rel8able ()
426356import Rel8.Table.Serialize
427357import Rel8.Table.These
428−import Rel8.Table.Transpose
429−import Rel8.Table.Window
430358import Rel8.Type
359+import Rel8.Type.Array1D
431360import Rel8.Type.Composite
432361import Rel8.Type.Eq
433362import Rel8.Type.Enum
@@ -441,216 +370,3 @@ import Rel8.Type.ReadShow
441370import Rel8.Type.Semigroup
442371import Rel8.Type.String
443372import Rel8.Type.Sum
444−import Rel8.Window
445−
446−
447−-- $running
448−-- To run queries and otherwise interact with a PostgreSQL database, Rel8
449−-- provides 'select', 'insert', 'update' and 'delete' functions. Note that
450−-- 'insert', 'update' and 'delete' will generally need the
451−-- `DuplicateRecordFields` language extension enabled.
452−
453−-- $adts
454−-- Algebraic data types can be modelled between Haskell and SQL.
455−--
456−-- * Your SQL table needs a certain text field that tags which Haskell constructor is in use.
457−-- * You have to use a few combinators to specify the sum type's individual constructors.
458−-- * If you want to do case analysis at the @Expr@ (SQL) level, you can use 'maybe'/'either'-like eliminators.
459−--
460−-- The documentation in this section will assume a set of database types like this:
461−--
462−-- @
463−-- data Thing f = ThingEmployer (Employer f) | ThingPotato (Potato f) | Nullary
464−-- deriving stock Generic
465−--
466−-- data Employer f = Employer { employerId :: f Int32, employerName :: f Text}
467−-- deriving stock Generic
468−-- deriving anyclass Rel8able
469−--
470−-- data Potato f = Potato { size :: f Int32, grower :: f Text }
471−-- deriving stock Generic
472−-- deriving anyclass Rel8able
473−-- @
474−
475−-- $naming
476−--
477−-- First, in your 'TableSchema', name your type like this:
478−--
479−-- @
480−-- thingSchema :: TableSchema (ADT Thing Name)
481−-- thingSchema =
482−-- TableSchema
483−-- { schema = Nothing,
484−-- name = \"thing\",
485−-- columns =
486−-- nameADT @Thing
487−-- \"tag\"
488−-- Employer
489−-- { employerName = \"name\",
490−-- employerId = \"id\"
491−-- }
492−-- Potato {size = \"size\", grower = \"Mary\"}
493−-- }
494−-- @
495−--
496−-- Note that @nameADT \@Thing "tag"@ is variadic: it accepts one
497−-- argument per constructor, except the nullary ones (Nullary) because
498−-- there's nothing to do for them.
499−
500−-- $deconstruction
501−--
502−-- To deconstruct sum types at the SQL level, use 'deconstructADT',
503−-- which is also variadic, and has one argument for each
504−-- constructor. Similar to 'maybe'.
505−--
506−-- @
507−-- query :: Query (ADT Thing Expr)
508−-- query = do
509−-- thingExpr <- each thingSchema
510−-- where_ $
511−-- deconstructADT @Thing
512−-- (\employer -> employerName employer ==. lit \"Mary\")
513−-- (\potato -> grower potato ==. lit \"Mary\")
514−-- (lit False) -- Nullary case
515−-- thingExpr
516−-- pure thingExpr
517−-- @
518−--
519−-- SQL output:
520−--
521−-- @
522−-- SELECT
523−-- CAST("tag0_1" AS text) as "tag",
524−-- CAST("id1_1" AS int4) as "ThingEmployer/_1/employerId",
525−-- CAST("name2_1" AS text) as "ThingEmployer/_1/employerName",
526−-- CAST("size3_1" AS int4) as "ThingPotato/_1/size",
527−-- CAST("Mary4_1" AS text) as "ThingPotato/_1/grower"
528−-- FROM (SELECT
529−-- *
530−-- FROM (SELECT
531−-- "tag" as "tag0_1",
532−-- "id" as "id1_1",
533−-- "name" as "name2_1",
534−-- "size" as "size3_1",
535−-- "Mary" as "Mary4_1"
536−-- FROM "thing" as "T1") as "T1"
537−-- WHERE (CASE WHEN ("tag0_1") = (CAST(E'ThingPotato' AS text)) THEN ("Mary4_1") = (CAST(E'Mary' AS text))
538−-- WHEN ("tag0_1") = (CAST(E'Nullary' AS text)) THEN CAST(FALSE AS bool) ELSE ("name2_1") = (CAST(E'Mary' AS text)) END)) as "T1"
539−-- @
540−
541−-- $construction
542−--
543−-- To construct an ADT, you can use 'buildADT' or 'constructADT'. Consider the following type:
544−--
545−-- @
546−-- data Task f = Pending | Complete (CompletedTask f)
547−-- @
548−--
549−-- 'buildADT' is for constructing values of 'Task' in the 'Expr'
550−-- context. 'buildADT' needs two type-level arguments before its type
551−-- makes any sense. The first argument is the type of the "ADT", which
552−-- in our case is 'Task'. The second is the name of the constructor we
553−-- want to use. So that means we have the following possible
554−-- instantiations of 'buildADT' for 'Task':
555−--
556−-- @
557−-- > :t buildADT @Task @\"Pending\"
558−-- buildADT @Task @\"Pending\" :: ADT Task Expr
559−-- > :t buildADT @Task @\"Complete\"
560−-- buildADT @Task @\"Complete\" :: CompletedTask Expr -> ADT Task Expr
561−-- @
562−--
563−-- Note that as the "Pending" constructor has no fields, @buildADT
564−-- \@Task \@"Pending"@ is equivalent to @lit Pending@. But @buildADT
565−-- \@Task \@"Complete"@ is not the same as @lit . Complete@:
566−--
567−-- @
568−-- > :t lit . Complete
569−-- lit . Complete :: CompletedTask Result -> ADT Task Expr
570−-- @
571−--
572−--
573−-- Note that the former takes a @CompletedTask Expr@ while the latter
574−-- takes a @CompletedTask Result@. The former is more powerful because
575−-- you can construct @Task@s using dynamic values coming a database
576−-- query.
577−--
578−-- To show what this can look like in SQL, consider:
579−--
580−-- @
581−-- > :{
582−-- showQuery $ values
583−-- [ buildADT @Task @\"Pending\"
584−-- , buildADT @Task @\"Complete\" CompletedTask {date = Rel8.Expr.Time.now}
585−-- ]
586−-- :}
587−-- @
588−--
589−-- This produces the following SQL:
590−--
591−-- @
592−-- SELECT
593−-- CAST(\"values0_1\" AS text) as \"tag\",
594−-- CAST(\"values1_1\" AS timestamptz) as \"Complete/_1/date\"
595−-- FROM (SELECT
596−-- *
597−-- FROM (SELECT \"column1\" as \"values0_1\",
598−-- \"column2\" as \"values1_1\"
599−-- FROM
600−-- (VALUES
601−-- (CAST(E'Pending' AS text),CAST(NULL AS timestamptz)),
602−-- (CAST(E'Complete' AS text),CAST(now() AS timestamptz))) as \"V\") as \"T1\") as \"T1\"
603−-- @
604−--
605−-- This is what you get if you run it in @psql@:
606−--
607−--
608−-- @
609−-- tag | Complete/_1/date
610−-- ----------+-------------------------------
611−-- Pending |
612−-- Complete | 2022-05-19 21:28:23.969065+00
613−-- (2 rows)
614−-- @
615−--
616−-- "constructADT" is less convenient but more general alternative to
617−-- "buildADT". It requires only one type-level argument for its type
618−-- to make sense:
619−--
620−-- @
621−-- > :t constructADT @Task
622−-- constructADT @Task
623−-- :: (forall r. r -> (CompletedTask Expr -> r) -> r) -> ADT Task Expr
624−-- @
625−--
626−-- This might still seem a bit opaque, but basically it gives you a
627−-- Church-encoded constructor for arbitrary algebraic data types. You
628−-- might use it as follows:
629−--
630−-- @
631−-- let
632−-- pending :: ADT Task Expr
633−-- pending = constructADT @Task $ \pending _complete -> pending
634−--
635−-- complete :: ADT Task Expr
636−-- complete = constructADT @Task $ \_pending complete -> complete CompletedTask {date = Rel8.Expr.Time.now}
637−-- @
638−--
639−-- These values are otherwise identical to the ones we saw above with
640−-- @buildADT@, it's just a different style of constructing them.
641−--
642−
643−-- $misc-notes
644−--
645−-- 1. Note that the order of the arguments for all of these functions
646−-- is determined by the order of the constructors in the data
647−-- definition. If it were @data Task = Complete (CompletedTask f) |
648−-- Pending@ then the order of all the invocations of @constructADT@
649−-- and @deconstructADT@ would need to change.
650−--
651−-- 2. Maybe this is obvious, but just to spell it out: once you're in
652−-- the @Result@ context, you can of course construct @Task@ values
653−-- normally and use standard Haskell pattern-matching. @constructADT@
654−-- and @deconstructADT@ are specifically only needed in the @Expr@
655−-- context, and they allow you to do the equivalent of pattern
656−-- matching in PostgreSQL.
src/Rel8/Aggregate.hs+128−42
@@ -1,83 +1,169 @@
11{-# language DataKinds #-}
2+{-# language DerivingVia #-}
23{-# language FlexibleContexts #-}
34{-# language FlexibleInstances #-}
5+{-# language GADTs #-}
46{-# language MultiParamTypeClasses #-}
5−{-# language RankNTypes #-}
7+{-# language NamedFieldPuns #-}
8+{-# language PolyKinds #-}
69{-# language StandaloneKindSignatures #-}
710{-# language TypeFamilies #-}
811{-# language UndecidableInstances #-}
12+{-# language UndecidableSuperClasses #-}
913
1014module Rel8.Aggregate
11− ( Aggregate(..), zipOutputs
12− , unsafeMakeAggregate
15+ ( Aggregate(..), foldInputs, mapInputs
16+ , Aggregator(..), unsafeMakeAggregate
1317 , Aggregates
18+ , Col( Aggregation )
1419 )
1520where
1621
1722-- base
18−import Control.Applicative ( liftA2 )
19−import Data.Functor.Identity ( Identity( Identity ) )
23+import Data.Functor.Const ( Const( Const ), getConst )
24+import Data.Functor.Identity ( Identity )
2025import Data.Kind ( Constraint, Type )
2126import Prelude
2227
23−-- profunctors
24−import Data.Profunctor ( dimap )
25−
2628-- opaleye
27−import qualified Opaleye.Aggregate as Opaleye
29+import qualified Opaleye.Internal.Aggregate as Opaleye
2830import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
29−import qualified Opaleye.Internal.Column as Opaleye
31+import qualified Opaleye.Internal.PackMap as Opaleye
3032
3133-- rel8
32−import Rel8.Expr ( Expr )
33−import Rel8.Schema.HTable.Identity ( HIdentity(..) )
34−import qualified Rel8.Schema.Kind as K
34+import Rel8.Expr ( Expr, Col(..) )
35+import Rel8.Schema.Context ( Interpretation(..) )
36+import Rel8.Schema.Context.Label ( Labelable(..) )
37+import Rel8.Schema.HTable ( hfield, htabulate, htabulateA, hspecs )
38+import Rel8.Schema.Name ( Name )
3539import Rel8.Schema.Null ( Sql )
40+import Rel8.Schema.Reify ( notReify )
41+import Rel8.Schema.Result ( Result )
42+import Rel8.Schema.Spec ( Spec( Spec ), SSpec(..) )
3643import Rel8.Table
3744 ( Table, Columns, Context, fromColumns, toColumns
38− , FromExprs, fromResult, toResult
39− , Transpose
45+ , reify, unreify
4046 )
41−import Rel8.Table.Transpose ( Transposes )
47+import Rel8.Table.Recontextualize ( Recontextualize )
4248import Rel8.Type ( DBType )
4349
50+-- semigroupoids
51+import Data.Functor.Apply ( Apply, (<.>) )
52+
53+
54+-- | An @Aggregate a@ describes how to aggregate @Table@s of type @a@. You can
55+-- unpack an @Aggregate@ back to @a@ by running it with 'Rel8.aggregate'. As
56+-- @Aggregate@ is almost an 'Applicative' functor - but there is no 'pure'
57+-- operation. This means 'Aggregate' is an instance of 'Apply', and you can
58+-- combine @Aggregate@s using the @<.>@ combinator.
59+type Aggregate :: k -> Type
60+data Aggregate a where
61+ Aggregate :: !(Opaleye.Aggregator () a) -> Aggregate a
62+
63+
64+instance Functor Aggregate where
65+ fmap f (Aggregate a) = Aggregate (fmap f a)
66+
67+
68+instance Apply Aggregate where
69+ Aggregate f <.> Aggregate a = Aggregate (f <*> a)
70+
4471
45−-- | 'Aggregate' is a special context used by 'Rel8.aggregate'.
46−type Aggregate :: K.Context
47−newtype Aggregate a = Aggregate (Opaleye.Aggregator () (Expr a))
72+instance Interpretation Aggregate where
73+ data Col Aggregate _spec where
74+ Aggregation :: ()
75+ => Aggregate (Expr a)
76+ -> Col Aggregate ('Spec labels necessity a)
4877
4978
50−instance Sql DBType a => Table Aggregate (Aggregate a) where
51− type Columns (Aggregate a) = HIdentity a
79+instance Table Expr a => Table Aggregate (Aggregate a) where
80+ type Columns (Aggregate a) = Columns a
5281 type Context (Aggregate a) = Aggregate
53− type FromExprs (Aggregate a) = a
54− type Transpose to (Aggregate a) = to a
5582
56− toColumns = HIdentity
57− fromColumns (HIdentity a) = a
58− toResult = HIdentity . Identity
59− fromResult (HIdentity (Identity a)) = a
83+ toColumns a = htabulate $ \field -> case hfield hspecs field of
84+ SSpec {} -> Aggregation $ unDB . (`hfield` field) . toColumns <$> a
85+ fromColumns as = fmap fromColumns $ htabulateA $ \field ->
86+ case hfield as field of
87+ Aggregation a -> DB <$> a
88+
89+ reify = notReify
90+ unreify = notReify
91+
92+
93+instance Sql DBType a =>
94+ Recontextualize Aggregate Aggregate (Aggregate (Expr a)) (Aggregate (Expr a))
95+
96+
97+instance Sql DBType a =>
98+ Recontextualize Aggregate Expr (Aggregate (Expr a)) (Expr a)
99+
100+
101+instance Sql DBType a =>
102+ Recontextualize Aggregate Result (Aggregate (Expr a)) (Identity a)
60103
61104
62−-- | @Aggregates a b@ means that the columns in @a@ are all 'Aggregate's
63−-- for the 'Expr' columns in @b@.
105+instance Sql DBType a =>
106+ Recontextualize Aggregate Name (Aggregate (Expr a)) (Name a)
107+
108+
109+instance Sql DBType a =>
110+ Recontextualize Expr Aggregate (Expr a) (Aggregate (Expr a))
111+
112+
113+instance Sql DBType a =>
114+ Recontextualize Result Aggregate (Identity a) (Aggregate (Expr a))
115+
116+
117+instance Sql DBType a =>
118+ Recontextualize Name Aggregate (Name a) (Aggregate (Expr a))
119+
120+
121+instance Labelable Aggregate where
122+ labeler (Aggregation aggregate) = Aggregation aggregate
123+ unlabeler (Aggregation aggregate) = Aggregation aggregate
124+
125+
126+-- | @Aggregates a b@ means that the columns in @a@ are all 'Aggregate' 'Expr's
127+-- for the columns in @b@.
64128type Aggregates :: Type -> Type -> Constraint
65−class Transposes Aggregate Expr aggregates exprs => Aggregates aggregates exprs
66−instance Transposes Aggregate Expr aggregates exprs => Aggregates aggregates exprs
129+class Recontextualize Aggregate Expr aggregates exprs => Aggregates aggregates exprs
130+instance Recontextualize Aggregate Expr aggregates exprs => Aggregates aggregates exprs
131+
132+
133+foldInputs :: Monoid b
134+ => (Maybe Aggregator -> Opaleye.PrimExpr -> b) -> Aggregate a -> b
135+foldInputs f (Aggregate (Opaleye.Aggregator (Opaleye.PackMap agg))) =
136+ getConst $ flip agg () $ \(aggregator, a) ->
137+ Const $ f (detuplize <$> aggregator) a
138+ where
139+ detuplize (operation, ordering, distinction) =
140+ Aggregator {operation, ordering, distinction}
141+
142+
143+mapInputs :: ()
144+ => (Opaleye.PrimExpr -> Opaleye.PrimExpr) -> Aggregate a -> Aggregate a
145+mapInputs transform (Aggregate (Opaleye.Aggregator (Opaleye.PackMap agg))) =
146+ Aggregate $ Opaleye.Aggregator $ Opaleye.PackMap $ agg . \f input ->
147+ f (fmap transform input)
67148
68149
69−zipOutputs :: ()
70− => (Expr a -> Expr b -> Expr c) -> Aggregate a -> Aggregate b -> Aggregate c
71−zipOutputs f (Aggregate a) (Aggregate b) = Aggregate (liftA2 f a b)
150+type Aggregator :: Type
151+data Aggregator = Aggregator
152+ { operation :: Opaleye.AggrOp
153+ , ordering :: [Opaleye.OrderExpr]
154+ , distinction :: Opaleye.AggrDistinct
155+ }
72156
73157
74−unsafeMakeAggregate :: forall (input :: Type) (output :: Type) n n' a a'. ()
75− => (Expr input -> Opaleye.PrimExpr)
76− -> (Opaleye.PrimExpr -> Expr output)
77− -> Opaleye.Aggregator (Opaleye.Field_ n a) (Opaleye.Field_ n' a')
78− -> Expr input
158+unsafeMakeAggregate :: ()
159+ => (input -> Opaleye.PrimExpr)
160+ -> (Opaleye.PrimExpr -> output)
161+ -> Maybe Aggregator
162+ -> input
79163 -> Aggregate output
80164unsafeMakeAggregate input output aggregator expr =
81− Aggregate $ dimap in_ out aggregator
82− where out = output . Opaleye.unColumn
83− in_ = Opaleye.Column . input . const expr
165+ Aggregate $ Opaleye.Aggregator $ Opaleye.PackMap $ \f _ ->
166+ output <$> f (tuplize <$> aggregator, input expr)
167+ where
168+ tuplize Aggregator {operation, ordering, distinction} =
169+ (operation, ordering, distinction)
src/Rel8/Aggregate/Legacy.hsnew file+129
@@ -0,0 +1,129 @@
1+{-# language AllowAmbiguousTypes #-}
2+{-# language DataKinds #-}
3+{-# language FlexibleContexts #-}
4+{-# language RankNTypes #-}
5+{-# language ScopedTypeVariables #-}
6+{-# language StandaloneKindSignatures #-}
7+{-# language TypeApplications #-}
8+{-# language TypeFamilies #-}
9+{-# language ViewPatterns #-}
10+
11+module Rel8.Aggregate.Legacy
12+ ( Aggregates
13+ , aggregate
14+ , aggregateTabulation
15+ , groupBy
16+ , listAgg
17+ , nonEmptyAgg
18+
19+ , AggregateADT, aggregateADT
20+ , AggregateHKD, aggregateHKD
21+ )
22+where
23+
24+-- base
25+import Data.Functor.Identity ( Identity( Identity ) )
26+import Data.Kind ( Type )
27+import GHC.Generics ( Rep )
28+import Prelude
29+
30+-- opaleye
31+import qualified Opaleye.Aggregate as Opaleye
32+
33+-- rel8
34+import Rel8.Aggregate ( Aggregate, Aggregates, Col(..) )
35+import Rel8.Expr ( Col(..), Expr )
36+import Rel8.Expr.Aggregate ( groupByExpr, listAggExpr, nonEmptyAggExpr )
37+import Rel8.Generic.Construction ( GGAggregate', ggaggregate' )
38+import Rel8.Generic.Table ( GAlgebra )
39+import Rel8.Kind.Algebra ( Algebra( Sum ) )
40+import Rel8.Query ( Query )
41+import Rel8.Query.Opaleye ( mapOpaleye )
42+import Rel8.Schema.Dict ( Dict( Dict ) )
43+import Rel8.Schema.HTable ( htabulate, hfield )
44+import Rel8.Schema.HTable.Vectorize ( hvectorize )
45+import Rel8.Schema.Kind ( Rel8able )
46+import Rel8.Table ( toColumns, fromColumns )
47+import Rel8.Table.ADT ( ConstructableADT, ADT( ADT ), ADTRep )
48+import Rel8.Table.Eq ( EqTable, eqTable )
49+import Rel8.Table.HKD ( ConstructableHKD, HKD( HKD ), HKDRep )
50+import Rel8.Table.List ( ListTable )
51+import Rel8.Table.NonEmpty ( NonEmptyTable )
52+import Rel8.Table.Opaleye ( aggregator )
53+import Rel8.Tabulate ( Tabulation )
54+import qualified Rel8.Tabulate
55+
56+
57+-- | Apply an aggregation to all rows returned by a 'Query'.
58+aggregate :: Aggregates aggregates exprs => Query aggregates -> Query exprs
59+aggregate = mapOpaleye (Opaleye.aggregate aggregator) . fmap (fromColumns . toColumns)
60+
61+
62+aggregateTabulation
63+ :: (EqTable k, Aggregates aggregates exprs)
64+ => (t -> aggregates) -> Tabulation k t -> Tabulation k exprs
65+aggregateTabulation f =
66+ Rel8.Tabulate.aggregateTabulation . fmap (fromColumns . toColumns . f)
67+
68+
69+-- | Group equal tables together. This works by aggregating each column in the
70+-- given table with 'groupByExpr'.
71+groupBy :: forall exprs aggregates. (EqTable exprs, Aggregates aggregates exprs)
72+ => exprs -> aggregates
73+groupBy (toColumns -> exprs) = fromColumns $ htabulate $ \field ->
74+ case hfield (eqTable @exprs) field of
75+ Dict -> case hfield exprs field of
76+ DB expr -> Aggregation $ groupByExpr expr
77+
78+
79+-- | Aggregate rows into a single row containing an array of all aggregated
80+-- rows. This can be used to associate multiple rows with a single row, without
81+-- changing the over cardinality of the query. This allows you to essentially
82+-- return a tree-like structure from queries.
83+--
84+-- For example, if we have a table of orders and each orders contains multiple
85+-- items, we could aggregate the table of orders, pairing each order with its
86+-- items:
87+--
88+-- @
89+-- ordersWithItems :: Query (Order Expr, ListTable (Item Expr))
90+-- ordersWithItems = do
91+-- order <- each orderSchema
92+-- items <- aggregate $ listAgg <$> itemsFromOrder order
93+-- return (order, items)
94+-- @
95+listAgg :: Aggregates aggregates exprs => exprs -> ListTable aggregates
96+listAgg (toColumns -> exprs) = fromColumns $
97+ hvectorize
98+ (\_ (Identity (DB a)) -> Aggregation $ listAggExpr a)
99+ (pure exprs)
100+
101+
102+-- | Like 'listAgg', but the result is guaranteed to be a non-empty list.
103+nonEmptyAgg :: Aggregates aggregates exprs => exprs -> NonEmptyTable aggregates
104+nonEmptyAgg (toColumns -> exprs) = fromColumns $
105+ hvectorize
106+ (\_ (Identity (DB a)) -> Aggregation $ nonEmptyAggExpr a)
107+ (pure exprs)
108+
109+
110+type AggregateADT :: Rel8able -> Type
111+type AggregateADT t = forall r. GGAggregate' 'Sum (ADTRep t) r
112+
113+
114+aggregateADT :: forall t. ConstructableADT t
115+ => AggregateADT t -> ADT t Expr -> ADT t Aggregate
116+aggregateADT f =
117+ ggaggregate' @'Sum @(ADTRep t) @(ADT t Expr) @(ADT t Aggregate) ADT (\(ADT a) -> a)
118+ (f @(ADT t Aggregate))
119+
120+
121+type AggregateHKD :: Type -> Type
122+type AggregateHKD a = forall r. GGAggregate' (GAlgebra (Rep a)) (HKDRep a) r
123+
124+
125+aggregateHKD :: forall a. ConstructableHKD a
126+ => AggregateHKD a -> HKD a Expr -> HKD a Aggregate
127+aggregateHKD f =
128+ ggaggregate' @(GAlgebra (Rep a)) @(HKDRep a) @(HKD a Expr) @(HKD a Aggregate) HKD (\(HKD a) -> a)
129+ (f @(HKD a Aggregate))
src/Rel8/Column.hs+13−9
@@ -1,9 +1,9 @@
11{-# language DataKinds #-}
2−{-# language StandaloneKindSignatures #-}
32{-# language TypeFamilies #-}
3+{-# language StandaloneKindSignatures #-}
44
55module Rel8.Column
6− ( Column
6+ ( Column, Default
77 , TColumn
88 )
99where
@@ -13,18 +13,22 @@ import Data.Kind ( Type )
1313import Prelude ()
1414
1515-- rel8
16+import Rel8.Column.Field ( Field )
1617import Rel8.FCF ( Eval, Exp )
18+import Rel8.Kind.Necessity ( Necessity( Required, Optional ) )
1719import qualified Rel8.Schema.Kind as K
18−import Rel8.Schema.Result ( Result )
1920
2021
21−-- | This type family is used to specify columns in 'Rel8able's. In @Column f
22−-- a@, @f@ is the context of the column (which should be left polymorphic in
23−-- 'Rel8able' definitions), and @a@ is the type of the column.
22+-- | The @Column@ type family should be used to indicate which fields of your
23+-- data types are single columns in queries. This type family has special
24+-- support when a query is executed, allowing you to use a single data type for
25+-- both query data and rows decoded to Haskell.
2426type Column :: K.Context -> Type -> Type
25−type family Column context a where
26− Column Result a = a
27− Column context a = context a
27+type Column context a = Field context 'Required a
28+
29+
30+type Default :: K.Context -> Type -> Type
31+type Default context a = Field context 'Optional a
2832
2933
3034data TColumn :: K.Context -> Type -> Exp Type
src/Rel8/Column/ADT.hs+70−3
@@ -1,23 +1,90 @@
11{-# language DataKinds #-}
2+{-# language LambdaCase #-}
3+{-# language MultiParamTypeClasses #-}
24{-# language StandaloneKindSignatures #-}
35{-# language TypeFamilies #-}
6+{-# language UndecidableInstances #-}
47
58module Rel8.Column.ADT
6− ( HADT
9+ ( HADT, AHADT(..)
710 )
811where
912
1013-- base
1114import Data.Kind ( Type )
12−import Prelude ()
15+import Prelude
1316
1417-- rel8
18+import Rel8.Generic.Rel8able ( GColumns )
19+import Rel8.Kind.Context ( SContext(..), Reifiable, contextSing )
20+import Rel8.Schema.Context ( Col )
1521import qualified Rel8.Schema.Kind as K
22+import Rel8.Schema.Reify ( Reify, hreify, hunreify )
1623import Rel8.Schema.Result ( Result )
17−import Rel8.Table.ADT ( ADT )
24+import Rel8.Table
25+ ( Table, Columns, Context, fromColumns, toColumns
26+ , Unreify, reify, unreify
27+ )
28+import Rel8.Table.ADT ( ADT( ADT ), ADTable, fromADT, toADT )
29+import Rel8.Table.Recontextualize ( Recontextualize )
1830
1931
2032type HADT :: K.Context -> K.Rel8able -> Type
2133type family HADT context t where
34+ HADT (Reify context) t = AHADT context t
2235 HADT Result t = t Result
2336 HADT context t = ADT t context
37+
38+
39+type AHADT :: K.Context -> K.Rel8able -> Type
40+newtype AHADT context t = AHADT (HADT context t)
41+
42+
43+instance (ADTable t, Reifiable context) =>
44+ Table (Reify context) (AHADT context t)
45+ where
46+ type Context (AHADT context t) = Reify context
47+ type Columns (AHADT context t) = GColumns (ADT t)
48+ type Unreify (AHADT context t) = HADT context t
49+
50+ fromColumns = sfromColumnsADT contextSing
51+ toColumns = stoColumnsADT contextSing
52+ reify _ = AHADT
53+ unreify _ (AHADT a) = a
54+
55+
56+instance
57+ ( Reifiable context, Reifiable context'
58+ , ADTable t, t ~ t'
59+ )
60+ => Recontextualize
61+ (Reify context)
62+ (Reify context')
63+ (AHADT context t)
64+ (AHADT context' t')
65+
66+
67+sfromColumnsADT :: ADTable t
68+ => SContext context
69+ -> GColumns (ADT t) (Col (Reify context))
70+ -> AHADT context t
71+sfromColumnsADT = \case
72+ SAggregate -> AHADT . ADT . hunreify
73+ SExpr -> AHADT . ADT . hunreify
74+ SInsert -> AHADT . ADT . hunreify
75+ SName -> AHADT . ADT . hunreify
76+ SResult -> AHADT . fromADT . ADT . hunreify
77+ SReify context -> AHADT . sfromColumnsADT context . hunreify
78+
79+
80+stoColumnsADT :: ADTable t
81+ => SContext context
82+ -> AHADT context t
83+ -> GColumns (ADT t) (Col (Reify context))
84+stoColumnsADT = \case
85+ SAggregate -> hreify . (\(AHADT (ADT a)) -> a)
86+ SExpr -> hreify . (\(AHADT (ADT a)) -> a)
87+ SInsert -> hreify . (\(AHADT (ADT a)) -> a)
88+ SName -> hreify . (\(AHADT (ADT a)) -> a)
89+ SResult -> hreify . (\(ADT a) -> a) . toADT . (\(AHADT a) -> a)
90+ SReify context -> hreify . stoColumnsADT context . (\(AHADT a) -> a)
src/Rel8/Column/Either.hs+153−7
@@ -1,26 +1,172 @@
11{-# language DataKinds #-}
2+{-# language FlexibleContexts #-}
3+{-# language LambdaCase #-}
4+{-# language MultiParamTypeClasses #-}
25{-# language StandaloneKindSignatures #-}
3−{-# language TypeFamilyDependencies #-}
6+{-# language TypeFamilies #-}
7+{-# language UndecidableInstances #-}
48
59module Rel8.Column.Either
6− ( HEither
10+ ( HEither, AHEither(..)
711 )
812where
913
1014-- base
15+import Control.Applicative ( liftA2 )
16+import Data.Bifunctor ( Bifunctor, bimap )
1117import Data.Kind ( Type )
1218import Prelude
1319
1420-- rel8
21+import Rel8.Aggregate ( Aggregate )
22+import Rel8.Expr ( Expr )
23+import Rel8.Kind.Context ( SContext(..), Reifiable( contextSing ) )
24+import Rel8.Schema.Context ( Col )
25+import Rel8.Schema.HTable.Either ( HEitherTable )
26+import Rel8.Schema.Insert ( Insert )
1527import qualified Rel8.Schema.Kind as K
28+import Rel8.Schema.Name ( Name(..) )
29+import Rel8.Schema.Reify ( Reify, hreify, hunreify )
1630import Rel8.Schema.Result ( Result )
31+import Rel8.Table
32+ ( Table, Columns, Context, fromColumns, toColumns
33+ , Unreify, reify, unreify
34+ )
1735import Rel8.Table.Either ( EitherTable )
36+import Rel8.Table.Recontextualize ( Recontextualize )
1837
1938
20−-- | Nest an 'Either' value within a 'Rel8able'. @HEither f a b@ will produce a
21−-- 'EitherTable' @a b@ in the 'Expr' context, and a 'Either' @a b@ in the
22−-- 'Result' context.
2339type HEither :: K.Context -> Type -> Type -> Type
24−type family HEither context = either | either -> context where
40+type family HEither context where
41+ HEither (Reify context) = AHEither context
42+ HEither Aggregate = EitherTable
43+ HEither Expr = EitherTable
44+ HEither Insert = EitherTable
45+ HEither Name = EitherTable
2546 HEither Result = Either
26− HEither context = EitherTable context
47+
48+
49+type AHEither :: K.Context -> Type -> Type -> Type
50+newtype AHEither context a b = AHEither (HEither context a b)
51+
52+
53+instance Reifiable context => Bifunctor (AHEither context) where
54+ bimap = sbimapEither contextSing
55+
56+
57+instance Reifiable context => Functor (AHEither context a) where
58+ fmap = bimap id
59+
60+
61+instance (Reifiable context, Table (Reify context) a, Table (Reify context) b)
62+ => Table (Reify context) (AHEither context a b)
63+ where
64+ type Context (AHEither context a b) = Reify context
65+ type Columns (AHEither context a b) = HEitherTable (Columns a) (Columns b)
66+ type Unreify (AHEither context a b) = HEither context (Unreify a) (Unreify b)
67+
68+ fromColumns = sfromColumnsEither contextSing
69+ toColumns = stoColumnsEither contextSing
70+ reify proof = liftA2 bimap reify reify proof . AHEither
71+ unreify proof = (\(AHEither a) -> a) . liftA2 bimap unreify unreify proof
72+
73+
74+instance
75+ ( Reifiable context, Reifiable context'
76+ , Recontextualize (Reify context) (Reify context') a a'
77+ , Recontextualize (Reify context) (Reify context') b b'
78+ ) =>
79+ Recontextualize
80+ (Reify context)
81+ (Reify context')
82+ (AHEither context a b)
83+ (AHEither context' a' b')
84+
85+
86+sbimapEither :: ()
87+ => SContext context
88+ -> (a -> c)
89+ -> (b -> d)
90+ -> AHEither context a b
91+ -> AHEither context c d
92+sbimapEither = \case
93+ SAggregate -> \f g (AHEither a) -> AHEither (bimap f g a)
94+ SExpr -> \f g (AHEither a) -> AHEither (bimap f g a)
95+ SResult -> \f g (AHEither a) -> AHEither (bimap f g a)
96+ SInsert -> \f g (AHEither a) -> AHEither (bimap f g a)
97+ SName -> \f g (AHEither a) -> AHEither (bimap f g a)
98+ SReify context -> \f g (AHEither a) -> AHEither (sbimapEither context f g a)
99+
100+
101+sfromColumnsEither :: (Table (Reify context) a, Table (Reify context) b)
102+ => SContext context
103+ -> HEitherTable (Columns a) (Columns b) (Col (Reify context))
104+ -> AHEither context a b
105+sfromColumnsEither = \case
106+ SAggregate ->
107+ AHEither .
108+ bimap (fromColumns . hreify) (fromColumns . hreify) .
109+ fromColumns .
110+ hunreify
111+ SExpr ->
112+ AHEither .
113+ bimap (fromColumns . hreify) (fromColumns . hreify) .
114+ fromColumns .
115+ hunreify
116+ SResult ->
117+ AHEither .
118+ bimap (fromColumns . hreify) (fromColumns . hreify) .
119+ fromColumns .
120+ hunreify
121+ SInsert ->
122+ AHEither .
123+ bimap (fromColumns . hreify) (fromColumns . hreify) .
124+ fromColumns .
125+ hunreify
126+ SName ->
127+ AHEither .
128+ bimap (fromColumns . hreify) (fromColumns . hreify) .
129+ fromColumns .
130+ hunreify
131+ SReify context ->
132+ AHEither .
133+ sbimapEither context (fromColumns . hreify) (fromColumns . hreify) .
134+ sfromColumnsEither context .
135+ hunreify
136+
137+
138+stoColumnsEither :: (Table (Reify context) a, Table (Reify context) b)
139+ => SContext context
140+ -> AHEither context a b
141+ -> HEitherTable (Columns a) (Columns b) (Col (Reify context))
142+stoColumnsEither = \case
143+ SAggregate ->
144+ hreify .
145+ toColumns .
146+ bimap (hunreify . toColumns) (hunreify . toColumns) .
147+ (\(AHEither a) -> a)
148+ SExpr ->
149+ hreify .
150+ toColumns .
151+ bimap (hunreify . toColumns) (hunreify . toColumns) .
152+ (\(AHEither a) -> a)
153+ SResult ->
154+ hreify .
155+ toColumns .
156+ bimap (hunreify . toColumns) (hunreify . toColumns) .
157+ (\(AHEither a) -> a)
158+ SInsert ->
159+ hreify .
160+ toColumns .
161+ bimap (hunreify . toColumns) (hunreify . toColumns) .
162+ (\(AHEither a) -> a)
163+ SName ->
164+ hreify .
165+ toColumns .
166+ bimap (hunreify . toColumns) (hunreify . toColumns) .
167+ (\(AHEither a) -> a)
168+ SReify context ->
169+ hreify .
170+ stoColumnsEither context .
171+ sbimapEither context (hunreify . toColumns) (hunreify . toColumns) .
172+ (\(AHEither a) -> a)
src/Rel8/Column/Field.hsnew file+110
@@ -0,0 +1,110 @@
1+{-# language DataKinds #-}
2+{-# language FlexibleContexts #-}
3+{-# language LambdaCase #-}
4+{-# language MultiParamTypeClasses #-}
5+{-# language StandaloneKindSignatures #-}
6+{-# language TypeFamilies #-}
7+
8+module Rel8.Column.Field
9+ ( Field, AField(..)
10+ )
11+where
12+
13+-- base
14+import Data.Kind ( Type )
15+import Prelude
16+
17+-- rel8
18+import Rel8.Aggregate ( Aggregate, Col(..) )
19+import Rel8.Expr ( Expr, Col(..) )
20+import Rel8.Kind.Context ( SContext(..), Reifiable( contextSing ) )
21+import Rel8.Kind.Necessity
22+ ( Necessity( Required, Optional )
23+ , SNecessity( SRequired, SOptional )
24+ , KnownNecessity, necessitySing
25+ )
26+import Rel8.Schema.HTable.Identity ( HIdentity( HIdentity ) )
27+import Rel8.Schema.Insert ( Insert, Col(..) )
28+import qualified Rel8.Schema.Kind as K
29+import Rel8.Schema.Name ( Name(..), Col(..) )
30+import Rel8.Schema.Null ( Sql )
31+import Rel8.Schema.Reify ( Reify, Col(..) )
32+import Rel8.Schema.Result ( Col( Result ), Result )
33+import Rel8.Schema.Spec ( Spec( Spec ) )
34+import Rel8.Table
35+ ( Table, Columns, Context, fromColumns, toColumns
36+ , Unreify, reify, unreify
37+ )
38+import Rel8.Table.Recontextualize ( Recontextualize )
39+import Rel8.Type ( DBType )
40+
41+
42+type Field :: K.Context -> Necessity -> Type -> Type
43+type family Field context necessity a where
44+ Field (Reify context) necessity a = AField context necessity a
45+ Field Aggregate _necessity a = Aggregate (Expr a)
46+ Field Expr _necessity a = Expr a
47+ Field Insert 'Required a = Expr a
48+ Field Insert 'Optional a = Maybe (Expr a)
49+ Field Name _necessity a = Name a
50+ Field Result _necessity a = a
51+
52+
53+type AField :: K.Context -> Necessity -> Type -> Type
54+newtype AField context necessity a = AField (Field context necessity a)
55+
56+
57+instance (Reifiable context, KnownNecessity necessity, Sql DBType a) =>
58+ Table (Reify context) (AField context necessity a)
59+ where
60+ type Context (AField context necessity a) = Reify context
61+ type Columns (AField context necessity a) = HIdentity ('Spec '[] necessity a)
62+ type Unreify (AField context necessity a) = Field context necessity a
63+
64+ fromColumns (HIdentity (Reify a)) = sfromColumn contextSing a
65+ toColumns = HIdentity . Reify . stoColumn contextSing necessitySing
66+ reify _ = AField
67+ unreify _ (AField a) = a
68+
69+
70+instance
71+ ( Reifiable context, Reifiable context'
72+ , KnownNecessity necessity, Sql DBType a
73+ ) =>
74+ Recontextualize
75+ (Reify context)
76+ (Reify context')
77+ (AField context necessity a)
78+ (AField context' necessity a)
79+
80+
81+sfromColumn :: ()
82+ => SContext context
83+ -> Col context ('Spec labels necessity a)
84+ -> AField context necessity a
85+sfromColumn = \case
86+ SAggregate -> \(Aggregation a) -> AField a
87+ SExpr -> \(DB a) -> AField a
88+ SResult -> \(Result a) -> AField a
89+ SInsert -> \case
90+ RequiredInsert a -> AField a
91+ OptionalInsert a -> AField a
92+ SName -> \(NameCol a) -> AField (Name a)
93+ SReify context -> \(Reify a) -> AField (sfromColumn context a)
94+
95+
96+stoColumn :: ()
97+ => SContext context
98+ -> SNecessity necessity
99+ -> AField context necessity a
100+ -> Col context ('Spec labels necessity a)
101+stoColumn = \case
102+ SAggregate -> \_ (AField a) -> Aggregation a
103+ SExpr -> \_ (AField a) -> DB a
104+ SResult -> \_ (AField a) -> Result a
105+ SInsert -> \case
106+ SRequired -> \(AField a) -> RequiredInsert a
107+ SOptional -> \(AField a) -> OptionalInsert a
108+ SName -> \_ (AField (Name a)) -> NameCol a
109+ SReify context ->
110+ \necessity (AField a) -> Reify (stoColumn context necessity a)
src/Rel8/Column/Lift.hs+69−3
@@ -1,23 +1,89 @@
11{-# language DataKinds #-}
2+{-# language LambdaCase #-}
3+{-# language MultiParamTypeClasses #-}
24{-# language StandaloneKindSignatures #-}
35{-# language TypeFamilies #-}
46
57module Rel8.Column.Lift
6− ( Lift
8+ ( Lift, ALift(..)
79 )
810where
911
1012-- base
1113import Data.Kind ( Type )
12−import Prelude ()
14+import Prelude
1315
1416-- rel8
17+import Rel8.Generic.Rel8able ( GColumns )
18+import Rel8.Kind.Context ( Reifiable(..), SContext(..) )
19+import Rel8.Schema.Context ( Col )
1520import qualified Rel8.Schema.Kind as K
21+import Rel8.Schema.Reify ( Reify, hreify, hunreify )
1622import Rel8.Schema.Result ( Result )
17−import Rel8.Table.HKD ( HKD )
23+import Rel8.Table
24+ ( Table, Columns, Context, fromColumns, toColumns
25+ , Unreify, reify, unreify
26+ )
27+import Rel8.Table.Rel8able ()
28+import Rel8.Table.HKD ( HKD( HKD ), HKDable, fromHKD, toHKD )
29+import Rel8.Table.Recontextualize ( Recontextualize )
1830
1931
2032type Lift :: K.Context -> Type -> Type
2133type family Lift context a where
34+ Lift (Reify context) a = ALift context a
2235 Lift Result a = a
2336 Lift context a = HKD a context
37+
38+
39+type ALift :: K.Context -> Type -> Type
40+newtype ALift context a = ALift
41+ { unALift :: Lift context a
42+ }
43+
44+
45+instance (Reifiable context, HKDable a) =>
46+ Table (Reify context) (ALift context a)
47+ where
48+ type Context (ALift context a) = Reify context
49+ type Columns (ALift context a) = GColumns (HKD a)
50+ type Unreify (ALift context a) = Lift context a
51+
52+ fromColumns = sfromColumnsLift contextSing
53+ toColumns = stoColumnsLift contextSing
54+ reify _ = ALift
55+ unreify _ (ALift a) = a
56+
57+
58+instance (Reifiable context, Reifiable context', HKDable a) =>
59+ Recontextualize
60+ (Reify context)
61+ (Reify context')
62+ (ALift context a)
63+ (ALift context' a)
64+
65+
66+sfromColumnsLift :: HKDable a
67+ => SContext context
68+ -> GColumns (HKD a) (Col (Reify context))
69+ -> ALift context a
70+sfromColumnsLift = \case
71+ SAggregate -> ALift . fromColumns . hunreify
72+ SExpr -> ALift . fromColumns . hunreify
73+ SInsert -> ALift . fromColumns . hunreify
74+ SName -> ALift . fromColumns . hunreify
75+ SResult -> ALift . fromHKD . HKD . hunreify
76+ SReify context -> ALift . sfromColumnsLift context . hunreify
77+
78+
79+stoColumnsLift :: HKDable a
80+ => SContext context
81+ -> ALift context a
82+ -> GColumns (HKD a) (Col (Reify context))
83+stoColumnsLift = \case
84+ SAggregate -> hreify . toColumns . unALift
85+ SExpr -> hreify . toColumns . unALift
86+ SInsert -> hreify . toColumns . unALift
87+ SName -> hreify . toColumns . unALift
88+ SResult -> hreify . (\(HKD a) -> a) . toHKD . unALift
89+ SReify context -> hreify . stoColumnsLift context . unALift
src/Rel8/Column/List.hs+131−8
@@ -1,25 +1,148 @@
11{-# language DataKinds #-}
2+{-# language FlexibleContexts #-}
3+{-# language LambdaCase #-}
4+{-# language MultiParamTypeClasses #-}
25{-# language StandaloneKindSignatures #-}
3−{-# language TypeFamilyDependencies #-}
6+{-# language TypeFamilies #-}
7+{-# language UndecidableInstances #-}
48
59module Rel8.Column.List
6− ( HList
10+ ( HList, AHList(..)
711 )
812where
913
1014-- base
1115import Data.Kind ( Type )
12−import Prelude ()
16+import Data.Type.Equality ( (:~:)( Refl ) )
17+import Prelude
1318
1419-- rel8
20+import Rel8.Aggregate ( Aggregate )
21+import Rel8.Expr ( Expr )
22+import Rel8.Kind.Context ( SContext(..), Reifiable( contextSing ) )
23+import Rel8.Schema.Context ( Col )
24+import Rel8.Schema.HTable.List ( HListTable )
25+import Rel8.Schema.Insert ( Insert )
1526import qualified Rel8.Schema.Kind as K
27+import Rel8.Schema.Name ( Name )
28+import Rel8.Schema.Reify ( Reify, hreify, hunreify )
1629import Rel8.Schema.Result ( Result )
17−import Rel8.Table.List ( ListTable )
30+import Rel8.Table
31+ ( Table, Columns, Congruent, Context, fromColumns, toColumns
32+ , Unreify, reify, unreify
33+ )
34+import Rel8.Table.List ( ListTable( ListTable ) )
35+import Rel8.Table.Recontextualize ( Recontextualize )
36+import Rel8.Table.Unreify ( Unreifiability(..), Unreifiable, unreifiability )
1837
1938
20−-- | Nest a list within a 'Rel8able'. @HList f a@ will produce a 'ListTable'
21−-- @a@ in the 'Expr' context, and a @[a]@ in the 'Result' context.
2239type HList :: K.Context -> Type -> Type
23−type family HList context = list | list -> context where
40+type family HList context where
41+ HList (Reify context) = AHList context
42+ HList Aggregate = ListTable
43+ HList Expr = ListTable
44+ HList Insert = ListTable
45+ HList Name = ListTable
2446 HList Result = []
25− HList context = ListTable context
47+
48+
49+type AHList :: K.Context -> Type -> Type
50+newtype AHList context a = AHList (HList context a)
51+
52+
53+instance (Reifiable context, Unreifiable a, Table (Reify context) a) =>
54+ Table (Reify context) (AHList context a)
55+ where
56+ type Context (AHList context a) = Reify context
57+ type Columns (AHList context a) = HListTable (Columns a)
58+ type Unreify (AHList context a) = HList context (Unreify a)
59+
60+ fromColumns = sfromColumnsList contextSing
61+ toColumns = stoColumnsList contextSing
62+
63+ reify _ = sreifyList (unreifiability contextSing)
64+ unreify _ = sunreifyList (unreifiability contextSing)
65+
66+
67+instance
68+ ( Reifiable context, Reifiable context'
69+ , Unreifiable a, Unreifiable a'
70+ , Recontextualize (Reify context) (Reify context') a a'
71+ )
72+ => Recontextualize
73+ (Reify context)
74+ (Reify context')
75+ (AHList context a)
76+ (AHList context' a')
77+
78+
79+smapList :: Congruent a b
80+ => SContext context
81+ -> (a -> b)
82+ -> (HListTable (Columns a) (Col (Context a)) -> HListTable (Columns b) (Col (Context b)))
83+ -> AHList context a
84+ -> AHList context b
85+smapList = \case
86+ SAggregate -> \_ f (AHList (ListTable a)) -> AHList (ListTable (f a))
87+ SExpr -> \_ f (AHList (ListTable a)) -> AHList (ListTable (f a))
88+ SResult -> \f _ (AHList as) -> AHList (fmap f as)
89+ SInsert -> \_ f (AHList (ListTable a)) -> AHList (ListTable (f a))
90+ SName -> \_ f (AHList (ListTable a)) -> AHList (ListTable (f a))
91+ SReify context -> \f g (AHList as) -> AHList (smapList context f g as)
92+
93+
94+sfromColumnsList :: Table (Reify context) a
95+ => SContext context
96+ -> HListTable (Columns a) (Col (Reify context))
97+ -> AHList context a
98+sfromColumnsList = \case
99+ SAggregate -> AHList . ListTable
100+ SExpr -> AHList . ListTable
101+ SResult -> AHList . fmap (fromColumns . hreify) . fromColumns . hunreify
102+ SInsert -> AHList . ListTable
103+ SName -> AHList . ListTable
104+ SReify context ->
105+ AHList .
106+ smapList context (fromColumns . hreify) hreify .
107+ sfromColumnsList context .
108+ hunreify
109+
110+
111+stoColumnsList :: Table (Reify context) a
112+ => SContext context
113+ -> AHList context a
114+ -> HListTable (Columns a) (Col (Reify context))
115+stoColumnsList = \case
116+ SAggregate -> \(AHList (ListTable a)) -> a
117+ SExpr -> \(AHList (ListTable a)) -> a
118+ SResult ->
119+ hreify . toColumns . fmap (hunreify . toColumns) . (\(AHList a) -> a)
120+ SInsert -> \(AHList (ListTable a)) -> a
121+ SName -> \(AHList (ListTable a)) -> a
122+ SReify context ->
123+ hreify .
124+ stoColumnsList context .
125+ smapList context (hunreify . toColumns) hunreify .
126+ (\(AHList a) -> a)
127+
128+
129+sreifyList :: Table (Reify context) a
130+ => Unreifiability context a
131+ -> HList context (Unreify a)
132+ -> AHList context a
133+sreifyList = \case
134+ UResult -> AHList . fmap (reify Refl)
135+ Unreifiability context ->
136+ smapList context (reify Refl) hreify .
137+ AHList
138+
139+
140+sunreifyList :: Table (Reify context) a
141+ => Unreifiability context a
142+ -> AHList context a
143+ -> HList context (Unreify a)
144+sunreifyList = \case
145+ UResult -> fmap (unreify Refl) . (\(AHList a) -> a)
146+ Unreifiability context ->
147+ (\(AHList a) -> a) .
148+ smapList context (unreify Refl) hunreify
src/Rel8/Column/Maybe.hs+111−7
@@ -1,9 +1,14 @@
11{-# language DataKinds #-}
2+{-# language FlexibleContexts #-}
3+{-# language GADTs #-}
4+{-# language LambdaCase #-}
5+{-# language MultiParamTypeClasses #-}
26{-# language StandaloneKindSignatures #-}
3−{-# language TypeFamilyDependencies #-}
7+{-# language TypeFamilies #-}
8+{-# language UndecidableInstances #-}
49
510module Rel8.Column.Maybe
6− ( HMaybe
11+ ( HMaybe, AHMaybe(..)
712 )
813where
914
@@ -12,15 +17,114 @@ import Data.Kind ( Type )
1217import Prelude
1318
1419-- rel8
20+import Rel8.Aggregate ( Aggregate )
21+import Rel8.Expr ( Expr )
22+import Rel8.Kind.Context ( SContext(..), Reifiable( contextSing ) )
23+import Rel8.Schema.Context ( Col )
24+import Rel8.Schema.HTable.Maybe ( HMaybeTable )
25+import Rel8.Schema.Insert ( Insert )
1526import qualified Rel8.Schema.Kind as K
27+import Rel8.Schema.Name ( Name )
28+import Rel8.Schema.Reify ( Reify, hreify, hunreify )
1629import Rel8.Schema.Result ( Result )
30+import Rel8.Table
31+ ( Table, Columns, Context, fromColumns, toColumns
32+ , Unreify, reify, unreify
33+ )
1734import Rel8.Table.Maybe ( MaybeTable )
35+import Rel8.Table.Recontextualize ( Recontextualize )
1836
1937
20−-- | Nest a 'Maybe' value within a 'Rel8able'. @HMaybe f a@ will produce a
21−-- 'MaybeTable' @a@ in the 'Expr' context, and a 'Maybe' @a@ in the 'Result'
22−-- context.
2338type HMaybe :: K.Context -> Type -> Type
24−type family HMaybe context = maybe | maybe -> context where
39+type family HMaybe context where
40+ HMaybe (Reify context) = AHMaybe context
41+ HMaybe Aggregate = MaybeTable
42+ HMaybe Expr = MaybeTable
43+ HMaybe Insert = MaybeTable
44+ HMaybe Name = MaybeTable
2545 HMaybe Result = Maybe
26− HMaybe context = MaybeTable context
46+
47+
48+type AHMaybe :: K.Context -> Type -> Type
49+newtype AHMaybe context a = AHMaybe (HMaybe context a)
50+
51+
52+instance Reifiable context => Functor (AHMaybe context) where
53+ fmap = smapMaybe contextSing
54+
55+
56+instance (Reifiable context, Table (Reify context) a) =>
57+ Table (Reify context) (AHMaybe context a)
58+ where
59+ type Context (AHMaybe context a) = Reify context
60+ type Columns (AHMaybe context a) = HMaybeTable (Columns a)
61+ type Unreify (AHMaybe context a) = HMaybe context (Unreify a)
62+
63+ fromColumns = sfromColumnsMaybe contextSing
64+ toColumns = stoColumnsMaybe contextSing
65+ reify proof = fmap fmap reify proof . AHMaybe
66+ unreify proof = (\(AHMaybe a) -> a) . fmap fmap unreify proof
67+
68+
69+instance
70+ ( Reifiable context, Reifiable context'
71+ , Recontextualize (Reify context) (Reify context') a a'
72+ ) =>
73+ Recontextualize
74+ (Reify context)
75+ (Reify context')
76+ (AHMaybe context a)
77+ (AHMaybe context' a')
78+
79+
80+smapMaybe :: ()
81+ => SContext context
82+ -> (a -> b)
83+ -> AHMaybe context a
84+ -> AHMaybe context b
85+smapMaybe = \case
86+ SAggregate -> \f (AHMaybe a) -> AHMaybe (fmap f a)
87+ SExpr -> \f (AHMaybe a) -> AHMaybe (fmap f a)
88+ SResult -> \f (AHMaybe a) -> AHMaybe (fmap f a)
89+ SInsert -> \f (AHMaybe a) -> AHMaybe (fmap f a)
90+ SName -> \f (AHMaybe a) -> AHMaybe (fmap f a)
91+ SReify context -> \f (AHMaybe a) -> AHMaybe (smapMaybe context f a)
92+
93+
94+sfromColumnsMaybe :: Table (Reify context) a
95+ => SContext context
96+ -> HMaybeTable (Columns a) (Col (Reify context))
97+ -> AHMaybe context a
98+sfromColumnsMaybe = \case
99+ SAggregate -> AHMaybe . fmap (fromColumns . hreify) . fromColumns . hunreify
100+ SExpr -> AHMaybe . fmap (fromColumns . hreify) . fromColumns . hunreify
101+ SResult -> AHMaybe . fmap (fromColumns . hreify) . fromColumns . hunreify
102+ SInsert -> AHMaybe . fmap (fromColumns . hreify) . fromColumns . hunreify
103+ SName -> AHMaybe . fmap (fromColumns . hreify) . fromColumns . hunreify
104+ SReify context ->
105+ AHMaybe .
106+ smapMaybe context (fromColumns . hreify) .
107+ sfromColumnsMaybe context .
108+ hunreify
109+
110+
111+stoColumnsMaybe :: Table (Reify context) a
112+ => SContext context
113+ -> AHMaybe context a
114+ -> HMaybeTable (Columns a) (Col (Reify context))
115+stoColumnsMaybe = \case
116+ SAggregate ->
117+ hreify . toColumns . fmap (hunreify . toColumns) . (\(AHMaybe a) -> a)
118+ SExpr ->
119+ hreify . toColumns . fmap (hunreify . toColumns) . (\(AHMaybe a) -> a)
120+ SResult ->
121+ hreify . toColumns . fmap (hunreify . toColumns) . (\(AHMaybe a) -> a)
122+ SInsert ->
123+ hreify . toColumns . fmap (hunreify . toColumns) . (\(AHMaybe a) -> a)
124+ SName ->
125+ hreify . toColumns . fmap (hunreify . toColumns) . (\(AHMaybe a) -> a)
126+ SReify context ->
127+ hreify .
128+ stoColumnsMaybe context .
129+ smapMaybe context (hunreify . toColumns) .
130+ (\(AHMaybe a) -> a)
src/Rel8/Column/NonEmpty.hs+132−9
@@ -1,27 +1,150 @@
11{-# language DataKinds #-}
2+{-# language FlexibleContexts #-}
3+{-# language LambdaCase #-}
4+{-# language MultiParamTypeClasses #-}
25{-# language StandaloneKindSignatures #-}
3−{-# language TypeFamilyDependencies #-}
6+{-# language TypeFamilies #-}
7+{-# language UndecidableInstances #-}
48
59module Rel8.Column.NonEmpty
6− ( HNonEmpty
10+ ( HNonEmpty, AHNonEmpty(..)
711 )
812where
913
1014-- base
1115import Data.Kind ( Type )
1216import Data.List.NonEmpty ( NonEmpty )
13−import Prelude ()
17+import Data.Type.Equality ( (:~:)( Refl ) )
18+import Prelude
1419
1520-- rel8
21+import Rel8.Aggregate ( Aggregate )
22+import Rel8.Expr ( Expr )
23+import Rel8.Kind.Context ( SContext(..), Reifiable( contextSing ) )
24+import Rel8.Schema.Context ( Col )
25+import Rel8.Schema.HTable.NonEmpty ( HNonEmptyTable )
26+import Rel8.Schema.Insert ( Insert )
1627import qualified Rel8.Schema.Kind as K
28+import Rel8.Schema.Name ( Name )
29+import Rel8.Schema.Reify ( Reify, hreify, hunreify )
1730import Rel8.Schema.Result ( Result )
18−import Rel8.Table.NonEmpty ( NonEmptyTable )
31+import Rel8.Table
32+ ( Table, Columns, Congruent, Context, fromColumns, toColumns
33+ , Unreify, reify, unreify
34+ )
35+import Rel8.Table.NonEmpty ( NonEmptyTable( NonEmptyTable ) )
36+import Rel8.Table.Recontextualize ( Recontextualize )
37+import Rel8.Table.Unreify ( Unreifiability(..), Unreifiable, unreifiability )
1938
2039
21−-- | Nest a 'NonEmpty' list within a 'Rel8able'. @HNonEmpty f a@ will produce a
22−-- 'NonEmptyTable' @a@ in the 'Expr' context, and a 'NonEmpty' @a@ in the
23−-- 'Result' context.
2440type HNonEmpty :: K.Context -> Type -> Type
25−type family HNonEmpty context = nonEmpty | nonEmpty -> context where
41+type family HNonEmpty context where
42+ HNonEmpty (Reify context) = AHNonEmpty context
43+ HNonEmpty Aggregate = NonEmptyTable
44+ HNonEmpty Expr = NonEmptyTable
45+ HNonEmpty Insert = NonEmptyTable
46+ HNonEmpty Name = NonEmptyTable
2647 HNonEmpty Result = NonEmpty
27− HNonEmpty context = NonEmptyTable context
48+
49+
50+type AHNonEmpty :: K.Context -> Type -> Type
51+newtype AHNonEmpty context a = AHNonEmpty (HNonEmpty context a)
52+
53+
54+instance (Reifiable context, Unreifiable a, Table (Reify context) a) =>
55+ Table (Reify context) (AHNonEmpty context a)
56+ where
57+ type Context (AHNonEmpty context a) = Reify context
58+ type Columns (AHNonEmpty context a) = HNonEmptyTable (Columns a)
59+ type Unreify (AHNonEmpty context a) = HNonEmpty context (Unreify a)
60+
61+ fromColumns = sfromColumnsNonEmpty contextSing
62+ toColumns = stoColumnsNonEmpty contextSing
63+
64+ reify _ = sreifyNonEmpty (unreifiability contextSing)
65+ unreify _ = sunreifyNonEmpty (unreifiability contextSing)
66+
67+
68+instance
69+ ( Reifiable context, Reifiable context'
70+ , Unreifiable a, Unreifiable a'
71+ , Recontextualize (Reify context) (Reify context') a a'
72+ )
73+ => Recontextualize
74+ (Reify context)
75+ (Reify context')
76+ (AHNonEmpty context a)
77+ (AHNonEmpty context' a')
78+
79+
80+smapNonEmpty :: Congruent a b
81+ => SContext context
82+ -> (a -> b)
83+ -> (HNonEmptyTable (Columns a) (Col (Context a)) -> HNonEmptyTable (Columns b) (Col (Context b)))
84+ -> AHNonEmpty context a
85+ -> AHNonEmpty context b
86+smapNonEmpty = \case
87+ SAggregate -> \_ f (AHNonEmpty (NonEmptyTable a)) -> AHNonEmpty (NonEmptyTable (f a))
88+ SExpr -> \_ f (AHNonEmpty (NonEmptyTable a)) -> AHNonEmpty (NonEmptyTable (f a))
89+ SResult -> \f _ (AHNonEmpty as) -> AHNonEmpty (fmap f as)
90+ SInsert -> \_ f (AHNonEmpty (NonEmptyTable a)) -> AHNonEmpty (NonEmptyTable (f a))
91+ SName -> \_ f (AHNonEmpty (NonEmptyTable a)) -> AHNonEmpty (NonEmptyTable (f a))
92+ SReify context -> \f g (AHNonEmpty as) -> AHNonEmpty (smapNonEmpty context f g as)
93+
94+
95+sfromColumnsNonEmpty :: Table (Reify context) a
96+ => SContext context
97+ -> HNonEmptyTable (Columns a) (Col (Reify context))
98+ -> AHNonEmpty context a
99+sfromColumnsNonEmpty = \case
100+ SAggregate -> AHNonEmpty . NonEmptyTable
101+ SExpr -> AHNonEmpty . NonEmptyTable
102+ SResult ->
103+ AHNonEmpty . fmap (fromColumns . hreify) . fromColumns . hunreify
104+ SInsert -> AHNonEmpty . NonEmptyTable
105+ SName -> AHNonEmpty . NonEmptyTable
106+ SReify context ->
107+ AHNonEmpty .
108+ smapNonEmpty context (fromColumns . hreify) hreify .
109+ sfromColumnsNonEmpty context .
110+ hunreify
111+
112+
113+stoColumnsNonEmpty :: Table (Reify context) a
114+ => SContext context
115+ -> AHNonEmpty context a
116+ -> HNonEmptyTable (Columns a) (Col (Reify context))
117+stoColumnsNonEmpty = \case
118+ SAggregate -> \(AHNonEmpty (NonEmptyTable a)) -> a
119+ SExpr -> \(AHNonEmpty (NonEmptyTable a)) -> a
120+ SResult ->
121+ hreify . toColumns . fmap (hunreify . toColumns) . (\(AHNonEmpty a) -> a)
122+ SInsert -> \(AHNonEmpty (NonEmptyTable a)) -> a
123+ SName -> \(AHNonEmpty (NonEmptyTable a)) -> a
124+ SReify context ->
125+ hreify .
126+ stoColumnsNonEmpty context .
127+ smapNonEmpty context (hunreify . toColumns) hunreify .
128+ (\(AHNonEmpty a) -> a)
129+
130+
131+sreifyNonEmpty :: Table (Reify context) a
132+ => Unreifiability context a
133+ -> HNonEmpty context (Unreify a)
134+ -> AHNonEmpty context a
135+sreifyNonEmpty = \case
136+ UResult -> AHNonEmpty . fmap (reify Refl)
137+ Unreifiability context ->
138+ smapNonEmpty context (reify Refl) hreify .
139+ AHNonEmpty
140+
141+
142+sunreifyNonEmpty :: Table (Reify context) a
143+ => Unreifiability context a
144+ -> AHNonEmpty context a
145+ -> HNonEmpty context (Unreify a)
146+sunreifyNonEmpty = \case
147+ UResult -> fmap (unreify Refl) . (\(AHNonEmpty a) -> a)
148+ Unreifiability context ->
149+ (\(AHNonEmpty a) -> a) .
150+ smapNonEmpty context (unreify Refl) hunreify
src/Rel8/Column/Null.hsdeleted−26
@@ -1,26 +0,0 @@
1−{-# language DataKinds #-}
2−{-# language StandaloneKindSignatures #-}
3−{-# language TypeFamilyDependencies #-}
4−
5−module Rel8.Column.Null
6− ( HNull
7− )
8−where
9−
10−-- base
11−import Data.Kind ( Type )
12−import Prelude
13−
14−-- rel8
15−import qualified Rel8.Schema.Kind as K
16−import Rel8.Schema.Result ( Result )
17−import Rel8.Table.Null ( NullTable )
18−
19−
20−-- | Nest a 'Null' value within a 'Rel8able'. @HNull f a@ will produce a
21−-- 'NullTable' @a@ in the 'Expr' context, and a @'Maybe' a@ in the 'Result'
22−-- context.
23−type HNull :: K.Context -> Type -> Type
24−type family HNull context = maybe | maybe -> context where
25− HNull Result = Maybe
26− HNull context = NullTable context
src/Rel8/Column/These.hs+155−8
@@ -1,29 +1,176 @@
11{-# language DataKinds #-}
2+{-# language FlexibleContexts #-}
3+{-# language GADTs #-}
4+{-# language LambdaCase #-}
5+{-# language MultiParamTypeClasses #-}
26{-# language StandaloneKindSignatures #-}
3−{-# language TypeFamilyDependencies #-}
7+{-# language TypeFamilies #-}
8+{-# language UndecidableInstances #-}
49
510module Rel8.Column.These
6− ( HThese
11+ ( HThese, AHThese(..)
712 )
813where
914
1015-- base
16+import Control.Applicative ( liftA2 )
17+import Data.Bifunctor ( Bifunctor, bimap )
1118import Data.Kind ( Type )
12−import Prelude ()
19+import Prelude
1320
1421-- rel8
22+import Rel8.Aggregate ( Aggregate )
23+import Rel8.Expr ( Expr )
24+import Rel8.Kind.Context ( SContext(..), Reifiable( contextSing ) )
25+import Rel8.Schema.Context ( Col )
26+import Rel8.Schema.HTable.These ( HTheseTable )
27+import Rel8.Schema.Insert ( Insert )
1528import qualified Rel8.Schema.Kind as K
29+import Rel8.Schema.Name ( Name )
30+import Rel8.Schema.Reify ( Reify, hreify, hunreify )
1631import Rel8.Schema.Result ( Result )
32+import Rel8.Table
33+ ( Table, Columns, Context, fromColumns, toColumns
34+ , Unreify, reify, unreify
35+ )
36+import Rel8.Table.Recontextualize ( Recontextualize )
1737import Rel8.Table.These ( TheseTable )
1838
1939-- these
2040import Data.These ( These )
2141
2242
23−-- | Nest an 'These' value within a 'Rel8able'. @HThese f a b@ will produce a
24−-- 'TheseTable' @a b@ in the 'Expr' context, and a 'These' @a b@ in the
25−-- 'Result' context.
2643type HThese :: K.Context -> Type -> Type -> Type
27−type family HThese context = these | these -> context where
44+type family HThese context where
45+ HThese (Reify context) = AHThese context
46+ HThese Aggregate = TheseTable
47+ HThese Expr = TheseTable
48+ HThese Insert = TheseTable
49+ HThese Name = TheseTable
2850 HThese Result = These
29− HThese context = TheseTable context
51+
52+
53+type AHThese :: K.Context -> Type -> Type -> Type
54+newtype AHThese context a b = AHThese (HThese context a b)
55+
56+
57+instance Reifiable context => Bifunctor (AHThese context) where
58+ bimap = sbimapThese contextSing
59+
60+
61+instance Reifiable context => Functor (AHThese context a) where
62+ fmap = bimap id
63+
64+
65+instance (Reifiable context, Table (Reify context) a, Table (Reify context) b)
66+ => Table (Reify context) (AHThese context a b)
67+ where
68+ type Context (AHThese context a b) = Reify context
69+ type Columns (AHThese context a b) = HTheseTable (Columns a) (Columns b)
70+ type Unreify (AHThese context a b) = HThese context (Unreify a) (Unreify b)
71+
72+ fromColumns = sfromColumnsThese contextSing
73+ toColumns = stoColumnsThese contextSing
74+ reify proof = liftA2 bimap reify reify proof . AHThese
75+ unreify proof = (\(AHThese a) -> a) . liftA2 bimap unreify unreify proof
76+
77+
78+instance
79+ ( Reifiable context, Reifiable context'
80+ , Recontextualize (Reify context) (Reify context') a a'
81+ , Recontextualize (Reify context) (Reify context') b b'
82+ ) =>
83+ Recontextualize
84+ (Reify context)
85+ (Reify context')
86+ (AHThese context a b)
87+ (AHThese context' a' b')
88+
89+
90+sbimapThese :: ()
91+ => SContext context
92+ -> (a -> c)
93+ -> (b -> d)
94+ -> AHThese context a b
95+ -> AHThese context c d
96+sbimapThese = \case
97+ SAggregate -> \f g (AHThese a) -> AHThese (bimap f g a)
98+ SExpr -> \f g (AHThese a) -> AHThese (bimap f g a)
99+ SResult -> \f g (AHThese a) -> AHThese (bimap f g a)
100+ SInsert -> \f g (AHThese a) -> AHThese (bimap f g a)
101+ SName -> \f g (AHThese a) -> AHThese (bimap f g a)
102+ SReify context -> \f g (AHThese a) -> AHThese (sbimapThese context f g a)
103+
104+
105+sfromColumnsThese :: (Table (Reify context) a, Table (Reify context) b)
106+ => SContext context
107+ -> HTheseTable (Columns a) (Columns b) (Col (Reify context))
108+ -> AHThese context a b
109+sfromColumnsThese = \case
110+ SAggregate ->
111+ AHThese .
112+ bimap (fromColumns . hreify) (fromColumns . hreify) .
113+ fromColumns .
114+ hunreify
115+ SExpr ->
116+ AHThese .
117+ bimap (fromColumns . hreify) (fromColumns . hreify) .
118+ fromColumns .
119+ hunreify
120+ SResult ->
121+ AHThese .
122+ bimap (fromColumns . hreify) (fromColumns . hreify) .
123+ fromColumns .
124+ hunreify
125+ SInsert ->
126+ AHThese .
127+ bimap (fromColumns . hreify) (fromColumns . hreify) .
128+ fromColumns .
129+ hunreify
130+ SName ->
131+ AHThese .
132+ bimap (fromColumns . hreify) (fromColumns . hreify) .
133+ fromColumns .
134+ hunreify
135+ SReify context ->
136+ AHThese .
137+ sbimapThese context (fromColumns . hreify) (fromColumns . hreify) .
138+ sfromColumnsThese context .
139+ hunreify
140+
141+
142+stoColumnsThese :: (Table (Reify context) a, Table (Reify context) b)
143+ => SContext context
144+ -> AHThese context a b
145+ -> HTheseTable (Columns a) (Columns b) (Col (Reify context))
146+stoColumnsThese = \case
147+ SAggregate ->
148+ hreify .
149+ toColumns .
150+ bimap (hunreify . toColumns) (hunreify . toColumns) .
151+ (\(AHThese a) -> a)
152+ SExpr ->
153+ hreify .
154+ toColumns .
155+ bimap (hunreify . toColumns) (hunreify . toColumns) .
156+ (\(AHThese a) -> a)
157+ SResult ->
158+ hreify .
159+ toColumns .
160+ bimap (hunreify . toColumns) (hunreify . toColumns) .
161+ (\(AHThese a) -> a)
162+ SInsert ->
163+ hreify .
164+ toColumns .
165+ bimap (hunreify . toColumns) (hunreify . toColumns) .
166+ (\(AHThese a) -> a)
167+ SName ->
168+ hreify .
169+ toColumns .
170+ bimap (hunreify . toColumns) (hunreify . toColumns) .
171+ (\(AHThese a) -> a)
172+ SReify context ->
173+ hreify .
174+ stoColumnsThese context .
175+ sbimapThese context (hunreify . toColumns) (hunreify . toColumns) .
176+ (\(AHThese a) -> a)
src/Rel8/Expr.hs+47−17
@@ -1,21 +1,27 @@
11{-# language DataKinds #-}
22{-# language DerivingStrategies #-}
3−{-# language FlexibleContexts #-}
43{-# language FlexibleInstances #-}
4+{-# language GADTs #-}
55{-# language MultiParamTypeClasses #-}
6+{-# language PolyKinds #-}
7+{-# language RoleAnnotations #-}
68{-# language ScopedTypeVariables #-}
9+{-# language StandaloneDeriving #-}
710{-# language StandaloneKindSignatures #-}
811{-# language TypeApplications #-}
912{-# language TypeFamilies #-}
1013{-# language UndecidableInstances #-}
14+{-# language UndecidableSuperClasses #-}
1115
1216module Rel8.Expr
1317 ( Expr(..)
18+ , Col( DB, unDB )
1419 )
1520where
1621
1722-- base
18−import Data.Functor.Identity ( Identity( Identity ) )
23+import Data.Functor.Identity ( Identity )
24+import Data.Kind ( Type )
1925import Data.String ( IsString, fromString )
2026import Prelude hiding ( null )
2127
@@ -32,14 +38,17 @@ import Rel8.Expr.Opaleye
3238 , zipPrimExprsWith
3339 )
3440import Rel8.Expr.Serialize ( litExpr )
35−import Rel8.Schema.HTable.Identity ( HIdentity( HIdentity ) )
36−import qualified Rel8.Schema.Kind as K
41+import Rel8.Schema.Context ( Interpretation, Col )
42+import Rel8.Schema.Context.Label ( Labelable, labeler, unlabeler )
43+import Rel8.Schema.HTable.Identity ( HIdentity( HType ), HType )
3744import Rel8.Schema.Null ( Nullity( Null, NotNull ), Sql, nullable )
45+import Rel8.Schema.Reify ( notReify )
46+import Rel8.Schema.Result ( Result )
47+import Rel8.Schema.Spec ( Spec( Spec ) )
3848import Rel8.Table
39− ( Table, Columns, Context, fromColumns, toColumns
40− , FromExprs, fromResult, toResult
41− , Transpose
49+ ( Table, Columns, Context, fromColumns, toColumns, reify, unreify
4250 )
51+import Rel8.Table.Recontextualize ( Recontextualize )
4352import Rel8.Type ( DBType )
4453import Rel8.Type.Monoid ( DBMonoid, memptyExpr )
4554import Rel8.Type.Num ( DBFloating, DBFractional, DBNum )
@@ -47,9 +56,13 @@ import Rel8.Type.Semigroup ( DBSemigroup, (<>.) )
4756
4857
4958-- | Typed SQL expressions.
50−type Expr :: K.Context
51−newtype Expr a = Expr Opaleye.PrimExpr
52− deriving stock Show
59+type role Expr representational
60+type Expr :: k -> Type
61+data Expr a where
62+ Expr :: k ~ Type => !Opaleye.PrimExpr -> Expr (a :: k)
63+
64+
65+deriving stock instance Show (Expr a)
5366
5467
5568instance Sql DBSemigroup a => Semigroup (Expr a) where
@@ -113,13 +126,30 @@ instance Sql DBFloating a => Floating (Expr a) where
113126 atanh = function "atanh"
114127
115128
129+instance Interpretation Expr where
130+ data Col Expr _spec where
131+ DB :: {unDB :: Expr a} -> Col Expr ('Spec labels necessity a)
132+
133+
116134instance Sql DBType a => Table Expr (Expr a) where
117− type Columns (Expr a) = HIdentity a
135+ type Columns (Expr a) = HType a
118136 type Context (Expr a) = Expr
119− type FromExprs (Expr a) = a
120− type Transpose to (Expr a) = to a
121137
122− toColumns a = HIdentity a
123− fromColumns (HIdentity a) = a
124− toResult a = HIdentity (Identity a)
125− fromResult (HIdentity (Identity a)) = a
138+ toColumns a = HType (DB a)
139+ fromColumns (HType (DB a)) = a
140+ reify = notReify
141+ unreify = notReify
142+
143+
144+instance Sql DBType a => Recontextualize Expr Expr (Expr a) (Expr a)
145+
146+
147+instance Sql DBType a => Recontextualize Expr Result (Expr a) (Identity a)
148+
149+
150+instance Sql DBType a => Recontextualize Result Expr (Identity a) (Expr a)
151+
152+
153+instance Labelable Expr where
154+ labeler (DB a) = DB a
155+ unlabeler (DB a) = DB a
src/Rel8/Expr.hs-boot+8−6
@@ -1,4 +1,6 @@
1−{-# language DataKinds #-}
1+{-# language GADTs #-}
2+{-# language PolyKinds #-}
3+{-# language RoleAnnotations #-}
24{-# language StandaloneKindSignatures #-}
35
46module Rel8.Expr
@@ -7,14 +9,14 @@ module Rel8.Expr
79where
810
911-- base
12+import Data.Kind ( Type )
1013import Prelude ()
1114
1215-- opaleye
1316import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
1417
15−-- rel8
16−import Rel8.Schema.Kind ( Context )
1718
18−
19−type Expr :: Context
20−newtype Expr a = Expr Opaleye.PrimExpr
19+type role Expr representational
20+type Expr :: k -> Type
21+data Expr a where
22+ Expr :: k ~ Type => !Opaleye.PrimExpr -> Expr (a :: k)
src/Rel8/Expr/Aggregate.hs+115−53
@@ -10,11 +10,10 @@ module Rel8.Expr.Aggregate
1010 , and, or
1111 , min, max
1212 , sum, sumWhere
13− , avg
1413 , stringAgg
1514 , groupByExpr
16− , listAggExpr, nonEmptyAggExpr
17− , slistAggExpr, snonEmptyAggExpr
15+ , array1DAggExpr, listAggExpr, nonEmptyAggExpr
16+ , listAggExprWithOrder, nonEmptyAggExprWithOrder
1817 )
1918where
2019
@@ -24,12 +23,10 @@ import Data.List.NonEmpty ( NonEmpty )
2423import Prelude hiding ( and, max, min, null, or, sum )
2524
2625-- opaleye
27−import qualified Opaleye.Internal.Aggregate as Opaleye
28−import Opaleye.Internal.Column ( Field_( Column ) )
29−import qualified Opaleye.Aggregate as Opaleye
26+import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
3027
3128-- rel8
32−import Rel8.Aggregate ( Aggregate, unsafeMakeAggregate )
29+import Rel8.Aggregate ( Aggregate, Aggregator(..), unsafeMakeAggregate )
3330import Rel8.Expr ( Expr )
3431import Rel8.Expr.Bool ( caseExpr )
3532import Rel8.Expr.Opaleye
@@ -40,11 +37,11 @@ import Rel8.Expr.Opaleye
4037 )
4138import Rel8.Expr.Null ( null )
4239import Rel8.Expr.Serialize ( litExpr )
43−import Rel8.Schema.Null ( Sql, Unnullify )
44−import Rel8.Type ( DBType, typeInformation )
45−import Rel8.Type.Array ( encodeArrayElement )
40+import Rel8.Order ( Order, toOrderExprs )
41+import Rel8.Schema.Null ( Sql )
42+import Rel8.Type.Array ( fromPrimArray )
43+import Rel8.Type.Array1D ( Array1D, NotArray )
4644import Rel8.Type.Eq ( DBEq )
47−import Rel8.Type.Information ( TypeInformation )
4845import Rel8.Type.Num ( DBNum )
4946import Rel8.Type.Ord ( DBMax, DBMin )
5047import Rel8.Type.String ( DBString )
@@ -52,99 +49,164 @@ import Rel8.Type.Sum ( DBSum )
5249
5350
5451-- | Count the occurances of a single column. Corresponds to @COUNT(a)@
55−count :: Expr a -> Aggregate Int64
56−count = unsafeMakeAggregate toPrimExpr fromPrimExpr Opaleye.count
52+count :: Expr a -> Aggregate (Expr Int64)
53+count = unsafeMakeAggregate toPrimExpr fromPrimExpr $
54+ Just Aggregator
55+ { operation = Opaleye.AggrCount
56+ , ordering = []
57+ , distinction = Opaleye.AggrAll
58+ }
59+
5760
5861-- | Count the number of distinct occurances of a single column. Corresponds to
5962-- @COUNT(DISTINCT a)@
60−countDistinct :: Sql DBEq a => Expr a -> Aggregate Int64
63+countDistinct :: Sql DBEq a => Expr a -> Aggregate (Expr Int64)
6164countDistinct = unsafeMakeAggregate toPrimExpr fromPrimExpr $
62− Opaleye.distinctAggregator Opaleye.count
65+ Just Aggregator
66+ { operation = Opaleye.AggrCount
67+ , ordering = []
68+ , distinction = Opaleye.AggrDistinct
69+ }
6370
6471
6572-- | Corresponds to @COUNT(*)@.
66−countStar :: Aggregate Int64
73+countStar :: Aggregate (Expr Int64)
6774countStar = count (litExpr True)
6875
6976
7077-- | A count of the number of times a given expression is @true@.
71−countWhere :: Expr Bool -> Aggregate Int64
78+countWhere :: Expr Bool -> Aggregate (Expr Int64)
7279countWhere condition = count (caseExpr [(condition, litExpr (Just True))] null)
7380
7481
7582-- | Corresponds to @bool_and@.
76−and :: Expr Bool -> Aggregate Bool
77−and = unsafeMakeAggregate toPrimExpr fromPrimExpr Opaleye.boolAnd
83+and :: Expr Bool -> Aggregate (Expr Bool)
84+and = unsafeMakeAggregate toPrimExpr fromPrimExpr $
85+ Just Aggregator
86+ { operation = Opaleye.AggrBoolAnd
87+ , ordering = []
88+ , distinction = Opaleye.AggrAll
89+ }
7890
7991
8092-- | Corresponds to @bool_or@.
81−or :: Expr Bool -> Aggregate Bool
82−or = unsafeMakeAggregate toPrimExpr fromPrimExpr Opaleye.boolOr
93+or :: Expr Bool -> Aggregate (Expr Bool)
94+or = unsafeMakeAggregate toPrimExpr fromPrimExpr $
95+ Just Aggregator
96+ { operation = Opaleye.AggrBoolOr
97+ , ordering = []
98+ , distinction = Opaleye.AggrAll
99+ }
83100
84101
85102-- | Produce an aggregation for @Expr a@ using the @max@ function.
86−max :: Sql DBMax a => Expr a -> Aggregate a
87−max = unsafeMakeAggregate toPrimExpr fromPrimExpr Opaleye.unsafeMax
103+max :: Sql DBMax a => Expr a -> Aggregate (Expr a)
104+max = unsafeMakeAggregate toPrimExpr fromPrimExpr $
105+ Just Aggregator
106+ { operation = Opaleye.AggrMax
107+ , ordering = []
108+ , distinction = Opaleye.AggrAll
109+ }
88110
89111
90112-- | Produce an aggregation for @Expr a@ using the @max@ function.
91−min :: Sql DBMin a => Expr a -> Aggregate a
92−min = unsafeMakeAggregate toPrimExpr fromPrimExpr Opaleye.unsafeMin
113+min :: Sql DBMin a => Expr a -> Aggregate (Expr a)
114+min = unsafeMakeAggregate toPrimExpr fromPrimExpr $
115+ Just Aggregator
116+ { operation = Opaleye.AggrMin
117+ , ordering = []
118+ , distinction = Opaleye.AggrAll
119+ }
93120
94121-- | Corresponds to @sum@. Note that in SQL, @sum@ is type changing - for
95122-- example the @sum@ of @integer@ returns a @bigint@. Rel8 doesn't support
96−-- this, and will add explicit casts back to the original input type. This can
123+-- this, and will add explicit cast back to the original input type. This can
97124-- lead to overflows, and if you anticipate very large sums, you should upcast
98125-- your input.
99−sum :: Sql DBSum a => Expr a -> Aggregate a
100−sum = unsafeMakeAggregate toPrimExpr (castExpr . fromPrimExpr) Opaleye.unsafeSum
101−
126+sum :: Sql DBSum a => Expr a -> Aggregate (Expr a)
127+sum = unsafeMakeAggregate toPrimExpr (castExpr . fromPrimExpr) $
128+ Just Aggregator
129+ { operation = Opaleye.AggrSum
130+ , ordering = []
131+ , distinction = Opaleye.AggrAll
132+ }
102133
103−-- | Corresponds to @avg@. Note that in SQL, @avg@ is type changing - for
104−-- example, the @avg@ of @integer@ returns a @numeric@. Rel8 doesn't support
105−-- this, and will add explicit casts back to the original input type. If you
106−-- need a fractional result on an integral column, you should cast your input
107−-- to 'Double' or 'Data.Scientific.Scientific' before calling 'avg'.
108−avg :: Sql DBSum a => Expr a -> Aggregate a
109−avg = unsafeMakeAggregate toPrimExpr (castExpr . fromPrimExpr) Opaleye.unsafeAvg
110134
111135-- | Take the sum of all expressions that satisfy a predicate.
112136sumWhere :: (Sql DBNum a, Sql DBSum a)
113− => Expr Bool -> Expr a -> Aggregate a
137+ => Expr Bool -> Expr a -> Aggregate (Expr a)
114138sumWhere condition a = sum (caseExpr [(condition, a)] 0)
115139
116140
117141-- | Corresponds to @string_agg()@.
118142stringAgg :: Sql DBString a
119− => Expr db -> Expr a -> Aggregate a
143+ => Expr db -> Expr a -> Aggregate (Expr a)
120144stringAgg delimiter =
121− unsafeMakeAggregate toPrimExpr (castExpr . fromPrimExpr) (Opaleye.stringAgg (Column (toPrimExpr delimiter)))
145+ unsafeMakeAggregate toPrimExpr (castExpr . fromPrimExpr) $
146+ Just Aggregator
147+ { operation = Opaleye.AggrStringAggr (toPrimExpr delimiter)
148+ , ordering = []
149+ , distinction = Opaleye.AggrAll
150+ }
122151
123152
124153-- | Aggregate a value by grouping by it.
125−groupByExpr :: Sql DBEq a => Expr a -> Aggregate a
126−groupByExpr = unsafeMakeAggregate toPrimExpr fromPrimExpr Opaleye.groupBy
154+groupByExpr :: Sql DBEq a => Expr a -> Aggregate (Expr a)
155+groupByExpr = unsafeMakeAggregate toPrimExpr fromPrimExpr Nothing
156+
157+
158+-- | Collect expressions values as an array.
159+array1DAggExpr :: NotArray a => Expr a -> Aggregate (Expr (Array1D a))
160+array1DAggExpr = unsafeMakeAggregate toPrimExpr fromPrimExpr $ Just
161+ Aggregator
162+ { operation = Opaleye.AggrArr
163+ , ordering = []
164+ , distinction = Opaleye.AggrAll
165+ }
127166
128167
129168-- | Collect expressions values as a list.
130−listAggExpr :: Sql DBType a => Expr a -> Aggregate [a]
131−listAggExpr = slistAggExpr typeInformation
169+listAggExpr :: Expr a -> Aggregate (Expr [a])
170+listAggExpr = unsafeMakeAggregate toPrimExpr from $ Just
171+ Aggregator
172+ { operation = Opaleye.AggrArr
173+ , ordering = []
174+ , distinction = Opaleye.AggrAll
175+ }
176+ where
177+ from = fromPrimExpr . fromPrimArray
132178
133179
134180-- | Collect expressions values as a non-empty list.
135−nonEmptyAggExpr :: Sql DBType a => Expr a -> Aggregate (NonEmpty a)
136−nonEmptyAggExpr = snonEmptyAggExpr typeInformation
181+nonEmptyAggExpr :: Expr a -> Aggregate (Expr (NonEmpty a))
182+nonEmptyAggExpr = unsafeMakeAggregate toPrimExpr from $ Just
183+ Aggregator
184+ { operation = Opaleye.AggrArr
185+ , ordering = []
186+ , distinction = Opaleye.AggrAll
187+ }
188+ where
189+ from = fromPrimExpr . fromPrimArray
137190
138191
139−slistAggExpr :: ()
140− => TypeInformation (Unnullify a) -> Expr a -> Aggregate [a]
141−slistAggExpr info = unsafeMakeAggregate to fromPrimExpr Opaleye.arrayAgg
192+listAggExprWithOrder :: Order o -> o -> Expr a -> Aggregate (Expr [a])
193+listAggExprWithOrder order o = unsafeMakeAggregate toPrimExpr from $ Just
194+ Aggregator
195+ { operation = Opaleye.AggrArr
196+ , ordering = toOrderExprs order o
197+ , distinction = Opaleye.AggrAll
198+ }
142199 where
143− to = encodeArrayElement info . toPrimExpr
200+ from = fromPrimExpr . fromPrimArray
144201
145202
146−snonEmptyAggExpr :: ()
147− => TypeInformation (Unnullify a) -> Expr a -> Aggregate (NonEmpty a)
148−snonEmptyAggExpr info = unsafeMakeAggregate to fromPrimExpr Opaleye.arrayAgg
203+nonEmptyAggExprWithOrder :: ()
204+ => Order o -> o -> Expr a -> Aggregate (Expr (NonEmpty a))
205+nonEmptyAggExprWithOrder order o = unsafeMakeAggregate toPrimExpr from $ Just
206+ Aggregator
207+ { operation = Opaleye.AggrArr
208+ , ordering = toOrderExprs order o
209+ , distinction = Opaleye.AggrAll
210+ }
149211 where
150− to = encodeArrayElement info . toPrimExpr
212+ from = fromPrimExpr . fromPrimArray
src/Rel8/Expr/Array.hs+6−6
@@ -25,21 +25,21 @@ import Rel8.Expr.Opaleye
2525 , zipPrimExprsWith
2626 )
2727import Rel8.Type ( DBType, typeInformation )
28−import Rel8.Type.Array ( array )
28+import Rel8.Type.Array ( array, zipPrimArraysWith )
2929import Rel8.Type.Information ( TypeInformation(..) )
30−import Rel8.Schema.Null ( Unnullify, Sql )
30+import Rel8.Schema.Null ( Unnullify, Nullity, Sql )
3131
3232
3333sappend :: Expr [a] -> Expr [a] -> Expr [a]
34−sappend = zipPrimExprsWith (Opaleye.BinExpr (Opaleye.:||))
34+sappend = zipPrimExprsWith (zipPrimArraysWith (Opaleye.BinExpr (Opaleye.:||)))
3535
3636
3737sappend1 :: Expr (NonEmpty a) -> Expr (NonEmpty a) -> Expr (NonEmpty a)
38−sappend1 = zipPrimExprsWith (Opaleye.BinExpr (Opaleye.:||))
38+sappend1 = zipPrimExprsWith (zipPrimArraysWith (Opaleye.BinExpr (Opaleye.:||)))
3939
4040
41−sempty :: TypeInformation (Unnullify a) -> Expr [a]
42−sempty info = fromPrimExpr $ array info []
41+sempty :: Nullity a -> TypeInformation (Unnullify a) -> Expr [a]
42+sempty _ info = fromPrimExpr $ array info []
4343
4444
4545slistOf :: TypeInformation (Unnullify a) -> [Expr a] -> Expr [a]
src/Rel8/Expr/Default.hsdeleted−35
@@ -1,35 +0,0 @@
1−module Rel8.Expr.Default
2− ( unsafeDefault
3− )
4−where
5−
6−-- base
7−import Prelude ()
8−
9−-- opaleye
10−import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
11−
12−-- rel8
13−import Rel8.Expr ( Expr )
14−import Rel8.Expr.Opaleye ( fromPrimExpr )
15−
16−
17−-- | Corresponds to the SQL @DEFAULT@ expression.
18−--
19−-- This 'Expr' is unsafe for numerous reasons, and should be used with care:
20−--
21−-- 1. This 'Expr' only makes sense in an @INSERT@ or @UPDATE@ statement.
22−--
23−-- 2. Rel8 is not able to verify that a particular column actually has a
24−-- @DEFAULT@ value. Trying to use @unsafeDefault@ where there is no default
25−-- will cause a runtime crash
26−--
27−-- 3. @DEFAULT@ values can not be transformed. For example, the innocuous Rel8
28−-- code @unsafeDefault + 1@ will crash, despite type checking.
29−--
30−-- Given all these caveats, we suggest avoiding the use of default values where
31−-- possible, instead being explicit. A common scenario where default values are
32−-- used is with auto-incrementing identifier columns. In this case, we suggest
33−-- using 'Rel8.nextval' instead.
34−unsafeDefault :: Expr a
35−unsafeDefault = fromPrimExpr Opaleye.DefaultInsertExpr
src/Rel8/Expr/Eq.hs+1−1
@@ -22,7 +22,7 @@ import Prelude
2222import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
2323
2424-- rel8
25−import Rel8.Expr ( Expr )
25+import {-# SOURCE #-} Rel8.Expr ( Expr )
2626import Rel8.Expr.Bool ( (&&.), (||.), false, or_, coalesce )
2727import Rel8.Expr.Null ( isNull, unsafeLiftOpNull )
2828import Rel8.Expr.Opaleye ( fromPrimExpr, toPrimExpr, zipPrimExprsWith )
src/Rel8/Expr/Num.hs+6−39
@@ -4,24 +4,18 @@
44{-# options_ghc -fno-warn-redundant-constraints #-}
55
66module Rel8.Expr.Num
7− ( fromIntegral
8− , realToFrac
9− , div, mod, divMod
10− , quot, rem, quotRem
11− , ceiling, floor, round, truncate
7+ ( fromIntegral, realToFrac, div, mod, ceiling, floor, round, truncate
128 )
139where
1410
1511-- base
16−import Prelude ( (+), (-), fst, negate, signum, snd )
12+import Prelude ()
1713
1814-- rel
1915import Rel8.Expr ( Expr( Expr ) )
20−import Rel8.Expr.Eq ( (==.) )
2116import Rel8.Expr.Function ( function )
2217import Rel8.Expr.Opaleye ( castExpr )
2318import Rel8.Schema.Null ( Homonullable, Sql )
24−import Rel8.Table.Bool ( bool )
2519import Rel8.Type.Num ( DBFractional, DBIntegral, DBNum )
2620
2721
@@ -48,41 +42,14 @@ ceiling :: (Sql DBFractional a, Sql DBIntegral b, Homonullable a b)
4842ceiling = function "ceiling"
4943
5044
51−-- | Emulates the behaviour of the Haskell function 'Prelude.div' in
52−-- PostgreSQL.
45+-- | Perform integral division. Corresponds to the @div()@ function.
5346div :: Sql DBIntegral a => Expr a -> Expr a -> Expr a
54−div n d = fst (divMod n d)
47+div = function "div"
5548
5649
57−-- | Emulates the behaviour of the Haskell function 'Prelude.mod' in
58−-- PostgreSQL.
50+-- | Corresponds to the @mod()@ function.
5951mod :: Sql DBIntegral a => Expr a -> Expr a -> Expr a
60−mod n d = snd (divMod n d)
61−
62−
63−-- | Simultaneous 'div' and 'mod'.
64−divMod :: Sql DBIntegral a => Expr a -> Expr a -> (Expr a, Expr a)
65−divMod n d = bool qr (q - 1, r + d) (signum r ==. negate (signum d))
66− where
67− qr@(q, r) = quotRem n d
68−
69−
70−-- | Perform integral division. Corresponds to the @div()@ function in
71−-- PostgreSQL, which behaves like Haskell's 'Prelude.quot' rather than
72−-- 'Prelude.div'.
73−quot :: Sql DBIntegral a => Expr a -> Expr a -> Expr a
74−quot = function "div"
75−
76−
77−-- | Corresponds to the @mod()@ function in PostgreSQL, which behaves like
78−-- Haskell's 'Prelude.rem' rather than 'Prelude.mod'.
79−rem :: Sql DBIntegral a => Expr a -> Expr a -> Expr a
80−rem = function "mod"
81−
82−
83−-- | Simultaneous 'quot' and 'rem'.
84−quotRem :: Sql DBIntegral a => Expr a -> Expr a -> (Expr a, Expr a)
85−quotRem n d = (quot n d, rem n d)
52+mod = function "mod"
8653
8754
8855-- | Round a 'DFractional' to a 'DBIntegral' by rounding to the nearest smaller
src/Rel8/Expr/Opaleye.hs+5−19
@@ -10,7 +10,7 @@ module Rel8.Expr.Opaleye
1010 , scastExpr, sunsafeCastExpr
1111 , unsafeLiteral
1212 , fromPrimExpr, toPrimExpr, mapPrimExpr, zipPrimExprsWith, traversePrimExpr
13− , toColumn, fromColumn, traverseFieldP
13+ , toColumn, fromColumn
1414 )
1515where
1616
@@ -27,9 +27,6 @@ import Rel8.Schema.Null ( Unnullify, Sql )
2727import Rel8.Type ( DBType, typeInformation )
2828import Rel8.Type.Information ( TypeInformation(..) )
2929
30−-- profunctors
31−import Data.Profunctor ( Profunctor, dimap )
32−
3330
3431castExpr :: Sql DBType a => Expr a -> Expr a
3532castExpr = scastExpr typeInformation
@@ -51,13 +48,8 @@ sunsafeCastExpr TypeInformation {typeName} =
5148 fromPrimExpr . Opaleye.CastExpr typeName . toPrimExpr
5249
5350
54−-- | Unsafely construct an expression from literal SQL.
55−--
56−-- This is an escape hatch, and can be used if Rel8 can not adequately express
57−-- the query you need. If you find yourself using this function, please let us
58−-- know, as it may indicate that something is missing from Rel8!
59−unsafeLiteral :: String -> Expr a
60−unsafeLiteral = Expr . Opaleye.ConstExpr . Opaleye.OtherLit
51+unsafeLiteral :: Sql DBType a => String -> Expr a
52+unsafeLiteral = castExpr . Expr . Opaleye.ConstExpr . Opaleye.OtherLit
6153
6254
6355fromPrimExpr :: Opaleye.PrimExpr -> Expr a
@@ -83,15 +75,9 @@ traversePrimExpr :: Functor f
8375traversePrimExpr f = fmap fromPrimExpr . f . toPrimExpr
8476
8577
86−traverseFieldP :: Profunctor p
87− => p (Opaleye.Field_ n x) (Opaleye.Field_ m y)
88− -> p (Expr a) (Expr b)
89−traverseFieldP = dimap (toColumn . toPrimExpr) (fromPrimExpr . fromColumn)
90−
91−
92−toColumn :: Opaleye.PrimExpr -> Opaleye.Field_ n b
78+toColumn :: Opaleye.PrimExpr -> Opaleye.Column b
9379toColumn = Opaleye.Column
9480
9581
96−fromColumn :: Opaleye.Field_ n b -> Opaleye.PrimExpr
82+fromColumn :: Opaleye.Column b -> Opaleye.PrimExpr
9783fromColumn (Opaleye.Column a) = a
src/Rel8/Expr/Sequence.hsdeleted−22
@@ -1,22 +0,0 @@
1−module Rel8.Expr.Sequence
2− ( nextval
3− )
4−where
5−
6−-- base
7−import Data.Int ( Int64 )
8−import Prelude
9−
10−-- rel8
11−import Rel8.Expr ( Expr )
12−import Rel8.Expr.Function ( function )
13−import Rel8.Expr.Serialize ( litExpr )
14−import Rel8.Expr.Text ( quoteIdent )
15−
16−-- text
17−import Data.Text ( pack )
18−
19−
20−-- | See https://www.postgresql.org/docs/current/functions-sequence.html
21−nextval :: String -> Expr Int64
22−nextval = function "nextval" . quoteIdent . litExpr . pack
src/Rel8/Expr/Text.hs+4−24
@@ -17,9 +17,6 @@ module Rel8.Expr.Text
1717 , pgClientEncoding, quoteIdent, quoteLiteral, quoteNullable, regexpReplace
1818 , regexpSplitToArray, repeat, replace, reverse, right, rpad, rtrim
1919 , splitPart, strpos, substr, translate
20−
21− -- * @LIKE@ and @ILIKE@
22− , like, ilike
2320 )
2421where
2522
@@ -27,7 +24,7 @@ where
2724import Data.Bool ( Bool )
2825import Data.Int ( Int32 )
2926import Data.Maybe ( Maybe( Nothing, Just ) )
30−import Prelude ( flip )
27+import Prelude ()
3128
3229-- bytestring
3330import Data.ByteString ( ByteString )
@@ -35,6 +32,7 @@ import Data.ByteString ( ByteString )
3532-- rel8
3633import Rel8.Expr ( Expr )
3734import Rel8.Expr.Function ( binaryOperator, function, nullaryFunction )
35+import Rel8.Type.Array1D ( Array1D )
3836
3937-- text
4038import Data.Text (Text)
@@ -52,7 +50,7 @@ infixr 6 ++.
5250
5351
5452-- | Matches regular expression, case sensitive
55−--
53+--
5654-- Corresponds to the @~.@ operator.
5755(~.) :: Expr Text -> Expr Text -> Expr Bool
5856(~.) = binaryOperator "~."
@@ -220,7 +218,7 @@ regexpReplace a b c Nothing = function "regexp_replace" a b c
220218
221219-- | Corresponds to the @regexp_split_to_array@ function.
222220regexpSplitToArray :: ()
223− => Expr Text -> Expr Text -> Maybe (Expr Text) -> Expr [Text]
221+ => Expr Text -> Expr Text -> Maybe (Expr Text) -> Expr (Array1D Text)
224222regexpSplitToArray a b (Just c) = function "regexp_split_to_array" a b c
225223regexpSplitToArray a b Nothing = function "regexp_split_to_array" a b
226224
@@ -276,21 +274,3 @@ substr a b Nothing = function "substr" a b
276274-- | Corresponds to the @translate@ function.
277275translate :: Expr Text -> Expr Text -> Expr Text -> Expr Text
278276translate = function "translate"
279−
280−
281−-- | @like x y@ corresponds to the expression @y LIKE x@.
282−--
283−-- Note that the arguments to @like@ are swapped. This is to aid currying, so
284−-- you can write expressions like
285−-- @filter (like "Rel%" . packageName) =<< each haskellPackages@
286−like :: Expr Text -> Expr Text -> Expr Bool
287−like = flip (binaryOperator "LIKE")
288−
289−
290−-- | @ilike x y@ corresponds to the expression @y ILIKE x@.
291−--
292−-- Note that the arguments to @ilike@ are swapped. This is to aid currying, so
293−-- you can write expressions like
294−-- @filter (ilike "Rel%" . packageName) =<< each haskellPackages@
295−ilike :: Expr Text -> Expr Text -> Expr Bool
296−ilike = flip (binaryOperator "ILIKE")
src/Rel8/Expr/Time.hs+2−2
@@ -31,7 +31,7 @@ import Prelude
3131-- rel8
3232import Rel8.Expr ( Expr )
3333import Rel8.Expr.Function ( binaryOperator, nullaryFunction )
34−import Rel8.Expr.Opaleye ( castExpr, unsafeCastExpr, unsafeLiteral )
34+import Rel8.Expr.Opaleye ( unsafeCastExpr, unsafeLiteral )
3535
3636-- time
3737import Data.Time.Calendar ( Day )
@@ -164,4 +164,4 @@ years = (`scaleInterval` year)
164164
165165
166166singleton :: String -> Expr CalendarDiffTime
167−singleton unit = castExpr $ unsafeLiteral $ "'1 " ++ unit ++ "'"
167+singleton unit = unsafeLiteral $ "'1 " ++ unit ++ "'"
src/Rel8/Expr/Window.hsdeleted−121
@@ -1,121 +0,0 @@
1−module Rel8.Expr.Window
2− ( cumulative
3− , rowNumber
4− , rank
5− , denseRank
6− , percentRank
7− , cumeDist
8− , ntile
9− , lag
10− , lead
11− , firstValue
12− , lastValue
13− , nthValue
14− )
15−where
16−
17−-- base
18−import Data.Int ( Int32, Int64 )
19−import Prelude
20−
21−-- opaleye
22−import qualified Opaleye.Internal.Aggregate as Opaleye
23−import qualified Opaleye.Internal.PackMap as Opaleye
24−import qualified Opaleye.Internal.Window as Opaleye
25−import qualified Opaleye.Window as Opaleye
26−
27−-- profunctors
28−import Data.Profunctor (dimap)
29−
30−-- rel8
31−import Rel8.Aggregate ( Aggregate( Aggregate ) )
32−import Rel8.Expr ( Expr )
33−import Rel8.Expr.Opaleye ( fromColumn, fromPrimExpr, toColumn, toPrimExpr )
34−import Rel8.Schema.Null ( Nullify )
35−import Rel8.Window ( Window( Window ) )
36−
37−
38−cumulative :: (a -> Aggregate b) -> Window a (Expr b)
39−cumulative f =
40− fromWindowFunction $ Opaleye.aggregatorWindowFunction (fromAggregate f) id
41−
42−
43−-- | [@row_number()@](https://www.postgresql.org/docs/current/functions-window.html)
44−rowNumber :: Window a (Expr Int64)
45−rowNumber = fromWindowFunction $ fromPrimExpr . fromColumn <$> Opaleye.rowNumber
46−
47−
48−-- | [@rank()@](https://www.postgresql.org/docs/current/functions-window.html)
49−rank :: Window a (Expr Int64)
50−rank = fromWindowFunction $ fromPrimExpr . fromColumn <$> Opaleye.rank
51−
52−
53−-- | [@dense_rank()@](https://www.postgresql.org/docs/current/functions-window.html)
54−denseRank :: Window a (Expr Int64)
55−denseRank = fromWindowFunction $ fromPrimExpr . fromColumn <$> Opaleye.denseRank
56−
57−
58−-- | [@percent_rank()@](https://www.postgresql.org/docs/current/functions-window.html)
59−percentRank :: Window a (Expr Double)
60−percentRank = fromWindowFunction $ fromPrimExpr . fromColumn <$> Opaleye.percentRank
61−
62−
63−-- | [@cume_dist()@](https://www.postgresql.org/docs/current/functions-window.html)
64−cumeDist :: Window a (Expr Double)
65−cumeDist = fromWindowFunction $ fromPrimExpr . fromColumn <$> Opaleye.cumeDist
66−
67−
68−-- | [@ntile(num_buckets)@](https://www.postgresql.org/docs/current/functions-window.html)
69−ntile :: Expr Int32 -> Window a (Expr Int32)
70−ntile buckets = fromWindowFunction $ fromPrimExpr . fromColumn <$>
71− Opaleye.ntile (toColumn (toPrimExpr buckets))
72−
73−
74−-- | [@lag(value, offset, default)@](https://www.postgresql.org/docs/current/functions-window.html)
75−lag :: Expr Int32 -> Expr a -> Window (Expr a) (Expr a)
76−lag offset def =
77− fromWindowFunction $
78− dimap (toColumn . toPrimExpr) (fromPrimExpr . fromColumn) $
79− Opaleye.lag (toColumn (toPrimExpr offset)) (toColumn (toPrimExpr def))
80−
81−
82−-- | [@lead(value, offset, default)@](https://www.postgresql.org/docs/current/functions-window.html)
83−lead :: Expr Int32 -> Expr a -> Window (Expr a) (Expr a)
84−lead offset def =
85− fromWindowFunction $
86− dimap (toColumn . toPrimExpr) (fromPrimExpr . fromColumn) $
87− Opaleye.lead (toColumn (toPrimExpr offset)) (toColumn (toPrimExpr def))
88−
89−
90−-- | [@first_value(value)@](https://www.postgresql.org/docs/current/functions-window.html)
91−firstValue :: Window (Expr a) (Expr a)
92−firstValue =
93− fromWindowFunction $
94− dimap (toColumn . toPrimExpr) (fromPrimExpr . fromColumn)
95− Opaleye.firstValue
96−
97−
98−-- | [@last_value(value)@](https://www.postgresql.org/docs/current/functions-window.html)
99−lastValue :: Window (Expr a) (Expr a)
100−lastValue =
101− fromWindowFunction $
102− dimap (toColumn . toPrimExpr) (fromPrimExpr . fromColumn)
103− Opaleye.lastValue
104−
105−
106−-- | [@nth_value(value, n)@](https://www.postgresql.org/docs/current/functions-window.html)
107−nthValue :: Expr Int32 -> Window (Expr a) (Expr (Nullify a))
108−nthValue n =
109− fromWindowFunction $
110− dimap (toColumn . toPrimExpr) (fromPrimExpr . fromColumn) $
111− Opaleye.nthValue (toColumn (toPrimExpr n))
112−
113−
114−fromAggregate :: (a -> Aggregate b) -> Opaleye.Aggregator a (Expr b)
115−fromAggregate f = Opaleye.Aggregator $ Opaleye.PackMap $ \w a -> case f a of
116− Aggregate (Opaleye.Aggregator (Opaleye.PackMap x)) -> x w ()
117−
118−
119−fromWindowFunction :: Opaleye.WindowFunction a b -> Window a b
120−fromWindowFunction (Opaleye.WindowFunction (Opaleye.PackMap w)) =
121− Window $ Opaleye.Windows $ Opaleye.PackMap $ \f -> w $ \o -> f (o, mempty)
src/Rel8/FCF.hs+3−3
@@ -5,7 +5,7 @@
55
66module Rel8.FCF
77 ( Exp, Eval
8− , Id
8+ , Compose
99 )
1010where
1111
@@ -22,5 +22,5 @@ type Eval :: Exp e -> e
2222type family Eval a
2323
2424
25−data Id :: a -> Exp a
26−type instance Eval (Id a) = a
25+data Compose :: (Type -> Type) -> (Type -> Exp Type) -> Type -> Exp Type
26+type instance Eval (Compose f g a) = f (Eval (g a))
src/Rel8/Generic/Construction.hs+330−151
@@ -2,6 +2,9 @@
22{-# language ConstraintKinds #-}
33{-# language DataKinds #-}
44{-# language FlexibleContexts #-}
5+{-# language FlexibleInstances #-}
6+{-# language LambdaCase #-}
7+{-# language MultiParamTypeClasses #-}
58{-# language NamedFieldPuns #-}
69{-# language ScopedTypeVariables #-}
710{-# language StandaloneKindSignatures #-}
@@ -13,11 +16,13 @@
1316module Rel8.Generic.Construction
1417 ( GGBuildable
1518 , GGBuild, ggbuild
19+ , GGInsert, gginsert
1620 , GGConstructable
1721 , GGConstruct, ggconstruct
1822 , GGDeconstruct, ggdeconstruct
1923 , GGName, ggname
2024 , GGAggregate, ggaggregate
25+ , GGAggregate', ggaggregate'
2126 )
2227where
2328
@@ -25,29 +30,30 @@ where
2530import Data.Bifunctor ( first )
2631import Data.Kind ( Constraint, Type )
2732import Data.List.NonEmpty ( NonEmpty( (:|) ) )
33+import Data.Type.Equality ( (:~:)( Refl ) )
2834import GHC.TypeLits ( Symbol )
2935import Prelude
3036
3137-- rel8
32−import Rel8.Aggregate ( Aggregate( Aggregate ) )
33−import Rel8.Expr ( Expr )
38+import Rel8.Aggregate ( Col( Aggregation ), Aggregate )
39+import Rel8.Expr ( Col( DB ), Expr )
3440import Rel8.Expr.Aggregate ( groupByExpr )
3541import Rel8.Expr.Eq ( (==.) )
3642import Rel8.Expr.Null ( nullify, snull, unsafeUnnullify )
3743import Rel8.Expr.Serialize ( litExpr )
38−import Rel8.FCF ( Eval, Exp, Id )
44+import Rel8.FCF ( Compose, Eval, Exp )
3945import Rel8.Generic.Construction.ADT
4046 ( GConstructorADT, GMakeableADT, gmakeADT
4147 , GConstructableADT
4248 , GBuildADT, gbuildADT, gunbuildADT
4349 , GConstructADT, gconstructADT, gdeconstructADT
44− , RepresentableConstructors, GConstructors, gcindex, gctabulate
45− , RepresentableFields, gfindex, gftabulate
50+ , CorepConstructors, GConstructors, gcindex, gctabulate
51+ , CorepFields, gfindex, gftabulate, gftraverse
4652 )
4753import Rel8.Generic.Construction.Record
4854 ( GConstructor
4955 , GConstructable, GConstruct, gconstruct, gdeconstruct
50− , Representable, gindex, gtabulate
56+ , Corep, gindex, gtabulate, gtraverse
5157 )
5258import Rel8.Generic.Table ( GGColumns )
5359import Rel8.Kind.Algebra
@@ -55,28 +61,36 @@ import Rel8.Kind.Algebra
5561 , KnownAlgebra, algebraSing
5662 )
5763import qualified Rel8.Kind.Algebra as K
58−import Rel8.Schema.Context.Nullify ( sguard, snullify )
64+import Rel8.Kind.Necessity ( SNecessity( SOptional, SRequired ) )
65+import Rel8.Schema.Context.Nullify ( runTag )
5966import Rel8.Schema.HTable ( HTable )
60−import Rel8.Schema.HTable.Identity ( HIdentity( HIdentity ) )
67+import Rel8.Schema.HTable.Identity ( HIdentity( HType ) )
68+import Rel8.Schema.Insert ( Col( OptionalInsert, RequiredInsert ), Insert )
6169import qualified Rel8.Schema.Kind as K
62−import Rel8.Schema.Name ( Name( Name ) )
70+import Rel8.Schema.Name ( Col( NameCol ), Name( Name ) )
6371import Rel8.Schema.Null ( Nullity( Null, NotNull ) )
64−import Rel8.Schema.Spec ( Spec( Spec, nullity, info ) )
72+import Rel8.Schema.Spec ( SSpec( SSpec, necessity, nullity, info ) )
73+import Rel8.Schema.Reify ( Col( Reify ), Reify, hreify, hunreify )
74+import Rel8.Schema.Result ( Result )
6575import Rel8.Table
66− ( TTable, TColumns
67− , Table, fromColumns, toColumns
76+ ( TTable, TColumns, TUnreify
77+ , Table, fromColumns, toColumns, reify, unreify
6878 )
6979import Rel8.Table.Bool ( case_ )
7080import Rel8.Type.Tag ( Tag )
7181
82+-- semigroupoids
83+import Data.Functor.Apply ( Apply, MaybeApply( MaybeApply ), liftF2 )
84+
7285
7386type GGBuildable :: K.Algebra -> Symbol -> (K.Context -> Exp (Type -> Type)) -> Constraint
7487type GGBuildable algebra name rep =
7588 ( KnownAlgebra algebra
76− , Eval (GGColumns algebra TColumns (Eval (rep Aggregate))) ~ Eval (GGColumns algebra TColumns (Eval (rep Expr)))
77− , Eval (GGColumns algebra TColumns (Eval (rep Expr))) ~ Eval (GGColumns algebra TColumns (Eval (rep Expr)))
78− , Eval (GGColumns algebra TColumns (Eval (rep Name))) ~ Eval (GGColumns algebra TColumns (Eval (rep Expr)))
79− , HTable (Eval (GGColumns algebra TColumns (Eval (rep Expr))))
89+ , Eval (GGColumns algebra TColumns (Eval (rep (Reify Aggregate)))) ~ Eval (GGColumns algebra TColumns (Eval (rep (Reify Result))))
90+ , Eval (GGColumns algebra TColumns (Eval (rep (Reify Expr)))) ~ Eval (GGColumns algebra TColumns (Eval (rep (Reify Result))))
91+ , Eval (GGColumns algebra TColumns (Eval (rep (Reify Insert)))) ~ Eval (GGColumns algebra TColumns (Eval (rep (Reify Result))))
92+ , Eval (GGColumns algebra TColumns (Eval (rep (Reify Name)))) ~ Eval (GGColumns algebra TColumns (Eval (rep (Reify Result))))
93+ , HTable (Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))))
8094 , GGBuildable' algebra name rep
8195 )
8296
@@ -84,63 +98,117 @@ type GGBuildable algebra name rep =
8498type GGBuildable' :: K.Algebra -> Symbol -> (K.Context -> Exp (Type -> Type)) -> Constraint
8599type family GGBuildable' algebra name rep where
86100 GGBuildable' 'K.Product name rep =
87− ( name ~ GConstructor (Eval (rep Expr))
88− , Representable Id (Eval (rep Expr))
89− , GConstructable (TTable Expr) TColumns Id Expr (Eval (rep Expr))
101+ ( name ~ GConstructor (Eval (rep (Reify Expr)))
102+ , name ~ GConstructor (Eval (rep (Reify Insert)))
103+ , Corep TUnreify (Eval (rep (Reify Expr)))
104+ , Corep TUnreify (Eval (rep (Reify Insert)))
105+ , GConstructable (TTable (Reify Expr)) TColumns TUnreify (Col (Reify Expr)) (Eval (rep (Reify Expr)))
106+ , GConstructable (TTable (Reify Insert)) TColumns TUnreify (Col (Reify Insert)) (Eval (rep (Reify Insert)))
90107 )
91108 GGBuildable' 'K.Sum name rep =
92− ( Representable Id (GConstructorADT name (Eval (rep Expr)))
93− , GMakeableADT (TTable Expr) TColumns Id Expr name (Eval (rep Expr))
109+ ( Corep TUnreify (GConstructorADT name (Eval (rep (Reify Expr))))
110+ , Corep TUnreify (GConstructorADT name (Eval (rep (Reify Insert))))
111+ , GMakeableADT (TTable (Reify Expr)) TColumns TUnreify (Col (Reify Expr)) name (Eval (rep (Reify Expr)))
112+ , GMakeableADT (TTable (Reify Insert)) TColumns TUnreify (Col (Reify Insert)) name (Eval (rep (Reify Insert)))
94113 )
95114
96115
97116type GGBuild :: K.Algebra -> Symbol -> (K.Context -> Exp (Type -> Type)) -> Type -> Type
98117type family GGBuild algebra name rep r where
99118 GGBuild 'K.Product _name rep r =
100− GConstruct Id (Eval (rep Expr)) r
119+ GConstruct TUnreify (Eval (rep (Reify Expr))) r
101120 GGBuild 'K.Sum name rep r =
102− GConstruct Id (GConstructorADT name (Eval (rep Expr))) r
121+ GConstruct TUnreify (GConstructorADT name (Eval (rep (Reify Expr)))) r
103122
104123
105124ggbuild :: forall algebra name rep a. GGBuildable algebra name rep
106− => (Eval (GGColumns algebra TColumns (Eval (rep Expr))) Expr -> a)
125+ => (Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))) (Col Expr) -> a)
107126 -> GGBuild algebra name rep a
108127ggbuild gfromColumns = case algebraSing @algebra of
109128 SProduct ->
110− gtabulate @Id @(Eval (rep Expr)) @a $
129+ gtabulate @TUnreify @(Eval (rep (Reify Expr))) @a $
130+ gfromColumns .
131+ hunreify .
132+ gconstruct
133+ @(TTable (Reify Expr))
134+ @TColumns
135+ @TUnreify
136+ @(Col (Reify Expr))
137+ @(Eval (rep (Reify Expr)))
138+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
139+ SSum ->
140+ gtabulate @TUnreify @(GConstructorADT name (Eval (rep (Reify Expr)))) @a $
141+ gfromColumns .
142+ hunreify .
143+ gmakeADT
144+ @(TTable (Reify Expr))
145+ @TColumns
146+ @TUnreify
147+ @(Col (Reify Expr))
148+ @name
149+ @(Eval (rep (Reify Expr)))
150+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
151+ (\SSpec {info} -> Reify (DB (snull info)))
152+ (\SSpec {nullity} -> case nullity of
153+ Null -> id
154+ NotNull -> \(Reify (DB a)) -> Reify (DB (nullify a)))
155+ (HType . Reify . DB . litExpr)
156+
157+
158+type GGInsert :: K.Algebra -> Symbol -> (K.Context -> Exp (Type -> Type)) -> Type -> Type
159+type family GGInsert algebra name rep r where
160+ GGInsert 'K.Product _name rep r =
161+ GConstruct TUnreify (Eval (rep (Reify Insert))) r
162+ GGInsert 'K.Sum name rep r =
163+ GConstruct TUnreify (GConstructorADT name (Eval (rep (Reify Insert)))) r
164+
165+
166+gginsert :: forall algebra name rep a. GGBuildable algebra name rep
167+ => (Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))) (Col Insert) -> a)
168+ -> GGInsert algebra name rep a
169+gginsert gfromColumns = case algebraSing @algebra of
170+ SProduct ->
171+ gtabulate @TUnreify @(Eval (rep (Reify Insert))) @a $
111172 gfromColumns .
173+ hunreify .
112174 gconstruct
113− @(TTable Expr)
175+ @(TTable (Reify Insert))
114176 @TColumns
115− @Id
116− @Expr
117− @(Eval (rep Expr))
118− (const toColumns)
177+ @TUnreify
178+ @(Col (Reify Insert))
179+ @(Eval (rep (Reify Insert)))
180+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
119181 SSum ->
120− gtabulate @Id @(GConstructorADT name (Eval (rep Expr))) @a $
182+ gtabulate @TUnreify @(GConstructorADT name (Eval (rep (Reify Insert)))) @a $
121183 gfromColumns .
184+ hunreify .
122185 gmakeADT
123− @(TTable Expr)
186+ @(TTable (Reify Insert))
124187 @TColumns
125− @Id
126− @Expr
188+ @TUnreify
189+ @(Col (Reify Insert))
127190 @name
128− @(Eval (rep Expr))
129− (const toColumns)
130− (\Spec {info} -> snull info)
131− (\Spec {nullity} -> case nullity of
191+ @(Eval (rep (Reify Insert)))
192+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
193+ (\SSpec {necessity, info} -> Reify $ case necessity of
194+ SRequired -> RequiredInsert (snull info)
195+ SOptional -> OptionalInsert (Just (snull info)))
196+ (\SSpec {nullity} -> case nullity of
132197 Null -> id
133− NotNull -> nullify)
134− (HIdentity . litExpr)
198+ NotNull -> \case
199+ Reify (RequiredInsert a) -> Reify (RequiredInsert (nullify a))
200+ Reify (OptionalInsert a) -> Reify (OptionalInsert (nullify <$> a)))
201+ (HType . Reify . RequiredInsert . litExpr)
135202
136203
137204type GGConstructable :: K.Algebra -> (K.Context -> Exp (Type -> Type)) -> Constraint
138205type GGConstructable algebra rep =
139206 ( KnownAlgebra algebra
140− , Eval (GGColumns algebra TColumns (Eval (rep Aggregate))) ~ Eval (GGColumns algebra TColumns (Eval (rep Expr)))
141− , Eval (GGColumns algebra TColumns (Eval (rep Expr))) ~ Eval (GGColumns algebra TColumns (Eval (rep Expr)))
142− , Eval (GGColumns algebra TColumns (Eval (rep Name))) ~ Eval (GGColumns algebra TColumns (Eval (rep Expr)))
143− , HTable (Eval (GGColumns algebra TColumns (Eval (rep Expr))))
207+ , Eval (GGColumns algebra TColumns (Eval (rep (Reify Aggregate)))) ~ Eval (GGColumns algebra TColumns (Eval (rep (Reify Result))))
208+ , Eval (GGColumns algebra TColumns (Eval (rep (Reify Expr)))) ~ Eval (GGColumns algebra TColumns (Eval (rep (Reify Result))))
209+ , Eval (GGColumns algebra TColumns (Eval (rep (Reify Insert)))) ~ Eval (GGColumns algebra TColumns (Eval (rep (Reify Result))))
210+ , Eval (GGColumns algebra TColumns (Eval (rep (Reify Name)))) ~ Eval (GGColumns algebra TColumns (Eval (rep (Reify Result))))
211+ , HTable (Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))))
144212 , GGConstructable' algebra rep
145213 )
146214
@@ -148,100 +216,112 @@ type GGConstructable algebra rep =
148216type GGConstructable' :: K.Algebra -> (K.Context -> Exp (Type -> Type)) -> Constraint
149217type family GGConstructable' algebra rep where
150218 GGConstructable' 'K.Product rep =
151− ( Representable Id (Eval (rep Aggregate))
152− , Representable Id (Eval (rep Expr))
153− , Representable Id (Eval (rep Name))
154− , GConstructable (TTable Aggregate) TColumns Id Aggregate (Eval (rep Aggregate))
155− , GConstructable (TTable Expr) TColumns Id Expr (Eval (rep Expr))
156− , GConstructable (TTable Name) TColumns Id Name (Eval (rep Name))
219+ ( Corep (Compose Aggregate TUnreify) (Eval (rep (Reify Expr)))
220+ , Corep TUnreify (Eval (rep (Reify Aggregate)))
221+ , Corep TUnreify (Eval (rep (Reify Expr)))
222+ , Corep TUnreify (Eval (rep (Reify Insert)))
223+ , Corep TUnreify (Eval (rep (Reify Name)))
224+ , GConstructable (TTable (Reify Aggregate)) TColumns TUnreify (Col (Reify Aggregate)) (Eval (rep (Reify Aggregate)))
225+ , GConstructable (TTable (Reify Expr)) TColumns TUnreify (Col (Reify Expr)) (Eval (rep (Reify Expr)))
226+ , GConstructable (TTable (Reify Insert)) TColumns TUnreify (Col (Reify Insert)) (Eval (rep (Reify Insert)))
227+ , GConstructable (TTable (Reify Name)) TColumns TUnreify (Col (Reify Name)) (Eval (rep (Reify Name)))
157228 )
158229 GGConstructable' 'K.Sum rep =
159− ( RepresentableConstructors Id (Eval (rep Expr))
160− , RepresentableFields Id (Eval (rep Aggregate))
161− , RepresentableFields Id (Eval (rep Expr))
162− , RepresentableFields Id (Eval (rep Name))
163− , Functor (GConstructors Id (Eval (rep Expr)))
164− , GConstructableADT (TTable Aggregate) TColumns Id Aggregate (Eval (rep Aggregate))
165− , GConstructableADT (TTable Expr) TColumns Id Expr (Eval (rep Expr))
166− , GConstructableADT (TTable Name) TColumns Id Name (Eval (rep Name))
230+ ( CorepConstructors TUnreify (Eval (rep (Reify Expr)))
231+ , CorepConstructors TUnreify (Eval (rep (Reify Insert)))
232+ , CorepFields (Compose Aggregate TUnreify) (Eval (rep (Reify Expr)))
233+ , CorepFields TUnreify (Eval (rep (Reify Aggregate)))
234+ , CorepFields TUnreify (Eval (rep (Reify Expr)))
235+ , CorepFields TUnreify (Eval (rep (Reify Name)))
236+ , Functor (GConstructors TUnreify (Eval (rep (Reify Expr))))
237+ , Functor (GConstructors TUnreify (Eval (rep (Reify Insert))))
238+ , GConstructableADT (TTable (Reify Aggregate)) TColumns TUnreify (Col (Reify Aggregate)) (Eval (rep (Reify Aggregate)))
239+ , GConstructableADT (TTable (Reify Expr)) TColumns TUnreify (Col (Reify Expr)) (Eval (rep (Reify Expr)))
240+ , GConstructableADT (TTable (Reify Insert)) TColumns TUnreify (Col (Reify Insert)) (Eval (rep (Reify Insert)))
241+ , GConstructableADT (TTable (Reify Name)) TColumns TUnreify (Col (Reify Name)) (Eval (rep (Reify Name)))
167242 )
168243
169244
170245type GGConstruct :: K.Algebra -> (K.Context -> Exp (Type -> Type)) -> Type -> Type
171246type family GGConstruct algebra rep r where
172− GGConstruct 'K.Product rep r = GConstruct Id (Eval (rep Expr)) r -> r
173− GGConstruct 'K.Sum rep r = GConstructADT Id (Eval (rep Expr)) r r
247+ GGConstruct 'K.Product rep r =
248+ GConstruct TUnreify (Eval (rep (Reify Expr))) r -> r
249+ GGConstruct 'K.Sum rep r =
250+ GConstructADT TUnreify (Eval (rep (Reify Expr))) r r
174251
175252
176253ggconstruct :: forall algebra rep a. GGConstructable algebra rep
177− => (Eval (GGColumns algebra TColumns (Eval (rep Expr))) Expr -> a)
254+ => (Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))) (Col Expr) -> a)
178255 -> GGConstruct algebra rep a -> a
179256ggconstruct gfromColumns f = case algebraSing @algebra of
180257 SProduct ->
181258 f $
182− gtabulate @Id @(Eval (rep Expr)) @a $
259+ gtabulate @TUnreify @(Eval (rep (Reify Expr))) @a $
183260 gfromColumns .
261+ hunreify .
184262 gconstruct
185− @(TTable Expr)
263+ @(TTable (Reify Expr))
186264 @TColumns
187− @Id
188− @Expr
189− @(Eval (rep Expr))
190− (const toColumns)
265+ @TUnreify
266+ @(Col (Reify Expr))
267+ @(Eval (rep (Reify Expr)))
268+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
191269 SSum ->
192− gcindex @Id @(Eval (rep Expr)) @a f $
193− fmap gfromColumns $
270+ gcindex @TUnreify @(Eval (rep (Reify Expr))) @a f $
271+ fmap (gfromColumns . hunreify) $
194272 gconstructADT
195− @(TTable Expr)
273+ @(TTable (Reify Expr))
196274 @TColumns
197− @Id
198− @Expr
199− @(Eval (rep Expr))
200− (const toColumns)
201− (\Spec {info} -> snull info)
202− (\Spec {nullity} -> case nullity of
275+ @TUnreify
276+ @(Col (Reify Expr))
277+ @(Eval (rep (Reify Expr)))
278+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
279+ (\SSpec {info} -> Reify (DB (snull info)))
280+ (\SSpec {nullity} -> case nullity of
203281 Null -> id
204− NotNull -> nullify)
205− (HIdentity . litExpr)
282+ NotNull -> \(Reify (DB a)) -> Reify (DB (nullify a)))
283+ (HType . Reify . DB . litExpr)
206284
207285
208286type GGDeconstruct :: K.Algebra -> (K.Context -> Exp (Type -> Type)) -> Type -> Type -> Type
209287type family GGDeconstruct algebra rep a r where
210288 GGDeconstruct 'K.Product rep a r =
211− GConstruct Id (Eval (rep Expr)) r -> a -> r
289+ GConstruct TUnreify (Eval (rep (Reify Expr))) r -> a -> r
212290 GGDeconstruct 'K.Sum rep a r =
213− GConstructADT Id (Eval (rep Expr)) r (a -> r)
291+ GConstructADT TUnreify (Eval (rep (Reify Expr))) r (a -> r)
214292
215293
216294ggdeconstruct :: forall algebra rep a r. (GGConstructable algebra rep, Table Expr r)
217− => (a -> Eval (GGColumns algebra TColumns (Eval (rep Expr))) Expr)
295+ => (a -> Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))) (Col Expr))
218296 -> GGDeconstruct algebra rep a r
219297ggdeconstruct gtoColumns = case algebraSing @algebra of
220298 SProduct -> \build ->
221− gindex @Id @(Eval (rep Expr)) @r build .
299+ gindex @TUnreify @(Eval (rep (Reify Expr))) @r build .
222300 gdeconstruct
223− @(TTable Expr)
301+ @(TTable (Reify Expr))
224302 @TColumns
225− @Id
226− @Expr
227− @(Eval (rep Expr))
228− (const fromColumns) .
303+ @TUnreify
304+ @(Col (Reify Expr))
305+ @(Eval (rep (Reify Expr)))
306+ (\(_ :: proxy x) -> unreify @_ @x Refl . fromColumns) .
307+ hreify .
229308 gtoColumns
230309 SSum ->
231− gctabulate @Id @(Eval (rep Expr)) @r @(a -> r) $ \constructors as ->
310+ gctabulate @TUnreify @(Eval (rep (Reify Expr))) @r @(a -> r) $ \constructors as ->
232311 let
233− (HIdentity tag, cases) =
312+ (HType (Reify (DB tag)), cases) =
234313 gdeconstructADT
235− @(TTable Expr)
314+ @(TTable (Reify Expr))
236315 @TColumns
237− @Id
238− @Expr
239− @(Eval (rep Expr))
240− (const fromColumns)
241− (\Spec {nullity} -> case nullity of
316+ @TUnreify
317+ @(Col (Reify Expr))
318+ @(Eval (rep (Reify Expr)))
319+ (\(_ :: proxy x) -> unreify @_ @x Refl . fromColumns)
320+ (\SSpec {nullity} -> case nullity of
242321 Null -> id
243− NotNull -> unsafeUnnullify)
322+ NotNull -> \(Reify (DB a)) -> Reify (DB (unsafeUnnullify a)))
244323 constructors $
324+ hreify $
245325 gtoColumns as
246326 in
247327 case cases of
@@ -251,102 +331,201 @@ ggdeconstruct gtoColumns = case algebraSing @algebra of
251331
252332type GGName :: K.Algebra -> (K.Context -> Exp (Type -> Type)) -> Type -> Type
253333type family GGName algebra rep a where
254− GGName 'K.Product rep a = GConstruct Id (Eval (rep Name)) a
255− GGName 'K.Sum rep a = Name Tag -> GBuildADT Id (Eval (rep Name)) a
334+ GGName 'K.Product rep a = GConstruct TUnreify (Eval (rep (Reify Name))) a
335+ GGName 'K.Sum rep a = Name Tag -> GBuildADT TUnreify (Eval (rep (Reify Name))) a
256336
257337
258338ggname :: forall algebra rep a. GGConstructable algebra rep
259− => (Eval (GGColumns algebra TColumns (Eval (rep Expr))) Name -> a)
339+ => (Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))) (Col Name) -> a)
260340 -> GGName algebra rep a
261341ggname gfromColumns = case algebraSing @algebra of
262342 SProduct ->
263− gtabulate @Id @(Eval (rep Name)) @a $
343+ gtabulate @TUnreify @(Eval (rep (Reify Name))) @a $
264344 gfromColumns .
345+ hunreify .
265346 gconstruct
266− @(TTable Name)
347+ @(TTable (Reify Name))
267348 @TColumns
268− @Id
269− @Name
270− @(Eval (rep Name))
271− (const toColumns)
349+ @TUnreify
350+ @(Col (Reify Name))
351+ @(Eval (rep (Reify Name)))
352+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
272353 SSum -> \tag ->
273− gftabulate @Id @(Eval (rep Name)) @a $
354+ gftabulate @TUnreify @(Eval (rep (Reify Name))) @a $
274355 gfromColumns .
356+ hunreify .
275357 gbuildADT
276− @(TTable Name)
358+ @(TTable (Reify Name))
277359 @TColumns
278− @Id
279− @Name
280− @(Eval (rep Name))
281− (const toColumns)
282− (\_ _ (Name a) -> Name a)
283− (HIdentity tag)
360+ @TUnreify
361+ @(Col (Reify Name))
362+ @(Eval (rep (Reify Name)))
363+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
364+ (\_ _ (Reify (NameCol a)) -> Reify (NameCol a))
365+ (HType ((\(Name a) -> Reify (NameCol a)) tag))
284366
285367
286368type GGAggregate :: K.Algebra -> (K.Context -> Exp (Type -> Type)) -> Type -> Type
287369type family GGAggregate algebra rep r where
288370 GGAggregate 'K.Product rep r =
289− GConstruct Id (Eval (rep Aggregate)) r ->
290− GConstruct Id (Eval (rep Expr)) r
371+ GConstruct (Compose Aggregate TUnreify) (Eval (rep (Reify Expr))) r ->
372+ GConstruct TUnreify (Eval (rep (Reify Expr))) r
291373 GGAggregate 'K.Sum rep r =
292− GBuildADT Id (Eval (rep Aggregate)) r ->
293− GBuildADT Id (Eval (rep Expr)) r
374+ GBuildADT (Compose Aggregate TUnreify) (Eval (rep (Reify Expr))) r ->
375+ GBuildADT TUnreify (Eval (rep (Reify Expr))) r
294376
295377
296−ggaggregate :: forall algebra rep exprs agg. GGConstructable algebra rep
297− => (Eval (GGColumns algebra TColumns (Eval (rep Expr))) Aggregate -> agg)
298− -> (exprs -> Eval (GGColumns algebra TColumns (Eval (rep Expr))) Expr)
299− -> GGAggregate algebra rep agg -> exprs -> agg
378+ggaggregate :: forall algebra rep a. GGConstructable algebra rep
379+ => (Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))) (Col Expr) -> a)
380+ -> (a -> Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))) (Col Expr))
381+ -> GGAggregate algebra rep (Aggregate a) -> a -> Aggregate a
300382ggaggregate gfromColumns gtoColumns agg es = case algebraSing @algebra of
383+ SProduct -> flip f exprs $
384+ fmap
385+ ( gfromColumns
386+ . hunreify
387+ . gconstruct
388+ @(TTable (Reify Expr))
389+ @TColumns
390+ @TUnreify
391+ @(Col (Reify Expr))
392+ @(Eval (rep (Reify Expr)))
393+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
394+ ) .
395+ liftF½ .
396+ gtraverse @TUnreify @(Eval (rep (Reify Expr))) @_ @Aggregate (MaybeApply . Left)
397+ where
398+ f =
399+ gindex @TUnreify @(Eval (rep (Reify Expr))) @(Aggregate a) .
400+ agg .
401+ gtabulate @(Compose Aggregate TUnreify) @(Eval (rep (Reify Expr))) @(Aggregate a)
402+ exprs =
403+ gdeconstruct
404+ @(TTable (Reify Expr))
405+ @TColumns
406+ @TUnreify
407+ @(Col (Reify Expr))
408+ @(Eval (rep (Reify Expr)))
409+ (\(_ :: proxy x) -> unreify @_ @x Refl . fromColumns) $
410+ hreify $
411+ gtoColumns es
412+ SSum -> flip f exprs $
413+ liftF1½
414+ (\tag' ->
415+ gfromColumns .
416+ hunreify .
417+ gbuildADT
418+ @(TTable (Reify Expr))
419+ @TColumns
420+ @TUnreify
421+ @(Col (Reify Expr))
422+ @(Eval (rep (Reify Expr)))
423+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
424+ (\tag'' SSpec {nullity} (Reify (DB a)) ->
425+ Reify $ DB $ runTag nullity (tag ==. litExpr tag'') a)
426+ (HType (Reify (DB tag'))))
427+ (groupByExpr tag) .
428+ gftraverse @TUnreify @(Eval (rep (Reify Expr))) @_ @Aggregate (MaybeApply . Left)
429+ where
430+ f =
431+ gfindex @TUnreify @(Eval (rep (Reify Expr))) @(Aggregate a) .
432+ agg .
433+ gftabulate @(Compose Aggregate TUnreify) @(Eval (rep (Reify Expr))) @(Aggregate a)
434+ (HType (Reify (DB tag)), exprs) =
435+ gunbuildADT
436+ @(TTable (Reify Expr))
437+ @TColumns
438+ @TUnreify
439+ @(Col (Reify Expr))
440+ @(Eval (rep (Reify Expr)))
441+ (\(_ :: proxy x) -> unreify @_ @x Refl . fromColumns)
442+ (\SSpec {nullity} -> case nullity of
443+ Null -> id
444+ NotNull -> \(Reify (DB a)) -> Reify (DB (unsafeUnnullify a))) $
445+ hreify $
446+ gtoColumns es
447+
448+
449+type GGAggregate' :: K.Algebra -> (K.Context -> Exp (Type -> Type)) -> Type -> Type
450+type family GGAggregate' algebra rep r where
451+ GGAggregate' 'K.Product rep r =
452+ GConstruct TUnreify (Eval (rep (Reify Aggregate))) r ->
453+ GConstruct TUnreify (Eval (rep (Reify Expr))) r
454+ GGAggregate' 'K.Sum rep r =
455+ GBuildADT TUnreify (Eval (rep (Reify Aggregate))) r ->
456+ GBuildADT TUnreify (Eval (rep (Reify Expr))) r
457+
458+
459+ggaggregate' :: forall algebra rep exprs agg. GGConstructable algebra rep
460+ => (Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))) (Col Aggregate) -> agg)
461+ -> (exprs -> Eval (GGColumns algebra TColumns (Eval (rep (Reify Result)))) (Col Expr))
462+ -> GGAggregate' algebra rep agg -> exprs -> agg
463+ggaggregate' gfromColumns gtoColumns agg es = case algebraSing @algebra of
301464 SProduct -> flip f exprs $
302465 gfromColumns .
466+ hunreify .
303467 gconstruct
304− @(TTable Aggregate)
468+ @(TTable (Reify Aggregate))
305469 @TColumns
306− @Id
307− @Aggregate
308− @(Eval (rep Aggregate))
309− (const toColumns)
470+ @TUnreify
471+ @(Col (Reify Aggregate))
472+ @(Eval (rep (Reify Aggregate)))
473+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
310474 where
311475 f =
312− gindex @Id @(Eval (rep Expr)) @agg .
476+ gindex @TUnreify @(Eval (rep (Reify Expr))) @agg .
313477 agg .
314− gtabulate @Id @(Eval (rep Aggregate)) @agg
478+ gtabulate @TUnreify @(Eval (rep (Reify Aggregate))) @agg
315479 exprs =
316480 gdeconstruct
317− @(TTable Expr)
481+ @(TTable (Reify Expr))
318482 @TColumns
319− @Id
320− @Expr
321− @(Eval (rep Expr))
322− (const fromColumns) $
483+ @TUnreify
484+ @(Col (Reify Expr))
485+ @(Eval (rep (Reify Expr)))
486+ (\(_ :: proxy x) -> unreify @_ @x Refl . fromColumns) $
487+ hreify $
323488 gtoColumns es
324489 SSum -> flip f exprs $
325490 gfromColumns .
491+ hunreify .
326492 gbuildADT
327− @(TTable Aggregate)
493+ @(TTable (Reify Aggregate))
328494 @TColumns
329− @Id
330− @Aggregate
331− @(Eval (rep Aggregate))
332− (const toColumns)
333− (\tag' Spec {nullity} (Aggregate a) ->
334− Aggregate $ sguard (tag ==. litExpr tag') . snullify nullity <$> a)
335− (HIdentity (groupByExpr tag))
495+ @TUnreify
496+ @(Col (Reify Aggregate))
497+ @(Eval (rep (Reify Aggregate)))
498+ (\(_ :: proxy x) -> toColumns . reify @_ @x Refl)
499+ (\tag' SSpec {nullity} (Reify (Aggregation a)) ->
500+ Reify $ Aggregation $ runTag nullity (tag ==. litExpr tag') <$> a)
501+ (HType (Reify (Aggregation (groupByExpr tag))))
336502 where
337503 f =
338− gfindex @Id @(Eval (rep Expr)) @agg .
504+ gfindex @TUnreify @(Eval (rep (Reify Expr))) @agg .
339505 agg .
340− gftabulate @Id @(Eval (rep Aggregate)) @agg
341− (HIdentity tag, exprs) =
506+ gftabulate @TUnreify @(Eval (rep (Reify Aggregate))) @agg
507+ (HType (Reify (DB tag)), exprs) =
342508 gunbuildADT
343− @(TTable Expr)
509+ @(TTable (Reify Expr))
344510 @TColumns
345− @Id
346− @Expr
347− @(Eval (rep Expr))
348− (const fromColumns)
349− (\Spec {nullity} -> case nullity of
511+ @TUnreify
512+ @(Col (Reify Expr))
513+ @(Eval (rep (Reify Expr)))
514+ (\(_ :: proxy x) -> unreify @_ @x Refl . fromColumns)
515+ (\SSpec {nullity} -> case nullity of
350516 Null -> id
351− NotNull -> unsafeUnnullify) $
517+ NotNull -> \(Reify (DB a)) -> Reify (DB (unsafeUnnullify a))) $
518+ hreify $
352519 gtoColumns es
520+
521+
522+liftF½ :: MaybeApply Aggregate a -> Aggregate a
523+liftF½ (MaybeApply ma) = case ma of
524+ Left a -> a
525+ Right a -> a <$ groupByExpr (litExpr False)
526+
527+
528+liftF1½ :: Apply v => (a -> b -> c) -> v a -> MaybeApply v b -> v c
529+liftF1½ f a (MaybeApply eb) = case eb of
530+ Left b -> liftF2 f a b
531+ Right b -> fmap (`f` b) a
src/Rel8/Generic/Construction/ADT.hs+69−47
@@ -1,7 +1,6 @@
11{-# language AllowAmbiguousTypes #-}
22{-# language BlockArguments #-}
33{-# language DataKinds #-}
4−{-# language FlexibleContexts #-}
54{-# language FlexibleInstances #-}
65{-# language MultiParamTypeClasses #-}
76{-# language RankNTypes #-}
@@ -17,13 +16,14 @@ module Rel8.Generic.Construction.ADT
1716 ( GConstructableADT
1817 , GBuildADT, gbuildADT, gunbuildADT
1918 , GConstructADT, gconstructADT, gdeconstructADT
20− , GFields, RepresentableFields, gftabulate, gfindex
21− , GConstructors, RepresentableConstructors, gctabulate, gcindex
19+ , GFields, CorepFields, gftabulate, gfindex, gftraverse
20+ , GConstructors, CorepConstructors, gctabulate, gcindex
2221 , GConstructorADT, GMakeableADT, gmakeADT
2322 )
2423where
2524
2625-- base
26+import Control.Applicative ( liftA2 )
2727import Data.Bifunctor ( first )
2828import Data.Functor.Identity ( runIdentity )
2929import Data.Kind ( Constraint, Type )
@@ -41,21 +41,22 @@ import GHC.TypeLits
4141import Prelude hiding ( null )
4242
4343-- rel8
44−import Rel8.FCF ( Exp )
44+import Rel8.FCF ( Compose, Exp )
4545import Rel8.Generic.Construction.Record
4646 ( GConstruct, GConstructable, gconstruct, gdeconstruct
47− , GFields, Representable, gtabulate, gindex
47+ , GFields, Corep, gtabulate, gindex, gtraverse
4848 , FromColumns, ToColumns
4949 )
5050import Rel8.Generic.Table.ADT ( GColumnsADT, GColumnsADT' )
5151import Rel8.Generic.Table.Record ( GColumns )
52+import Rel8.Schema.Context.Label ( HLabelable, hlabeler, hunlabeler )
5253import Rel8.Schema.HTable ( HTable )
53−import Rel8.Schema.HTable.Identity ( HIdentity )
54+import Rel8.Schema.HTable.Identity ( HType )
5455import Rel8.Schema.HTable.Label ( HLabel, hlabel, hunlabel )
5556import Rel8.Schema.HTable.Nullify ( HNullify, hnulls, hnullify, hunnullify )
5657import Rel8.Schema.HTable.Product ( HProduct( HProduct ) )
5758import Rel8.Schema.Null ( Nullify )
58−import Rel8.Schema.Spec ( Spec )
59+import Rel8.Schema.Spec ( Spec( Spec ), SSpec )
5960import qualified Rel8.Schema.Kind as K
6061import Rel8.Type.Tag ( Tag( Tag ) )
6162
@@ -63,16 +64,24 @@ import Rel8.Type.Tag ( Tag( Tag ) )
6364import Data.Text ( pack )
6465
6566
66−type Null :: K.Context -> Type
67−type Null context = forall a. Spec a -> context (Nullify a)
67+type Null :: K.HContext -> Type
68+type Null context = forall labels necessity a. ()
69+ => SSpec ('Spec labels necessity a)
70+ -> context ('Spec labels necessity (Nullify a))
6871
6972
70−type Nullifier :: K.Context -> Type
71−type Nullifier context = forall a. Spec a -> context a -> context (Nullify a)
73+type Nullifier :: K.HContext -> Type
74+type Nullifier context = forall labels necessity a. ()
75+ => SSpec ('Spec labels necessity a)
76+ -> context ('Spec labels necessity a)
77+ -> context ('Spec labels necessity (Nullify a))
7278
7379
74−type Unnullifier :: K.Context -> Type
75−type Unnullifier context = forall a. Spec a -> context (Nullify a) -> context a
80+type Unnullifier :: K.HContext -> Type
81+type Unnullifier context = forall labels necessity a. ()
82+ => SSpec ('Spec labels necessity a)
83+ -> context ('Spec labels necessity (Nullify a))
84+ -> context ('Spec labels necessity a)
7685
7786
7887type NoConstructor :: Symbol -> Symbol -> ErrorMessage
@@ -117,26 +126,26 @@ type family GConstructors f rep where
117126 GConstructors f (M1 C _ rep) = (->) (GFields f rep)
118127
119128
120−type RepresentableConstructors :: (Type -> Exp Type) -> (Type -> Type) -> Constraint
121−class RepresentableConstructors f rep where
129+type CorepConstructors :: (Type -> Exp Type) -> (Type -> Type) -> Constraint
130+class CorepConstructors f rep where
122131 gctabulate :: (GConstructors f rep r -> a) -> GConstructADT f rep r a
123132 gcindex :: GConstructADT f rep r a -> GConstructors f rep r -> a
124133
125134
126−instance RepresentableConstructors f rep => RepresentableConstructors f (M1 D meta rep) where
135+instance CorepConstructors f rep => CorepConstructors f (M1 D meta rep) where
127136 gctabulate = gctabulate @f @rep
128137 gcindex = gcindex @f @rep
129138
130139
131−instance (RepresentableConstructors f a, RepresentableConstructors f b) =>
132− RepresentableConstructors f (a :+: b)
140+instance (CorepConstructors f a, CorepConstructors f b) =>
141+ CorepConstructors f (a :+: b)
133142 where
134143 gctabulate f =
135144 gctabulate @f @a \a -> gctabulate @f @b \b -> f (a :*: b)
136145 gcindex f (a :*: b) = gcindex @f @b (gcindex @f @a f a) b
137146
138147
139−instance Representable f rep => RepresentableConstructors f (M1 C meta rep) where
148+instance Corep f rep => CorepConstructors f (M1 C meta rep) where
140149 gctabulate f = f . gindex @f @rep
141150 gcindex f = f . gtabulate @f @rep
142151
@@ -155,38 +164,44 @@ type family GFieldsADT f rep where
155164 GFieldsADT f (M1 C _ rep) = GFields f rep
156165
157166
158−type RepresentableFields :: (Type -> Exp Type) -> (Type -> Type) -> Constraint
159−class RepresentableFields f rep where
167+type CorepFields :: (Type -> Exp Type) -> (Type -> Type) -> Constraint
168+class CorepFields f rep where
160169 gftabulate :: (GFieldsADT f rep -> a) -> GBuildADT f rep a
161170 gfindex :: GBuildADT f rep a -> GFieldsADT f rep -> a
171+ gftraverse :: Applicative m
172+ => (forall a. g a -> m a)
173+ -> GFieldsADT (Compose g f) rep -> m (GFieldsADT f rep)
162174
163175
164−instance RepresentableFields f rep => RepresentableFields f (M1 D meta rep) where
176+instance CorepFields f rep => CorepFields f (M1 D meta rep) where
165177 gftabulate = gftabulate @f @rep
166178 gfindex = gfindex @f @rep
179+ gftraverse = gftraverse @f @rep
167180
168181
169−instance (RepresentableFields f a, RepresentableFields f b) => RepresentableFields f (a :+: b) where
182+instance (CorepFields f a, CorepFields f b) => CorepFields f (a :+: b) where
170183 gftabulate f =
171184 gftabulate @f @a \a -> gftabulate @f @b \b -> f (a, b)
172185 gfindex f (a, b) = gfindex @f @b (gfindex @f @a f a) b
186+ gftraverse f (a, b) = liftA2 (,) (gftraverse @f @a f a) (gftraverse @f @b f b)
173187
174188
175−instance Representable f rep => RepresentableFields f (M1 C meta rep) where
189+instance Corep f rep => CorepFields f (M1 C meta rep) where
176190 gftabulate = gtabulate @f @rep
177191 gfindex = gindex @f @rep
192+ gftraverse = gtraverse @f @rep
178193
179194
180195type GConstructableADT
181196 :: (Type -> Exp Constraint)
182197 -> (Type -> Exp K.HTable)
183198 -> (Type -> Exp Type)
184− -> K.Context -> (Type -> Type) -> Constraint
199+ -> K.HContext -> (Type -> Type) -> Constraint
185200class GConstructableADT _Table _Columns f context rep where
186201 gbuildADT :: ()
187202 => ToColumns _Table _Columns f context
188203 -> (Tag -> Nullifier context)
189− -> HIdentity Tag context
204+ -> HType Tag context
190205 -> GFieldsADT f rep
191206 -> GColumnsADT _Columns rep context
192207
@@ -194,13 +209,13 @@ class GConstructableADT _Table _Columns f context rep where
194209 => FromColumns _Table _Columns f context
195210 -> Unnullifier context
196211 -> GColumnsADT _Columns rep context
197− -> (HIdentity Tag context, GFieldsADT f rep)
212+ -> (HType Tag context, GFieldsADT f rep)
198213
199214 gconstructADT :: ()
200215 => ToColumns _Table _Columns f context
201216 -> Null context
202217 -> Nullifier context
203− -> (Tag -> HIdentity Tag context)
218+ -> (Tag -> HType Tag context)
204219 -> GConstructors f rep (GColumnsADT _Columns rep context)
205220
206221 gdeconstructADT :: ()
@@ -208,29 +223,30 @@ class GConstructableADT _Table _Columns f context rep where
208223 -> Unnullifier context
209224 -> GConstructors f rep r
210225 -> GColumnsADT _Columns rep context
211− -> (HIdentity Tag context, NonEmpty (Tag, r))
226+ -> (HType Tag context, NonEmpty (Tag, r))
212227
213228
214229instance
215− ( htable ~ HLabel "tag" (HIdentity Tag)
230+ ( htable ~ HLabel "tag" (HType Tag)
216231 , GConstructableADT' _Table _Columns f context htable rep
232+ , HLabelable context
217233 )
218234 => GConstructableADT _Table _Columns f context (M1 D meta rep)
219235 where
220236 gbuildADT toColumns nullifier =
221237 gbuildADT' @_Table @_Columns @f @context @htable @rep toColumns nullifier .
222− hlabel
238+ hlabel hlabeler
223239
224240 gunbuildADT fromColumns unnullifier =
225− first hunlabel .
241+ first (hunlabel hunlabeler) .
226242 gunbuildADT' @_Table @_Columns @f @context @htable @rep fromColumns unnullifier
227243
228244 gconstructADT toColumns null nullifier mk =
229245 gconstructADT' @_Table @_Columns @f @context @htable @rep toColumns null nullifier
230− (hlabel . mk)
246+ (hlabel hlabeler . mk)
231247
232248 gdeconstructADT fromColumns unnullifier cases =
233− first hunlabel .
249+ first (hunlabel hunlabeler) .
234250 gdeconstructADT' @_Table @_Columns @f @context @htable @rep fromColumns unnullifier cases
235251
236252
@@ -238,7 +254,7 @@ type GConstructableADT'
238254 :: (Type -> Exp Constraint)
239255 -> (Type -> Exp K.HTable)
240256 -> (Type -> Exp Type)
241− -> K.Context -> K.HTable -> (Type -> Type) -> Constraint
257+ -> K.HContext -> K.HTable -> (Type -> Type) -> Constraint
242258class GConstructableADT' _Table _Columns f context htable rep where
243259 gbuildADT' :: ()
244260 => ToColumns _Table _Columns f context
@@ -325,6 +341,7 @@ instance {-# OVERLAPPABLE #-}
325341 ( HTable (GColumns _Columns rep)
326342 , KnownSymbol label
327343 , meta ~ 'MetaCons label _fixity _isRecord
344+ , HLabelable context
328345 , GConstructable _Table _Columns f context rep
329346 , GColumnsADT' _Columns htable (M1 C meta rep) ~
330347 HProduct htable (HLabel label (HNullify (GColumns _Columns rep)))
@@ -333,7 +350,7 @@ instance {-# OVERLAPPABLE #-}
333350 where
334351 gbuildADT' toColumns nullifier htable =
335352 HProduct htable .
336− hlabel .
353+ hlabel hlabeler .
337354 hnullify (nullifier tag) .
338355 gconstruct @_Table @_Columns @f @context @rep toColumns
339356 where
@@ -344,13 +361,13 @@ instance {-# OVERLAPPABLE #-}
344361 , gdeconstruct @_Table @_Columns @f @context @rep fromColumns $
345362 runIdentity $
346363 hunnullify (\spec -> pure . unnullifier spec) $
347− hunlabel
364+ hunlabel hunlabeler
348365 a
349366 )
350367
351368 gconstructADT' toColumns _ nullifier mk =
352369 HProduct htable .
353− hlabel .
370+ hlabel hlabeler .
354371 hnullify nullifier .
355372 gconstruct @_Table @_Columns @f @context @rep toColumns
356373 where
@@ -365,34 +382,35 @@ instance {-# OVERLAPPABLE #-}
365382 a = gdeconstruct @_Table @_Columns @f @context @rep fromColumns $
366383 runIdentity $
367384 hunnullify (\spec -> pure . unnullifier spec) $
368− hunlabel
385+ hunlabel hunlabeler
369386 columns
370387 tag = Tag $ pack $ symbolVal (Proxy @label)
371388
372− gfill null htable = HProduct htable (hlabel (hnulls null))
389+ gfill null htable = HProduct htable (hlabel hlabeler (hnulls null))
373390
374391
375392type GMakeableADT
376393 :: (Type -> Exp Constraint)
377394 -> (Type -> Exp K.HTable)
378395 -> (Type -> Exp Type)
379− -> K.Context -> Symbol -> (Type -> Type) -> Constraint
396+ -> K.HContext -> Symbol -> (Type -> Type) -> Constraint
380397class GMakeableADT _Table _Columns f context name rep where
381398 gmakeADT :: ()
382399 => ToColumns _Table _Columns f context
383400 -> Null context
384401 -> Nullifier context
385− -> (Tag -> HIdentity Tag context)
402+ -> (Tag -> HType Tag context)
386403 -> GFields f (GConstructorADT name rep)
387404 -> GColumnsADT _Columns rep context
388405
389406
390407instance
391− ( htable ~ HLabel "tag" (HIdentity Tag)
408+ ( htable ~ HLabel "tag" (HType Tag)
392409 , meta ~ 'MetaData datatype _module _package _newtype
393410 , fallback ~ TypeError (NoConstructor datatype name)
394411 , fields ~ GFields f (GConstructorADT' name rep fallback)
395412 , GMakeableADT' _Table _Columns f context htable name rep fields
413+ , HLabelable context
396414 , KnownSymbol name
397415 )
398416 => GMakeableADT _Table _Columns f context name (M1 D meta rep)
@@ -403,14 +421,14 @@ instance
403421 toColumns null nullifier htable
404422 where
405423 tag = Tag $ pack $ symbolVal (Proxy @name)
406− htable = hlabel (wrap tag)
424+ htable = hlabel hlabeler (wrap tag)
407425
408426
409427type GMakeableADT'
410428 :: (Type -> Exp Constraint)
411429 -> (Type -> Exp K.HTable)
412430 -> (Type -> Exp Type)
413− -> K.Context -> K.HTable -> Symbol -> (Type -> Type) -> Type -> Constraint
431+ -> K.HContext -> K.HTable -> Symbol -> (Type -> Type) -> Type -> Constraint
414432class GMakeableADT' _Table _Columns f context htable name rep fields where
415433 gmakeADT' :: ()
416434 => ToColumns _Table _Columns f context
@@ -451,6 +469,8 @@ instance {-# OVERLAPS #-}
451469
452470instance {-# OVERLAPS #-}
453471 ( HTable (GColumns _Columns rep)
472+ , KnownSymbol name
473+ , HLabelable context
454474 , GConstructable _Table _Columns f context rep
455475 , fields ~ GFields f rep
456476 , GColumnsADT' _Columns htable (M1 C ('MetaCons name _fixity _isRecord) rep) ~
@@ -460,13 +480,15 @@ instance {-# OVERLAPS #-}
460480 where
461481 gmakeADT' toColumns _ nullifier htable =
462482 HProduct htable .
463− hlabel .
483+ hlabel hlabeler .
464484 hnullify nullifier .
465485 gconstruct @_Table @_Columns @f @context @rep toColumns
466486
467487
468488instance {-# OVERLAPPABLE #-}
469489 ( HTable (GColumns _Columns rep)
490+ , KnownSymbol label
491+ , HLabelable context
470492 , GColumnsADT' _Columns htable (M1 C ('MetaCons label _fixity _isRecord) rep) ~
471493 HProduct htable (HLabel label (HNullify (GColumns _Columns rep)))
472494 )
@@ -474,5 +496,5 @@ instance {-# OVERLAPPABLE #-}
474496 where
475497 gmakeADT' _ null _ htable _ =
476498 HProduct htable $
477− hlabel $
499+ hlabel hlabeler $
478500 hnulls null
src/Rel8/Generic/Construction/Record.hs+28−15
@@ -13,12 +13,13 @@
1313
1414module Rel8.Generic.Construction.Record
1515 ( GConstructor, GConstruct, GConstructable, gconstruct, gdeconstruct
16− , GFields, Representable, gtabulate, gindex
16+ , GFields, Corep, gtabulate, gindex, gtraverse
1717 , FromColumns, ToColumns
1818 )
1919where
2020
2121-- base
22+import Control.Applicative ( liftA2 )
2223import Data.Kind ( Constraint, Type )
2324import Data.Proxy ( Proxy( Proxy ) )
2425import GHC.Generics
@@ -27,13 +28,15 @@ import GHC.Generics
2728 )
2829import GHC.TypeLits
2930 ( ErrorMessage( (:<>:), Text ), TypeError
30− , Symbol
31+ , Symbol, KnownSymbol
3132 )
3233import Prelude
3334
3435-- rel8
35−import Rel8.FCF ( Eval, Exp )
36+import Rel8.FCF ( Compose, Eval, Exp )
3637import Rel8.Generic.Table.Record ( GColumns )
38+import Rel8.Schema.Context.Label ( HLabelable, hlabeler, hunlabeler )
39+import Rel8.Schema.HTable ( HTable )
3740import Rel8.Schema.HTable.Label ( hlabel, hunlabel )
3841import Rel8.Schema.HTable.Product ( HProduct( HProduct ) )
3942import qualified Rel8.Schema.Kind as K
@@ -43,7 +46,7 @@ type FromColumns
4346 :: (Type -> Exp Constraint)
4447 -> (Type -> Exp K.HTable)
4548 -> (Type -> Exp Type)
46− -> K.Context
49+ -> K.HContext
4750 -> Type
4851type FromColumns _Table _Columns f context = forall proxy x.
4952 Eval (_Table x) => proxy x -> Eval (_Columns x) context -> Eval (f x)
@@ -53,7 +56,7 @@ type ToColumns
5356 :: (Type -> Exp Constraint)
5457 -> (Type -> Exp K.HTable)
5558 -> (Type -> Exp Type)
56− -> K.Context
59+ -> K.HContext
5760 -> Type
5861type ToColumns _Table _Columns f context = forall proxy x.
5962 Eval (_Table x) => proxy x -> Eval (f x) -> Eval (_Columns x) context
@@ -85,39 +88,46 @@ type family GFields f rep where
8588 GFields f (K1 _ a) = Eval (f a)
8689
8790
88−type Representable :: (Type -> Exp Type) -> (Type -> Type) -> Constraint
89−class Representable f rep where
91+type Corep :: (Type -> Exp Type) -> (Type -> Type) -> Constraint
92+class Corep f rep where
9093 gtabulate :: (GFields f rep -> a) -> GConstruct f rep a
9194 gindex :: GConstruct f rep a -> GFields f rep -> a
95+ gtraverse :: Applicative m
96+ => (forall a. g a -> m a)
97+ -> GFields (Compose g f) rep -> m (GFields f rep)
9298
9399
94−instance Representable f rep => Representable f (M1 i meta rep) where
100+instance Corep f rep => Corep f (M1 i meta rep) where
95101 gtabulate = gtabulate @f @rep
96102 gindex = gindex @f @rep
103+ gtraverse = gtraverse @f @rep
97104
98105
99−instance (Representable f a, Representable f b) =>
100− Representable f (a :*: b)
106+instance (Corep f a, Corep f b) =>
107+ Corep f (a :*: b)
101108 where
102109 gtabulate f = gtabulate @f @a \a -> gtabulate @f @b \b -> f (a, b)
103110 gindex f (a, b) = gindex @f @b (gindex @f @a f a) b
111+ gtraverse f (a, b) = liftA2 (,) (gtraverse @f @a f a) (gtraverse @f @b f b)
104112
105113
106−instance Representable f U1 where
114+instance Corep f U1 where
107115 gtabulate = ($ ())
108116 gindex = const
117+ gtraverse = const pure
109118
110119
111−instance Representable f (K1 i a) where
120+instance Corep f (K1 i a) where
112121 gtabulate = id
113122 gindex = id
123+ gtraverse = id
114124
115125
116126type GConstructable
117127 :: (Type -> Exp Constraint)
118128 -> (Type -> Exp K.HTable)
119129 -> (Type -> Exp Type)
120− -> K.Context -> (Type -> Type) -> Constraint
130+ -> K.HContext -> (Type -> Type) -> Constraint
121131class GConstructable _Table _Columns f context rep where
122132 gconstruct :: ()
123133 => ToColumns _Table _Columns f context
@@ -160,9 +170,12 @@ instance
160170
161171instance
162172 ( Eval (_Table a)
173+ , HTable (Eval (_Columns a))
174+ , HLabelable context
175+ , KnownSymbol label
163176 , meta ~ 'MetaSel ('Just label) _su _ss _ds
164177 )
165178 => GConstructable _Table _Columns f context (M1 S meta (K1 i a))
166179 where
167− gconstruct toColumns = hlabel . toColumns (Proxy @a)
168− gdeconstruct fromColumns = fromColumns (Proxy @a) . hunlabel
180+ gconstruct toColumns = hlabel hlabeler . toColumns (Proxy @a)
181+ gdeconstruct fromColumns = fromColumns (Proxy @a) . hunlabel hunlabeler
src/Rel8/Generic/Map.hs+64−20
@@ -1,19 +1,26 @@
1+{-# language AllowAmbiguousTypes #-}
12{-# language DataKinds #-}
3+{-# language EmptyCase #-}
4+{-# language FlexibleInstances #-}
5+{-# language LambdaCase #-}
6+{-# language MultiParamTypeClasses #-}
7+{-# language RankNTypes #-}
8+{-# language ScopedTypeVariables #-}
29{-# language StandaloneKindSignatures #-}
10+{-# language TypeApplications #-}
311{-# language TypeFamilies #-}
412{-# language TypeOperators #-}
513{-# language UndecidableInstances #-}
614
715module Rel8.Generic.Map
8− ( GMap
9− , Map
16+ ( GMap, GMappable (gmap, gunmap)
1017 )
1118where
1219
1320-- base
14−import Data.Kind ( Type )
21+import Data.Kind ( Constraint, Type )
1522import GHC.Generics
16− ( (:+:), (:*:), K1, M1, U1, V1
23+ ( (:+:)( L1, R1 ), (:*:)( (:*:) ), K1( K1 ), M1( M1 ), U1( U1 ), V1
1724 )
1825import Prelude ()
1926
@@ -31,19 +38,56 @@ type family GMap f rep where
3138 GMap f (K1 i a) = K1 i (Eval (f a))
3239
3340
34−-- | Map a @Type -> Type@ function over the @Type@-kinded type variables in
35−-- of a type constructor.
36−type Map :: (Type -> Exp Type) -> Type -> Type
37−type family Map f a where
38− Map p (t a b c d e f g) =
39− t (Eval (p a)) (Eval (p b)) (Eval (p c)) (Eval (p d)) (Eval (p e))
40− (Eval (p f)) (Eval (p g))
41− Map p (t a b c d e f) =
42− t (Eval (p a)) (Eval (p b)) (Eval (p c)) (Eval (p d)) (Eval (p e))
43− (Eval (p f))
44− Map p (t a b c d e) =
45− t (Eval (p a)) (Eval (p b)) (Eval (p c)) (Eval (p d)) (Eval (p e))
46− Map p (t a b c d) = t (Eval (p a)) (Eval (p b)) (Eval (p c)) (Eval (p d))
47− Map p (t a b c) = t (Eval (p a)) (Eval (p b)) (Eval (p c))
48− Map p (t a b) = t (Eval (p a)) (Eval (p b))
49− Map p (t a) = t (Eval (p a))
41+type GMappable :: (Type -> Exp Constraint) -> (Type -> Type) -> Constraint
42+class GMappable constraint rep where
43+ gmap :: ()
44+ => proxy f
45+ -> (forall a. Eval (constraint a) => a -> Eval (f a))
46+ -> rep x
47+ -> GMap f rep x
48+
49+ gunmap :: ()
50+ => proxy f
51+ -> (forall a. Eval (constraint a) => Eval (f a) -> a)
52+ -> GMap f rep x
53+ -> rep x
54+
55+
56+instance GMappable constraint rep => GMappable constraint (M1 i c rep) where
57+ gmap proxy f (M1 a) = M1 (gmap @constraint proxy f a)
58+ gunmap proxy f (M1 a) = M1 (gunmap @constraint proxy f a)
59+
60+
61+instance GMappable constraint V1 where
62+ gmap _ _ = \case
63+ gunmap _ _ = \case
64+
65+
66+instance (GMappable constraint rep1, GMappable constraint rep2) =>
67+ GMappable constraint (rep1 :+: rep2)
68+ where
69+ gmap proxy f = \case
70+ L1 a -> L1 (gmap @constraint proxy f a)
71+ R1 a -> R1 (gmap @constraint proxy f a)
72+ gunmap proxy f = \case
73+ L1 a -> L1 (gunmap @constraint proxy f a)
74+ R1 a -> R1 (gunmap @constraint proxy f a)
75+
76+
77+instance GMappable constraint U1 where
78+ gmap _ _ U1 = U1
79+ gunmap _ _ U1 = U1
80+
81+
82+instance (GMappable constraint rep1, GMappable constraint rep2) =>
83+ GMappable constraint (rep1 :*: rep2)
84+ where
85+ gmap proxy f (a :*: b) =
86+ gmap @constraint proxy f a :*: gmap @constraint proxy f b
87+ gunmap proxy f (a :*: b) =
88+ gunmap @constraint proxy f a :*: gunmap @constraint proxy f b
89+
90+
91+instance Eval (constraint a) => GMappable constraint (K1 i a) where
92+ gmap _ f (K1 a) = K1 (f a)
93+ gunmap _ f (K1 a) = K1 (f a)
src/Rel8/Generic/Record.hs−2
@@ -1,6 +1,5 @@
11{-# language AllowAmbiguousTypes #-}
22{-# language DataKinds #-}
3−{-# language FlexibleContexts #-}
43{-# language FlexibleInstances #-}
54{-# language MultiParamTypeClasses #-}
65{-# language PolyKinds #-}
@@ -142,7 +141,6 @@ instance {-# OVERLAPPABLE #-} Snd (Count n rep) ~ rep => Countable n rep where
142141 uncount = id
143142
144143
145−type Record :: Type -> Type
146144newtype Record a = Record
147145 { unrecord :: a
148146 }
src/Rel8/Generic/Reify.hsnew file+24
@@ -0,0 +1,24 @@
1+{-# language StandaloneKindSignatures #-}
2+{-# language TypeFamilies #-}
3+
4+module Rel8.Generic.Reify
5+ ( ARep
6+ )
7+where
8+
9+-- base
10+import Data.Functor.Contravariant ( Contravariant, contramap )
11+import Data.Kind ( Type )
12+import Data.Void ( Void, absurd )
13+import GHC.Generics ( Generic, Rep, from, to )
14+import Prelude
15+
16+
17+type ARep :: (Type -> Type) -> Type
18+newtype ARep rep = ARep (rep Void)
19+
20+
21+instance (Contravariant rep, Functor rep) => Generic (ARep rep) where
22+ type Rep (ARep rep) = rep
23+ from (ARep a) = fmap absurd a
24+ to = ARep . contramap absurd
src/Rel8/Generic/Rel8able.hs+81−188
@@ -1,18 +1,13 @@
11{-# language AllowAmbiguousTypes #-}
2−{-# language ConstraintKinds #-}
32{-# language DataKinds #-}
43{-# language DefaultSignatures #-}
54{-# language FlexibleContexts #-}
65{-# language FlexibleInstances #-}
7−{-# language LambdaCase #-}
86{-# language MultiParamTypeClasses #-}
9−{-# language PolyKinds #-}
10−{-# language QuantifiedConstraints #-}
117{-# language ScopedTypeVariables #-}
128{-# language StandaloneKindSignatures #-}
139{-# language TypeApplications #-}
14−{-# language TypeFamilyDependencies #-}
15−{-# language TypeOperators #-}
10+{-# language TypeFamilies #-}
1611{-# language UndecidableInstances #-}
1712
1813module Rel8.Generic.Rel8able
@@ -20,99 +15,42 @@ module Rel8.Generic.Rel8able
2015 , Algebra
2116 , GRep
2217 , GColumns, gfromColumns, gtoColumns
23− , GFromExprs, gfromResult, gtoResult
24− , TSerialize, serialize, deserialize
18+ , greify, gunreify
19+ , TUnreifyContext
2520 )
2621where
2722
2823-- base
29−import Data.Functor.Identity ( Identity )
3024import Data.Kind ( Constraint, Type )
31−import Data.Type.Bool ( type (&&) )
25+import Data.Proxy ( Proxy( Proxy ) )
26+import Data.Type.Equality ( (:~:)( Refl ) )
3227import GHC.Generics ( Generic, Rep, from, to )
3328import Prelude
3429
3530-- rel8
36−import Rel8.Aggregate ( Aggregate )
37−import Rel8.Expr ( Expr )
38−import Rel8.FCF ( Exp, Eval )
31+import Rel8.Kind.Context ( Reifiable )
32+import Rel8.FCF ( Eval, Exp )
33+import Rel8.Generic.Map ( GMap, GMappable, gmap, gunmap )
3934import Rel8.Generic.Record ( Record(..) )
4035import Rel8.Generic.Table ( GAlgebra )
4136import qualified Rel8.Generic.Table.Record as G
4237import qualified Rel8.Kind.Algebra as K ( Algebra(..) )
43−import Rel8.Kind.Context ( SContext(..) )
44−import Rel8.Schema.Field ( Field )
38+import Rel8.Schema.Context ( Col )
39+import Rel8.Schema.Context.Label ( Labelable )
4540import Rel8.Schema.HTable ( HTable )
4641import qualified Rel8.Schema.Kind as K
47−import Rel8.Schema.Name ( Name )
42+import Rel8.Schema.Reify ( Reify, UnwrapReify )
4843import Rel8.Schema.Result ( Result )
4944import Rel8.Table
50− ( Table, Columns, Context, fromColumns, toColumns
51− , FromExprs, fromResult, toResult
52− , Transpose
53− , TTable, TColumns
45+ ( fromColumns, toColumns, reify, unreify
46+ , TTable, TColumns, TContext, TUnreify
5447 )
55−import Rel8.Table.Transpose ( Transposes )
5648
5749
58−-- | The kind of 'Rel8able' types
5950type KRel8able :: Type
6051type KRel8able = K.Rel8able
6152
6253
63−-- This is almost 'Data.Type.Equality.==', but we add an extra case.
64−type (==) :: k -> k -> Bool
65−type family a == b where
66− -- This extra case is needed to solve the equation "a == a" (where a is a
67− -- KRel8able), which occurs when we have polymorphic Rel8ables
68− -- (e.g., newtype T t f = T { x :: t a })
69− (a :: KRel8able) == (a :: KRel8able) = 'True
70−
71− -- This extra case is needed to solve the equation "a == Identity a",
72− -- which occurs when we have polymorphic Rel8ables
73− -- (e.g., newtype T a f = T { x :: Column f a })
74− a == Identity a = 'False
75−
76− -- These cases are exactly the same as those in 'Data.Type.Equality.==.
77− f a == g b = f == g && a == b
78− a == a = 'True
79− _ == _ = 'False
80−
81−
82−type Serialize :: Bool -> Type -> Type -> Constraint
83−class transposition ~ (a == Transpose Result expr) =>
84− Serialize transposition expr a
85− where
86− serialize :: a -> Columns expr Result
87− deserialize :: Columns expr Result -> a
88−
89−
90−instance
91− ( (a == Transpose Result expr) ~ 'True
92− , Transposes Expr Result expr a
93− )
94− => Serialize 'True expr a
95− where
96− serialize = toColumns
97− deserialize = fromColumns
98−
99−
100−instance
101− ( (a == Transpose Result expr) ~ 'False
102− , Table (Context expr) expr
103− , FromExprs expr ~ a
104− )
105− => Serialize 'False expr a
106− where
107− serialize = toResult @_ @expr
108− deserialize = fromResult @_ @expr
109−
110−
111−data TSerialize :: Type -> Type -> Exp Constraint
112−type instance Eval (TSerialize expr a) =
113− Serialize (a == Transpose Result expr) expr a
114−
115−
11654-- | This type class allows you to define custom 'Table's using higher-kinded
11755-- data types. Higher-kinded data types are data types of the pattern:
11856--
@@ -124,158 +62,113 @@ type instance Eval (TSerialize expr a) =
12462-- , fieldN :: Column f Tn OR HKn f
12563-- }
12664-- @
127−--
65+--
12866-- where @Tn@ is any Haskell type, and @HKn@ is any higher-kinded type.
129−--
67+--
13068-- That is, higher-kinded data are records where all fields in the record are
13169-- all either of the type @Column f T@ (for any @T@), or are themselves
13270-- higher-kinded data:
133−--
71+--
13472-- [Nested]
135−--
73+--
13674-- @
13775-- data Nested f =
13876-- Nested { nested1 :: MyType f
13977-- , nested2 :: MyType f
14078-- }
14179-- @
142−--
80+--
14381-- The @Rel8able@ type class is used to give us a special mapping operation
14482-- that lets us change the type parameter @f@.
145−--
83+--
14684-- [Supplying @Rel8able@ instances]
147−--
85+--
14886-- This type class should be derived generically for all table types in your
149−-- project. To do this, enable the @DeriveAnyClass@ and @DeriveGeneric@ language
87+-- project. To do this, enable the @DeriveAnyType@ and @DeriveGeneric@ language
15088-- extensions:
151−--
89+--
15290-- @
15391-- \{\-\# LANGUAGE DeriveAnyClass, DeriveGeneric #-\}
154−--
92+--
15593-- data MyType f = MyType { fieldA :: Column f T }
15694-- deriving ( GHC.Generics.Generic, Rel8able )
15795-- @
15896type Rel8able :: K.Rel8able -> Constraint
15997class HTable (GColumns t) => Rel8able t where
16098 type GColumns t :: K.HTable
161− type GFromExprs t :: Type
16299
163− gfromColumns :: SContext context -> GColumns t context -> t context
164− gtoColumns :: SContext context -> t context -> GColumns t context
100+ gfromColumns :: (Labelable context, Reifiable context)
101+ => GColumns t (Col (Reify context)) -> t (Reify context)
102+
103+ gtoColumns :: (Labelable context, Reifiable context)
104+ => t (Reify context) -> GColumns t (Col (Reify context))
105+
106+ greify :: (Labelable context, Reifiable context)
107+ => t context -> t (Reify context)
165108
166− gfromResult :: GColumns t Result -> GFromExprs t
167− gtoResult :: GFromExprs t -> GColumns t Result
109+ gunreify :: (Labelable context, Reifiable context)
110+ => t (Reify context) -> t context
168111
169− type GColumns t = G.GColumns TColumns (GRep t Expr)
170− type GFromExprs t = t Result
112+ type GColumns t = G.GColumns TColumns (GRep t (Reify Result))
171113
172114 default gfromColumns :: forall context.
173− ( SRel8able t Aggregate
174− , SRel8able t Expr
175− , forall table. SRel8able t (Field table)
176− , SRel8able t Name
177− , SSerialize t
115+ ( Generic (Record (t (Reify context)))
116+ , G.GTable (TTable (Reify context)) TColumns (Col (Reify context)) (GRep t (Reify context))
117+ , G.GColumns TColumns (GRep t (Reify context)) ~ GColumns t
178118 )
179− => SContext context -> GColumns t context -> t context
180− gfromColumns = \case
181− SAggregate -> sfromColumns
182− SExpr -> sfromColumns
183− SField -> sfromColumns
184− SName -> sfromColumns
185− SResult -> sfromResult
119+ => GColumns t (Col (Reify context)) -> t (Reify context)
120+ gfromColumns =
121+ unrecord .
122+ to .
123+ G.gfromColumns @(TTable (Reify context)) @TColumns fromColumns
186124
187125 default gtoColumns :: forall context.
188− ( SRel8able t Aggregate
189− , SRel8able t Expr
190− , forall table. SRel8able t (Field table)
191− , SRel8able t Name
192− , SSerialize t
126+ ( Generic (Record (t (Reify context)))
127+ , G.GTable (TTable (Reify context)) TColumns (Col (Reify context)) (GRep t (Reify context))
128+ , G.GColumns TColumns (GRep t (Reify context)) ~ GColumns t
193129 )
194− => SContext context -> t context -> GColumns t context
195− gtoColumns = \case
196− SAggregate -> stoColumns
197− SExpr -> stoColumns
198− SField -> stoColumns
199− SName -> stoColumns
200− SResult -> stoResult
201−
202− default gfromResult :: (SSerialize t, GFromExprs t ~ t Result)
203− => GColumns t Result -> GFromExprs t
204− gfromResult = sfromResult
205−
206− default gtoResult :: (SSerialize t, GFromExprs t ~ t Result)
207− => GFromExprs t -> GColumns t Result
208− gtoResult = stoResult
130+ => t (Reify context) -> GColumns t (Col (Reify context))
131+ gtoColumns =
132+ G.gtoColumns @(TTable (Reify context)) @TColumns toColumns .
133+ from .
134+ Record
135+
136+ default greify :: forall context.
137+ ( Generic (Record (t context))
138+ , Generic (Record (t (Reify context)))
139+ , GMappable (TTable (Reify context)) (GRep t (Reify context))
140+ , GRep t context ~ GMap TUnreify (GRep t (Reify context))
141+ )
142+ => t context -> t (Reify context)
143+ greify =
144+ unrecord .
145+ to .
146+ gunmap @(TTable (Reify context)) (Proxy @TUnreify) (reify Refl) .
147+ from .
148+ Record
149+
150+ default gunreify :: forall context.
151+ ( Generic (Record (t context))
152+ , Generic (Record (t (Reify context)))
153+ , GMappable (TTable (Reify context)) (GRep t (Reify context))
154+ , GRep t context ~ GMap TUnreify (GRep t (Reify context))
155+ )
156+ => t (Reify context) -> t context
157+ gunreify =
158+ unrecord .
159+ to .
160+ gmap @(TTable (Reify context)) (Proxy @TUnreify) (unreify Refl) .
161+ from .
162+ Record
209163
210164
211165type Algebra :: K.Rel8able -> K.Algebra
212−type Algebra t = GAlgebra (GRep t Expr)
166+type Algebra t = GAlgebra (GRep t (Reify Result))
213167
214168
215169type GRep :: K.Rel8able -> K.Context -> Type -> Type
216170type GRep t context = Rep (Record (t context))
217171
218172
219−type SRel8able :: K.Rel8able -> K.Context -> Constraint
220−class
221− ( Generic (Record (t context))
222− , G.GTable (TTable context) TColumns (GRep t context)
223− , G.GColumns TColumns (GRep t context) ~ GColumns t
224− )
225− => SRel8able t context
226−instance
227− ( Generic (Record (t context))
228− , G.GTable (TTable context) TColumns (GRep t context)
229− , G.GColumns TColumns (GRep t context) ~ GColumns t
230− )
231− => SRel8able t context
232−
233−
234−type SSerialize :: K.Rel8able -> Constraint
235−type SSerialize t =
236− ( Generic (Record (t Result))
237− , G.GSerialize TSerialize TColumns (GRep t Expr) (GRep t Result)
238− , G.GColumns TColumns (GRep t Expr) ~ GColumns t
239− )
240−
241−
242−sfromColumns :: forall t context. SRel8able t context
243− => GColumns t context -> t context
244−sfromColumns =
245− unrecord .
246− to .
247− G.gfromColumns @(TTable context) @TColumns fromColumns
248−
249−
250−stoColumns :: forall t context. SRel8able t context
251− => t context -> GColumns t context
252−stoColumns =
253− G.gtoColumns @(TTable context) @TColumns toColumns .
254− from .
255− Record
256−
257−
258−sfromResult :: forall t. SSerialize t
259− => GColumns t Result -> t Result
260−sfromResult =
261− unrecord .
262− to .
263− G.gfromResult
264− @TSerialize
265− @TColumns
266− @(GRep t Expr)
267− @(GRep t Result)
268− (\(_ :: proxy x) -> deserialize @_ @x)
269−
270−
271−stoResult :: forall t. SSerialize t
272− => t Result -> GColumns t Result
273−stoResult =
274− G.gtoResult
275− @TSerialize
276− @TColumns
277− @(GRep t Expr)
278− @(GRep t Result)
279− (\(_ :: proxy x) -> serialize @_ @x) .
280− from .
281− Record
173+data TUnreifyContext :: Type -> Exp K.Context
174+type instance Eval (TUnreifyContext a) = UnwrapReify (Eval (TContext a))
tests/Rel8/Generic/Rel8able/Test.hs → src/Rel8/Generic/Rel8able/Test.hsrenamed+17−48
@@ -1,11 +1,11 @@
11{-# language DataKinds #-}
22{-# language DeriveAnyClass #-}
33{-# language DeriveGeneric #-}
4−{-# language DerivingStrategies #-}
4+{-# language DerivingVia #-}
55{-# language DuplicateRecordFields #-}
66{-# language FlexibleInstances #-}
77{-# language MultiParamTypeClasses #-}
8−{-# language StandaloneKindSignatures #-}
8+{-# language StandaloneDeriving #-}
99{-# language TypeFamilies #-}
1010{-# language UndecidableInstances #-}
1111
@@ -36,7 +36,7 @@ data TableTest f = TableTest
3636
3737
3838data TablePair f = TablePair
39− { foo :: Column f Bool
39+ { foo :: Default f Bool
4040 , bars :: (Column f Text, Column f Text)
4141 }
4242 deriving stock Generic
@@ -98,20 +98,30 @@ data S3Object = S3Object
9898 deriving stock Generic
9999
100100
101−instance x ~ HKD S3Object Expr => ToExprs x S3Object
101+deriving via HKDT S3Object
102+ instance Table Result S3Object
103+
104+
105+deriving via HKDT S3Object
106+ instance x ~ HKD S3Object Expr => ToExprs x S3Object
102107
103108
104109data HKDSum = HKDSumA Text | HKDSumB Bool Char | HKDSumC
105110 deriving stock Generic
106111
107112
108−instance x ~ HKD HKDSum Expr => ToExprs x HKDSum
113+deriving via HKDT HKDSum
114+ instance Table Result HKDSum
115+
116+
117+deriving via HKDT HKDSum
118+ instance x ~ HKD HKDSum Expr => ToExprs x HKDSum
109119
110120
111121data HKDTest f = HKDTest
112122 { s3Object :: Lift f S3Object
113123 , hkdSum :: Lift f HKDSum
114− }
124+ }
115125 deriving stock Generic
116126 deriving anyclass Rel8able
117127
@@ -138,51 +148,10 @@ data TableSum f
138148 deriving stock Generic
139149
140150
141−data BarbieSum f
142− = BarbieSumA (f Bool) (f Text)
143− | BarbieSumB
144− | BarbieSumC (f Text)
145− deriving stock Generic
146−
147−
148151data TableProduct f = TableProduct
149− { sum :: HADT f BarbieSum
152+ { sum :: HADT f TableSum
150153 , list :: TableList f
151154 , foos :: HList f (HADT f TableSum, Lift f HKDSum, HKDTest f)
152155 }
153156 deriving stock Generic
154157 deriving anyclass Rel8able
155−
156−
157−data TableTestB f = TableTestB
158− { foo :: f Bool
159− , bar :: f (Maybe Bool)
160− }
161− deriving stock Generic
162− deriving anyclass Rel8able
163−
164−
165−data NestedTableTestB f = NestedTableTestB
166− { foo :: f Bool
167− , bar :: f (Maybe Bool)
168− , baz :: Column f Char
169− , nest :: TableTestB f
170− }
171− deriving stock Generic
172− deriving anyclass Rel8able
173−
174−
175−newtype IdRecord a f = IdRecord { recordId :: Column f a }
176− deriving stock Generic
177−
178−
179−instance DBType a => Rel8able (IdRecord a)
180−
181−
182−type Nest :: KRel8able -> KRel8able -> KRel8able
183−data Nest t u f = Nest
184− { foo :: t f
185− , bar :: u f
186− }
187− deriving stock Generic
188− deriving anyclass Rel8able
src/Rel8/Generic/Table.hs+109−24
@@ -12,7 +12,8 @@
1212{-# language UndecidableInstances #-}
1313
1414module Rel8.Generic.Table
15− ( GGSerialize, GGColumns, ggfromResult, ggtoResult
15+ ( GGTable, GGColumns, GGContext, ggfromColumns, ggtoColumns, ggtable
16+ , GGToExprs, ggfromResult, ggtoResult
1617 , GAlgebra
1718 )
1819where
@@ -25,19 +26,43 @@ import Prelude ()
2526-- rel8
2627import Rel8.FCF ( Eval, Exp )
2728import Rel8.Generic.Table.ADT
28− ( GSerializeADT, GColumnsADT, gtoResultADT, gfromResultADT
29+ ( GTableADT, GColumnsADT, gfromColumnsADT, gtoColumnsADT, gtableADT
30+ , GToExprsADT, gtoResultADT, gfromResultADT
31+ )
32+import Rel8.Generic.Table.Record
33+ ( GTable, GColumns, GContext, gfromColumns, gtoColumns, gtable
34+ , GToExprs, gtoResult, gfromResult
2935 )
30−import Rel8.Generic.Table.Record ( GSerialize, GColumns, gtoResult, gfromResult )
3136import Rel8.Kind.Algebra
3237 ( Algebra( Product, Sum )
3338 , SAlgebra( SProduct, SSum )
3439 , KnownAlgebra, algebraSing
3540 )
41+import Rel8.Schema.Context ( Col )
3642import qualified Rel8.Schema.Kind as K
43+import Rel8.Schema.Null ( Nullify )
44+import Rel8.Schema.Spec ( Spec( Spec ), SSpec )
3745import Rel8.Schema.Result ( Result )
3846
3947
40−data GGSerialize
48+data GGTable
49+ :: Algebra
50+ -> (Type -> Exp Constraint)
51+ -> (Type -> Exp K.HTable)
52+ -> K.HContext
53+ -> (Type -> Type)
54+ -> Exp Constraint
55+
56+
57+type instance Eval (GGTable 'Product _Table _Columns context rep) =
58+ GTable _Table _Columns context rep
59+
60+
61+type instance Eval (GGTable 'Sum _Table _Columns context rep) =
62+ GTableADT _Table _Columns context rep
63+
64+
65+data GGToExprs
4166 :: Algebra
4267 -> (Type -> Type -> Exp Constraint)
4368 -> (Type -> Exp K.HTable)
@@ -46,12 +71,12 @@ data GGSerialize
4671 -> Exp Constraint
4772
4873
49−type instance Eval (GGSerialize 'Product _Serialize _Columns exprs rep) =
50− GSerialize _Serialize _Columns exprs rep
74+type instance Eval (GGToExprs 'Product _ToExprs _Columns exprs rep) =
75+ GToExprs _ToExprs _Columns exprs rep
5176
5277
53−type instance Eval (GGSerialize 'Sum _Serialize _Columns exprs rep) =
54− GSerializeADT _Serialize _Columns exprs rep
78+type instance Eval (GGToExprs 'Sum _ToExprs _Columns exprs rep) =
79+ GToExprsADT _ToExprs _Columns exprs rep
5580
5681
5782data GGColumns
@@ -67,6 +92,19 @@ type instance Eval (GGColumns 'Product _Columns rep) = GColumns _Columns rep
6792type instance Eval (GGColumns 'Sum _Columns rep) = GColumnsADT _Columns rep
6893
6994
95+data GGContext
96+ :: Algebra
97+ -> (Type -> Exp K.Context)
98+ -> (Type -> Type)
99+ -> Exp K.Context
100+
101+
102+type instance Eval (GGContext 'Product _Context rep) = GContext _Context rep
103+
104+
105+type instance Eval (GGContext 'Sum _Context _rep) = Result
106+
107+
70108type GAlgebra :: (Type -> Type) -> Algebra
71109type family GAlgebra rep where
72110 GAlgebra (M1 _ _ rep) = GAlgebra rep
@@ -77,27 +115,74 @@ type family GAlgebra rep where
77115 GAlgebra (K1 _ _) = 'Product
78116
79117
80−ggfromResult :: forall algebra _Serialize _Columns exprs rep x.
118+ggfromColumns :: forall algebra _Table _Columns rep context x.
119+ ( KnownAlgebra algebra
120+ , Eval (GGTable algebra _Table _Columns context rep)
121+ )
122+ => (forall spec. algebra ~ 'Sum => context spec -> Col Result spec)
123+ -> (forall spec. algebra ~ 'Sum => Col Result spec -> context spec)
124+ -> (forall a. Eval (_Table a) => Eval (_Columns a) context -> a)
125+ -> Eval (GGColumns algebra _Columns rep) context
126+ -> rep x
127+ggfromColumns = case algebraSing @algebra of
128+ SProduct -> \_ _ -> gfromColumns @_Table @_Columns
129+ SSum -> gfromColumnsADT @_Table @_Columns
130+
131+
132+ggtoColumns :: forall algebra _Table _Columns rep context x.
133+ ( KnownAlgebra algebra
134+ , Eval (GGTable algebra _Table _Columns context rep)
135+ )
136+ => (forall spec. algebra ~ 'Sum => context spec -> Col Result spec)
137+ -> (forall spec. algebra ~ 'Sum => Col Result spec -> context spec)
138+ -> (forall a. Eval (_Table a) => a -> Eval (_Columns a) context)
139+ -> rep x
140+ -> Eval (GGColumns algebra _Columns rep) context
141+ggtoColumns = case algebraSing @algebra of
142+ SProduct -> \_ _ -> gtoColumns @_Table @_Columns
143+ SSum -> gtoColumnsADT @_Table @_Columns
144+
145+
146+ggtable :: forall algebra _Table _Columns rep context.
147+ ( KnownAlgebra algebra
148+ , Eval (GGTable algebra _Table _Columns context rep)
149+ )
150+ => (forall a proxy. Eval (_Table a) => proxy a -> Eval (_Columns a) context)
151+ -> (forall a labels necessity. ()
152+ => SSpec ('Spec labels necessity a)
153+ -> context ('Spec labels necessity a)
154+ -> context ('Spec labels necessity (Nullify a)))
155+ -> Eval (GGColumns algebra _Columns rep) context
156+ggtable = case algebraSing @algebra of
157+ SProduct -> \table _ -> gtable @_Table @_Columns @_ @rep table
158+ SSum -> gtableADT @_Table @_Columns @_ @rep
159+
160+
161+ggfromResult :: forall algebra _ToExprs _Columns exprs rep x.
81162 ( KnownAlgebra algebra
82− , Eval (GGSerialize algebra _Serialize _Columns exprs rep)
163+ , Eval (GGToExprs algebra _ToExprs _Columns exprs rep)
83164 )
84− => (forall expr a proxy. Eval (_Serialize expr a)
85− => proxy expr -> Eval (_Columns expr) Result -> a)
86− -> Eval (GGColumns algebra _Columns exprs) Result
165+ => (forall expr a proxy. Eval (_ToExprs expr a)
166+ => proxy expr
167+ -> Eval (_Columns expr) (Col Result)
168+ -> a)
169+ -> Eval (GGColumns algebra _Columns exprs) (Col Result)
87170 -> rep x
88−ggfromResult f x = case algebraSing @algebra of
89− SProduct -> gfromResult @_Serialize @_Columns @exprs @rep f x
90− SSum -> gfromResultADT @_Serialize @_Columns @exprs @rep f x
171+ggfromResult = case algebraSing @algebra of
172+ SProduct -> gfromResult @_ToExprs @_Columns @exprs
173+ SSum -> gfromResultADT @_ToExprs @_Columns @exprs
91174
92175
93−ggtoResult :: forall algebra _Serialize _Columns exprs rep x.
176+ggtoResult :: forall algebra _ToExprs _Columns exprs rep x.
94177 ( KnownAlgebra algebra
95− , Eval (GGSerialize algebra _Serialize _Columns exprs rep)
178+ , Eval (GGToExprs algebra _ToExprs _Columns exprs rep)
96179 )
97− => (forall expr a proxy. Eval (_Serialize expr a)
98− => proxy expr -> a -> Eval (_Columns expr) Result)
180+ => (forall expr a proxy. Eval (_ToExprs expr a)
181+ => proxy expr
182+ -> a
183+ -> Eval (_Columns expr) (Col Result))
99184 -> rep x
100− -> Eval (GGColumns algebra _Columns exprs) Result
101−ggtoResult f x = case algebraSing @algebra of
102− SProduct -> gtoResult @_Serialize @_Columns @exprs @rep f x
103− SSum -> gtoResultADT @_Serialize @_Columns @exprs @rep f x
185+ -> Eval (GGColumns algebra _Columns exprs) (Col Result)
186+ggtoResult = case algebraSing @algebra of
187+ SProduct -> gtoResult @_ToExprs @_Columns @exprs
188+ SSum -> gtoResultADT @_ToExprs @_Columns @exprs
src/Rel8/Generic/Table/ADT.hs+203−61
@@ -4,6 +4,7 @@
44{-# language FlexibleInstances #-}
55{-# language LambdaCase #-}
66{-# language MultiParamTypeClasses #-}
7+{-# language PolyKinds #-}
78{-# language RankNTypes #-}
89{-# language ScopedTypeVariables #-}
910{-# language StandaloneKindSignatures #-}
@@ -13,13 +14,13 @@
1314{-# language UndecidableInstances #-}
1415
1516module Rel8.Generic.Table.ADT
16− ( GSerializeADT, GColumnsADT, gfromResultADT, gtoResultADT
17− , GSerializeADT', GColumnsADT'
17+ ( GTableADT, GColumnsADT, gfromColumnsADT, gtoColumnsADT, gtableADT
18+ , GTableADT', GColumnsADT'
19+ , GToExprsADT, gfromResultADT, gtoResultADT
1820 )
1921where
2022
2123-- base
22−import Data.Functor.Identity ( Identity( Identity ) )
2324import Data.Kind ( Constraint, Type )
2425import Data.Proxy ( Proxy( Proxy ) )
2526import GHC.Generics
@@ -32,14 +33,23 @@ import Prelude hiding ( null )
3233
3334-- rel8
3435import Rel8.FCF ( Eval, Exp )
35−import Rel8.Generic.Table.Record ( GSerialize, GColumns, gfromResult, gtoResult )
36−import Rel8.Schema.HTable ( HTable )
37−import Rel8.Schema.HTable.Identity ( HIdentity( HIdentity ) )
36+import Rel8.Generic.Table.Record
37+ ( GTable, GColumns, gtable
38+ , GToExprs, gfromResult, gtoResult
39+ )
40+import Rel8.Schema.Context.Label ( HLabelable, hlabeler, labeler, unlabeler )
41+import Rel8.Schema.HTable ( HTable, hmap )
42+import Rel8.Schema.HTable.Identity ( HIdentity( HType ), HType )
3843import Rel8.Schema.HTable.Label ( HLabel, hlabel, hunlabel )
3944import Rel8.Schema.HTable.Nullify ( HNullify, hnulls, hnullify, hunnullify )
4045import Rel8.Schema.HTable.Product ( HProduct( HProduct ) )
4146import qualified Rel8.Schema.Kind as K
42−import Rel8.Schema.Result ( Result, null, nullifier, unnullifier )
47+import Rel8.Schema.Null ( Nullify )
48+import Rel8.Schema.Spec ( Spec( Spec ), SSpec )
49+import Rel8.Schema.Result
50+ ( Col( Result ), Result
51+ , null, nullifier, unnullifier
52+ )
4353import Rel8.Type.Tag ( Tag( Tag ) )
4454
4555-- text
@@ -51,7 +61,7 @@ type GColumnsADT
5161 -> (Type -> Type) -> K.HTable
5262type family GColumnsADT _Columns rep where
5363 GColumnsADT _Columns (M1 D _ rep) =
54− GColumnsADT' _Columns (HLabel "tag" (HIdentity Tag)) rep
64+ GColumnsADT' _Columns (HLabel "tag" (HType Tag)) rep
5565
5666
5767type GColumnsADT'
@@ -65,118 +75,246 @@ type family GColumnsADT' _Columns htable rep where
6575 HProduct htable (HLabel label (HNullify (GColumns _Columns rep)))
6676
6777
68−type GSerializeADT
78+type GTableADT
79+ :: (Type -> Exp Constraint)
80+ -> (Type -> Exp K.HTable)
81+ -> K.HContext -> (Type -> Type) -> Constraint
82+class GTableADT _Table _Columns context rep where
83+ gfromColumnsADT :: ()
84+ => (forall spec. context spec -> Col Result spec)
85+ -> (forall spec. Col Result spec -> context spec)
86+ -> (forall a. Eval (_Table a) => Eval (_Columns a) context -> a)
87+ -> GColumnsADT _Columns rep context
88+ -> rep x
89+
90+ gtoColumnsADT :: ()
91+ => (forall spec. context spec -> Col Result spec)
92+ -> (forall spec. Col Result spec -> context spec)
93+ -> (forall a. Eval (_Table a) => a -> Eval (_Columns a) context)
94+ -> rep x
95+ -> GColumnsADT _Columns rep context
96+
97+ gtableADT :: ()
98+ => (forall a proxy. Eval (_Table a) => proxy a -> Eval (_Columns a) context)
99+ -> (forall a labels necessity. ()
100+ => SSpec ('Spec labels necessity a)
101+ -> context ('Spec labels necessity a)
102+ -> context ('Spec labels necessity (Nullify a)))
103+ -> GColumnsADT _Columns rep context
104+
105+
106+instance
107+ ( htable ~ HLabel "tag" (HType Tag)
108+ , HTable (GColumnsADT _Columns (M1 D meta rep))
109+ , Eval (_Table (htable context))
110+ , Eval (_Columns (htable context)) ~ htable
111+ , GTableADT' _Table _Columns htable context rep
112+ , GToExprsADT' (Const _Table) _Columns htable rep rep
113+ )
114+ => GTableADT _Table _Columns context (M1 D meta rep)
115+ where
116+ gfromColumnsADT fromContext toContext fromColumns =
117+ gfromResultADT @(Const _Table) @_Columns @(M1 D meta rep) @(M1 D meta rep)
118+ (const (fromColumns . hmap toContext)) .
119+ hmap fromContext
120+
121+ gtoColumnsADT fromContext toContext toColumns =
122+ hmap toContext .
123+ gtoResultADT @(Const _Table) @_Columns @(M1 D meta rep) @(M1 D meta rep)
124+ (const (hmap fromContext . toColumns))
125+
126+ gtableADT table hnullifier =
127+ gtableADT' @_Table @_Columns @htable @context @rep table hnullifier htable
128+ where
129+ htable = table (Proxy @(htable context))
130+
131+
132+type GTableADT'
133+ :: (Type -> Exp Constraint)
134+ -> (Type -> Exp K.HTable)
135+ -> K.HTable -> K.HContext -> (Type -> Type) -> Constraint
136+class GTableADT' _Table _Columns htable context rep where
137+ gtableADT' :: ()
138+ => (forall a proxy. Eval (_Table a) => proxy a -> Eval (_Columns a) context)
139+ -> (forall a labels necessity. ()
140+ => SSpec ('Spec labels necessity a)
141+ -> context ('Spec labels necessity a)
142+ -> context ('Spec labels necessity (Nullify a)))
143+ -> htable context
144+ -> GColumnsADT' _Columns htable rep context
145+
146+
147+instance
148+ ( htable' ~ GColumnsADT' _Columns htable a
149+ , GTableADT' _Table _Columns htable context a
150+ , GTableADT' _Table _Columns htable' context b
151+ )
152+ => GTableADT' _Table _Columns htable context (a :+: b)
153+ where
154+ gtableADT' table hnullifier =
155+ gtableADT' @_Table @_Columns @_ @_ @b table hnullifier .
156+ gtableADT' @_Table @_Columns @_ @_ @a table hnullifier
157+
158+
159+instance meta ~ 'MetaCons label _fixity _isRecord =>
160+ GTableADT' _Table _Columns htable context (M1 C meta U1)
161+ where
162+ gtableADT' _ _ = id
163+
164+
165+instance {-# OVERLAPPABLE #-}
166+ ( HTable (GColumns _Columns rep)
167+ , GTable _Table _Columns context rep
168+ , HLabelable context
169+ , meta ~ 'MetaCons label _fixity _isRecord
170+ , KnownSymbol label
171+ , GColumnsADT' _Columns htable (M1 C ('MetaCons label _fixity _isRecord) rep) ~
172+ HProduct htable (HLabel label (HNullify (GColumns _Columns rep)))
173+ )
174+ => GTableADT' _Table _Columns htable context (M1 C meta rep)
175+ where
176+ gtableADT' table hnullifier htable =
177+ HProduct htable $
178+ hlabel hlabeler $
179+ hnullify hnullifier $
180+ gtable @_Table @_Columns @_ @rep table
181+
182+
183+type GToExprsADT
69184 :: (Type -> Type -> Exp Constraint)
70185 -> (Type -> Exp K.HTable)
71186 -> (Type -> Type) -> (Type -> Type) -> Constraint
72−class GSerializeADT _Serialize _Columns exprs rep where
187+class GToExprsADT _ToExprs _Columns exprs rep where
73188 gfromResultADT :: ()
74− => (forall expr a proxy. Eval (_Serialize expr a)
75− => proxy expr -> Eval (_Columns expr) Result -> a)
76− -> GColumnsADT _Columns exprs Result
189+ => (forall expr a proxy.
190+ ( Eval (_ToExprs expr a)
191+ , HTable (Eval (_Columns expr))
192+ )
193+ => proxy expr
194+ -> Eval (_Columns expr) (Col Result)
195+ -> a)
196+ -> GColumnsADT _Columns exprs (Col Result)
77197 -> rep x
78198
79199 gtoResultADT :: ()
80− => (forall expr a proxy. Eval (_Serialize expr a)
81− => proxy expr -> a -> Eval (_Columns expr) Result)
200+ => (forall expr a proxy.
201+ ( Eval (_ToExprs expr a)
202+ , HTable (Eval (_Columns expr))
203+ )
204+ => proxy expr
205+ -> a
206+ -> Eval (_Columns expr) (Col Result))
82207 -> rep x
83− -> GColumnsADT _Columns exprs Result
208+ -> GColumnsADT _Columns exprs (Col Result)
84209
85210
86211instance
87− ( htable ~ HLabel "tag" (HIdentity Tag)
88− , GSerializeADT' _Serialize _Columns htable exprs rep
212+ ( htable ~ HLabel "tag" (HType Tag)
213+ , GToExprsADT' _ToExprs _Columns htable exprs rep
89214 )
90− => GSerializeADT _Serialize _Columns (M1 D meta exprs) (M1 D meta rep)
215+ => GToExprsADT _ToExprs _Columns (M1 D meta exprs) (M1 D meta rep)
91216 where
92217 gfromResultADT fromResult columns =
93− case gfromResultADT' @_Serialize @_Columns @htable @exprs @rep fromResult tag columns of
218+ case gfromResultADT' @_ToExprs @_Columns @_ @exprs fromResult tag columns of
94219 Just rep -> M1 rep
95220 _ -> error "ADT.fromColumns: mismatch between tag and data"
96221 where
97− tag = (\(HIdentity (Identity a)) -> a) . hunlabel @"tag"
222+ tag = (\(HType (Result a)) -> a) . hunlabel @_ @"tag" unlabeler
98223
99224 gtoResultADT toResult (M1 rep) =
100− gtoResultADT' @_Serialize @_Columns @htable @exprs @rep toResult tag (Just rep)
225+ gtoResultADT' @_ToExprs @_Columns @_ @exprs toResult tag (Just rep)
101226 where
102− tag = hlabel @"tag" . HIdentity . Identity
227+ tag = hlabel @_ @"tag" labeler . HType . Result
103228
104229
105−type GSerializeADT'
230+type GToExprsADT'
106231 :: (Type -> Type -> Exp Constraint)
107232 -> (Type -> Exp K.HTable)
108233 -> K.HTable -> (Type -> Type) -> (Type -> Type) -> Constraint
109−class GSerializeADT' _Serialize _Columns htable exprs rep where
110− gfromResultADT' :: context ~ Result
111− => (forall expr a proxy. Eval (_Serialize expr a)
112− => proxy expr -> Eval (_Columns expr) context -> a)
113− -> (htable Result -> Tag)
114− -> GColumnsADT' _Columns htable exprs context
234+class GToExprsADT' _ToExprs _Columns htable exprs rep where
235+ gfromResultADT' :: ()
236+ => (forall expr a proxy.
237+ ( Eval (_ToExprs expr a)
238+ , HTable (Eval (_Columns expr))
239+ )
240+ => proxy expr
241+ -> Eval (_Columns expr) (Col Result)
242+ -> a)
243+ -> (htable (Col Result) -> Tag)
244+ -> GColumnsADT' _Columns htable exprs (Col Result)
115245 -> Maybe (rep x)
116246
117− gtoResultADT' :: context ~ Result
118− => (forall expr a proxy. Eval (_Serialize expr a)
119− => proxy expr -> a -> Eval (_Columns expr) context)
120− -> (Tag -> htable Result)
247+ gtoResultADT' :: ()
248+ => (forall expr a proxy.
249+ ( Eval (_ToExprs expr a)
250+ , HTable (Eval (_Columns expr))
251+ )
252+ => proxy expr
253+ -> a
254+ -> Eval (_Columns expr) (Col Result))
255+ -> (Tag -> htable (Col Result))
121256 -> Maybe (rep x)
122− -> GColumnsADT' _Columns htable exprs context
257+ -> GColumnsADT' _Columns htable exprs (Col Result)
123258
124259 extract :: GColumnsADT' _Columns htable exprs context -> htable context
125260
126261
127262instance
128− ( htable' ~ GColumnsADT' _Columns htable exprs1
129− , GSerializeADT' _Serialize _Columns htable exprs1 a
130− , GSerializeADT' _Serialize _Columns htable' exprs2 b
263+ ( htable' ~ GColumnsADT' _Columns htable a
264+ , GToExprsADT' _ToExprs _Columns htable a rep1
265+ , GToExprsADT' _ToExprs _Columns htable' b rep2
131266 )
132− => GSerializeADT' _Serialize _Columns htable (exprs1 :+: exprs2) (a :+: b)
267+ => GToExprsADT' _ToExprs _Columns htable (a :+: b) (rep1 :+: rep2)
133268 where
134269 gfromResultADT' fromResult f columns =
135270 case ma of
136271 Just a -> Just (L1 a)
137272 Nothing -> R1 <$>
138− gfromResultADT' @_Serialize @_Columns @_ @exprs2 @b
273+ gfromResultADT' @_ToExprs @_Columns @_ @b @rep2
139274 fromResult
140− (f . extract @_Serialize @_Columns @_ @exprs1 @a)
275+ (f . extract @_ToExprs @_Columns @_ @a @rep1)
141276 columns
142277 where
143278 ma =
144− gfromResultADT' @_Serialize @_Columns @_ @exprs1 @a
279+ gfromResultADT' @_ToExprs @_Columns @_ @a @rep1
145280 fromResult
146281 f
147− (extract @_Serialize @_Columns @_ @exprs2 @b columns)
282+ (extract @_ToExprs @_Columns @_ @b @rep2 columns)
148283
149284 gtoResultADT' toResult tag = \case
150285 Just (L1 a) ->
151− gtoResultADT' @_Serialize @_Columns @_ @exprs2 @b
286+ gtoResultADT' @_ToExprs @_Columns @_ @b @rep2
152287 toResult
153− (\_ -> gtoResultADT' @_Serialize @_Columns @_ @exprs1 @a
288+ (\_ -> gtoResultADT' @_ToExprs @_Columns @_ @a @rep1
154289 toResult
155290 tag
156291 (Just a))
157292 Nothing
158293 Just (R1 b) ->
159− gtoResultADT' @_Serialize @_Columns @_ @exprs2 @b
294+ gtoResultADT' @_ToExprs @_Columns @_ @b @rep2
160295 toResult
161296 (\tag' ->
162− gtoResultADT' @_Serialize @_Columns @_ @exprs1 @a
297+ gtoResultADT' @_ToExprs @_Columns @_ @a @rep1
163298 toResult
164299 (\_ -> tag tag')
165300 Nothing)
166301 (Just b)
167302 Nothing ->
168− gtoResultADT' @_Serialize @_Columns @_ @exprs2 @b
303+ gtoResultADT' @_ToExprs @_Columns @_ @b @rep2
169304 toResult
170− (\_ -> gtoResultADT' @_Serialize @_Columns @_ @exprs1 @a toResult tag Nothing)
305+ (\_ -> gtoResultADT' @_ToExprs @_Columns @_ @a @rep1 toResult tag Nothing)
171306 Nothing
172307
173308 extract =
174− extract @_Serialize @_Columns @_ @exprs1 @a .
175− extract @_Serialize @_Columns @_ @exprs2 @b
309+ extract @_ToExprs @_Columns @_ @a @rep1 .
310+ extract @_ToExprs @_Columns @_ @b @rep2
176311
177312
178−instance (meta ~ 'MetaCons label _fixity _isRecord, KnownSymbol label) =>
179− GSerializeADT' _Serialize _Columns _htable (M1 C meta U1) (M1 C meta U1)
313+instance
314+ ( meta ~ 'MetaCons label _fixity _isRecord
315+ , KnownSymbol label
316+ )
317+ => GToExprsADT' _ToExprs _Columns htable (M1 C meta U1) (M1 C meta U1)
180318 where
181319 gfromResultADT' _ tag columns
182320 | tag columns == tag' = Just (M1 U1)
@@ -193,29 +331,33 @@ instance (meta ~ 'MetaCons label _fixity _isRecord, KnownSymbol label) =>
193331
194332instance {-# OVERLAPPABLE #-}
195333 ( HTable (GColumns _Columns exprs)
196− , GSerialize _Serialize _Columns exprs rep
334+ , GToExprs _ToExprs _Columns exprs rep
197335 , meta ~ 'MetaCons label _fixity _isRecord
198336 , KnownSymbol label
199− , GColumnsADT' _Columns htable (M1 C ('MetaCons label _fixity _isRecord) exprs) ~
337+ , GColumnsADT' _Columns htable (M1 C meta exprs) ~
200338 HProduct htable (HLabel label (HNullify (GColumns _Columns exprs)))
201339 )
202− => GSerializeADT' _Serialize _Columns htable (M1 C meta exprs) (M1 C meta rep)
340+ => GToExprsADT' _ToExprs _Columns htable (M1 C meta exprs) (M1 C meta rep)
203341 where
204342 gfromResultADT' fromResult tag (HProduct a b)
205343 | tag a == tag' =
206− M1 . gfromResult @_Serialize @_Columns @exprs @rep fromResult <$>
207− hunnullify unnullifier (hunlabel b)
344+ M1 . gfromResult @_ToExprs @_Columns @exprs fromResult <$>
345+ hunnullify unnullifier (hunlabel unlabeler b)
208346 | otherwise = Nothing
209347 where
210348 tag' = Tag $ pack $ symbolVal (Proxy @label)
211349
212350 gtoResultADT' toResult tag = \case
213− Nothing -> HProduct (tag tag') (hlabel (hnulls (const null)))
351+ Nothing -> HProduct (tag tag') (hlabel labeler (hnulls (const null)))
214352 Just (M1 rep) -> HProduct (tag tag') $
215− hlabel $
353+ hlabel labeler $
216354 hnullify nullifier $
217− gtoResult @_Serialize @_Columns @exprs @rep toResult rep
355+ gtoResult @_ToExprs @_Columns @exprs toResult rep
218356 where
219357 tag' = Tag $ pack $ symbolVal (Proxy @label)
220358
221359 extract (HProduct a _) = a
360+
361+
362+data Const :: (a -> Exp Constraint) -> a -> a -> Exp Constraint
363+type instance Eval (Const f x a) = (Eval (f a), x ~ a)
src/Rel8/Generic/Table/Record.hs+99−74
@@ -14,7 +14,7 @@
1414
1515module Rel8.Generic.Table.Record
1616 ( GTable, GColumns, GContext, gfromColumns, gtoColumns, gtable
17− , GSerialize, gfromResult, gtoResult
17+ , GToExprs, gfromResult, gtoResult
1818 )
1919where
2020
@@ -26,13 +26,18 @@ import GHC.Generics
2626 , C, D, S
2727 , Meta( MetaSel )
2828 )
29+import GHC.TypeLits ( KnownSymbol )
2930import Prelude hiding ( null )
3031
3132-- rel8
3233import Rel8.FCF ( Eval, Exp )
34+import Rel8.Schema.Context ( Col )
35+import Rel8.Schema.Context.Label ( HLabelable, hlabeler, hunlabeler )
36+import Rel8.Schema.HTable ( HTable )
3337import Rel8.Schema.HTable.Label ( HLabel, hlabel, hunlabel )
3438import Rel8.Schema.HTable.Product ( HProduct(..) )
3539import qualified Rel8.Schema.Kind as K
40+import Rel8.Schema.Result ( Result )
3641
3742
3843type GColumns :: (Type -> Exp K.HTable) -> (Type -> Type) -> K.HTable
@@ -55,8 +60,8 @@ type family GContext _Context rep where
5560type GTable
5661 :: (Type -> Exp Constraint)
5762 -> (Type -> Exp K.HTable)
58− -> (Type -> Type) -> Constraint
59−class GTable _Table _Columns rep
63+ -> K.HContext -> (Type -> Type) -> Constraint
64+class GTable _Table _Columns context rep
6065 where
6166 gfromColumns :: ()
6267 => (forall a. Eval (_Table a) => Eval (_Columns a) context -> a)
@@ -73,109 +78,129 @@ class GTable _Table _Columns rep
7378 -> GColumns _Columns rep context
7479
7580
76−type GSerialize
77− :: (Type -> Type -> Exp Constraint)
78− -> (Type -> Exp K.HTable)
79− -> (Type -> Type) -> (Type -> Type) -> Constraint
80−class GSerialize _Serialize _Columns exprs rep
81+instance GTable _Table _Columns context rep =>
82+ GTable _Table _Columns context (M1 D c rep)
8183 where
82− gfromResult :: ()
83− => (forall expr a proxy. Eval (_Serialize expr a)
84− => proxy expr -> Eval (_Columns expr) context -> a)
85− -> GColumns _Columns exprs context
86− -> rep x
87−
88− gtoResult :: ()
89− => (forall expr a proxy. Eval (_Serialize expr a)
90− => proxy expr -> a -> Eval (_Columns expr) context)
91− -> rep x
92− -> GColumns _Columns exprs context
84+ gfromColumns fromColumns =
85+ M1 . gfromColumns @_Table @_Columns @context @rep fromColumns
86+ gtoColumns toColumns (M1 a) =
87+ gtoColumns @_Table @_Columns @context @rep toColumns a
88+ gtable = gtable @_Table @_Columns @context @rep
9389
9490
95−instance GTable _Table _Columns rep => GTable _Table _Columns (M1 D c rep)
91+instance GTable _Table _Columns context rep =>
92+ GTable _Table _Columns context (M1 C c rep)
9693 where
9794 gfromColumns fromColumns =
98− M1 . gfromColumns @_Table @_Columns @rep fromColumns
95+ M1 . gfromColumns @_Table @_Columns @context @rep fromColumns
9996 gtoColumns toColumns (M1 a) =
100− gtoColumns @_Table @_Columns @rep toColumns a
101− gtable = gtable @_Table @_Columns @rep
97+ gtoColumns @_Table @_Columns @context @rep toColumns a
98+ gtable = gtable @_Table @_Columns @context @rep
10299
103100
104−instance GSerialize _Serialize _Columns exprs rep =>
105− GSerialize _Serialize _Columns (M1 D c exprs) (M1 D c rep)
101+instance
102+ ( GTable _Table _Columns context rep1
103+ , GTable _Table _Columns context rep2
104+ )
105+ => GTable _Table _Columns context (rep1 :*: rep2)
106106 where
107− gfromResult fromResult =
108− M1 . gfromResult @_Serialize @_Columns @exprs @rep fromResult
109− gtoResult toResult (M1 a) =
110− gtoResult @_Serialize @_Columns @exprs @rep toResult a
107+ gfromColumns fromColumns (HProduct a b) =
108+ gfromColumns @_Table @_Columns @context @rep1 fromColumns a :*:
109+ gfromColumns @_Table @_Columns @context @rep2 fromColumns b
110+ gtoColumns toColumns (a :*: b) = HProduct
111+ (gtoColumns @_Table @_Columns @context @rep1 toColumns a)
112+ (gtoColumns @_Table @_Columns @context @rep2 toColumns b)
113+ gtable table = HProduct
114+ (gtable @_Table @_Columns @context @rep1 table)
115+ (gtable @_Table @_Columns @context @rep2 table)
111116
112117
113−instance GTable _Table _Columns rep => GTable _Table _Columns (M1 C c rep)
118+instance
119+ ( HTable (Eval (_Columns a))
120+ , Eval (_Table a)
121+ , HLabelable context
122+ , KnownSymbol label
123+ , meta ~ 'MetaSel ('Just label) _su _ss _ds
124+ , k1 ~ K1 i a
125+ )
126+ => GTable _Table _Columns context (M1 S meta k1)
114127 where
115− gfromColumns fromColumns =
116− M1 . gfromColumns @_Table @_Columns @rep fromColumns
117− gtoColumns toColumns (M1 a) =
118− gtoColumns @_Table @_Columns @rep toColumns a
119− gtable = gtable @_Table @_Columns @rep
128+ gfromColumns fromColumns = M1 . K1 . fromColumns . hunlabel hunlabeler
129+ gtoColumns toColumns (M1 (K1 a)) = hlabel hlabeler (toColumns a)
130+ gtable table = hlabel hlabeler (table (Proxy @a))
120131
121132
122−instance GSerialize _Serialize _Columns exprs rep =>
123− GSerialize _Serialize _Columns (M1 C c exprs) (M1 C c rep)
133+type GToExprs
134+ :: (Type -> Type -> Exp Constraint)
135+ -> (Type -> Exp K.HTable)
136+ -> (Type -> Type) -> (Type -> Type) -> Constraint
137+class GToExprs _ToExprs _Columns exprs rep where
138+ gfromResult :: ()
139+ => (forall expr a proxy.
140+ ( Eval (_ToExprs expr a)
141+ , HTable (Eval (_Columns expr))
142+ )
143+ => proxy expr
144+ -> Eval (_Columns expr) (Col Result)
145+ -> a)
146+ -> GColumns _Columns exprs (Col Result)
147+ -> rep x
148+ gtoResult :: ()
149+ => (forall expr a proxy.
150+ ( Eval (_ToExprs expr a)
151+ , HTable (Eval (_Columns expr))
152+ )
153+ => proxy expr
154+ -> a
155+ -> Eval (_Columns expr) (Col Result))
156+ -> rep x
157+ -> GColumns _Columns exprs (Col Result)
158+
159+
160+instance GToExprs _ToExprs _Columns exprs rep =>
161+ GToExprs _ToExprs _Columns (M1 D c exprs) (M1 D c rep)
124162 where
125163 gfromResult fromResult =
126− M1 . gfromResult @_Serialize @_Columns @exprs @rep fromResult
164+ M1 . gfromResult @_ToExprs @_Columns @exprs fromResult
127165 gtoResult toResult (M1 a) =
128− gtoResult @_Serialize @_Columns @exprs @rep toResult a
166+ gtoResult @_ToExprs @_Columns @exprs toResult a
129167
130168
131−instance (GTable _Table _Columns rep1, GTable _Table _Columns rep2) =>
132− GTable _Table _Columns (rep1 :*: rep2)
169+instance GToExprs _ToExprs _Columns exprs rep =>
170+ GToExprs _ToExprs _Columns (M1 C c exprs) (M1 C c rep)
133171 where
134− gfromColumns fromColumns (HProduct a b) =
135− gfromColumns @_Table @_Columns @rep1 fromColumns a :*:
136− gfromColumns @_Table @_Columns @rep2 fromColumns b
137− gtoColumns toColumns (a :*: b) = HProduct
138− (gtoColumns @_Table @_Columns @rep1 toColumns a)
139− (gtoColumns @_Table @_Columns @rep2 toColumns b)
140− gtable table = HProduct
141− (gtable @_Table @_Columns @rep1 table)
142− (gtable @_Table @_Columns @rep2 table)
172+ gfromResult fromResult =
173+ M1 . gfromResult @_ToExprs @_Columns @exprs fromResult
174+ gtoResult toResult (M1 a) =
175+ gtoResult @_ToExprs @_Columns @exprs toResult a
143176
144177
145178instance
146− ( GSerialize _Serialize _Columns expr1 rep1
147− , GSerialize _Serialize _Columns expr2 rep2
179+ ( GToExprs _ToExprs _Columns exprs1 rep1
180+ , GToExprs _ToExprs _Columns exprs2 rep2
148181 )
149− => GSerialize _Serialize _Columns (expr1 :*: expr2) (rep1 :*: rep2)
182+ => GToExprs _ToExprs _Columns (exprs1 :*: exprs2) (rep1 :*: rep2)
150183 where
151184 gfromResult fromResult (HProduct a b) =
152− gfromResult @_Serialize @_Columns @expr1 @rep1 fromResult a :*:
153− gfromResult @_Serialize @_Columns @expr2 @rep2 fromResult b
185+ gfromResult @_ToExprs @_Columns @exprs1 fromResult a :*:
186+ gfromResult @_ToExprs @_Columns @exprs2 fromResult b
154187 gtoResult toResult (a :*: b) =
155188 HProduct
156− (gtoResult @_Serialize @_Columns @expr1 @rep1 toResult a)
157− (gtoResult @_Serialize @_Columns @expr2 @rep2 toResult b)
189+ (gtoResult @_ToExprs @_Columns @exprs1 toResult a)
190+ (gtoResult @_ToExprs @_Columns @exprs2 toResult b)
158191
159192
160193instance
161− ( Eval (_Table a)
194+ ( Eval (_ToExprs exprs a)
195+ , HTable (Eval (_Columns exprs))
196+ , KnownSymbol label
162197 , meta ~ 'MetaSel ('Just label) _su _ss _ds
163− , k1 ~ K1 i a
164− )
165− => GTable _Table _Columns (M1 S meta k1)
166− where
167− gfromColumns fromColumns = M1 . K1 . fromColumns . hunlabel
168− gtoColumns toColumns (M1 (K1 a)) = hlabel (toColumns a)
169− gtable table = hlabel (table (Proxy @a))
170−
171−
172−instance
173− ( Eval (_Serialize expr a)
174− , meta ~ 'MetaSel ('Just label) _su _ss _ds
175− , k1 ~ K1 i expr
198+ , k1 ~ K1 i exprs
176199 , k1' ~ K1 i a
177200 )
178− => GSerialize _Serialize _Columns (M1 S meta k1) (M1 S meta k1')
201+ => GToExprs _ToExprs _Columns (M1 S meta k1) (M1 S meta k1')
179202 where
180− gfromResult fromResult = M1 . K1 . fromResult (Proxy @expr) . hunlabel
181− gtoResult toResult (M1 (K1 a)) = hlabel (toResult (Proxy @expr) a)
203+ gfromResult fromResult =
204+ M1 . K1 . fromResult (Proxy @exprs) . hunlabel hunlabeler
205+ gtoResult toResult (M1 (K1 a)) =
206+ hlabel hlabeler (toResult (Proxy @exprs) a)
src/Rel8/Kind/Context.hs+41−8
@@ -1,11 +1,13 @@
11{-# language DataKinds #-}
22{-# language GADTs #-}
3+{-# language LambdaCase #-}
34{-# language StandaloneKindSignatures #-}
4−{-# language TypeSynonymInstances #-}
55
66module Rel8.Kind.Context
77 ( Reifiable( contextSing )
88 , SContext(..)
9+ , sReifiable
10+ , sLabelable
911 )
1012where
1113
@@ -16,9 +18,13 @@ import Prelude ()
1618-- rel8
1719import Rel8.Aggregate ( Aggregate )
1820import Rel8.Expr ( Expr )
19−import Rel8.Schema.Field ( Field )
21+import Rel8.Schema.Dict ( Dict( Dict ) )
22+import Rel8.Schema.Context ( Interpretation )
23+import Rel8.Schema.Context.Label ( Labelable )
24+import Rel8.Schema.Insert ( Insert )
2025import Rel8.Schema.Kind ( Context )
2126import Rel8.Schema.Name ( Name )
27+import Rel8.Schema.Reify ( Reify )
2228import Rel8.Schema.Result ( Result )
2329
2430
@@ -26,13 +32,14 @@ type SContext :: Context -> Type
2632data SContext context where
2733 SAggregate :: SContext Aggregate
2834 SExpr :: SContext Expr
29− SField :: SContext (Field table)
35+ SInsert :: SContext Insert
3036 SName :: SContext Name
3137 SResult :: SContext Result
38+ SReify :: SContext context -> SContext (Reify context)
3239
3340
3441type Reifiable :: Context -> Constraint
35−class Reifiable context where
42+class Interpretation context => Reifiable context where
3643 contextSing :: SContext context
3744
3845
@@ -44,13 +51,39 @@ instance Reifiable Expr where
4451 contextSing = SExpr
4552
4653
47−instance Reifiable (Field table) where
48− contextSing = SField
49−
50−
5154instance Reifiable Result where
5255 contextSing = SResult
5356
5457
58+instance Reifiable Insert where
59+ contextSing = SInsert
60+
61+
5562instance Reifiable Name where
5663 contextSing = SName
64+
65+
66+instance Reifiable context => Reifiable (Reify context) where
67+ contextSing = SReify contextSing
68+
69+
70+sReifiable :: SContext context -> Dict Reifiable context
71+sReifiable = \case
72+ SAggregate -> Dict
73+ SExpr -> Dict
74+ SInsert -> Dict
75+ SName -> Dict
76+ SResult -> Dict
77+ SReify context -> case sReifiable context of
78+ Dict -> Dict
79+
80+
81+sLabelable :: SContext context -> Dict Labelable context
82+sLabelable = \case
83+ SAggregate -> Dict
84+ SExpr -> Dict
85+ SInsert -> Dict
86+ SName -> Dict
87+ SResult -> Dict
88+ SReify context -> case sLabelable context of
89+ Dict -> Dict
src/Rel8/Kind/Labels.hsnew file+57
@@ -0,0 +1,57 @@
1+{-# language DataKinds #-}
2+{-# language FlexibleContexts #-}
3+{-# language FlexibleInstances #-}
4+{-# language GADTs #-}
5+{-# language LambdaCase #-}
6+{-# language StandaloneKindSignatures #-}
7+{-# language TypeOperators #-}
8+
9+module Rel8.Kind.Labels
10+ ( Labels
11+ , SLabels( SNil, SCons )
12+ , KnownLabels( labelsSing )
13+ , renderLabels
14+ )
15+where
16+
17+-- base
18+import Data.Kind ( Constraint, Type )
19+import Data.List.NonEmpty ( NonEmpty, nonEmpty )
20+import Data.Maybe ( fromMaybe )
21+import Data.Proxy ( Proxy( Proxy ) )
22+import GHC.TypeLits ( KnownSymbol, Symbol, symbolVal )
23+import Prelude
24+
25+
26+type Labels :: Type
27+type Labels = [Symbol]
28+
29+
30+type SLabels :: Labels -> Type
31+data SLabels labels where
32+ SNil :: SLabels '[]
33+ SCons :: KnownSymbol label => Proxy label -> SLabels labels -> SLabels (label ': labels)
34+
35+
36+type KnownLabels :: Labels -> Constraint
37+class KnownLabels labels where
38+ labelsSing :: SLabels labels
39+
40+
41+instance KnownLabels '[] where
42+ labelsSing = SNil
43+
44+
45+instance (KnownSymbol label, KnownLabels labels) =>
46+ KnownLabels (label ': labels)
47+ where
48+ labelsSing = SCons Proxy labelsSing
49+
50+
51+renderLabels :: SLabels labels -> NonEmpty String
52+renderLabels = fromMaybe (pure "anon") . nonEmpty . go
53+ where
54+ go :: SLabels labels -> [String]
55+ go = \case
56+ SNil -> []
57+ SCons label labels -> symbolVal label : go labels
src/Rel8/Kind/Necessity.hsnew file+38
@@ -0,0 +1,38 @@
1+{-# language DataKinds #-}
2+{-# language FlexibleContexts #-}
3+{-# language GADTs #-}
4+{-# language StandaloneKindSignatures #-}
5+
6+module Rel8.Kind.Necessity
7+ ( Necessity( Optional, Required )
8+ , SNecessity( SOptional, SRequired )
9+ , KnownNecessity( necessitySing )
10+ )
11+where
12+
13+-- base
14+import Data.Kind ( Constraint, Type )
15+import Prelude ()
16+
17+
18+type Necessity :: Type
19+data Necessity = Optional | Required
20+
21+
22+type SNecessity :: Necessity -> Type
23+data SNecessity necessity where
24+ SOptional :: SNecessity 'Optional
25+ SRequired :: SNecessity 'Required
26+
27+
28+type KnownNecessity :: Necessity -> Constraint
29+class KnownNecessity necessity where
30+ necessitySing :: SNecessity necessity
31+
32+
33+instance KnownNecessity 'Optional where
34+ necessitySing = SOptional
35+
36+
37+instance KnownNecessity 'Required where
38+ necessitySing = SRequired
src/Rel8/Order.hs+9−2
@@ -4,6 +4,7 @@
44
55module Rel8.Order
66 ( Order(..)
7+ , toOrderExprs
78 )
89where
910
@@ -16,7 +17,8 @@ import Prelude
1617import Data.Functor.Contravariant.Divisible ( Decidable, Divisible )
1718
1819-- opaleye
19−import qualified Opaleye.Order as Opaleye
20+import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
21+import qualified Opaleye.Internal.Order as Opaleye
2022
2123
2224-- | An ordering expression for @a@. Primitive orderings are defined with
@@ -24,7 +26,12 @@ import qualified Opaleye.Order as Opaleye
2426-- instances.
2527--
2628-- A common pattern is to use '<>' to combine multiple orderings in sequence,
27−-- and 'Data.Functor.Contravariant.>$<' to select individual columns.
29+-- and '>$<' (from 'Contravariant') to select individual columns.
2830type Order :: Type -> Type
2931newtype Order a = Order (Opaleye.Order a)
3032 deriving newtype (Contravariant, Divisible, Decidable, Semigroup, Monoid)
33+
34+
35+toOrderExprs :: Order a -> a -> [Opaleye.OrderExpr]
36+toOrderExprs (Order (Opaleye.Order order)) a =
37+ uncurry Opaleye.OrderExpr <$> order a
src/Rel8/Query.hs+7−181
@@ -1,6 +1,6 @@
1−{-# language FlexibleContexts #-}
1+{-# language DerivingVia #-}
2+{-# language GeneralizedNewtypeDeriving #-}
23{-# language StandaloneKindSignatures #-}
3−{-# language UndecidableInstances #-}
44
55module Rel8.Query
66 ( Query( Query )
@@ -8,201 +8,37 @@ module Rel8.Query
88where
99
1010-- base
11−import Control.Applicative ( liftA2 )
12−import Control.Monad ( liftM2 )
1311import Data.Kind ( Type )
14−import Data.Monoid ( Any( Any ) )
1512import Prelude
1613
1714-- opaleye
18−import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
19−import qualified Opaleye.Internal.PackMap as Opaleye
20−import qualified Opaleye.Internal.PrimQuery as Opaleye hiding (lateral)
21−import qualified Opaleye.Internal.QueryArr as Opaleye
22−import qualified Opaleye.Internal.Tag as Opaleye
15+import qualified Opaleye.Select as Opaleye
2316
2417-- rel8
25−import Rel8.Expr ( Expr )
2618import Rel8.Query.Set ( unionAll )
27−import Rel8.Query.Opaleye ( fromOpaleye )
2819import Rel8.Query.Values ( values )
29−import Rel8.Table ( Table, fromColumns, toColumns )
3020import Rel8.Table.Alternative
3121 ( AltTable, (<|>:)
3222 , AlternativeTable, emptyTable
3323 )
34−import Rel8.Table.Projection ( Projectable, apply, project )
3524
3625-- semigroupoids
37−import Data.Functor.Apply ( Apply, (<.>) )
26+import Data.Functor.Apply ( Apply, WrappedApplicative(..) )
3827import Data.Functor.Bind ( Bind, (>>-) )
3928
4029
4130-- | The @Query@ monad allows you to compose a @SELECT@ query. This monad has
4231-- semantics similar to the list (@[]@) monad.
4332type Query :: Type -> Type
44−newtype Query a =
45− Query (
46− -- This is based on Opaleye's Select monad, but with two addtions. We
47− -- maintain a stack of PrimExprs from parent previous subselects. In
48− -- practice, these are always the results of dummy calls to random().
49− --
50− -- We also return a Bool that indicates to the parent subselect whether
51− -- or not that stack of PrimExprs were used at any point. If they weren't,
52− -- then the call to random() is never added to the query.
53− --
54− -- This is all needed to implement evaluate. Consider the following code:
55− --
56− -- do
57− -- x <- values [lit 'a', lit 'b', lit 'c']
58− -- y <- evaluate $ nextval "user_id_seq"
59− -- pure (x, y)
60− --
61− -- If we just used Opaleye's Select monad directly, the SQL would come out
62− -- like this:
63− --
64− -- SELECT
65− -- a, b
66− -- FROM
67− -- (VALUES ('a'), ('b'), ('c')) Q1(a),
68− -- LATERAL (SELECT nextval('user_id_seq')) Q2(b);
69− --
70− -- From the Haskell code, you would intuitively expect to get back the
71− -- results of three different calls to nextval(), but from Postgres' point
72− -- of view, because the Q2 subquery doesn't reference anything from the Q1
73− -- query, it thinks it only needs to call nextval() once. This is actually
74− -- exactly the same problem you get with the deprecated ListT IO monad from
75− -- the transformers package — *> behaves differently to >>=, so
76− -- using ApplicativeDo can change the results of a program. ApplicativeDo
77− -- is exactly the optimisation Postgres does on a "LATERAL" query that
78− -- doesn't make any references to previous subselects.
79− --
80− -- Rel8's solution is generate the following SQL instead:
81− --
82− -- SELECT
83− -- a, b
84− -- FROM
85− -- (SELECT
86− -- random() AS dummy,
87− -- *
88− -- FROM
89− -- (VALUES ('a'), ('b'), ('c')) Q1(a)) Q1,
90− -- LATERAL (SELECT
91− -- CASE
92− -- WHEN dummy IS NOT NULL
93− -- THEN nextval('user_id_seq')
94− -- END) Q2(b);
95− --
96− -- We use random() here as the dummy value (and not some constant) because
97− -- Postgres will again optimize if it sees that a value is constant
98− -- (and thus only call nextval() once), but because random() is marked as
99− -- VOLATILE, this inhibits Postgres from doing that optimisation.
100− --
101− -- Why not just reference the a column from the previous query directly
102− -- instead of adding a dummy value? Basically, even if we extract out all
103− -- the bindings introduced in a PrimQuery, we can't always be sure which
104− -- ones refer to constant values, so if we end up laterally referencing a
105− -- constant value, then all of this would be for nothing.
106− --
107− -- Why not just add the call to the previous subselect directly, like so:
108− --
109− -- SELECT
110− -- a, b
111− -- FROM
112− -- (SELECT
113− -- nextval('user_id_seq') AS eval,
114− -- *
115− -- FROM
116− -- (VALUES ('a'), ('b'), ('c')) Q1(a)) Q1,
117− -- LATERAL (SELECT eval) Q2(b);
118− --
119− -- That would work in this case. But consider the following Rel8 code:
120− --
121− -- do
122− -- x <- values [lit 'a', lit 'b', lit 'c']
123− -- y <- values [lit 'd', lit 'e', lit 'f']
124− -- z <- evaluate $ nextval "user_id_seq"
125− -- pure (x, y, z)
126− --
127− -- How many calls to nextval should there be? Our Haskell intuition says
128− -- nine. But that's not what you would get if you used the above
129− -- technique. The problem is, which VALUES query should the nextval be
130− -- added to? You can choose one or the other to get three calls to
131− -- nextval, but you still need to make a superfluous LATERAL references to
132− -- the other if you want nine calls. So for the above Rel8 code we generate
133− -- the following SQL:
134− --
135− -- SELECT
136− -- a, b, c
137− -- FROM
138− -- (SELECT
139− -- random() AS dummy,
140− -- *
141− -- FROM
142− -- (VALUES ('a'), ('b'), ('c')) Q1(a)) Q1,
143− -- (SELECT
144− -- random() AS dummy,
145− -- *
146− -- FROM
147− -- (VALUES ('d'), ('e'), ('f')) Q2(b)) Q2,
148− -- LATERAL (SELECT
149− -- CASE
150− -- WHEN Q1.dummy IS NOT NULL AND Q2.dummy IS NOT NULL
151− -- THEN nextval('user_id_seq')
152− -- END) Q3(c);
153− --
154− -- This gives nine calls to nextval() as we would expect.
155− [Opaleye.PrimExpr] -> Opaleye.Select (Any, a)
156− )
157−
158−
159−instance Projectable Query where
160− project f = fmap (fromColumns . apply f . toColumns)
161−
162−
163−instance Functor Query where
164− fmap f (Query a) = Query (fmap (fmap (fmap f)) a)
165−
166−
167−instance Apply Query where
168− (<.>) = (<*>)
169−
170−
171−instance Applicative Query where
172− pure = fromOpaleye . pure
173− liftA2 = liftM2
33+newtype Query a = Query (Opaleye.Select a)
34+ deriving newtype (Functor, Applicative, Monad)
35+ deriving Apply via (WrappedApplicative Opaleye.Select)
17436
17537
17638instance Bind Query where
17739 (>>-) = (>>=)
17840
17941
180−instance Monad Query where
181− Query q >>= f = Query $ \dummies -> Opaleye.stateQueryArr $ \_ tag ->
182− let
183− qa = q dummies
184− ((m, a), query, tag') = Opaleye.runStateQueryArr qa () tag
185− Query q' = f a
186− (dummies', query', tag'') =
187− ( dummy : dummies
188− , query <> Opaleye.aRebind bindings
189− , Opaleye.next tag'
190− )
191− where
192− (dummy, bindings) = Opaleye.run $ name random
193− where
194− random = Opaleye.FunExpr "random" []
195− name = Opaleye.extractAttr "dummy" tag'
196− qa' = Opaleye.lateral $ \_ -> q' dummies'
197− ((m'@(Any needsDummies), b), query'', tag''') = Opaleye.runStateQueryArr qa' () tag''
198− query'''
199− | needsDummies = query' <> query''
200− | otherwise = query <> query''
201− m'' = m <> m'
202− in
203− ((m'', b), query''', tag''')
204−
205−
20642-- | '<|>:' = 'unionAll'.
20743instance AltTable Query where
20844 (<|>:) = unionAll
@@ -211,13 +47,3 @@ instance AltTable Query where
21147-- | 'emptyTable' = 'values' @[]@.
21248instance AlternativeTable Query where
21349 emptyTable = values []
214−
215−
216−-- | '<>' = 'unionAll'.
217−instance Table Expr a => Semigroup (Query a) where
218− (<>) = (<|>:)
219−
220−
221−-- | 'mempty' = @'values' []@.
222−instance Table Expr a => Monoid (Query a) where
223− mempty = emptyTable
src/Rel8/Query.hs-boot+1−3
@@ -7,13 +7,11 @@ where
77
88-- base
99import Data.Kind ( Type )
10−import Data.Monoid ( Any )
1110import Prelude ()
1211
1312-- opaleye
14−import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
1513import qualified Opaleye.Select as Opaleye
1614
1715
1816type Query :: Type -> Type
19−newtype Query a = Query ([Opaleye.PrimExpr] -> Opaleye.Select (Any, a))
17+newtype Query a = Query (Opaleye.Select a)
src/Rel8/Query/Aggregate.hs+2−22
@@ -1,17 +1,12 @@
11{-# language FlexibleContexts #-}
2−{-# language MonoLocalBinds #-}
3−{-# language ScopedTypeVariables #-}
4−{-# language TypeApplications #-}
52
63module Rel8.Query.Aggregate
74 ( aggregate
85 , countRows
9− , mode
106 )
117where
128
139-- base
14−import Data.Functor.Contravariant ( (>$<) )
1510import Data.Int ( Int64 )
1611import Prelude
1712
@@ -19,25 +14,18 @@ import Prelude
1914import qualified Opaleye.Aggregate as Opaleye
2015
2116-- rel8
22−import Rel8.Aggregate ( Aggregates )
17+import Rel8.Aggregate ( Aggregate )
2318import Rel8.Expr ( Expr )
2419import Rel8.Expr.Aggregate ( countStar )
25−import Rel8.Expr.Order ( desc )
2620import Rel8.Query ( Query )
27−import Rel8.Query.Limit ( limit )
2821import Rel8.Query.Maybe ( optional )
2922import Rel8.Query.Opaleye ( mapOpaleye )
30−import Rel8.Query.Order ( orderBy )
31−import Rel8.Table ( toColumns )
32−import Rel8.Table.Aggregate ( hgroupBy )
33−import Rel8.Table.Cols ( Cols( Cols ), fromCols )
34−import Rel8.Table.Eq ( EqTable, eqTable )
3523import Rel8.Table.Opaleye ( aggregator )
3624import Rel8.Table.Maybe ( maybeTable )
3725
3826
3927-- | Apply an aggregation to all rows returned by a 'Query'.
40−aggregate :: Aggregates aggregates exprs => Query aggregates -> Query exprs
28+aggregate :: Query (Aggregate exprs) -> Query exprs
4129aggregate = mapOpaleye (Opaleye.aggregate aggregator)
4230
4331
@@ -46,11 +34,3 @@ aggregate = mapOpaleye (Opaleye.aggregate aggregator)
4634-- will return @0@.
4735countRows :: Query a -> Query (Expr Int64)
4836countRows = fmap (maybeTable 0 id) . optional . aggregate . fmap (const countStar)
49−
50−
51−-- | Return the most common row in a query.
52−mode :: forall a. EqTable a => Query a -> Query a
53−mode rows = limit 1 $ fmap (fromCols . snd) $ orderBy (fst >$< desc) $ do
54− aggregate $ do
55− row <- toColumns <$> rows
56− pure (countStar, Cols $ hgroupBy (eqTable @a) row)
src/Rel8/Query/Distinct.hs+9−4
@@ -1,3 +1,5 @@
1+{-# options_ghc -fno-warn-redundant-constraints #-}
2+
13module Rel8.Query.Distinct
24 ( distinct
35 , distinctOn
@@ -6,11 +8,12 @@ module Rel8.Query.Distinct
68where
79
810-- base
9−import Prelude ()
11+import Prelude
1012
1113-- opaleye
1214import qualified Opaleye.Distinct as Opaleye
13−import qualified Opaleye.Order as Opaleye
15+import qualified Opaleye.Internal.Order as Opaleye
16+import qualified Opaleye.Internal.QueryArr as Opaleye
1417
1518-- rel8
1619import Rel8.Order ( Order( Order ) )
@@ -30,11 +33,13 @@ distinct = mapOpaleye (Opaleye.distinctExplicit distinctspec)
3033-- to a projection. If multiple rows have the same projection, it is
3134-- unspecified which row will be returned. If this matters, use 'distinctOnBy'.
3235distinctOn :: EqTable b => (a -> b) -> Query a -> Query a
33−distinctOn proj = mapOpaleye (Opaleye.distinctOnExplicit unpackspec proj)
36+distinctOn proj =
37+ mapOpaleye (\q -> Opaleye.productQueryArr (Opaleye.distinctOn unpackspec proj . Opaleye.runSimpleQueryArr q))
3438
3539
3640-- | Select all distinct rows from a query, where rows are equivalent according
3741-- to a projection. If there are multiple rows with the same projection, the
3842-- first row according to the specified 'Order' will be returned.
3943distinctOnBy :: EqTable b => (a -> b) -> Order a -> Query a -> Query a
40−distinctOnBy proj (Order order) = mapOpaleye (Opaleye.distinctOnByExplicit unpackspec proj order)
44+distinctOnBy proj (Order order) =
45+ mapOpaleye (\q -> Opaleye.productQueryArr (Opaleye.distinctOnBy unpackspec proj order . Opaleye.runSimpleQueryArr q))
src/Rel8/Query/Each.hs+3−3
@@ -17,7 +17,7 @@ import Rel8.Query ( Query )
1717import Rel8.Query.Opaleye ( fromOpaleye )
1818import Rel8.Schema.Name ( Selects )
1919import Rel8.Schema.Table ( TableSchema )
20−import Rel8.Table.Cols ( fromCols, toCols )
20+import Rel8.Table ( fromColumns, toColumns )
2121import Rel8.Table.Opaleye ( table, unpackspec )
2222
2323
@@ -25,8 +25,8 @@ import Rel8.Table.Opaleye ( table, unpackspec )
2525-- table@.
2626each :: Selects names exprs => TableSchema names -> Query exprs
2727each =
28− fmap fromCols .
28+ fmap fromColumns .
2929 fromOpaleye .
3030 Opaleye.selectTableExplicit unpackspec .
3131 table .
32− fmap toCols
32+ fmap toColumns
src/Rel8/Query/Either.hs+17−27
@@ -3,22 +3,23 @@
33module Rel8.Query.Either
44 ( keepLeftTable
55 , keepRightTable
6+ , bindEitherTable
67 , bitraverseEitherTable
78 )
89where
910
1011-- base
12+import Data.Functor ( (<&>) )
1113import Prelude
1214
13−-- comonad
14−import Control.Comonad ( extract )
15−
1615-- rel8
1716import Rel8.Expr ( Expr )
1817import Rel8.Expr.Eq ( (==.) )
1918import Rel8.Query ( Query )
2019import Rel8.Query.Filter ( where_ )
2120import Rel8.Query.Maybe ( optional )
21+import Rel8.Table ( Table )
22+import Rel8.Table.Bool ( bool )
2223import Rel8.Table.Either
2324 ( EitherTable( EitherTable )
2425 , isLeftTable, isRightTable
@@ -26,41 +27,30 @@ import Rel8.Table.Either
2627import Rel8.Table.Maybe ( MaybeTable( MaybeTable ), isJustTable )
2728
2829
29−-- | Filter 'EitherTable's, keeping only 'leftTable's.
30−keepLeftTable :: EitherTable Expr a b -> Query a
30+keepLeftTable :: EitherTable a b -> Query a
3131keepLeftTable e@(EitherTable _ a _) = do
3232 where_ $ isLeftTable e
33− pure (extract a)
33+ pure a
3434
3535
36−-- | Filter 'EitherTable's, keeping only 'rightTable's.
37−keepRightTable :: EitherTable Expr a b -> Query b
36+keepRightTable :: EitherTable a b -> Query b
3837keepRightTable e@(EitherTable _ _ b) = do
3938 where_ $ isRightTable e
40− pure (extract b)
39+ pure b
40+
41+
42+bindEitherTable :: (Table Expr a, Functor m)
43+ => (i -> m (EitherTable a b)) -> EitherTable a i -> m (EitherTable a b)
44+bindEitherTable query e@(EitherTable input a i) = do
45+ query i <&> \(EitherTable output a' b) ->
46+ EitherTable (input <> output) (bool a a' (isRightTable e)) b
4147
4248
43−-- | @bitraverseEitherTable f g x@ will pass all @leftTable@s through @f@ and
44−-- all @rightTable@s through @g@. The results are then lifted back into
45−-- @leftTable@ and @rightTable@, respectively. This is similar to 'bitraverse'
46−-- for 'Either'.
47−--
48−-- For example,
49−--
50−-- >>> :{
51−-- select do
52−-- x <- values (map lit [ Left True, Right (42 :: Int32) ])
53−-- bitraverseEitherTable (\y -> values [y, not_ y]) (\y -> pure (y * 100)) x
54−-- :}
55−-- [ Left True
56−-- , Left False
57−-- , Right 4200
58−-- ]
5949bitraverseEitherTable :: ()
6050 => (a -> Query c)
6151 -> (b -> Query d)
62− -> EitherTable Expr a b
63− -> Query (EitherTable Expr c d)
52+ -> EitherTable a b
53+ -> Query (EitherTable c d)
6454bitraverseEitherTable f g e@(EitherTable tag _ _) = do
6555 mc@(MaybeTable _ c) <- optional (f =<< keepLeftTable e)
6656 md@(MaybeTable _ d) <- optional (g =<< keepRightTable e)
src/Rel8/Query/Evaluate.hsdeleted−49
@@ -1,49 +0,0 @@
1−{-# language FlexibleContexts #-}
2−{-# language TupleSections #-}
3−
4−module Rel8.Query.Evaluate
5− ( evaluate
6− )
7−where
8−
9−-- base
10−import Control.Monad ( (>=>) )
11−import Data.Foldable ( foldl' )
12−import Data.List.NonEmpty ( NonEmpty( (:|) ), nonEmpty )
13−import Data.Monoid ( Any( Any ) )
14−import Prelude hiding ( undefined )
15−
16−-- opaleye
17−import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
18−
19−-- rel8
20−import Rel8.Expr ( Expr )
21−import Rel8.Expr.Bool ( (&&.) )
22−import Rel8.Expr.Opaleye ( fromPrimExpr )
23−import Rel8.Query ( Query( Query ) )
24−import Rel8.Query.Rebind ( rebind )
25−import Rel8.Table ( Table )
26−import Rel8.Table.Bool ( case_ )
27−import Rel8.Table.Undefined ( undefined )
28−
29−
30−-- | 'evaluate' takes expressions that could potentially have side effects and
31−-- \"runs\" them in the 'Query' monad. The returned expressions have no side
32−-- effects and can safely be reused.
33−evaluate :: Table Expr a => a -> Query a
34−evaluate = laterally >=> rebind "eval"
35−
36−
37−laterally :: Table Expr a => a -> Query a
38−laterally a = Query $ \bindings -> pure $ (Any True,) $
39− case nonEmpty bindings of
40− Nothing -> a
41− Just bindings' -> case_ [(condition, a)] undefined
42− where
43− condition = foldl1' (&&.) (fmap go bindings')
44− where
45− go = fromPrimExpr . Opaleye.UnExpr Opaleye.OpIsNotNull
46−
47−
48−foldl1' :: (a -> a -> a) -> NonEmpty a -> a
49−foldl1' f (a :| as) = foldl' f a as
src/Rel8/Query/Exists.hs+16−14
@@ -2,8 +2,8 @@
22
33module Rel8.Query.Exists
44 ( exists, inQuery
5− , present, with, withBy
6− , absent, without, withoutBy
5+ , whereExists, with, withBy
6+ , whereNotExists, without, withoutBy
77 )
88where
99
@@ -11,44 +11,46 @@ where
1111import Prelude hiding ( filter )
1212
1313-- opaleye
14−import qualified Opaleye.Exists as Opaleye
1514import qualified Opaleye.Operators as Opaleye
1615
1716-- rel8
1817import Rel8.Expr ( Expr )
19−import Rel8.Expr.Opaleye ( fromColumn, fromPrimExpr )
2018import Rel8.Query ( Query )
2119import Rel8.Query.Filter ( filter )
20+import Rel8.Query.Maybe ( optional )
2221import Rel8.Query.Opaleye ( mapOpaleye )
2322import Rel8.Table.Eq ( EqTable, (==:) )
23+import Rel8.Table.Maybe ( isJustTable )
2424
2525
2626-- | Checks if a query returns at least one row.
2727exists :: Query a -> Query (Expr Bool)
28−exists = fmap (fromPrimExpr . fromColumn) . mapOpaleye Opaleye.exists
28+exists = fmap isJustTable . optional . whereExists
29+-- FIXME: change this when b7aacc07c6392654cae439fc3b997620c3aa7a87 makes it
30+-- into a release of Opaleye
2931
3032
3133inQuery :: EqTable a => a -> Query a -> Query (Expr Bool)
3234inQuery a = exists . (>>= filter (a ==:))
3335
3436
35−-- | Produce the empty query if the given query returns no rows. @present@
37+-- | Produce the empty query if the given query returns no rows. @whereExists@
3638-- is equivalent to @WHERE EXISTS@ in SQL.
37−present :: Query a -> Query ()
38−present = mapOpaleye Opaleye.restrictExists
39+whereExists :: Query a -> Query ()
40+whereExists = mapOpaleye Opaleye.restrictExists
3941
4042
41−-- | Produce the empty query if the given query returns rows. @absent@
43+-- | Produce the empty query if the given query returns rows. @whereNotExists@
4244-- is equivalent to @WHERE NOT EXISTS@ in SQL.
43−absent :: Query a -> Query ()
44−absent = mapOpaleye Opaleye.restrictNotExists
45+whereNotExists :: Query a -> Query ()
46+whereNotExists = mapOpaleye Opaleye.restrictNotExists
4547
4648
4749-- | @with@ is similar to 'filter', but allows the predicate to be a full query.
4850--
49−-- @with f a = a <$ present (f a)@, but this form matches 'filter'.
51+-- @with f a = a <$ whereExists (f a)@, but this form matches 'filter'.
5052with :: (a -> Query b) -> a -> Query a
51−with f a = a <$ present (f a)
53+with f a = a <$ whereExists (f a)
5254
5355
5456-- | Like @with@, but with a custom membership test.
@@ -58,7 +60,7 @@ withBy predicate bs = with $ \a -> bs >>= filter (predicate a)
5860
5961-- | Filter rows where @a -> Query b@ yields no rows.
6062without :: (a -> Query b) -> a -> Query a
61−without f a = a <$ absent (f a)
63+without f a = a <$ whereNotExists (f a)
6264
6365
6466-- | Like @without@, but with a custom membership test.
src/Rel8/Query/Indexed.hsdeleted−21
@@ -1,21 +0,0 @@
1−module Rel8.Query.Indexed
2− ( indexed
3− )
4−where
5−
6−-- base
7−import Control.Applicative ( liftA2 )
8−import Data.Int ( Int64 )
9−import Prelude
10−
11−-- rel8
12−import Rel8.Expr ( Expr )
13−import Rel8.Expr.Window ( rowNumber )
14−import Rel8.Query ( Query )
15−import Rel8.Query.Window ( window )
16−import Rel8.Table.Window ( currentRow )
17−
18−
19−-- | Pair each row of a query with its index within the query.
20−indexed :: Query a -> Query (Expr Int64, a)
21−indexed = window (liftA2 (,) (subtract 1 <$> rowNumber) currentRow)
src/Rel8/Query/List.hs+20−83
@@ -1,58 +1,29 @@
11{-# language FlexibleContexts #-}
2−{-# language GADTs #-}
3−{-# language NamedFieldPuns #-}
2+{-# language MonoLocalBinds #-}
43
54module Rel8.Query.List
65 ( many, some
76 , manyExpr, someExpr
8− , catListTable, catNonEmptyTable
9− , catList, catNonEmpty
107 )
118where
129
1310-- base
14−import Data.Functor.Identity ( runIdentity )
1511import Data.List.NonEmpty ( NonEmpty )
1612import Prelude
1713
18−-- opaleye
19−import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
20−
2114-- rel8
2215import Rel8.Expr ( Expr )
2316import Rel8.Expr.Aggregate ( listAggExpr, nonEmptyAggExpr )
24−import Rel8.Expr.Opaleye ( mapPrimExpr )
2517import Rel8.Query ( Query )
2618import Rel8.Query.Aggregate ( aggregate )
2719import Rel8.Query.Maybe ( optional )
28−import Rel8.Query.Rebind ( rebind )
29−import Rel8.Schema.HTable.Vectorize ( hunvectorize )
30−import Rel8.Schema.Null ( Sql, Unnullify )
31−import Rel8.Schema.Spec ( Spec( Spec, info ) )
32−import Rel8.Table ( Table, fromColumns )
33−import Rel8.Table.Cols ( toCols )
20+import Rel8.Schema.Null ( Sql )
21+import Rel8.Table ( Table )
3422import Rel8.Table.Aggregate ( listAgg, nonEmptyAgg )
35−import Rel8.Table.List ( ListTable( ListTable ) )
23+import Rel8.Table.List ( ListTable )
3624import Rel8.Table.Maybe ( maybeTable )
37−import Rel8.Table.NonEmpty ( NonEmptyTable( NonEmptyTable ) )
38−import Rel8.Type ( DBType, typeInformation )
39−import Rel8.Type.Array ( extractArrayElement )
40−import Rel8.Type.Information ( TypeInformation )
41−
42−
43−-- | Aggregate a 'Query' into a 'ListTable'. If the supplied query returns 0
44−-- rows, this function will produce a 'Query' that returns one row containing
45−-- the empty @ListTable@. If the supplied @Query@ does return rows, @many@ will
46−-- return exactly one row, with a @ListTable@ collecting all returned rows.
47−--
48−-- @many@ is analogous to 'Control.Applicative.many' from
49−-- @Control.Applicative@.
50−many :: Table Expr a => Query a -> Query (ListTable Expr a)
51−many =
52− fmap (maybeTable mempty (\(ListTable a) -> ListTable a)) .
53− optional .
54− aggregate .
55− fmap (listAgg . toCols)
25+import Rel8.Table.NonEmpty ( NonEmptyTable )
26+import Rel8.Type ( DBType )
5627
5728
5829-- | Aggregate a 'Query' into a 'NonEmptyTable'. If the supplied query returns
@@ -63,11 +34,19 @@ many =
6334--
6435-- @some@ is analogous to 'Control.Applicative.some' from
6536-- @Control.Applicative@.
66−some :: Table Expr a => Query a -> Query (NonEmptyTable Expr a)
67−some =
68− fmap (\(NonEmptyTable a) -> NonEmptyTable a) .
69− aggregate .
70− fmap (nonEmptyAgg . toCols)
37+some :: Table Expr a => Query a -> Query (NonEmptyTable a)
38+some = aggregate . fmap nonEmptyAgg
39+
40+
41+-- | Aggregate a 'Query' into a 'ListTable'. If the supplied query returns 0
42+-- rows, this function will produce a 'Query' that returns one row containing
43+-- the empty @ListTable@. If the supplied @Query@ does return rows, @many@ will
44+-- return exactly one row, with a @ListTable@ collecting all returned rows.
45+--
46+-- @many@ is analogous to 'Control.Applicative.many' from
47+-- @Control.Applicative@.
48+many :: Table Expr a => Query a -> Query (ListTable a)
49+many = fmap (maybeTable mempty id) . optional . aggregate . fmap listAgg
7150
7251
7352-- | A version of 'many' specialised to single expressions.
@@ -76,47 +55,5 @@ manyExpr = fmap (maybeTable mempty id) . optional . aggregate . fmap listAggExpr
7655
7756
7857-- | A version of 'many' specialised to single expressions.
79−someExpr :: Sql DBType a => Query (Expr a) -> Query (Expr (NonEmpty a))
58+someExpr :: Query (Expr a) -> Query (Expr (NonEmpty a))
8059someExpr = aggregate . fmap nonEmptyAggExpr
81−
82−
83−-- | Expand a 'ListTable' into a 'Query', where each row in the query is an
84−-- element of the given @ListTable@.
85−--
86−-- @catListTable@ is an inverse to 'many'.
87−catListTable :: Table Expr a => ListTable Expr a -> Query a
88−catListTable (ListTable as) =
89− rebind "unnest" $ fromColumns $ runIdentity $
90− hunvectorize (\Spec {info} -> pure . sunnest info) as
91−
92−
93−-- | Expand a 'NonEmptyTable' into a 'Query', where each row in the query is an
94−-- element of the given @NonEmptyTable@.
95−--
96−-- @catNonEmptyTable@ is an inverse to 'some'.
97−catNonEmptyTable :: Table Expr a => NonEmptyTable Expr a -> Query a
98−catNonEmptyTable (NonEmptyTable as) =
99− rebind "unnest" $ fromColumns $ runIdentity $
100− hunvectorize (\Spec {info} -> pure . sunnest info) as
101−
102−
103−-- | Expand an expression that contains a list into a 'Query', where each row
104−-- in the query is an element of the given list.
105−--
106−-- @catList@ is an inverse to 'manyExpr'.
107−catList :: Sql DBType a => Expr [a] -> Query (Expr a)
108−catList = rebind "unnest" . sunnest typeInformation
109−
110−
111−-- | Expand an expression that contains a non-empty list into a 'Query', where
112−-- each row in the query is an element of the given list.
113−--
114−-- @catNonEmpty@ is an inverse to 'someExpr'.
115−catNonEmpty :: Sql DBType a => Expr (NonEmpty a) -> Query (Expr a)
116−catNonEmpty = rebind "unnest" . sunnest typeInformation
117−
118−
119−sunnest :: TypeInformation (Unnullify a) -> Expr (list a) -> Expr a
120−sunnest info = mapPrimExpr $
121− extractArrayElement info .
122− Opaleye.UnExpr (Opaleye.UnOpOther "UNNEST")
src/Rel8/Query/Maybe.hs+45−26
@@ -1,10 +1,7 @@
1−{-# language GADTs #-}
2−{-# language LambdaCase #-}
3−{-# language NamedFieldPuns #-}
4−
51module Rel8.Query.Maybe
62 ( optional
73 , catMaybeTable
4+ , bindMaybeTable
85 , traverseMaybeTable
96 )
107where
@@ -12,20 +9,23 @@ where
129-- base
1310import Prelude
1411
15−-- comonad
16−import Control.Comonad ( extract )
17−
1812-- opaleye
19−import qualified Opaleye.Internal.MaybeFields as Opaleye
13+import qualified Opaleye.Internal.PackMap as Opaleye
14+import qualified Opaleye.Internal.PrimQuery as Opaleye
15+import qualified Opaleye.Internal.QueryArr as Opaleye
16+import qualified Opaleye.Internal.Tag as Opaleye
17+import qualified Opaleye.Internal.Unpackspec as Opaleye
2018
2119-- rel8
22−import Rel8.Expr ( Expr )
20+import Rel8.Expr.Bool ( true )
2321import Rel8.Expr.Eq ( (==.) )
24−import Rel8.Expr.Opaleye ( fromColumn, fromPrimExpr )
22+import Rel8.Expr.Opaleye ( toPrimExpr )
2523import Rel8.Query ( Query )
2624import Rel8.Query.Filter ( where_ )
2725import Rel8.Query.Opaleye ( mapOpaleye )
28−import Rel8.Table.Maybe ( MaybeTable(..), isJustTable )
26+import Rel8.Table.Maybe ( MaybeTable( MaybeTable ), isJustTable )
27+import Rel8.Table.Opaleye ( unpackspec )
28+import Rel8.Table.Tag ( Tag(..), fromExpr )
2929
3030
3131-- | Convert a query that might return zero rows to a query that always returns
@@ -33,11 +33,18 @@ import Rel8.Table.Maybe ( MaybeTable(..), isJustTable )
3333--
3434-- To speak in more concrete terms, 'optional' is most useful to write @LEFT
3535-- JOIN@s.
36−optional :: Query a -> Query (MaybeTable Expr a)
37−optional = mapOpaleye $ Opaleye.optionalInternal $ \tag a -> MaybeTable
38− { tag = fromPrimExpr $ fromColumn tag
39− , just = pure a
40− }
36+optional :: Query a -> Query (MaybeTable a)
37+optional = mapOpaleye $ Opaleye.QueryArr . go
38+ where
39+ go query (i, left, tag) =
40+ (MaybeTable (fromExpr t') a, join, Opaleye.next tag')
41+ where
42+ (MaybeTable Tag {expr = t} a, right, tag') =
43+ Opaleye.runSimpleQueryArr (pure <$> query) (i, tag)
44+ (t', bindings) = Opaleye.run $
45+ Opaleye.runUnpackspec unpackspec (Opaleye.extractAttr "maybe" tag') t
46+ join = Opaleye.Join Opaleye.LeftJoin condition [] bindings left right
47+ condition = toPrimExpr true
4148
4249
4350-- | Filter out 'MaybeTable's, returning only the tables that are not-null.
@@ -45,24 +52,36 @@ optional = mapOpaleye $ Opaleye.optionalInternal $ \tag a -> MaybeTable
4552-- This operation can be used to "undo" the effect of 'optional', which
4653-- operationally is like turning a @LEFT JOIN@ back into a full @JOIN@. You
4754-- can think of this as analogous to 'Data.Maybe.catMaybes'.
48−catMaybeTable :: MaybeTable Expr a -> Query a
55+catMaybeTable :: MaybeTable a -> Query a
4956catMaybeTable ma@(MaybeTable _ a) = do
5057 where_ $ isJustTable ma
51− pure (extract a)
58+ pure a
59+
60+
61+-- | @bindMaybeTable f x@ is similar to the monadic bind (@>>=@) operation. It
62+-- allows you to "extend" an optional query with another query. If either the
63+-- input or output are 'Rel8.nothingTable', then the result is
64+-- 'Rel8.nothingTable'.
65+--
66+-- This is similar to 'traverseMaybeTable', followed by a @join@ on the
67+-- resulting @MaybeTable@s.
68+bindMaybeTable :: Monad m
69+ => (a -> m (MaybeTable b)) -> MaybeTable a -> m (MaybeTable b)
70+bindMaybeTable query (MaybeTable input a) = do
71+ MaybeTable output b <- query a
72+ pure $ MaybeTable (input <> output) b
5273
5374
5475-- | Extend an optional query with another query. This is useful if you want
5576-- to step through multiple @LEFT JOINs@.
5677--
5778-- Note that @traverseMaybeTable@ takes a @a -> Query b@ function, which means
58−-- you also have the ability to "expand" one row into multiple rows. If the
79+-- you also have the ability to "expand" one row into multiple rows. If the
5980-- @a -> Query b@ function returns no rows, then the resulting query will also
6081-- have no rows. However, regardless of the given @a -> Query b@ function, if
61−-- the input is @nothingTable@, you will always get exactly one @nothingTable@
62−-- back.
63−traverseMaybeTable :: (a -> Query b) -> MaybeTable Expr a -> Query (MaybeTable Expr b)
82+-- the input is @noTable@, you will always get exactly one @noTable@ back.
83+traverseMaybeTable :: (a -> Query b) -> MaybeTable a -> Query (MaybeTable b)
6484traverseMaybeTable query ma@(MaybeTable input _) = do
65− optional (query =<< catMaybeTable ma) >>= \case
66− MaybeTable output b -> do
67− where_ $ output ==. input
68− pure $ MaybeTable input b
85+ MaybeTable output b <- optional (query =<< catMaybeTable ma)
86+ where_ $ expr output ==. expr input
87+ pure $ MaybeTable input b
src/Rel8/Query/Null.hs−15
@@ -1,8 +1,5 @@
1−{-# language FlexibleContexts #-}
2−
31module Rel8.Query.Null
42 ( catNull
5− , catNullTable
63 )
74where
85
@@ -12,8 +9,6 @@ import Prelude
129-- rel8
1310import Rel8.Expr ( Expr )
1411import Rel8.Expr.Null ( isNonNull, unsafeUnnullify )
15−import Rel8.Table ( Table )
16−import Rel8.Table.Null ( NullTable, isNonNullTable, unsafeUnnullifyTable )
1712import Rel8.Query ( Query )
1813import Rel8.Query.Filter ( where_ )
1914
@@ -26,13 +21,3 @@ catNull :: Expr (Maybe a) -> Query (Expr a)
2621catNull a = do
2722 where_ $ isNonNull a
2823 pure $ unsafeUnnullify a
29−
30−
31−-- | Filter a 'Query' that might return @nullTable@ to a 'Query' without any
32−-- @nullTable@s.
33−--
34−-- Corresponds to 'Data.Maybe.catMaybes'.
35−catNullTable :: Table Expr a => NullTable Expr a -> Query a
36−catNullTable a = do
37− where_ $ isNonNullTable a
38− pure $ unsafeUnnullifyTable a
src/Rel8/Query/Opaleye.hs+5−41
@@ -1,70 +1,34 @@
1−{-# language TupleSections #-}
2−
31module Rel8.Query.Opaleye
42 ( fromOpaleye
53 , toOpaleye
64 , mapOpaleye
75 , zipOpaleyeWith
8− , unsafePeekQuery
96 )
107where
118
129-- base
13−import Control.Applicative ( liftA2 )
1410import Prelude
1511
1612-- opaleye
17−import qualified Opaleye.Internal.QueryArr as Opaleye
18−import qualified Opaleye.Internal.Tag as Opaleye
13+import qualified Opaleye.Select as Opaleye
1914
2015-- rel8
2116import {-# SOURCE #-} Rel8.Query ( Query( Query ) )
2217
2318
2419fromOpaleye :: Opaleye.Select a -> Query a
25−fromOpaleye = Query . pure . fmap pure
20+fromOpaleye = Query
2621
2722
2823toOpaleye :: Query a -> Opaleye.Select a
29−toOpaleye (Query a) = snd <$> a mempty
24+toOpaleye (Query a) = a
3025
3126
3227mapOpaleye :: (Opaleye.Select a -> Opaleye.Select b) -> Query a -> Query b
33−mapOpaleye f (Query a) = Query (fmap (mapping f) a)
28+mapOpaleye f = fromOpaleye . f . toOpaleye
3429
3530
3631zipOpaleyeWith :: ()
3732 => (Opaleye.Select a -> Opaleye.Select b -> Opaleye.Select c)
3833 -> Query a -> Query b -> Query c
39−zipOpaleyeWith f (Query a) (Query b) = Query $ liftA2 (zipping f) a b
40−
41−
42−unsafePeekQuery :: Query a -> a
43−unsafePeekQuery (Query q) = case q mempty of
44− f -> case Opaleye.runStateQueryArr f () Opaleye.start of
45− ((_, a), _, _) -> a
46−
47−
48−mapping :: ()
49− => (Opaleye.Select a -> Opaleye.Select b)
50− -> Opaleye.Select (m, a) -> Opaleye.Select (m, b)
51−mapping f q = Opaleye.stateQueryArr $ \_ tag ->
52− let
53− ((m, _), _, _) = Opaleye.runStateQueryArr q () tag
54− q' = (m,) <$> f (snd <$> q)
55− in
56− Opaleye.runStateQueryArr q' () tag
57−
58−
59−zipping :: Semigroup m
60− => (Opaleye.Select a -> Opaleye.Select b -> Opaleye.Select c)
61− -> Opaleye.Select (m, a) -> Opaleye.Select (m, b) -> Opaleye.Select (m, c)
62−zipping f q q' =
63− Opaleye.stateQueryArr $ \_ tag ->
64− let
65− ((m, _), _, _) = Opaleye.runStateQueryArr q () tag
66− ((m', _), _, _) = Opaleye.runStateQueryArr q' () tag
67− m'' = m <> m'
68− q'' = (m'',) <$> f (snd <$> q) (snd <$> q')
69− in
70− Opaleye.runStateQueryArr q'' () tag
34+zipOpaleyeWith f a b = fromOpaleye $ f (toOpaleye a) (toOpaleye b)
src/Rel8/Query/Rebind.hsdeleted−27
@@ -1,27 +0,0 @@
1−{-# language FlexibleContexts #-}
2−
3−module Rel8.Query.Rebind
4− ( rebind
5− )
6−where
7−
8−-- base
9−import Prelude
10−import Control.Arrow ((<<<))
11−
12−-- opaleye
13−import qualified Opaleye.Internal.Rebind as Opaleye
14−
15−-- rel8
16−import Rel8.Expr ( Expr )
17−import Rel8.Query ( Query )
18−import Rel8.Table ( Table )
19−import Rel8.Table.Opaleye ( unpackspec )
20−import Rel8.Query.Opaleye (fromOpaleye)
21−
22−
23−-- | 'rebind' takes a variable name, some expressions, and binds each of them
24−-- to a new variable in the SQL. The @a@ returned consists only of these
25−-- variables. It's essentially a @let@ binding for Postgres expressions.
26−rebind :: Table Expr a => String -> a -> Query a
27−rebind prefix a = fromOpaleye (Opaleye.rebindExplicitPrefix prefix unpackspec <<< pure a)
src/Rel8/Query/SQL.hs+59−6
@@ -1,21 +1,74 @@
11{-# language FlexibleContexts #-}
2−{-# language MonoLocalBinds #-}
2+{-# language TypeFamilies #-}
3+{-# language ViewPatterns #-}
34
45module Rel8.Query.SQL
56 ( showQuery
7+ , sqlForQuery, sqlForQueryWithNames
68 )
79where
810
911-- base
12+import Data.Foldable ( fold )
13+import Data.Functor.Const ( Const( Const ), getConst )
14+import Data.Void ( Void )
1015import Prelude
1116
17+-- opaleye
18+import qualified Opaleye.Internal.HaskellDB.Sql as Opaleye
19+import qualified Opaleye.Internal.PrimQuery as Opaleye
20+import qualified Opaleye.Internal.Print as Opaleye
21+import qualified Opaleye.Internal.Optimize as Opaleye
22+import qualified Opaleye.Internal.QueryArr as Opaleye hiding ( Select )
23+import qualified Opaleye.Internal.Sql as Opaleye
24+
1225-- rel8
13−import Rel8.Expr ( Expr )
26+import Rel8.Expr ( Expr, Col(..) )
27+import Rel8.Expr.Opaleye ( toPrimExpr )
1428import Rel8.Query ( Query )
15−import Rel8.Statement.Select ( ppSelect )
16−import Rel8.Table ( Table )
29+import Rel8.Query.Opaleye ( toOpaleye )
30+import Rel8.Schema.Name ( Selects, Col(..) )
31+import Rel8.Schema.HTable ( htabulateA, hfield )
32+import Rel8.Table ( Table, toColumns )
33+import Rel8.Table.Name ( namesFromLabels )
34+import Rel8.Table.Opaleye ( castTable )
1735
1836
19−-- | Convert a 'Query' to a 'String' containing a @SELECT@ statement.
37+-- | Convert a query to a 'String' containing the query as a @SELECT@
38+-- statement.
2039showQuery :: Table Expr a => Query a -> String
21−showQuery = show . ppSelect
40+showQuery = fold . sqlForQuery
41+
42+
43+sqlForQuery :: Table Expr a
44+ => Query a -> Maybe String
45+sqlForQuery = sqlForQueryWithNames namesFromLabels . fmap toColumns
46+
47+
48+sqlForQueryWithNames :: Selects names exprs
49+ => names -> Query exprs -> Maybe String
50+sqlForQueryWithNames names query =
51+ show . Opaleye.ppSql . selectFrom names exprs <$> optimize primQuery
52+ where
53+ (exprs, primQuery, _) =
54+ Opaleye.runSimpleQueryArrStart (toOpaleye query) ()
55+
56+
57+optimize :: Opaleye.PrimQuery' a -> Maybe (Opaleye.PrimQuery' Void)
58+optimize = Opaleye.removeEmpty . Opaleye.optimize
59+
60+
61+selectFrom :: Selects names exprs
62+ => names -> exprs -> Opaleye.PrimQuery' Void -> Opaleye.Select
63+selectFrom (toColumns -> names) (toColumns . castTable -> exprs) query =
64+ Opaleye.SelectFrom $ Opaleye.newSelect
65+ { Opaleye.attrs = Opaleye.SelectAttrs attributes
66+ , Opaleye.tables = Opaleye.oneTable select
67+ }
68+ where
69+ select = Opaleye.foldPrimQuery Opaleye.sqlQueryGenerator query
70+ attributes = getConst $ htabulateA $ \field -> case hfield names field of
71+ NameCol name -> case hfield exprs field of
72+ DB (toPrimExpr -> expr) -> Const (pure (makeAttr name expr))
73+ makeAttr label expr =
74+ (Opaleye.sqlExpr expr, Just (Opaleye.SqlColumn label))
src/Rel8/Query/Set.hs+6−6
@@ -23,36 +23,36 @@ import Rel8.Table.Opaleye ( binaryspec )
2323
2424
2525-- | Combine the results of two queries of the same type, collapsing
26−-- duplicates. @union a b@ is the same as the SQL statement @a UNION b@.
26+-- duplicates. @union a b@ is the same as the SQL statement @x UNION b@.
2727union :: EqTable a => Query a -> Query a -> Query a
2828union = zipOpaleyeWith (Opaleye.unionExplicit binaryspec)
2929
3030
3131-- | Combine the results of two queries of the same type, retaining duplicates.
32−-- @unionAll a b@ is the same as the SQL statement @a UNION ALL b@.
32+-- @unionAll a b@ is the same as the SQL statement @x UNION ALL b@.
3333unionAll :: Table Expr a => Query a -> Query a -> Query a
3434unionAll = zipOpaleyeWith (Opaleye.unionAllExplicit binaryspec)
3535
3636
3737-- | Find the intersection of two queries, collapsing duplicates. @intersect a
38−-- b@ is the same as the SQL statement @a INTERSECT b@.
38+-- b@ is the same as the SQL statement @x INTERSECT b@.
3939intersect :: EqTable a => Query a -> Query a -> Query a
4040intersect = zipOpaleyeWith (Opaleye.intersectExplicit binaryspec)
4141
4242
4343-- | Find the intersection of two queries, retaining duplicates. @intersectAll
44−-- a b@ is the same as the SQL statement @a INTERSECT ALL b@.
44+-- a b@ is the same as the SQL statement @x INTERSECT ALL b@.
4545intersectAll :: EqTable a => Query a -> Query a -> Query a
4646intersectAll = zipOpaleyeWith (Opaleye.intersectAllExplicit binaryspec)
4747
4848
4949-- | Find the difference of two queries, collapsing duplicates @except a b@ is
50−-- the same as the SQL statement @a EXCEPT b@.
50+-- the same as the SQL statement @x INTERSECT b@.
5151except :: EqTable a => Query a -> Query a -> Query a
5252except = zipOpaleyeWith (Opaleye.exceptExplicit binaryspec)
5353
5454
5555-- | Find the difference of two queries, retaining duplicates. @exceptAll a b@
56−-- is the same as the SQL statement @a EXCEPT ALL b@.
56+-- is the same as the SQL statement @x EXCEPT ALL b@.
5757exceptAll :: EqTable a => Query a -> Query a -> Query a
5858exceptAll = zipOpaleyeWith (Opaleye.exceptAllExplicit binaryspec)
src/Rel8/Query/These.hs+45−52
@@ -1,5 +1,4 @@
11{-# language FlexibleContexts #-}
2−{-# language GADTs #-}
32
43module Rel8.Query.These
54 ( alignBy
@@ -8,6 +7,7 @@ module Rel8.Query.These
87 , keepThisTable, loseThisTable
98 , keepThatTable, loseThatTable
109 , keepThoseTable, loseThoseTable
10+ , bindTheseTable
1111 , bitraverseTheseTable
1212 )
1313where
@@ -15,29 +15,27 @@ where
1515-- base
1616import Prelude
1717
18−-- comonad
19−import Control.Comonad ( extract )
20−
2118-- opaleye
22−import qualified Opaleye.Internal.PackMap as Opaleye
19+import qualified Opaleye.Internal.Join as Opaleye
2320import qualified Opaleye.Internal.PrimQuery as Opaleye
24−import qualified Opaleye.Internal.QueryArr as Opaleye
25−import qualified Opaleye.Internal.Tag as Opaleye
2621
2722-- rel8
2823import Rel8.Expr ( Expr )
2924import Rel8.Expr.Bool ( boolExpr, not_ )
3025import Rel8.Expr.Eq ( (==.) )
31−import Rel8.Expr.Opaleye ( toPrimExpr, traversePrimExpr )
26+import Rel8.Expr.Opaleye ( toColumn, toPrimExpr )
3227import Rel8.Expr.Serialize ( litExpr )
3328import Rel8.Query ( Query )
3429import Rel8.Query.Filter ( where_ )
3530import Rel8.Query.Maybe ( optional )
3631import Rel8.Query.Opaleye ( zipOpaleyeWith )
32+import Rel8.Table ( Table )
3733import Rel8.Table.Either ( EitherTable( EitherTable ) )
3834import Rel8.Table.Maybe ( MaybeTable( MaybeTable ), isJustTable )
35+import Rel8.Table.Opaleye ( unpackspec )
36+import Rel8.Table.Tag ( Tag(..) )
3937import Rel8.Table.These
40− ( TheseTable( TheseTable, here, there )
38+ ( TheseTable( TheseTable )
4139 , hasHereTable, hasThereTable
4240 , isThisTable, isThatTable, isThoseTable
4341 )
@@ -45,91 +43,86 @@ import Rel8.Type.Tag ( EitherTag( IsLeft, IsRight ) )
4543
4644
4745-- | Corresponds to a @FULL OUTER JOIN@ between two queries.
48−alignBy :: ()
46+alignBy :: (Table Expr a, Table Expr b)
4947 => (a -> b -> Expr Bool)
50− -> Query a -> Query b -> Query (TheseTable Expr a b)
51−alignBy condition = zipOpaleyeWith $ \left right -> Opaleye.stateQueryArr $ \_ t -> case t of
52− tag -> (tab, join', tag''')
53− where
54− (ma, left', tag') = Opaleye.runStateQueryArr (pure <$> left) () tag
55− (mb, right', tag'') = Opaleye.runStateQueryArr (pure <$> right) () tag'
56− MaybeTable hasHere a = ma
57− MaybeTable hasThere b = mb
58− (hasHere', lbindings) = Opaleye.run $ do
59− traversePrimExpr (Opaleye.extractAttr "hasHere" tag'') hasHere
60− (hasThere', rbindings) = Opaleye.run $ do
61− traversePrimExpr (Opaleye.extractAttr "hasThere" tag'') hasThere
62− tag''' = Opaleye.next tag''
63− join = Opaleye.Join Opaleye.FullJoin on left'' right''
64− where
65− on = toPrimExpr $ condition (extract a) (extract b)
66− left'' = (Opaleye.NonLateral, Opaleye.toPrimQuery (left' <> Opaleye.aRebind lbindings))
67− right'' = (Opaleye.NonLateral, Opaleye.toPrimQuery (right' <> Opaleye.aRebind rbindings))
68− ma' = MaybeTable hasHere' a
69− mb' = MaybeTable hasThere' b
70− tab = TheseTable {here = ma', there = mb'}
71− join' = Opaleye.aProduct join
72−
73−
74−keepHereTable :: TheseTable Expr a b -> Query (a, MaybeTable Expr b)
48+ -> Query a -> Query b -> Query (TheseTable a b)
49+alignBy condition as bs =
50+ uncurry TheseTable <$> zipOpaleyeWith fullOuterJoin as bs
51+ where
52+ fullOuterJoin a b =
53+ Opaleye.joinExplicit unpackspec unpackspec pure pure full a b on
54+ where
55+ full = Opaleye.FullJoin
56+ on = toColumn . toPrimExpr . uncurry condition
57+
58+
59+keepHereTable :: TheseTable a b -> Query (a, MaybeTable b)
7560keepHereTable = loseThatTable
7661
7762
78−loseHereTable :: TheseTable Expr a b -> Query b
63+loseHereTable :: TheseTable a b -> Query b
7964loseHereTable = keepThatTable
8065
8166
82−keepThereTable :: TheseTable Expr a b -> Query (MaybeTable Expr a, b)
67+keepThereTable :: TheseTable a b -> Query (MaybeTable a, b)
8368keepThereTable = loseThisTable
8469
8570
86−loseThereTable :: TheseTable Expr a b -> Query a
71+loseThereTable :: TheseTable a b -> Query a
8772loseThereTable = keepThisTable
8873
8974
90−keepThisTable :: TheseTable Expr a b -> Query a
75+keepThisTable :: TheseTable a b -> Query a
9176keepThisTable t@(TheseTable (MaybeTable _ a) _) = do
9277 where_ $ isThisTable t
93− pure (extract a)
78+ pure a
9479
9580
96−loseThisTable :: TheseTable Expr a b -> Query (MaybeTable Expr a, b)
81+loseThisTable :: TheseTable a b -> Query (MaybeTable a, b)
9782loseThisTable t@(TheseTable ma (MaybeTable _ b)) = do
9883 where_ $ not_ $ isThisTable t
99− pure (ma, extract b)
84+ pure (ma, b)
10085
10186
102−keepThatTable :: TheseTable Expr a b -> Query b
87+keepThatTable :: TheseTable a b -> Query b
10388keepThatTable t@(TheseTable _ (MaybeTable _ b)) = do
10489 where_ $ isThatTable t
105− pure (extract b)
90+ pure b
10691
10792
108−loseThatTable :: TheseTable Expr a b -> Query (a, MaybeTable Expr b)
93+loseThatTable :: TheseTable a b -> Query (a, MaybeTable b)
10994loseThatTable t@(TheseTable (MaybeTable _ a) mb) = do
11095 where_ $ not_ $ isThatTable t
111− pure (extract a, mb)
96+ pure (a, mb)
11297
11398
114−keepThoseTable :: TheseTable Expr a b -> Query (a, b)
99+keepThoseTable :: TheseTable a b -> Query (a, b)
115100keepThoseTable t@(TheseTable (MaybeTable _ a) (MaybeTable _ b)) = do
116101 where_ $ isThoseTable t
117− pure (extract a, extract b)
102+ pure (a, b)
118103
119104
120−loseThoseTable :: TheseTable Expr a b -> Query (EitherTable Expr a b)
105+loseThoseTable :: TheseTable a b -> Query (EitherTable a b)
121106loseThoseTable t@(TheseTable (MaybeTable _ a) (MaybeTable _ b)) = do
122107 where_ $ not_ $ isThoseTable t
123− pure $ EitherTable tag a b
108+ pure $ EitherTable result a b
124109 where
125110 tag = boolExpr (litExpr IsLeft) (litExpr IsRight) (isThatTable t)
111+ result = (mempty `asTypeOf` result) {expr = tag}
112+
113+
114+bindTheseTable :: (Table Expr a, Semigroup a, Monad m)
115+ => (i -> m (TheseTable a b)) -> TheseTable a i -> m (TheseTable a b)
116+bindTheseTable query (TheseTable here (MaybeTable input i)) = do
117+ TheseTable here' (MaybeTable output b) <- query i
118+ pure $ TheseTable (here <> here') (MaybeTable (input <> output) b)
126119
127120
128121bitraverseTheseTable :: ()
129122 => (a -> Query c)
130123 -> (b -> Query d)
131− -> TheseTable Expr a b
132− -> Query (TheseTable Expr c d)
124+ -> TheseTable a b
125+ -> Query (TheseTable c d)
133126bitraverseTheseTable f g t = do
134127 mc <- optional (f . fst =<< keepHereTable t)
135128 md <- optional (g . snd =<< keepThereTable t)
src/Rel8/Query/Window.hsdeleted−26
@@ -1,26 +0,0 @@
1−module Rel8.Query.Window
2− ( window
3− )
4−where
5−
6−-- base
7−import Prelude ()
8−
9−-- opaleye
10−import qualified Opaleye.Window as Opaleye
11−
12−-- rel8
13−import Rel8.Query ( Query )
14−import Rel8.Query.Opaleye ( mapOpaleye )
15−import Rel8.Window ( Window( Window ) )
16−
17−
18−-- | 'window' runs a query composed of expressions containing
19−-- [window functions](https://www.postgresql.org/docs/current/tutorial-window.html).
20−-- 'window' is similar to 'Rel8.aggregate', with the main difference being
21−-- that in a window query, each input row corresponds to one output row,
22−-- whereas aggregation queries fold the entire input query down into a single
23−-- row. To put this into a Haskell context, 'Rel8.aggregate' is to 'foldl' as
24−-- 'window' is to 'scanl'.
25−window :: Window a b -> Query a -> Query b
26−window (Window a) = mapOpaleye (Opaleye.runWindows a)
src/Rel8/Schema/Context.hsnew file+20
@@ -0,0 +1,20 @@
1+{-# language DataKinds #-}
2+{-# language StandaloneKindSignatures #-}
3+{-# language TypeFamilies #-}
4+
5+module Rel8.Schema.Context
6+ ( Interpretation( Col )
7+ )
8+where
9+
10+-- base
11+import Data.Kind ( Constraint )
12+import Prelude ()
13+
14+-- rel8
15+import Rel8.Schema.Kind ( Context, HContext )
16+
17+
18+type Interpretation :: Context -> Constraint
19+class Interpretation context where
20+ data Col context :: HContext
src/Rel8/Schema/Context/Label.hsnew file+60
@@ -0,0 +1,60 @@
1+{-# language DataKinds #-}
2+{-# language FlexibleInstances #-}
3+{-# language StandaloneKindSignatures #-}
4+{-# language TypeFamilies #-}
5+{-# language TypeOperators #-}
6+
7+module Rel8.Schema.Context.Label
8+ ( Labelable( labeler, unlabeler )
9+ , HLabelable( hlabeler, hunlabeler )
10+ )
11+where
12+
13+-- base
14+import Data.Kind ( Constraint )
15+import Prelude hiding ( null )
16+
17+-- rel8
18+import Rel8.Schema.Context ( Interpretation )
19+import Rel8.Schema.Dict ( Dict( Dict ) )
20+import Rel8.Schema.Kind ( Context, HContext )
21+import Rel8.Schema.Spec ( Spec( Spec ) )
22+import Rel8.Schema.Result ( Col( Result ), Result )
23+import Rel8.Schema.Spec.ConstrainDBType ( ConstrainDBType )
24+
25+
26+type Labelable :: Context -> Constraint
27+class Interpretation context => Labelable context where
28+ labeler :: ()
29+ => Col context ('Spec labels necessity a)
30+ -> Col context ('Spec (label ': labels) necessity a)
31+
32+ unlabeler :: ()
33+ => Col context ('Spec (label ': labels) necessity a)
34+ -> Col context ('Spec labels necessity a)
35+
36+
37+instance Labelable Result where
38+ labeler (Result a) = Result a
39+ unlabeler (Result a) = Result a
40+
41+
42+type HLabelable :: HContext -> Constraint
43+class HLabelable context where
44+ hlabeler :: ()
45+ => context ('Spec labels necessity a)
46+ -> context ('Spec (label ': labels) necessity a)
47+
48+ hunlabeler :: ()
49+ => context ('Spec (label ': labels) necessity a)
50+ -> context ('Spec labels necessity a)
51+
52+
53+instance Labelable context => HLabelable (Col context) where
54+ hlabeler = labeler
55+ hunlabeler = unlabeler
56+
57+
58+instance HLabelable (Dict (ConstrainDBType constraint)) where
59+ hlabeler Dict = Dict
60+ hunlabeler Dict = Dict
src/Rel8/Schema/Context/Nullify.hs+149−105
@@ -1,144 +1,188 @@
11{-# language DataKinds #-}
2−{-# language EmptyCase #-}
32{-# language FlexibleContexts #-}
4−{-# language GADTs #-}
5−{-# language LambdaCase #-}
3+{-# language FlexibleInstances #-}
4+{-# language InstanceSigs #-}
5+{-# language MultiParamTypeClasses #-}
66{-# language NamedFieldPuns #-}
7+{-# language ScopedTypeVariables #-}
78{-# language StandaloneKindSignatures #-}
9+{-# language TypeFamilies #-}
810
911module Rel8.Schema.Context.Nullify
10− ( Nullifiability(..), NonNullifiability(..), nullifiableOrNot, absurd
11− , Nullifiable, nullifiability
12− , guarder, nullifier, unnullifier
13− , sguard, snullify
12+ ( Nullifiable( ConstrainTag, encodeTag, decodeTag, nullifier, unnullifier )
13+ , HNullifiable( HConstrainTag, hencodeTag, hdecodeTag, hnullifier, hunnullifier )
14+ , runTag, unnull
1415 )
1516where
1617
1718-- base
18−import Data.Bool ( bool )
19−import Data.Functor.Identity ( Identity( Identity ) )
2019import Data.Kind ( Constraint, Type )
20+import GHC.TypeLits ( KnownSymbol )
2121import Prelude hiding ( null )
2222
2323-- opaleye
2424import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
2525
2626-- rel8
27−import Rel8.Aggregate ( Aggregate(..), zipOutputs )
28−import Rel8.Expr ( Expr )
27+import Rel8.Aggregate
28+ ( Aggregate, Col(..)
29+ , mapInputs
30+ , unsafeMakeAggregate
31+ )
32+import Rel8.Expr ( Expr, Col(..) )
2933import Rel8.Expr.Bool ( boolExpr )
3034import Rel8.Expr.Null ( nullify, unsafeUnnullify )
31−import Rel8.Expr.Opaleye ( fromPrimExpr )
32−import Rel8.Kind.Context ( SContext(..) )
33−import Rel8.Schema.Field ( Field )
35+import Rel8.Expr.Opaleye ( fromPrimExpr, toPrimExpr )
36+import Rel8.Kind.Necessity ( Necessity( Required ) )
37+import Rel8.Schema.Context ( Interpretation )
3438import qualified Rel8.Schema.Kind as K
35−import Rel8.Schema.Name ( Name( Name ) )
36−import Rel8.Schema.Null ( Nullify, Nullity( Null, NotNull ) )
37−import Rel8.Schema.Result ( Result )
38−import Rel8.Schema.Spec ( Spec(..) )
39−
40−
41−type Nullifiability :: K.Context -> Type
42−data Nullifiability context where
43− NAggregate :: Nullifiability Aggregate
44− NExpr :: Nullifiability Expr
45− NName :: Nullifiability Name
39+import Rel8.Schema.Name ( Name( Name ), Col(..) )
40+import Rel8.Schema.Null ( Nullify, Nullity( Null, NotNull ), Sql )
41+import Rel8.Schema.Dict ( Dict( Dict ) )
42+import Rel8.Schema.Spec ( Spec( Spec ), SSpec(..) )
43+import Rel8.Schema.Spec.ConstrainDBType ( ConstrainDBType )
44+import qualified Rel8.Schema.Spec.ConstrainDBType as ConstrainDBType
45+import Rel8.Table.Tag ( Tag(..), Taggable, fromAggregate, fromExpr, fromName )
4646
4747
4848type Nullifiable :: K.Context -> Constraint
49−class Nullifiable context where
50− nullifiability :: Nullifiability context
49+class Interpretation context => Nullifiable context where
50+ type ConstrainTag context :: Type -> Constraint
51+ type ConstrainTag _context = DefaultConstrainTag
52+
53+ encodeTag ::
54+ ( Sql (ConstrainTag context) a
55+ , KnownSymbol label
56+ , Taggable a
57+ )
58+ => Tag label a
59+ -> Col context ('Spec labels 'Required a)
60+
61+ decodeTag ::
62+ ( Sql (ConstrainTag context) a
63+ , KnownSymbol label
64+ , Taggable a
65+ )
66+ => Col context ('Spec labels 'Required a)
67+ -> Tag label a
68+
69+ nullifier :: ()
70+ => Tag label a
71+ -> (Expr a -> Expr Bool)
72+ -> SSpec ('Spec labels necessity x)
73+ -> Col context ('Spec labels necessity x)
74+ -> Col context ('Spec labels necessity (Nullify x))
75+
76+ unnullifier :: ()
77+ => SSpec ('Spec labels necessity x)
78+ -> Col context ('Spec labels necessity (Nullify x))
79+ -> Col context ('Spec labels necessity x)
5180
5281
5382instance Nullifiable Aggregate where
54− nullifiability = NAggregate
83+ encodeTag Tag {aggregator, expr} =
84+ Aggregation $ unsafeMakeAggregate toPrimExpr fromPrimExpr aggregator expr
85+
86+ decodeTag (Aggregation aggregate) = fromAggregate aggregate
87+
88+ nullifier Tag {expr} test SSpec {nullity} (Aggregation aggregate) =
89+ Aggregation $
90+ mapInputs (toPrimExpr . runTag nullity condition . fromPrimExpr) $
91+ runTag nullity condition <$> aggregate
92+ where
93+ condition = test expr
94+
95+ unnullifier SSpec {nullity} (Aggregation aggregate) =
96+ Aggregation $ unnull nullity <$> aggregate
97+
98+ {-# INLINABLE encodeTag #-}
99+ {-# INLINABLE decodeTag #-}
100+ {-# INLINABLE nullifier #-}
101+ {-# INLINABLE unnullifier #-}
55102
56103
57104instance Nullifiable Expr where
58− nullifiability = NExpr
105+ encodeTag Tag {expr} = DB expr
106+ decodeTag (DB a) = fromExpr a
107+ nullifier Tag {expr} test SSpec {nullity} (DB a) =
108+ DB $ runTag nullity (test expr) a
109+ unnullifier SSpec {nullity} (DB a) = DB $ unnull nullity a
110+
111+ {-# INLINABLE encodeTag #-}
112+ {-# INLINABLE decodeTag #-}
113+ {-# INLINABLE nullifier #-}
114+ {-# INLINABLE unnullifier #-}
59115
60116
61117instance Nullifiable Name where
62− nullifiability = NName
63−
64−
65−type NonNullifiability :: K.Context -> Type
66−data NonNullifiability context where
67− NField :: NonNullifiability (Field table)
68− NResult :: NonNullifiability Result
69−
70−
71−nullifiableOrNot :: ()
72− => SContext context
73− -> Either (NonNullifiability context) (Nullifiability context)
74−nullifiableOrNot = \case
75− SAggregate -> Right NAggregate
76− SExpr -> Right NExpr
77− SField -> Left NField
78− SName -> Right NName
79− SResult -> Left NResult
80−
81−
82−absurd :: Nullifiability context -> NonNullifiability context -> a
83−absurd = \case
84− NAggregate -> \case
85− NExpr -> \case
86− NName -> \case
87−
88−
89−guarder :: ()
90− => SContext context
91− -> context tag
92− -> (tag -> Bool)
93− -> (Expr tag -> Expr Bool)
94− -> context (Maybe a)
95− -> context (Maybe a)
96−guarder = \case
97− SAggregate -> \tag _ isNonNull -> zipOutputs (sguard . isNonNull) tag
98− SExpr -> \tag _ isNonNull -> sguard (isNonNull tag)
99− SField -> \_ _ _ -> id
100− SName -> \_ _ _ -> id
101− SResult -> \(Identity tag) isNonNull _ (Identity a) ->
102− Identity (bool Nothing a (isNonNull tag))
103−
104−
105−nullifier :: ()
106− => Nullifiability context
107− -> Spec a
108− -> context a
109− -> context (Nullify a)
110−nullifier = \case
111− NAggregate -> \Spec {nullity} (Aggregate a) ->
112− Aggregate $ snullify nullity <$> a
113− NExpr -> \Spec {nullity} a -> snullify nullity a
114− NName -> \_ (Name a) -> Name a
115−
116−
117−unnullifier :: ()
118− => Nullifiability context
119− -> Spec a
120− -> context (Nullify a)
121− -> context a
122−unnullifier = \case
123− NAggregate -> \Spec {nullity} (Aggregate a) ->
124− Aggregate $ sunnullify nullity <$> a
125− NExpr -> \Spec {nullity} a -> sunnullify nullity a
126− NName -> \_ (Name a) -> Name a
127−
128−
129−sguard :: Expr Bool -> Expr (Maybe a) -> Expr (Maybe a)
130−sguard condition a = boolExpr null a condition
118+ encodeTag Tag {name = Name name} = NameCol name
119+ decodeTag (NameCol name) = fromName (Name name)
120+ nullifier _ _ _ (NameCol name) = NameCol name
121+ unnullifier _ (NameCol name) = NameCol name
122+
123+ {-# INLINABLE encodeTag #-}
124+ {-# INLINABLE decodeTag #-}
125+ {-# INLINABLE nullifier #-}
126+ {-# INLINABLE unnullifier #-}
127+
128+
129+runTag :: Nullity a -> Expr Bool -> Expr a -> Expr (Nullify a)
130+runTag nullity tag a = case nullity of
131+ Null -> boolExpr null a tag
132+ NotNull -> boolExpr null (nullify a) tag
131133 where
132134 null = fromPrimExpr $ Opaleye.ConstExpr Opaleye.NullLit
133135
134136
135−snullify :: Nullity a -> Expr a -> Expr (Nullify a)
136−snullify nullity a = case nullity of
137+unnull :: Nullity a -> Expr (Nullify a) -> Expr a
138+unnull nullity a = case nullity of
137139 Null -> a
138− NotNull -> nullify a
140+ NotNull -> unsafeUnnullify a
139141
140142
141−sunnullify :: Nullity a -> Expr (Nullify a) -> Expr a
142−sunnullify nullity a = case nullity of
143− Null -> a
144− NotNull -> unsafeUnnullify a
143+type HNullifiable :: K.HContext -> Constraint
144+class HNullifiable context where
145+ type HConstrainTag context :: Type -> Constraint
146+ type HConstrainTag _context = DefaultConstrainTag
147+
148+ hencodeTag :: (Sql (HConstrainTag context) a, KnownSymbol label, Taggable a)
149+ => Tag label a
150+ -> context ('Spec labels 'Required a)
151+
152+ hdecodeTag :: (Sql (HConstrainTag context) a, KnownSymbol label, Taggable a)
153+ => context ('Spec labels 'Required a)
154+ -> Tag label a
155+
156+ hnullifier :: ()
157+ => Tag label a
158+ -> (Expr a -> Expr Bool)
159+ -> SSpec ('Spec labels necessity x)
160+ -> context ('Spec labels necessity x)
161+ -> context ('Spec labels necessity (Nullify x))
162+
163+ hunnullifier :: ()
164+ => SSpec ('Spec labels necessity x)
165+ -> context ('Spec labels necessity (Nullify x))
166+ -> context ('Spec labels necessity x)
167+
168+
169+instance Nullifiable context => HNullifiable (Col context) where
170+ type HConstrainTag (Col context) = ConstrainTag context
171+ hencodeTag = encodeTag
172+ hdecodeTag = decodeTag
173+ hnullifier = nullifier
174+ hunnullifier = unnullifier
175+
176+
177+instance HNullifiable (Dict (ConstrainDBType constraint)) where
178+ type HConstrainTag (Dict (ConstrainDBType constraint)) = constraint
179+
180+ hencodeTag _ = Dict
181+ hdecodeTag = mempty
182+ hnullifier _ _ = ConstrainDBType.nullifier
183+ hunnullifier = ConstrainDBType.unnullifier
184+
185+
186+type DefaultConstrainTag :: Type -> Constraint
187+class DefaultConstrainTag a
188+instance DefaultConstrainTag a
src/Rel8/Schema/Field.hsdeleted−50
@@ -1,50 +0,0 @@
1−{-# language DataKinds #-}
2−{-# language FlexibleContexts #-}
3−{-# language MultiParamTypeClasses #-}
4−{-# language StandaloneKindSignatures #-}
5−{-# language TypeFamilies #-}
6−
7−module Rel8.Schema.Field
8− ( Field(..)
9− , fields
10− )
11−where
12−
13−-- base
14−import Data.Functor.Identity ( Identity( Identity ) )
15−import Data.Kind ( Type )
16−import Prelude
17−
18−-- rel8
19−import Rel8.Schema.HTable ( HField, htabulate )
20−import Rel8.Schema.HTable.Identity ( HIdentity( HIdentity ) )
21−import Rel8.Schema.Kind as K
22−import Rel8.Schema.Null ( Sql )
23−import Rel8.Table
24− ( Table, Columns, Context, fromColumns, toColumns
25− , FromExprs, fromResult, toResult
26− , Transpose
27− )
28−import Rel8.Table.Transpose ( Transposes )
29−import Rel8.Type ( DBType )
30−
31−
32−-- | A special context used in the construction of 'Rel8.Projection's.
33−type Field :: Type -> K.Context
34−newtype Field table a = Field (HField (Columns table) a)
35−
36−
37−instance Sql DBType a => Table (Field table) (Field table a) where
38− type Columns (Field table a) = HIdentity a
39− type Context (Field table a) = Field table
40− type FromExprs (Field table a) = a
41− type Transpose to (Field table a) = to a
42−
43− toColumns = HIdentity
44− fromColumns (HIdentity a) = a
45− toResult a = HIdentity (Identity a)
46− fromResult (HIdentity (Identity a)) = a
47−
48−
49−fields :: Transposes context (Field table) table fields => fields
50−fields = fromColumns $ htabulate Field
src/Rel8/Schema/HTable.hs+24−51
@@ -16,12 +16,11 @@
1616module Rel8.Schema.HTable
1717 ( HTable (HField, HConstrainTable)
1818 , hfield, htabulate, htraverse, hdicts, hspecs
19− , hfoldMap, hmap, htabulateA, htraverseP, htraversePWithField
19+ , hmap, htabulateA
2020 )
2121where
2222
2323-- base
24−import Data.Functor.Const ( Const( Const ), getConst )
2524import Data.Kind ( Constraint, Type )
2625import Data.Functor.Compose ( Compose( Compose ), getCompose )
2726import Data.Proxy ( Proxy )
@@ -33,21 +32,16 @@ import GHC.Generics
3332 )
3433import Prelude
3534
36−-- profunctors
37−import Data.Profunctor ( rmap, Profunctor (lmap) )
38−
39−-- product-profunctors
40−import Data.Profunctor.Product ( ProductProfunctor ((****)) )
41−
4235-- rel8
4336import Rel8.Schema.Dict ( Dict )
44−import Rel8.Schema.Spec ( Spec )
37+import Rel8.Schema.Spec ( Spec, SSpec )
4538import Rel8.Schema.HTable.Product ( HProduct( HProduct ) )
4639import qualified Rel8.Schema.Kind as K
4740
4841-- semigroupoids
4942import Data.Functor.Apply ( Apply, (<.>) )
5043
44+
5145-- | A @HTable@ is a functor-indexed/higher-kinded data type that is
5246-- representable ('htabulate'/'hfield'), constrainable ('hdicts'), and
5347-- specified ('hspecs').
@@ -56,14 +50,14 @@ import Data.Functor.Apply ( Apply, (<.>) )
5650-- instances yourself or specify this constraint.
5751type HTable :: K.HTable -> Constraint
5852class HTable t where
59− type HField t = (field :: Type -> Type) | field -> t
60− type HConstrainTable t (c :: Type -> Constraint) :: Constraint
53+ type HField t = (field :: Spec -> Type) | field -> t
54+ type HConstrainTable t (c :: Spec -> Constraint) :: Constraint
6155
62− hfield :: t context -> HField t a -> context a
63− htabulate :: (forall a. HField t a -> context a) -> t context
64− htraverse :: Apply m => (forall a. f a -> m (g a)) -> t f -> m (t g)
56+ hfield :: t context -> HField t spec -> context spec
57+ htabulate :: (forall spec. HField t spec -> context spec) -> t context
58+ htraverse :: Apply m => (forall spec. f spec -> m (g spec)) -> t f -> m (t g)
6559 hdicts :: HConstrainTable t c => t (Dict c)
66− hspecs :: t Spec
60+ hspecs :: t SSpec
6761
6862 type HField t = GHField t
6963 type HConstrainTable t c = HConstrainTable (GHColumns (Rep (t Proxy))) c
@@ -74,7 +68,7 @@ class HTable t where
7468 , HField (GHColumns (Rep (t Proxy))) ~ HField (GHColumns (Rep (t context)))
7569 , GHTable context (Rep (t context))
7670 )
77− => t context -> HField t a -> context a
71+ => t context -> HField t spec -> context spec
7872 hfield table (GHField field) = hfield (toGHColumns (from table)) field
7973
8074 default htabulate ::
@@ -83,7 +77,7 @@ class HTable t where
8377 , HField (GHColumns (Rep (t Proxy))) ~ HField (GHColumns (Rep (t context)))
8478 , GHTable context (Rep (t context))
8579 )
86− => (forall a. HField t a -> context a) -> t context
80+ => (forall spec. HField t spec -> context spec) -> t context
8781 htabulate f = to $ fromGHColumns $ htabulate (f . GHField)
8882
8983 default htraverse
@@ -93,7 +87,7 @@ class HTable t where
9387 , Generic (t g), GHTable g (Rep (t g))
9488 , GHColumns (Rep (t f)) ~ GHColumns (Rep (t g))
9589 )
96− => (forall a. f a -> m (g a)) -> t f -> m (t g)
90+ => (forall spec. f spec -> m (g spec)) -> t f -> m (t g)
9791 htraverse f = fmap (to . fromGHColumns) . htraverse f . toGHColumns . from
9892
9993 default hdicts
@@ -107,10 +101,10 @@ class HTable t where
107101 hdicts = to $ fromGHColumns (hdicts @(GHColumns (Rep (t Proxy))) @c)
108102
109103 default hspecs ::
110− ( Generic (t Spec)
111− , GHTable Spec (Rep (t Spec))
104+ ( Generic (t SSpec)
105+ , GHTable SSpec (Rep (t SSpec))
112106 )
113− => t Spec
107+ => t SSpec
114108 hspecs = to $ fromGHColumns hspecs
115109
116110 {-# INLINABLE hfield #-}
@@ -120,43 +114,22 @@ class HTable t where
120114 {-# INLINABLE hspecs #-}
121115
122116
123−hfoldMap :: (HTable t, Semigroup s)
124− => (forall a. context a -> s) -> t context -> s
125−hfoldMap f a = getConst $ htraverse (Const . f) a
126−
127−
128117hmap :: HTable t
129− => (forall a. context a -> context' a) -> t context -> t context'
118+ => (forall spec. context spec -> context' spec) -> t context -> t context'
130119hmap f a = htabulate $ \field -> f (hfield a field)
131120
132121
133122htabulateA :: (HTable t, Apply m)
134− => (forall a. HField t a -> m (context a)) -> m (t context)
123+ => (forall spec. HField t spec -> m (context spec)) -> m (t context)
135124htabulateA f = htraverse getCompose $ htabulate $ Compose . f
136125{-# INLINABLE htabulateA #-}
137126
138−newtype ApplyP p a b = ApplyP { unApplyP :: p a b }
139−
140−instance Profunctor p => Functor (ApplyP p a) where
141− fmap f = ApplyP . rmap f . unApplyP
142−
143−instance ProductProfunctor p => Apply (ApplyP p a) where
144− ApplyP f <.> ApplyP x = ApplyP (rmap id f **** x)
145−
146−htraverseP :: (HTable t, ProductProfunctor p)
147− => (forall a. p (f a) (g a)) -> p (t f) (t g)
148−htraverseP f = htraversePWithField (const f)
149−
150−htraversePWithField :: (HTable t, ProductProfunctor p)
151− => (forall a. HField t a -> p (f a) (g a)) -> p (t f) (t g)
152−htraversePWithField f = unApplyP $ htabulateA $ \field -> ApplyP $
153− lmap (flip hfield field) (f field)
154127
155−type GHField :: K.HTable -> Type -> Type
156−newtype GHField t a = GHField (HField (GHColumns (Rep (t Proxy))) a)
128+type GHField :: K.HTable -> Spec -> Type
129+newtype GHField t spec = GHField (HField (GHColumns (Rep (t Proxy))) spec)
157130
158131
159−type GHTable :: K.Context -> (Type -> Type) -> Constraint
132+type GHTable :: K.HContext -> (Type -> Type) -> Constraint
160133class HTable (GHColumns rep) => GHTable context rep | rep -> context where
161134 type GHColumns rep :: K.HTable
162135 toGHColumns :: rep x -> GHColumns rep context
@@ -182,10 +155,10 @@ instance (GHTable context a, GHTable context b) => GHTable context (a :*: b) whe
182155
183156
184157-- | A HField type for indexing into HProduct.
185−type HProductField :: K.HTable -> K.HTable -> Type -> Type
186−data HProductField x y a
187− = HFst (HField x a)
188− | HSnd (HField y a)
158+type HProductField :: K.HTable -> K.HTable -> Spec -> Type
159+data HProductField x y spec
160+ = HFst (HField x spec)
161+ | HSnd (HField y spec)
189162
190163
191164instance (HTable x, HTable y) => HTable (HProduct x y) where
src/Rel8/Schema/HTable/Either.hs+4−2
@@ -14,17 +14,19 @@ import GHC.Generics ( Generic )
1414import Prelude ()
1515
1616-- rel8
17+import Rel8.Kind.Necessity ( Necessity( Required ) )
1718import Rel8.Schema.HTable ( HTable )
18−import Rel8.Schema.HTable.Identity ( HIdentity )
19+import Rel8.Schema.HTable.Identity ( HIdentity(..) )
1920import Rel8.Schema.HTable.Label ( HLabel )
2021import Rel8.Schema.HTable.Nullify ( HNullify )
2122import qualified Rel8.Schema.Kind as K
23+import Rel8.Schema.Spec ( Spec( Spec ) )
2224import Rel8.Type.Tag ( EitherTag )
2325
2426
2527type HEitherTable :: K.HTable -> K.HTable -> K.HTable
2628data HEitherTable left right context = HEitherTable
27− { htag :: HLabel "isRight" (HIdentity EitherTag) context
29+ { htag :: HIdentity ('Spec '["isRight"] 'Required EitherTag) context
2830 , hleft :: HLabel "Left" (HNullify left) context
2931 , hright :: HLabel "Right" (HNullify right) context
3032 }
src/Rel8/Schema/HTable/Identity.hs+29−16
@@ -1,43 +1,56 @@
11{-# language DataKinds #-}
2−{-# language FlexibleContexts #-}
2+{-# language GADTs #-}
3+{-# language PatternSynonyms #-}
34{-# language StandaloneKindSignatures #-}
45{-# language TypeFamilies #-}
5−{-# language UndecidableInstances #-}
66
77module Rel8.Schema.HTable.Identity
8− ( HIdentity( HIdentity, unHIdentity )
8+ ( HIdentity( HIdentity, HType, unHIdentity )
9+ , HType
910 )
1011where
1112
1213-- base
1314import Data.Kind ( Type )
14−import Data.Type.Equality ( (:~:)( Refl ) )
1515import Prelude
1616
1717-- rel8
18+import Rel8.Kind.Necessity ( Necessity( Required ) )
1819import Rel8.Schema.Dict ( Dict( Dict ) )
1920import Rel8.Schema.HTable
2021 ( HTable, HConstrainTable, HField
2122 , hfield, htabulate, htraverse, hdicts, hspecs
2223 )
2324import qualified Rel8.Schema.Kind as K
24−import Rel8.Schema.Null ( Sql )
25−import Rel8.Schema.Spec ( specification )
26−import Rel8.Type ( DBType )
25+import Rel8.Schema.Spec ( Spec( Spec ), KnownSpec, specSing )
2726
2827
29−type HIdentity :: Type -> K.HTable
30−newtype HIdentity a context = HIdentity
31− { unHIdentity :: context a
28+type HType :: Type -> K.HTable
29+type HType a = HIdentity ('Spec '[] 'Required a)
30+
31+
32+pattern HType :: context ('Spec '[] 'Required a) -> HType a context
33+pattern HType a = HIdentity a
34+{-# COMPLETE HType #-}
35+
36+
37+type HIdentity :: Spec -> K.HTable
38+newtype HIdentity spec context = HIdentity
39+ { unHIdentity :: context spec
3240 }
3341
3442
35−instance Sql DBType a => HTable (HIdentity a) where
36− type HConstrainTable (HIdentity a) constraint = constraint a
37− type HField (HIdentity a) = (:~:) a
43+type HIdentityField :: Spec -> Spec -> Type
44+data HIdentityField _spec spec where
45+ HIdentityField :: HIdentityField spec spec
46+
47+
48+instance KnownSpec spec => HTable (HIdentity spec) where
49+ type HConstrainTable (HIdentity spec) c = c spec
50+ type HField (HIdentity spec) = HIdentityField spec
3851
39− hfield (HIdentity a) Refl = a
40− htabulate f = HIdentity $ f Refl
52+ hfield (HIdentity a) HIdentityField = a
53+ htabulate f = HIdentity $ f HIdentityField
4154 htraverse f (HIdentity a) = HIdentity <$> f a
4255 hdicts = HIdentity Dict
43− hspecs = HIdentity specification
56+ hspecs = HIdentity specSing
src/Rel8/Schema/HTable/Label.hs+50−37
@@ -1,70 +1,83 @@
1+{-# LANGUAGE DeriveAnyClass #-}
2+{-# LANGUAGE DeriveGeneric #-}
3+{-# LANGUAGE DerivingStrategies #-}
4+{-# LANGUAGE LambdaCase #-}
5+{-# language ConstraintKinds #-}
16{-# language DataKinds #-}
7+{-# language FlexibleInstances #-}
8+{-# language GADTs #-}
9+{-# language MultiParamTypeClasses #-}
10+{-# language QuantifiedConstraints #-}
211{-# language RankNTypes #-}
312{-# language RecordWildCards #-}
413{-# language ScopedTypeVariables #-}
514{-# language StandaloneKindSignatures #-}
6−{-# language TypeApplications #-}
715{-# language TypeFamilies #-}
16+{-# language TypeOperators #-}
17+{-# language UndecidableInstances #-}
818
919module Rel8.Schema.HTable.Label
10− ( HLabel, hlabel, hrelabel, hunlabel
11− , hproject
20+ ( HLabel, Label
21+ , hlabel, hunlabel
1222 )
1323where
1424
1525-- base
16−import Data.Kind ( Type )
1726import Data.Proxy ( Proxy( Proxy ) )
18−import GHC.TypeLits ( KnownSymbol, Symbol, symbolVal )
27+import GHC.TypeLits ( KnownSymbol, Symbol )
1928import Prelude
2029
2130-- rel8
31+import Rel8.Kind.Labels ( SLabels( SCons ) )
2232import Rel8.Schema.HTable
23− ( HTable, HConstrainTable, HField
24− , htabulate, hfield, htraverse, hdicts, hspecs
33+ ( HTable
34+ , hfield, htabulate, hspecs
2535 )
2636import qualified Rel8.Schema.Kind as K
27−import Rel8.Schema.Spec ( Spec(..) )
37+import Rel8.Schema.Spec ( Spec( Spec ), SSpec(..) )
38+import Rel8.FCF
39+import Rel8.Schema.HTable.MapTable
40+import GHC.Generics (Generic)
2841
2942
3043type HLabel :: Symbol -> K.HTable -> K.HTable
31−newtype HLabel label table context = HLabel (table context)
44+newtype HLabel label table context = HLabel (HMapTable (Label label) table context)
45+ deriving stock Generic
46+ deriving anyclass HTable
3247
3348
34−type HLabelField :: Symbol -> K.HTable -> Type -> Type
35−newtype HLabelField label table a = HLabelField (HField table a)
49+data Label :: Symbol -> Spec -> Exp Spec
3650
3751
38−instance (HTable table, KnownSymbol label) => HTable (HLabel label table) where
39− type HField (HLabel label table) = HLabelField label table
40− type HConstrainTable (HLabel label table) constraint =
41− HConstrainTable table constraint
52+type instance Eval (Label label ('Spec labels necessity a)) = 'Spec (label : labels) necessity a
4253
43− hfield (HLabel a) (HLabelField field) = hfield a field
44− htabulate f = HLabel (htabulate (f . HLabelField))
45− htraverse f (HLabel a) = HLabel <$> htraverse f a
46− hdicts = HLabel (hdicts @table)
47− hspecs = HLabel $ htabulate $ \field -> case hfield (hspecs @table) field of
48− Spec {..} -> Spec {labels = symbolVal (Proxy @label) : labels, ..}
49− {-# INLINABLE hspecs #-}
5054
51−
52−hlabel :: forall label t context. t context -> HLabel label t context
53−hlabel = HLabel
54−{-# INLINABLE hlabel #-}
55+instance KnownSymbol l => MapSpec (Label l) where
56+ mapInfo = \case
57+ SSpec {..} -> SSpec {labels = SCons Proxy labels, ..}
5558
5659
57−hrelabel :: forall label' label t context. HLabel label t context -> HLabel label' t context
58−hrelabel = hlabel . hunlabel
59−{-# INLINABLE hrelabel #-}
60+hlabel :: (HTable t, KnownSymbol label)
61+ => (forall labels necessity a. ()
62+ => context ('Spec labels necessity a)
63+ -> context ('Spec (label ': labels) necessity a))
64+ -> t context
65+ -> HLabel label t context
66+hlabel labeler a = HLabel $ htabulate $ \(HMapTableField field) ->
67+ case hfield hspecs field of
68+ SSpec {} -> labeler (hfield a field)
69+{-# INLINABLE hlabel #-}
6070
6171
62−hunlabel :: forall label t context. HLabel label t context -> t context
63−hunlabel (HLabel a) = a
72+hunlabel :: (HTable t, KnownSymbol label)
73+ => (forall labels necessity a. ()
74+ => context ('Spec (label ': labels) necessity a)
75+ -> context ('Spec labels necessity a))
76+ -> HLabel label t context
77+ -> t context
78+hunlabel unlabler (HLabel as) =
79+ htabulate $ \field ->
80+ case hfield hspecs field of
81+ SSpec {} -> case hfield as (HMapTableField field) of
82+ a -> unlabler a
6483{-# INLINABLE hunlabel #-}
65−
66−
67−hproject :: ()
68− => (forall ctx. t ctx -> t' ctx)
69− -> HLabel label t context -> HLabel label t' context
70−hproject f (HLabel a) = HLabel (f a)
src/Rel8/Schema/HTable/MapTable.hs+12−22
@@ -6,7 +6,7 @@
66{-# language GADTs #-}
77{-# language InstanceSigs #-}
88{-# language MultiParamTypeClasses #-}
9−{-# language RankNTypes #-}
9+{-# language PolyKinds #-}
1010{-# language ScopedTypeVariables #-}
1111{-# language StandaloneKindSignatures #-}
1212{-# language TypeApplications #-}
@@ -19,38 +19,34 @@ module Rel8.Schema.HTable.MapTable
1919 , MapSpec(..)
2020 , Precompose(..)
2121 , HMapTableField(..)
22− , hproject
2322 )
2423where
2524
2625-- base
2726import Data.Kind ( Constraint, Type )
28−import Prelude
27+import Prelude ( ($), (.), (<$>), fmap )
2928
3029-- rel8
31−import Rel8.FCF ( Exp, Eval )
30+import Rel8.FCF
3231import Rel8.Schema.HTable
33− ( HTable, HConstrainTable, HField
34− , hfield, htabulate, htraverse, hdicts, hspecs
35− )
36−import Rel8.Schema.Spec ( Spec )
32+import Rel8.Schema.Spec ( Spec, SSpec )
3733import qualified Rel8.Schema.Kind as K
3834import Rel8.Schema.Dict ( Dict( Dict ) )
3935
4036
41−type HMapTable :: (Type -> Exp Type) -> K.HTable -> K.HTable
42−newtype HMapTable f t context = HMapTable
43− { unHMapTable :: t (Precompose f context)
37+type HMapTable :: (a -> Exp b) -> ((a -> Type) -> Type) -> (b -> Type) -> Type
38+newtype HMapTable f t g = HMapTable
39+ { unHMapTable :: t (Precompose f g)
4440 }
4541
4642
47−type Precompose :: (Type -> Exp Type) -> K.Context -> K.Context
43+type Precompose :: (a -> Exp b) -> (b -> Type) -> a -> Type
4844newtype Precompose f g x = Precompose
4945 { precomposed :: g (Eval (f x))
5046 }
5147
5248
53−type HMapTableField :: (Type -> Exp Type) -> K.HTable -> K.Context
49+type HMapTableField :: (Spec -> Exp a) -> K.HTable -> a -> Type
5450data HMapTableField f t x where
5551 HMapTableField :: HField t a -> HMapTableField f t (Eval (f a))
5652
@@ -83,17 +79,11 @@ instance (HTable t, MapSpec f) => HTable (HMapTable f t) where
8379 {-# INLINABLE hspecs #-}
8480
8581
86−type MapSpec :: (Type -> Exp Type) -> Constraint
82+type MapSpec :: (Spec -> Exp Spec) -> Constraint
8783class MapSpec f where
88− mapInfo :: Spec x -> Spec (Eval (f x))
84+ mapInfo :: SSpec x -> SSpec (Eval (f x))
8985
9086
91−type ComposeConstraint :: (Type -> Exp Type) -> (Type -> Constraint) -> Type -> Constraint
87+type ComposeConstraint :: (a -> Exp b) -> (b -> Constraint) -> a -> Constraint
9288class c (Eval (f a)) => ComposeConstraint f c a
9389instance c (Eval (f a)) => ComposeConstraint f c a
94−
95−
96−hproject :: ()
97− => (forall ctx. t ctx -> t' ctx)
98− -> HMapTable f t context -> HMapTable f t' context
99−hproject f (HMapTable a) = HMapTable (f a)
src/Rel8/Schema/HTable/Maybe.hs+4−2
@@ -14,17 +14,19 @@ import GHC.Generics ( Generic )
1414import Prelude
1515
1616-- rel8
17+import Rel8.Kind.Necessity ( Necessity( Required ) )
1718import Rel8.Schema.HTable ( HTable )
18−import Rel8.Schema.HTable.Identity ( HIdentity )
19+import Rel8.Schema.HTable.Identity ( HIdentity(..) )
1920import Rel8.Schema.HTable.Label ( HLabel )
2021import Rel8.Schema.HTable.Nullify ( HNullify )
2122import qualified Rel8.Schema.Kind as K
23+import Rel8.Schema.Spec ( Spec( Spec ) )
2224import Rel8.Type.Tag ( MaybeTag )
2325
2426
2527type HMaybeTable :: K.HTable -> K.HTable
2628data HMaybeTable table context = HMaybeTable
27− { htag :: HLabel "isJust" (HIdentity (Maybe MaybeTag)) context
29+ { htag :: HIdentity ('Spec '["isJust"] 'Required (Maybe MaybeTag)) context
2830 , hjust :: HLabel "Just" (HNullify table) context
2931 }
3032 deriving stock Generic
src/Rel8/Schema/HTable/Nullify.hs+33−47
@@ -10,7 +10,6 @@
1010{-# language NamedFieldPuns #-}
1111{-# language QuantifiedConstraints #-}
1212{-# language RankNTypes #-}
13−{-# language RecordWildCards #-}
1413{-# language ScopedTypeVariables #-}
1514{-# language StandaloneKindSignatures #-}
1615{-# language TypeFamilies #-}
@@ -19,34 +18,25 @@
1918module Rel8.Schema.HTable.Nullify
2019 ( HNullify( HNullify )
2120 , Nullify
22− , hguard
23− , hnulls
24− , hnullify
25− , hunnullify
26− , hproject
21+ , hnulls, hnullify, hunnullify
2722 )
2823where
2924
3025-- base
31−import Data.Kind ( Type )
32−import GHC.Generics ( Generic )
3326import Prelude hiding ( null )
3427
3528-- rel8
36−import Rel8.FCF ( Eval, Exp )
3729import Rel8.Schema.HTable ( HTable, hfield, htabulate, htabulateA, hspecs )
38−import Rel8.Schema.HTable.MapTable
39− ( HMapTable, HMapTableField( HMapTableField )
40− , MapSpec, mapInfo
41− )
42−import qualified Rel8.Schema.HTable.MapTable as HMapTable ( hproject )
4330import qualified Rel8.Schema.Kind as K
4431import Rel8.Schema.Null ( Nullity( Null, NotNull ) )
4532import qualified Rel8.Schema.Null as Type ( Nullify )
46−import Rel8.Schema.Spec ( Spec(..) )
33+import Rel8.Schema.Spec ( Spec( Spec ), SSpec(..) )
4734
4835-- semigroupoids
4936import Data.Functor.Apply ( Apply )
37+import Rel8.Schema.HTable.MapTable
38+import Rel8.FCF
39+import GHC.Generics (Generic)
5040
5141
5242type HNullify :: K.HTable -> K.HTable
@@ -55,63 +45,59 @@ newtype HNullify table context = HNullify (HMapTable Nullify table context)
5545 deriving anyclass HTable
5646
5747
58−-- | Transform a 'Type' by allowing it to be @null@.
59−data Nullify :: Type -> Exp Type
60−type instance Eval (Nullify a) = Type.Nullify a
48+
49+-- | Transform a 'Spec' by allowing it to be @null@.
50+data Nullify :: Spec -> Exp Spec
51+
52+
53+type instance Eval (Nullify ('Spec labels necessity a)) =
54+ 'Spec labels necessity (Type.Nullify a)
6155
6256
6357instance MapSpec Nullify where
6458 mapInfo = \case
65− Spec {nullity, ..} -> Spec
66− { nullity = case nullity of
59+ SSpec{labels, necessity, info, nullity} -> SSpec
60+ { labels
61+ , necessity
62+ , info
63+ , nullity = case nullity of
6764 Null -> Null
6865 NotNull -> Null
69− , ..
70− }
71−
72−
73−hguard :: HTable t
74− => (forall a. context (Maybe a) -> context (Maybe a))
75− -> HNullify t context -> HNullify t context
76−hguard guarder (HNullify as) = HNullify $ htabulate $ \(HMapTableField field) ->
77− case hfield hspecs field of
78− Spec {nullity} -> case hfield as (HMapTableField field) of
79− a -> case nullity of
80− Null -> guarder a
81− NotNull -> guarder a
66+ }
8267
8368
8469hnulls :: HTable t
85− => (forall a. Spec a -> context (Type.Nullify a))
70+ => (forall labels necessity a. ()
71+ => SSpec ('Spec labels necessity a)
72+ -> context ('Spec labels necessity (Type.Nullify a)))
8673 -> HNullify t context
87−hnulls null = HNullify $ htabulate $ \(HMapTableField field) ->
88− case hfield hspecs field of
89− spec@Spec {} -> null spec
74+hnulls null = HNullify $ htabulate $ \(HMapTableField field) -> case hfield hspecs field of
75+ spec@SSpec {} -> null spec
9076{-# INLINABLE hnulls #-}
9177
9278
9379hnullify :: HTable t
94− => (forall a. Spec a -> context a -> context (Type.Nullify a))
80+ => (forall labels necessity a. ()
81+ => SSpec ('Spec labels necessity a)
82+ -> context ('Spec labels necessity a)
83+ -> context ('Spec labels necessity (Type.Nullify a)))
9584 -> t context
9685 -> HNullify t context
9786hnullify nullifier a = HNullify $ htabulate $ \(HMapTableField field) ->
9887 case hfield hspecs field of
99− spec@Spec {} -> nullifier spec (hfield a field)
88+ spec@SSpec {} -> nullifier spec (hfield a field)
10089{-# INLINABLE hnullify #-}
10190
10291
10392hunnullify :: (HTable t, Apply m)
104− => (forall a. Spec a -> context (Type.Nullify a) -> m (context a))
93+ => (forall labels necessity a. ()
94+ => SSpec ('Spec labels necessity a)
95+ -> context ('Spec labels necessity (Type.Nullify a))
96+ -> m (context ('Spec labels necessity a)))
10597 -> HNullify t context
10698 -> m (t context)
10799hunnullify unnullifier (HNullify as) =
108100 htabulateA $ \field -> case hfield hspecs field of
109− spec@Spec {} -> case hfield as (HMapTableField field) of
101+ spec@SSpec {} -> case hfield as (HMapTableField field) of
110102 a -> unnullifier spec a
111103{-# INLINABLE hunnullify #-}
112−
113−
114−hproject :: ()
115− => (forall ctx. t ctx -> t' ctx)
116− -> HNullify t context -> HNullify t' context
117−hproject f (HNullify a) = HNullify (HMapTable.hproject f a)
src/Rel8/Schema/HTable/These.hs+4−2
@@ -14,19 +14,21 @@ import GHC.Generics ( Generic )
1414import Prelude
1515
1616-- rel8
17+import Rel8.Kind.Necessity ( Necessity( Required ) )
1718import Rel8.Schema.HTable ( HTable )
1819import Rel8.Schema.HTable.Identity ( HIdentity )
1920import Rel8.Schema.HTable.Label ( HLabel )
2021import Rel8.Schema.HTable.Nullify ( HNullify )
2122import qualified Rel8.Schema.Kind as K
23+import Rel8.Schema.Spec ( Spec( Spec ) )
2224import Rel8.Type.Tag ( MaybeTag )
2325
2426
2527type HTheseTable :: K.HTable -> K.HTable -> K.HTable
2628data HTheseTable here there context = HTheseTable
27− { hhereTag :: HLabel "hereTag" (HIdentity (Maybe MaybeTag)) context
29+ { hhereTag :: HIdentity ('Spec '["hasHere"] 'Required (Maybe MaybeTag)) context
2830 , hhere :: HLabel "Here" (HNullify here) context
29− , hthereTag :: HLabel "thereTag" (HIdentity (Maybe MaybeTag)) context
31+ , hthereTag :: HIdentity ('Spec '["hasThere"] 'Required (Maybe MaybeTag)) context
3032 , hthere :: HLabel "There" (HNullify there) context
3133 }
3234 deriving stock Generic
src/Rel8/Schema/HTable/Vectorize.hs+50−40
@@ -9,6 +9,8 @@
99{-# language GADTs #-}
1010{-# language LambdaCase #-}
1111{-# language MultiParamTypeClasses #-}
12+{-# language NamedFieldPuns #-}
13+{-# language QuantifiedConstraints #-}
1214{-# language RankNTypes #-}
1315{-# language RecordWildCards #-}
1416{-# language ScopedTypeVariables #-}
@@ -21,39 +23,35 @@ module Rel8.Schema.HTable.Vectorize
2123 ( HVectorize
2224 , hvectorize, hunvectorize
2325 , happend, hempty
24− , hproject
25− , hcolumn
2626 )
2727where
2828
2929-- base
30−import Data.Kind ( Constraint, Type )
30+import Data.Kind ( Type )
3131import Data.List.NonEmpty ( NonEmpty )
32−import GHC.Generics (Generic)
3332import Prelude
3433
3534-- rel8
36−import Rel8.FCF ( Eval, Exp )
35+import Rel8.Kind.Necessity ( Necessity( Required ), SNecessity( SRequired ) )
36+import Rel8.Schema.Context.Label ( HLabelable, hlabeler, hunlabeler )
3737import Rel8.Schema.Dict ( Dict( Dict ) )
3838import qualified Rel8.Schema.Kind as K
39−import Rel8.Schema.HTable ( HTable, hfield, htabulate, htabulateA, hspecs )
40−import Rel8.Schema.HTable.Identity ( HIdentity( HIdentity ) )
41−import Rel8.Schema.HTable.MapTable
42− ( HMapTable( HMapTable ), HMapTableField( HMapTableField )
43− , MapSpec, mapInfo
44− , Precompose( Precompose )
39+import Rel8.Schema.HTable
40+ ( HTable
41+ , hfield, htabulate, htabulateA, hspecs
4542 )
46−import qualified Rel8.Schema.HTable.MapTable as HMapTable ( hproject )
4743import Rel8.Schema.Null ( Unnullify, NotNull, Nullity( NotNull ) )
48−import Rel8.Schema.Spec ( Spec(..) )
44+import Rel8.Schema.Spec ( Spec( Spec ), SSpec(..) )
4945import Rel8.Type.Array ( listTypeInformation, nonEmptyTypeInformation )
5046import Rel8.Type.Information ( TypeInformation )
5147
5248-- semialign
53−import Data.Zip ( Unzip, Zip, Zippy(..) )
49+import Data.Zip ( Unzip, Repeat, Zippy(..) )
50+import Rel8.FCF
51+import Rel8.Schema.HTable.MapTable
52+import GHC.Generics (Generic)
5453
5554
56−type Vector :: (Type -> Type) -> Constraint
5755class Vector list where
5856 listNotNull :: proxy a -> Dict NotNull (list a)
5957 vectorTypeInformation :: ()
@@ -78,66 +76,78 @@ newtype HVectorize list table context = HVectorize (HMapTable (Vectorize list) t
7876 deriving anyclass HTable
7977
8078
81−data Vectorize :: (Type -> Type) -> Type -> Exp Type
79+data Vectorize :: (Type -> Type) -> Spec -> Exp Spec
8280
8381
84−type instance Eval (Vectorize list a) = list a
82+type instance Eval (Vectorize list ('Spec labels _necessity a)) = 'Spec labels 'Required (list a)
8583
8684
8785instance Vector list => MapSpec (Vectorize list) where
8886 mapInfo = \case
89− Spec {..} -> case listNotNull @list nullity of
90− Dict -> Spec
91− { nullity = NotNull
87+ SSpec {..} -> case listNotNull @list nullity of
88+ Dict -> SSpec
89+ { necessity = SRequired
90+ , nullity = NotNull
9291 , info = vectorTypeInformation nullity info
9392 , ..
9493 }
9594
9695
9796hvectorize :: (HTable t, Unzip f, Vector list)
98− => (forall a. Spec a -> f (context a) -> context' (list a))
97+ => (forall labels necessity a. ()
98+ => SSpec ('Spec labels necessity a)
99+ -> f (context ('Spec labels necessity a))
100+ -> context' ('Spec labels 'Required (list a)))
99101 -> f (t context)
100102 -> HVectorize list t context'
101103hvectorize vectorizer as = HVectorize $ htabulate $ \(HMapTableField field) ->
102104 case hfield hspecs field of
103− spec -> vectorizer spec (fmap (`hfield` field) as)
105+ spec@SSpec {} -> vectorizer spec (fmap (`hfield` field) as)
104106{-# INLINABLE hvectorize #-}
105107
106108
107−hunvectorize :: (HTable t, Zip f, Vector list)
108− => (forall a. Spec a -> context (list a) -> f (context' a))
109+hunvectorize :: (HTable t, Repeat f, Vector list)
110+ => (forall labels necessity a. ()
111+ => SSpec ('Spec labels necessity a)
112+ -> context ('Spec labels 'Required (list a))
113+ -> f (context' ('Spec labels necessity a)))
109114 -> HVectorize list t context
110115 -> f (t context')
111116hunvectorize unvectorizer (HVectorize table) =
112117 getZippy $ htabulateA $ \field -> case hfield hspecs field of
113− spec -> case hfield table (HMapTableField field) of
118+ spec@SSpec{} -> case hfield table (HMapTableField field) of
114119 a -> Zippy (unvectorizer spec a)
115120{-# INLINABLE hunvectorize #-}
116121
117122
118−happend :: (HTable t, Vector list)
119− => (forall a. Spec a -> context (list a) -> context (list a) -> context (list a))
123+happend :: (HTable t, Vector list) =>
124+ ( forall labels necessity a. ()
125+ => Nullity a
126+ -> TypeInformation (Unnullify a)
127+ -> context ('Spec labels necessity (list a))
128+ -> context ('Spec labels necessity (list a))
129+ -> context ('Spec labels necessity (list a))
130+ )
120131 -> HVectorize list t context
121132 -> HVectorize list t context
122133 -> HVectorize list t context
123134happend append (HVectorize as) (HVectorize bs) = HVectorize $
124135 htabulate $ \field@(HMapTableField j) -> case (hfield as field, hfield bs field) of
125136 (a, b) -> case hfield hspecs j of
126− spec -> append spec a b
137+ SSpec {nullity, info} -> append nullity info a b
127138
128139
129−hempty :: HTable t
130− => (forall a. Spec a -> context [a])
140+hempty :: HTable t =>
141+ ( forall labels necessity a. ()
142+ => Nullity a
143+ -> TypeInformation (Unnullify a)
144+ -> context ('Spec labels necessity [a])
145+ )
131146 -> HVectorize [] t context
132−hempty empty = HVectorize $ htabulate $ \(HMapTableField field) ->
133− empty (hfield hspecs field)
134−
135−
136−hproject :: ()
137− => (forall ctx. t ctx -> t' ctx)
138− -> HVectorize list t context -> HVectorize list t' context
139−hproject f (HVectorize a) = HVectorize (HMapTable.hproject f a)
147+hempty empty = HVectorize $ htabulate $ \(HMapTableField field) -> case hfield hspecs field of
148+ SSpec {nullity, info} -> empty nullity info
140149
141150
142−hcolumn :: HVectorize list (HIdentity a) context -> context (list a)
143−hcolumn (HVectorize (HMapTable (HIdentity (Precompose a)))) = a
151+instance HLabelable g => HLabelable (Precompose (Vectorize list) g) where
152+ hlabeler = Precompose . hlabeler . precomposed
153+ hunlabeler = Precompose . hunlabeler . precomposed
src/Rel8/Schema/Insert.hsnew file+167
@@ -0,0 +1,167 @@
1+{-# language DataKinds #-}
2+{-# language DuplicateRecordFields #-}
3+{-# language FlexibleContexts #-}
4+{-# language FlexibleInstances #-}
5+{-# language GADTs #-}
6+{-# language LambdaCase #-}
7+{-# language MultiParamTypeClasses #-}
8+{-# language NamedFieldPuns #-}
9+{-# language PolyKinds #-}
10+{-# language StandaloneKindSignatures #-}
11+{-# language TypeFamilies #-}
12+{-# language UndecidableInstances #-}
13+{-# language UndecidableSuperClasses #-}
14+
15+module Rel8.Schema.Insert
16+ ( Insert(..)
17+ , OnConflict(..)
18+ , Col( RequiredInsert, OptionalInsert )
19+ , Inserts
20+ , Insertion(..)
21+ )
22+where
23+
24+-- base
25+import Data.Functor.Identity ( Identity )
26+import Data.Kind ( Constraint, Type )
27+import Prelude
28+
29+-- rel8
30+import Rel8.Aggregate ( Aggregate )
31+import Rel8.Expr ( Expr )
32+import Rel8.Kind.Necessity ( Necessity(Optional, Required) )
33+import Rel8.Schema.Context ( Interpretation(..) )
34+import Rel8.Schema.Context.Label ( Labelable(..) )
35+import Rel8.Schema.Context.Nullify
36+ ( Nullifiable, encodeTag, decodeTag, nullifier, unnullifier
37+ , runTag, unnull
38+ )
39+import Rel8.Schema.HTable.Identity ( HIdentity( HType ), HType )
40+import Rel8.Schema.Name ( Name, Selects )
41+import Rel8.Schema.Null ( Sql )
42+import Rel8.Schema.Reify ( notReify )
43+import Rel8.Schema.Result ( Result )
44+import Rel8.Schema.Spec ( SSpec(SSpec, nullity), Spec(Spec) )
45+import Rel8.Schema.Table ( TableSchema )
46+import Rel8.Statement.Returning ( Returning )
47+import Rel8.Table
48+ ( Table, Context, Columns, fromColumns, toColumns
49+ , reify, unreify
50+ )
51+import Rel8.Table.Recontextualize ( Recontextualize )
52+import Rel8.Table.Tag ( Tag(..), fromExpr )
53+import Rel8.Type ( DBType )
54+
55+
56+-- | @OnConflict@ allows you to add an @ON CONFLICT@ clause to an @INSERT@
57+-- statement.
58+data OnConflict
59+ = Abort -- ^ @ON CONFLICT ABORT@
60+ | DoNothing -- ^ @ON CONFLICT DO NOTHING@
61+
62+
63+-- | The constituent parts of a SQL @INSERT@ statement.
64+type Insert :: k -> Type
65+data Insert a where
66+ Insert :: (Selects names exprs, Inserts exprs inserts) =>
67+ { into :: TableSchema names
68+ -- ^ Which table to insert into.
69+ , rows :: [inserts]
70+ -- ^ The rows to insert.
71+ , onConflict :: OnConflict
72+ -- ^ What to do if the inserted rows conflict with data already in the
73+ -- table.
74+ , returning :: Returning names a
75+ -- ^ What information to return on completion.
76+ }
77+ -> Insert a
78+
79+
80+instance Interpretation Insert where
81+ data Col Insert _spec where
82+ RequiredInsert :: Expr a -> Col Insert ('Spec labels 'Required a)
83+ OptionalInsert :: Maybe (Expr a) -> Col Insert ('Spec labels 'Optional a)
84+
85+
86+type Insertion :: Type -> Type
87+newtype Insertion a = Insertion (Expr a)
88+
89+
90+instance Sql DBType a => Table Insert (Insertion a) where
91+ type Columns (Insertion a) = HType a
92+ type Context (Insertion a) = Insert
93+
94+ toColumns (Insertion a) = HType (RequiredInsert a)
95+ fromColumns (HType (RequiredInsert a)) = Insertion a
96+ reify = notReify
97+ unreify = notReify
98+
99+
100+instance Sql DBType a =>
101+ Recontextualize Aggregate Insert (Aggregate (Expr a)) (Insertion a)
102+
103+
104+instance Sql DBType a => Recontextualize Expr Insert (Expr a) (Insertion a)
105+
106+
107+instance Sql DBType a =>
108+ Recontextualize Result Insert (Identity a) (Insertion a)
109+
110+
111+instance Sql DBType a =>
112+ Recontextualize Insert Aggregate (Insertion a) (Aggregate (Expr a))
113+
114+
115+instance Sql DBType a => Recontextualize Insert Expr (Insertion a) (Expr a)
116+
117+
118+instance Sql DBType a =>
119+ Recontextualize Insert Result (Insertion a) (Identity a)
120+
121+
122+instance Sql DBType a => Recontextualize Insert Insert (Insertion a) (Insertion a)
123+
124+
125+instance Sql DBType a => Recontextualize Insert Name (Insertion a) (Name a)
126+
127+
128+instance Sql DBType a => Recontextualize Name Insert (Name a) (Insertion a)
129+
130+
131+instance Labelable Insert where
132+ labeler = \case
133+ RequiredInsert a -> RequiredInsert a
134+ OptionalInsert ma -> OptionalInsert ma
135+
136+ unlabeler = \case
137+ RequiredInsert a -> RequiredInsert a
138+ OptionalInsert ma -> OptionalInsert ma
139+
140+
141+instance Nullifiable Insert where
142+ encodeTag = RequiredInsert . expr
143+ decodeTag (RequiredInsert a) = fromExpr a
144+
145+ nullifier Tag {expr} test SSpec {nullity} = \case
146+ RequiredInsert a ->
147+ RequiredInsert $ runTag nullity condition a
148+ OptionalInsert ma ->
149+ OptionalInsert $ runTag nullity condition <$> ma
150+ where
151+ condition = test expr
152+
153+ unnullifier SSpec {nullity} = \case
154+ RequiredInsert a -> RequiredInsert $ unnull nullity a
155+ OptionalInsert ma -> OptionalInsert $ unnull nullity <$> ma
156+
157+ {-# INLINABLE encodeTag #-}
158+ {-# INLINABLE decodeTag #-}
159+ {-# INLINABLE nullifier #-}
160+ {-# INLINABLE unnullifier #-}
161+
162+
163+-- | @Inserts a b@ means that the columns in @a@ are compatible for inserting
164+-- with the table @b@.
165+type Inserts :: Type -> Type -> Constraint
166+class Recontextualize Expr Insert exprs inserts => Inserts exprs inserts
167+instance Recontextualize Expr Insert exprs inserts => Inserts exprs inserts
src/Rel8/Schema/Kind.hs+15−6
@@ -1,9 +1,8 @@
11{-# language StandaloneKindSignatures #-}
22
33module Rel8.Schema.Kind
4− ( Rel8able
5− , Context
6− , HTable
4+ ( Context, Rel8able
5+ , HContext, HTable
76 )
87where
98
@@ -11,13 +10,23 @@ where
1110import Data.Kind ( Type )
1211import Prelude ()
1312
13+-- rel8
14+import Rel8.Schema.Spec ( Spec )
1415
15−type Context :: Type
16−type Context = Type -> Type
16+
17+type HContext :: Type
18+type HContext = Spec -> Type
1719
1820
1921type HTable :: Type
20−type HTable = Context -> Type
22+type HTable = HContext -> Type
23+
24+
25+data X
26+
27+
28+type Context :: Type
29+type Context = X -> Type
2130
2231
2332type Rel8able :: Type
src/Rel8/Schema/Name.hs+54−34
@@ -3,44 +3,40 @@
33{-# language FlexibleContexts #-}
44{-# language FlexibleInstances #-}
55{-# language GADTs #-}
6−{-# language GeneralizedNewtypeDeriving #-}
76{-# language MultiParamTypeClasses #-}
7+{-# language PolyKinds #-}
88{-# language RankNTypes #-}
9+{-# language StandaloneDeriving #-}
910{-# language StandaloneKindSignatures #-}
1011{-# language TypeFamilies #-}
1112{-# language UndecidableInstances #-}
13+{-# language UndecidableSuperClasses #-}
1214
1315module Rel8.Schema.Name
1416 ( Name(..)
17+ , Col( NameCol )
1518 , Selects
16− , ppColumn
1719 )
1820where
1921
2022-- base
21−import Data.Functor.Identity ( Identity( Identity ) )
23+import Data.Functor.Identity ( Identity )
2224import Data.Kind ( Constraint, Type )
23−import Data.String ( IsString )
25+import Data.String ( IsString, fromString )
2426import Prelude
2527
26−-- opaleye
27−import qualified Opaleye.Internal.HaskellDB.Sql as Opaleye
28−import qualified Opaleye.Internal.HaskellDB.Sql.Print as Opaleye
29−
30−-- pretty
31−import Text.PrettyPrint ( Doc )
32−
3328-- rel8
3429import Rel8.Expr ( Expr )
35−import qualified Rel8.Schema.Kind as K
36−import Rel8.Schema.HTable.Identity ( HIdentity( HIdentity ) )
30+import Rel8.Schema.Context ( Interpretation, Col )
31+import Rel8.Schema.Context.Label ( Labelable, labeler, unlabeler )
32+import Rel8.Schema.HTable.Identity ( HIdentity( HType ), HType )
3733import Rel8.Schema.Null ( Sql )
34+import Rel8.Schema.Reify ( notReify )
35+import Rel8.Schema.Result ( Result )
3836import Rel8.Table
39− ( Table, Columns, Context, fromColumns, toColumns
40− , FromExprs, fromResult, toResult
41− , Transpose
37+ ( Table, Columns, Context, fromColumns, toColumns, reify, unreify
4238 )
43−import Rel8.Table.Transpose ( Transposes )
39+import Rel8.Table.Recontextualize ( Recontextualize )
4440import Rel8.Type ( DBType )
4541
4642
@@ -48,30 +44,54 @@ import Rel8.Type ( DBType )
4844-- schema definition. You can construct names by using the @OverloadedStrings@
4945-- extension and writing string literals. This is typically done when providing
5046-- a 'TableSchema' value.
51−type Name :: K.Context
52−newtype Name a = Name String
53− deriving stock Show
54− deriving newtype IsString
47+type Name :: k -> Type
48+data Name a where
49+ Name :: k ~ Type => !String -> Name (a :: k)
50+
51+
52+deriving stock instance Show (Name a)
53+
54+
55+instance k ~ Type => IsString (Name (a :: k)) where
56+ fromString = Name
5557
5658
5759instance Sql DBType a => Table Name (Name a) where
58− type Columns (Name a) = HIdentity a
60+ type Columns (Name a) = HType a
5961 type Context (Name a) = Name
60− type FromExprs (Name a) = a
61− type Transpose to (Name a) = to a
6262
63− toColumns a = HIdentity a
64− fromColumns (HIdentity a) = a
65− toResult a = HIdentity (Identity a)
66− fromResult (HIdentity (Identity a)) = a
63+ toColumns (Name a) = HType (NameCol a)
64+ fromColumns (HType (NameCol a)) = Name a
65+ reify = notReify
66+ unreify = notReify
67+
68+
69+instance Sql DBType a => Recontextualize Expr Name (Expr a) (Name a)
70+
71+
72+instance Sql DBType a => Recontextualize Result Name (Identity a) (Name a)
73+
74+
75+instance Sql DBType a => Recontextualize Name Expr (Name a) (Expr a)
76+
77+
78+instance Sql DBType a => Recontextualize Name Result (Name a) (Identity a)
79+
80+
81+instance Sql DBType a => Recontextualize Name Name (Name a) (Name a)
82+
83+
84+instance Interpretation Name where
85+ newtype Col Name _spec = NameCol String
86+
87+
88+instance Labelable Name where
89+ labeler (NameCol a) = NameCol a
90+ unlabeler (NameCol a) = NameCol a
6791
6892
6993-- | @Selects a b@ means that @a@ is a schema (i.e., a 'Table' of 'Name's) for
7094-- the 'Expr' columns in @b@.
7195type Selects :: Type -> Type -> Constraint
72−class Transposes Name Expr names exprs => Selects names exprs
73−instance Transposes Name Expr names exprs => Selects names exprs
74−
75−
76−ppColumn :: String -> Doc
77−ppColumn = Opaleye.ppSqlExpr . Opaleye.ColumnSqlExpr . Opaleye.SqlColumn
96+class Recontextualize Name Expr names exprs => Selects names exprs
97+instance Recontextualize Name Expr names exprs => Selects names exprs
src/Rel8/Schema/Reify.hsnew file+74
@@ -0,0 +1,74 @@
1+{-# language AllowAmbiguousTypes #-}
2+{-# language EmptyCase #-}
3+{-# language DataKinds #-}
4+{-# language FlexibleInstances #-}
5+{-# language ScopedTypeVariables #-}
6+{-# language StandaloneKindSignatures #-}
7+{-# language TypeApplications #-}
8+{-# language TypeFamilies #-}
9+{-# language TypeOperators #-}
10+{-# language UndecidableInstances #-}
11+
12+module Rel8.Schema.Reify
13+ ( Reify, Col( Reify ), hreify, hunreify
14+ , UnwrapReify
15+ , NotReify, notReify
16+ )
17+where
18+
19+-- base
20+import Data.Kind ( Constraint )
21+import Data.Type.Equality ( (:~:)( Refl ) )
22+import Prelude
23+
24+-- rel8
25+import Rel8.Schema.Context ( Interpretation, Col )
26+import Rel8.Schema.Context.Label ( Labelable, labeler, unlabeler )
27+import Rel8.Schema.HTable ( HTable, hmap )
28+import Rel8.Schema.Kind ( Context )
29+
30+
31+type Reify :: Context -> Context
32+data Reify context a
33+
34+
35+instance Interpretation (Reify context) where
36+ newtype Col (Reify context) spec = Reify (Col context spec)
37+
38+
39+instance Labelable context => Labelable (Reify context) where
40+ labeler (Reify a) = Reify (labeler a)
41+ unlabeler (Reify a) = Reify (unlabeler a)
42+
43+
44+hreify :: HTable t => t (Col context) -> t (Col (Reify context))
45+hreify = hmap Reify
46+
47+
48+hunreify :: HTable t => t (Col (Reify context)) -> t (Col context)
49+hunreify = hmap (\(Reify a) -> a)
50+
51+
52+type UnwrapReify :: Context -> Context
53+type family UnwrapReify context where
54+ UnwrapReify (Reify context) = context
55+
56+
57+type IsReify :: Context -> Bool
58+type family IsReify context where
59+ IsReify (Reify _) = 'True
60+ IsReify _ = 'False
61+
62+
63+type NotReify :: Context -> Constraint
64+class IsReify context ~ 'False => NotReify context
65+instance IsReify context ~ 'False => NotReify context
66+
67+
68+notReify :: forall context ctx a. NotReify context => context :~: Reify ctx -> a
69+notReify refl = case lemma @context of
70+ Refl -> case refl of
71+
72+
73+lemma :: NotReify context => IsReify context :~: 'False
74+lemma = Refl
src/Rel8/Schema/Result.hs+42−20
@@ -5,50 +5,72 @@
55{-# language TypeFamilies #-}
66
77module Rel8.Schema.Result
8− ( Result
8+ ( Col( Result ), Result
9+ , relabel
910 , null, nullifier, unnullifier
1011 , vectorizer, unvectorizer
1112 )
1213where
1314
1415-- base
15−import Data.Functor.Identity ( Identity( Identity), runIdentity )
1616import Prelude hiding ( null )
1717
1818-- rel8
19+import Rel8.Kind.Necessity ( Necessity( Required ) )
20+import Rel8.Schema.Context ( Interpretation( Col ) )
21+import Rel8.Schema.HTable.Identity ( HIdentity(..) )
1922import Rel8.Schema.Kind ( Context )
2023import Rel8.Schema.Null ( Nullify, Nullity( Null, NotNull ) )
21−import Rel8.Schema.Spec ( Spec(..) )
24+import Rel8.Schema.Spec ( Spec( Spec ), SSpec(..) )
2225
2326
24−-- | The @Result@ context is the context used for decoded query results.
25−--
26−-- When a query is executed against a PostgreSQL database, Rel8 parses the
27−-- returned rows, decoding each row into the @Result@ context.
2827type Result :: Context
29−type Result = Identity
28+data Result a
3029
3130
32−null :: Result (Maybe a)
33−null = Identity Nothing
31+instance Interpretation Result where
32+ data Col Result _spec where
33+ Result :: a -> Col Result ('Spec labels necessity a)
3434
3535
36−nullifier :: Spec a -> Result a -> Result (Nullify a)
37−nullifier Spec {nullity} (Identity a) = Identity $ case nullity of
36+relabel :: ()
37+ => HIdentity ('Spec labels necessity a) (Col Result)
38+ -> HIdentity ('Spec relabels necessity a) (Col Result)
39+relabel (HIdentity (Result a)) = HIdentity (Result a)
40+
41+
42+null :: Col Result ('Spec labels necessity (Maybe a))
43+null = Result Nothing
44+
45+
46+nullifier :: ()
47+ => SSpec ('Spec labels necessity a)
48+ -> Col Result ('Spec labels necessity a)
49+ -> Col Result ('Spec labels necessity (Nullify a))
50+nullifier SSpec {nullity} (Result a) = Result $ case nullity of
3851 Null -> a
3952 NotNull -> Just a
4053
4154
42−unnullifier :: Spec a -> Result (Nullify a) -> Maybe (Result a)
43−unnullifier Spec {nullity} (Identity a) =
55+unnullifier :: ()
56+ => SSpec ('Spec labels necessity a)
57+ -> Col Result ('Spec labels necessity (Nullify a))
58+ -> Maybe (Col Result ('Spec labels necessity a))
59+unnullifier SSpec {nullity} (Result a) =
4460 case nullity of
45− Null -> pure $ Identity a
46− NotNull -> Identity <$> a
61+ Null -> pure $ Result a
62+ NotNull -> Result <$> a
4763
4864
49−vectorizer :: Functor f => Spec a -> f (Result a) -> Result (f a)
50−vectorizer _ = Identity . fmap runIdentity
65+vectorizer :: Functor f
66+ => SSpec ('Spec labels necessity a)
67+ -> f (Col Result ('Spec labels necessity a))
68+ -> Col Result ('Spec labels 'Required (f a))
69+vectorizer _ = Result . fmap (\(Result a) -> a)
5170
5271
53−unvectorizer :: Functor f => Spec a -> Result (f a) -> f (Result a)
54−unvectorizer _ (Identity results) = Identity <$> results
72+unvectorizer :: Functor f
73+ => SSpec ('Spec labels necessity a)
74+ -> Col Result ('Spec labels 'Required (f a))
75+ -> f (Col Result ('Spec labels necessity a))
76+unvectorizer _ (Result results) = Result <$> results
src/Rel8/Schema/Spec.hs+45−17
@@ -1,34 +1,62 @@
1+{-# language DataKinds #-}
12{-# language FlexibleContexts #-}
2−{-# language MonoLocalBinds #-}
3+{-# language GADTs #-}
34{-# language StandaloneKindSignatures #-}
5+{-# language UndecidableInstances #-}
46
57module Rel8.Schema.Spec
6− ( Spec( Spec, labels, info, nullity )
7− , specification
8+ ( Spec( Spec )
9+ , SSpec( SSpec, labels, necessity, info, nullity )
10+ , KnownSpec( specSing )
811 )
912where
1013
1114-- base
12−import Data.Kind ( Type )
13−import Prelude
15+import Data.Kind ( Constraint, Type )
16+import Prelude ()
1417
1518-- rel8
19+import Rel8.Kind.Labels ( Labels, SLabels, KnownLabels, labelsSing )
20+import Rel8.Kind.Necessity
21+ ( Necessity
22+ , SNecessity
23+ , KnownNecessity, necessitySing
24+ )
1625import Rel8.Schema.Null ( Nullity, Sql, Unnullify, nullable )
1726import Rel8.Type ( DBType, typeInformation )
1827import Rel8.Type.Information ( TypeInformation )
1928
2029
21−type Spec :: Type -> Type
22−data Spec a = Spec
23− { labels :: [String]
24− , info :: TypeInformation (Unnullify a)
25− , nullity :: Nullity a
26− }
30+type Spec :: Type
31+data Spec = Spec Labels Necessity Type
32+
33+
34+type SSpec :: Spec -> Type
35+data SSpec spec where
36+ SSpec ::
37+ { labels :: SLabels labels
38+ , necessity :: SNecessity necessity
39+ , info :: TypeInformation (Unnullify a)
40+ , nullity :: Nullity a
41+ }
42+ -> SSpec ('Spec labels necessity a)
2743
2844
29−specification :: Sql DBType a => Spec a
30−specification = Spec
31− { labels = []
32− , info = typeInformation
33− , nullity = nullable
34− }
45+type KnownSpec :: Spec -> Constraint
46+class KnownSpec spec where
47+ specSing :: SSpec spec
48+
49+
50+instance
51+ ( KnownLabels labels
52+ , KnownNecessity necessity
53+ , Sql DBType a
54+ )
55+ => KnownSpec ('Spec labels necessity a)
56+ where
57+ specSing = SSpec
58+ { labels = labelsSing
59+ , necessity = necessitySing
60+ , info = typeInformation
61+ , nullity = nullable
62+ }
src/Rel8/Schema/Spec/ConstrainDBType.hsnew file+89
@@ -0,0 +1,89 @@
1+{-# language ConstraintKinds #-}
2+{-# language DataKinds #-}
3+{-# language FlexibleInstances #-}
4+{-# language MultiParamTypeClasses #-}
5+{-# language NamedFieldPuns #-}
6+{-# language QuantifiedConstraints #-}
7+{-# language StandaloneKindSignatures #-}
8+{-# language TypeFamilies #-}
9+{-# language UndecidableInstances #-}
10+
11+module Rel8.Schema.Spec.ConstrainDBType
12+ ( ConstrainDBType
13+ , dbTypeNullity, dbTypeDict
14+ , nullifier, unnullifier
15+ )
16+where
17+
18+-- base
19+import Data.Kind ( Constraint, Type )
20+import Prelude
21+
22+-- rel8
23+import Rel8.Schema.Dict ( Dict( Dict ) )
24+import Rel8.Schema.Null
25+ ( Nullify, Unnullify
26+ , Nullity( Null, NotNull )
27+ , Sql, nullable
28+ )
29+import Rel8.Schema.Spec ( Spec( Spec ), SSpec( SSpec, nullity ) )
30+
31+
32+type ConstrainDBType :: (Type -> Constraint) -> Spec -> Constraint
33+class
34+ ( forall c labels necessity a. ()
35+ => (spec ~ 'Spec labels necessity a)
36+ => (forall x. (constraint x => c x)) => Sql c a
37+ )
38+ => ConstrainDBType constraint spec
39+instance
40+ ( spec ~ 'Spec labels necessity a
41+ , Sql constraint a
42+ )
43+ => ConstrainDBType constraint spec
44+
45+
46+dbTypeNullity :: Dict (ConstrainDBType c) ('Spec l n a) -> Nullity a
47+dbTypeNullity = step2 . step1
48+ where
49+ step1 :: Dict (ConstrainDBType c) ('Spec l n a) -> Dict (Sql c) a
50+ step1 Dict = Dict
51+
52+ step2 :: Dict (Sql c) a -> Nullity a
53+ step2 Dict = nullable
54+
55+
56+dbTypeDict :: Dict (ConstrainDBType c) ('Spec l n a) -> Dict c (Unnullify a)
57+dbTypeDict = step2 . step1
58+ where
59+ step1 :: Dict (ConstrainDBType c) ('Spec l n a) -> Dict (Sql c) a
60+ step1 Dict = Dict
61+
62+ step2 :: Dict (Sql c) a -> Dict c (Unnullify a)
63+ step2 Dict = Dict
64+
65+
66+fromNullityDict :: Nullity a -> Dict c (Unnullify a) -> Dict (ConstrainDBType c) ('Spec l n a)
67+fromNullityDict Null Dict = Dict
68+fromNullityDict NotNull Dict = Dict
69+
70+
71+nullifier :: ()
72+ => SSpec ('Spec labels necessity a)
73+ -> Dict (ConstrainDBType c) ('Spec labels necessity a)
74+ -> Dict (ConstrainDBType c) ('Spec labels necessity (Nullify a))
75+nullifier SSpec {} dict = case dbTypeDict dict of
76+ Dict -> case dbTypeNullity dict of
77+ Null -> Dict
78+ NotNull -> Dict
79+
80+
81+unnullifier :: ()
82+ => SSpec ('Spec labels necessity a)
83+ -> Dict (ConstrainDBType c) ('Spec labels necessity (Nullify a))
84+ -> Dict (ConstrainDBType c) ('Spec labels necessity a)
85+unnullifier SSpec {nullity} dict = case dbTypeDict dict of
86+ Dict -> case nullity of
87+ Null -> Dict
88+ NotNull -> case dbTypeNullity dict of
89+ Null -> fromNullityDict nullity Dict
src/Rel8/Schema/Spec/ConstrainType.hsnew file+31
@@ -0,0 +1,31 @@
1+{-# language ConstraintKinds #-}
2+{-# language DataKinds #-}
3+{-# language FlexibleInstances #-}
4+{-# language MultiParamTypeClasses #-}
5+{-# language QuantifiedConstraints #-}
6+{-# language StandaloneKindSignatures #-}
7+{-# language TypeFamilies #-}
8+{-# language UndecidableInstances #-}
9+
10+module Rel8.Schema.Spec.ConstrainType
11+ ( ConstrainType
12+ )
13+where
14+
15+-- base
16+import Data.Kind ( Constraint, Type )
17+import Prelude ()
18+
19+-- rel8
20+import Rel8.Schema.Spec ( Spec( Spec ) )
21+
22+
23+type ConstrainType :: (Type -> Constraint) -> Spec -> Constraint
24+class
25+ ( forall labels necessity a. ()
26+ => (spec ~ 'Spec labels necessity a)
27+ => constraint a
28+ ) =>
29+ ConstrainType constraint spec
30+instance (spec ~ 'Spec labels necessity a, constraint a) =>
31+ ConstrainType constraint spec
src/Rel8/Schema/Table.hs−20
@@ -1,26 +1,14 @@
11{-# language DeriveFunctor #-}
22{-# language DerivingStrategies #-}
3−{-# language DisambiguateRecordFields #-}
4−{-# language NamedFieldPuns #-}
5−{-# language StandaloneKindSignatures #-}
63
74module Rel8.Schema.Table
85 ( TableSchema(..)
9− , ppTable
106 )
117where
128
139-- base
14−import Data.Kind ( Type )
1510import Prelude
1611
17−-- opaleye
18−import qualified Opaleye.Internal.HaskellDB.Sql as Opaleye
19−import qualified Opaleye.Internal.HaskellDB.Sql.Print as Opaleye
20−
21−-- pretty
22−import Text.PrettyPrint ( Doc )
23−
2412
2513-- | The schema for a table. This is used to specify the name and schema that a
2614-- table belongs to (the @FROM@ part of a SQL query), along with the schema of
@@ -28,7 +16,6 @@ import Text.PrettyPrint ( Doc )
2816--
2917-- For each selectable table in your database, you should provide a
3018-- @TableSchema@ in order to interact with the table via Rel8.
31−type TableSchema :: Type -> Type
3219data TableSchema names = TableSchema
3320 { name :: String
3421 -- ^ The name of the table.
@@ -40,10 +27,3 @@ data TableSchema names = TableSchema
4027 -- data type here, parameterized by the 'Rel8.ColumnSchema.ColumnSchema' functor.
4128 }
4229 deriving stock Functor
43−
44−
45−ppTable :: TableSchema a -> Doc
46−ppTable TableSchema {name, schema} = Opaleye.ppTable Opaleye.SqlTable
47− { sqlTableSchemaName = schema
48− , sqlTableName = name
49− }
src/Rel8/Statement/Delete.hs+48−35
@@ -1,37 +1,40 @@
11{-# language DuplicateRecordFields #-}
22{-# language GADTs #-}
33{-# language NamedFieldPuns #-}
4−{-# language RankNTypes #-}
5−{-# language RecordWildCards #-}
4+{-# language ScopedTypeVariables #-}
65{-# language StandaloneKindSignatures #-}
7−{-# language StrictData #-}
6+{-# language TypeApplications #-}
87
98module Rel8.Statement.Delete
109 ( Delete(..)
1110 , delete
12− , ppDelete
1311 )
1412where
1513
1614-- base
15+import Control.Exception ( throwIO )
1716import Data.Kind ( Type )
1817import Prelude
1918
2019-- hasql
20+import Hasql.Connection ( Connection )
21+import qualified Hasql.Decoders as Hasql
2122import qualified Hasql.Encoders as Hasql
23+import qualified Hasql.Session as Hasql
2224import qualified Hasql.Statement as Hasql
2325
24−-- pretty
25−import Text.PrettyPrint ( Doc, (<+>), ($$), text )
26+-- opaleye
27+import qualified Opaleye.Internal.Manipulation as Opaleye
2628
2729-- rel8
2830import Rel8.Expr ( Expr )
29−import Rel8.Query ( Query )
31+import Rel8.Expr.Opaleye ( toColumn, toPrimExpr )
3032import Rel8.Schema.Name ( Selects )
31−import Rel8.Schema.Table ( TableSchema, ppTable )
32−import Rel8.Statement.Returning ( Returning, decodeReturning, ppReturning )
33−import Rel8.Statement.Using ( ppUsing )
34−import Rel8.Statement.Where ( ppWhere )
33+import Rel8.Schema.Table ( TableSchema )
34+import Rel8.Statement.Returning ( Returning( NumberOfRowsAffected, Projection ) )
35+import Rel8.Table ( fromColumns, toColumns )
36+import Rel8.Table.Opaleye ( castTable, table, unpackspec )
37+import Rel8.Table.Serialize ( Serializable, parse )
3538
3639-- text
3740import qualified Data.Text as Text
@@ -44,10 +47,7 @@ data Delete a where
4447 Delete :: Selects names exprs =>
4548 { from :: TableSchema names
4649 -- ^ Which table to delete from.
47− , using :: Query using
48− -- ^ @USING@ clause — this can be used to join against other tables,
49− -- and its results can be referenced in the @WHERE@ clause
50− , deleteWhere :: using -> exprs -> Expr Bool
50+ , deleteWhere :: exprs -> Expr Bool
5151 -- ^ Which rows should be selected for deletion.
5252 , returning :: Returning names a
5353 -- ^ What to return from the @DELETE@ statement.
@@ -55,25 +55,38 @@ data Delete a where
5555 -> Delete a
5656
5757
58−ppDelete :: Delete a -> Doc
59−ppDelete Delete {..} = case ppUsing using of
60− Nothing ->
61− text "DELETE FROM" <+> ppTable from $$
62− text "WHERE false"
63− Just (usingDoc, i) ->
64− text "DELETE FROM" <+> ppTable from $$
65− usingDoc $$
66− ppWhere from (deleteWhere i) $$
67− ppReturning from returning
58+-- | Run a @DELETE@ statement.
59+delete :: Connection -> Delete a -> IO a
60+delete c Delete {from, deleteWhere, returning} =
61+ case returning of
62+ NumberOfRowsAffected -> Hasql.run session c >>= either throwIO pure
63+ where
64+ session = Hasql.statement () statement
65+ statement = Hasql.Statement bytes params decode prepare
66+ bytes = encodeUtf8 $ Text.pack sql
67+ params = Hasql.noParams
68+ decode = Hasql.rowsAffected
69+ prepare = False
70+ sql = Opaleye.arrangeDeleteSql from' where'
71+ where
72+ from' = table $ toColumns <$> from
73+ where' = toColumn . toPrimExpr . deleteWhere . fromColumns
6874
69−
70−-- | Run a 'Delete' statement.
71−delete :: Delete a -> Hasql.Statement () a
72−delete d@Delete {returning} = Hasql.Statement bytes params decode prepare
75+ Projection project -> Hasql.run session c >>= either throwIO pure
76+ where
77+ session = Hasql.statement () statement
78+ statement = Hasql.Statement bytes params decode prepare
79+ bytes = encodeUtf8 $ Text.pack sql
80+ params = Hasql.noParams
81+ decode = decoder project
82+ prepare = False
83+ sql =
84+ Opaleye.arrangeDeleteReturningSql unpackspec from' where' project'
85+ where
86+ from' = table $ toColumns <$> from
87+ where' = toColumn . toPrimExpr . deleteWhere . fromColumns
88+ project' = castTable . toColumns . project . fromColumns
7389 where
74− bytes = encodeUtf8 $ Text.pack sql
75− params = Hasql.noParams
76− decode = decodeReturning returning
77− prepare = False
78− sql = show doc
79− doc = ppDelete d
90+ decoder :: forall exprs projection a. Serializable projection a
91+ => (exprs -> projection) -> Hasql.Result [a]
92+ decoder _ = Hasql.rowList (parse @projection @a)
src/Rel8/Statement/Insert.hs+60−60
@@ -1,89 +1,89 @@
1−{-# language DuplicateRecordFields #-}
2−{-# language FlexibleContexts #-}
31{-# language GADTs #-}
42{-# language NamedFieldPuns #-}
5−{-# language RecordWildCards #-}
6−{-# language StandaloneKindSignatures #-}
7−{-# language StrictData #-}
3+{-# language ScopedTypeVariables #-}
4+{-# language TypeApplications #-}
85
96module Rel8.Statement.Insert
107 ( Insert(..)
8+ , OnConflict(..)
119 , insert
12− , ppInsert
13− , ppInto
1410 )
1511where
1612
1713-- base
18−import Data.Foldable ( toList )
19−import Data.Kind ( Type )
14+import Control.Exception ( throwIO )
15+import Data.List.NonEmpty ( NonEmpty( (:|) ) )
2016import Prelude
2117
2218-- hasql
19+import Hasql.Connection ( Connection )
20+import qualified Hasql.Decoders as Hasql
2321import qualified Hasql.Encoders as Hasql
22+import qualified Hasql.Session as Hasql
2423import qualified Hasql.Statement as Hasql
2524
2625-- opaleye
27−import qualified Opaleye.Internal.HaskellDB.Sql.Print as Opaleye
28−
29−-- pretty
30−import Text.PrettyPrint ( Doc, (<+>), ($$), parens, text )
26+import qualified Opaleye.Internal.Manipulation as Opaleye
27+import qualified Opaleye.Manipulation as Opaleye
3128
3229-- rel8
33−import Rel8.Query ( Query )
34−import Rel8.Schema.Name ( Name, Selects, ppColumn )
35−import Rel8.Schema.Table ( TableSchema(..), ppTable )
36−import Rel8.Statement.OnConflict ( OnConflict, ppOnConflict )
37−import Rel8.Statement.Returning ( Returning, decodeReturning, ppReturning )
38−import Rel8.Statement.Select ( ppRows )
39−import Rel8.Table ( Table )
40−import Rel8.Table.Name ( showNames )
30+import Rel8.Schema.Insert ( Insert(..), OnConflict(..) )
31+import Rel8.Statement.Returning ( Returning( Projection, NumberOfRowsAffected ) )
32+import Rel8.Table ( fromColumns, toColumns )
33+import Rel8.Table.Opaleye ( castTable, table, unpackspec )
34+import Rel8.Table.Serialize ( Serializable, parse )
4135
4236-- text
4337import qualified Data.Text as Text ( pack )
4438import Data.Text.Encoding ( encodeUtf8 )
4539
4640
47−-- | The constituent parts of a SQL @INSERT@ statement.
48−type Insert :: Type -> Type
49−data Insert a where
50− Insert :: Selects names exprs =>
51− { into :: TableSchema names
52− -- ^ Which table to insert into.
53− , rows :: Query exprs
54− -- ^ The rows to insert. This can be an arbitrary query — use
55− -- 'Rel8.values' insert a static list of rows.
56− , onConflict :: OnConflict names
57− -- ^ What to do if the inserted rows conflict with data already in the
58− -- table.
59− , returning :: Returning names a
60− -- ^ What information to return on completion.
61− }
62− -> Insert a
63−
64−
65−ppInsert :: Insert a -> Doc
66−ppInsert Insert {..} =
67− text "INSERT INTO" <+>
68− ppInto into $$
69− ppRows rows $$
70− ppOnConflict into onConflict $$
71− ppReturning into returning
41+-- | Run an @INSERT@ statement
42+insert :: Connection -> Insert a -> IO a
43+insert c Insert {into, rows, onConflict, returning} =
44+ case (rows, returning) of
45+ ([], NumberOfRowsAffected) -> pure 0
46+ ([], Projection _) -> pure []
7247
48+ (x:xs, NumberOfRowsAffected) -> Hasql.run session c >>= either throwIO pure
49+ where
50+ session = Hasql.statement () statement
51+ statement = Hasql.Statement bytes params decode prepare
52+ bytes = encodeUtf8 $ Text.pack sql
53+ params = Hasql.noParams
54+ decode = Hasql.rowsAffected
55+ prepare = False
56+ sql = Opaleye.arrangeInsertManySql into' rows' onConflict'
57+ where
58+ into' = table $ toColumns <$> into
59+ rows' = toColumns <$> x :| xs
7360
74−ppInto :: Table Name a => TableSchema a -> Doc
75−ppInto table@TableSchema {columns} =
76− ppTable table <+>
77− parens (Opaleye.commaV ppColumn (toList (showNames columns)))
61+ (x:xs, Projection project) -> Hasql.run session c >>= either throwIO pure
62+ where
63+ session = Hasql.statement () statement
64+ statement = Hasql.Statement bytes params decode prepare
65+ bytes = encodeUtf8 $ Text.pack sql
66+ params = Hasql.noParams
67+ decode = decoder project
68+ prepare = False
69+ sql =
70+ Opaleye.arrangeInsertManyReturningSql
71+ unpackspec
72+ into'
73+ rows'
74+ project'
75+ onConflict'
76+ where
77+ into' = table $ toColumns <$> into
78+ rows' = toColumns <$> x :| xs
79+ project' = castTable . toColumns . project . fromColumns
7880
79−
80−-- | Run an 'Insert' statement.
81−insert :: Insert a -> Hasql.Statement () a
82−insert i@Insert {returning} = Hasql.Statement bytes params decode prepare
8381 where
84− bytes = encodeUtf8 $ Text.pack sql
85− params = Hasql.noParams
86− decode = decodeReturning returning
87− prepare = False
88− sql = show doc
89− doc = ppInsert i
82+ onConflict' =
83+ case onConflict of
84+ DoNothing -> Just Opaleye.DoNothing
85+ Abort -> Nothing
86+
87+ decoder :: forall exprs projection a. Serializable projection a
88+ => (exprs -> projection) -> Hasql.Result [a]
89+ decoder _ = Hasql.rowList (parse @projection @a)
src/Rel8/Statement/OnConflict.hsdeleted−106
@@ -1,106 +0,0 @@
1−{-# language DuplicateRecordFields #-}
2−{-# language FlexibleContexts #-}
3−{-# language GADTs #-}
4−{-# language LambdaCase #-}
5−{-# language NamedFieldPuns #-}
6−{-# language RecordWildCards #-}
7−{-# language StandaloneKindSignatures #-}
8−{-# language StrictData #-}
9−
10−module Rel8.Statement.OnConflict
11− ( OnConflict(..)
12− , Upsert(..)
13− , ppOnConflict
14− )
15−where
16−
17−-- base
18−import Data.Foldable ( toList )
19−import Data.Kind ( Type )
20−import Prelude
21−
22−-- opaleye
23−import qualified Opaleye.Internal.HaskellDB.Sql.Print as Opaleye
24−
25−-- pretty
26−import Text.PrettyPrint ( Doc, (<+>), ($$), parens, text )
27−
28−-- rel8
29−import Rel8.Expr ( Expr )
30−import Rel8.Schema.Name ( Name, Selects, ppColumn )
31−import Rel8.Schema.Table ( TableSchema(..) )
32−import Rel8.Statement.Set ( ppSet )
33−import Rel8.Statement.Where ( ppWhere )
34−import Rel8.Table ( Table, toColumns )
35−import Rel8.Table.Cols ( Cols( Cols ) )
36−import Rel8.Table.Name ( showNames )
37−import Rel8.Table.Opaleye ( attributes )
38−import Rel8.Table.Projection ( Projecting, Projection, apply )
39−
40−
41−-- | 'OnConflict' represents the @ON CONFLICT@ clause of an @INSERT@
42−-- statement. This specifies what ought to happen when one or more of the
43−-- rows proposed for insertion conflict with an existing row in the table.
44−type OnConflict :: Type -> Type
45−data OnConflict names
46− = Abort
47− -- ^ Abort the transaction if there are conflicting rows (Postgres' default)
48− | DoNothing
49− -- ^ @ON CONFLICT DO NOTHING@
50− | DoUpdate (Upsert names)
51− -- ^ @ON CONFLICT DO UPDATE@
52−
53−
54−-- | The @ON CONFLICT (...) DO UPDATE@ clause of an @INSERT@ statement, also
55−-- known as \"upsert\".
56−--
57−-- When an existing row conflicts with a row proposed for insertion,
58−-- @ON CONFLICT DO UPDATE@ allows you to instead update this existing row. The
59−-- conflicting row proposed for insertion is then \"excluded\", but its values
60−-- can still be referenced from the @SET@ and @WHERE@ clauses of the @UPDATE@
61−-- statement.
62−--
63−-- Upsert in Postgres requires an explicit set of \"conflict targets\" — the
64−-- set of columns comprising the @UNIQUE@ index from conflicts with which we
65−-- would like to recover.
66−type Upsert :: Type -> Type
67−data Upsert names where
68− Upsert :: (Selects names exprs, Projecting names index, excluded ~ exprs) =>
69− { index :: Projection names index
70− -- ^ The set of conflict targets, projected from the set of columns for
71− -- the whole table
72− , set :: excluded -> exprs -> exprs
73− -- ^ How to update each selected row.
74− , updateWhere :: excluded -> exprs -> Expr Bool
75− -- ^ Which rows to select for update.
76− }
77− -> Upsert names
78−
79−
80−ppOnConflict :: TableSchema names -> OnConflict names -> Doc
81−ppOnConflict schema = \case
82− Abort -> mempty
83− DoNothing -> text "ON CONFLICT DO NOTHING"
84− DoUpdate upsert -> ppUpsert schema upsert
85−
86−
87−ppUpsert :: TableSchema names -> Upsert names -> Doc
88−ppUpsert schema@TableSchema {columns} Upsert {..} =
89− text "ON CONFLICT" <+>
90− ppIndex schema index <+>
91− text "DO UPDATE" $$
92− ppSet schema (set excluded) $$
93− ppWhere schema (updateWhere excluded)
94− where
95− excluded = attributes TableSchema
96− { schema = Nothing
97− , name = "excluded"
98− , columns
99− }
100−
101−
102−ppIndex :: (Table Name names, Projecting names index)
103− => TableSchema names -> Projection names index -> Doc
104−ppIndex TableSchema {columns} index =
105− parens $ Opaleye.commaV ppColumn $ toList $
106− showNames $ Cols $ apply index $ toColumns columns
src/Rel8/Statement/Returning.hs+10−114
@@ -1,133 +1,29 @@
11{-# language GADTs #-}
2−{-# language LambdaCase #-}
3−{-# language NamedFieldPuns #-}
4−{-# language RankNTypes #-}
5−{-# language ScopedTypeVariables #-}
62{-# language StandaloneKindSignatures #-}
7−{-# language StrictData #-}
8−{-# language TypeApplications #-}
93
104module Rel8.Statement.Returning
11− ( Returning( NumberOfRowsAffected, Projection )
12− , decodeReturning
13− , ppReturning
5+ ( Returning(..)
146 )
157where
168
179-- base
18−import Control.Applicative ( liftA2 )
19−import Data.Foldable ( toList )
2010import Data.Int ( Int64 )
2111import Data.Kind ( Type )
22−import Data.List.NonEmpty ( NonEmpty )
23−import Prelude
24−
25−-- hasql
26−import qualified Hasql.Decoders as Hasql
27−
28−-- opaleye
29−import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
30−import qualified Opaleye.Internal.HaskellDB.Sql.Print as Opaleye
31−import qualified Opaleye.Internal.Sql as Opaleye
32−
33−-- pretty
34−import Text.PrettyPrint ( Doc, (<+>), text )
12+import Prelude ()
3513
3614-- rel8
3715import Rel8.Schema.Name ( Selects )
38−import Rel8.Schema.Table ( TableSchema(..) )
39−import Rel8.Table.Opaleye ( castTable, exprs, view )
40−import Rel8.Table.Serialize ( Serializable, parse )
16+import Rel8.Table.Serialize ( Serializable )
4117
42−-- semigropuoids
43−import Data.Functor.Apply ( Apply, (<.>) )
4418
45−
46−-- | 'Rel8.Insert', 'Rel8.Update' and 'Rel8.Delete' all support returning either
47−-- the number of rows affected, or the actual rows modified.
19+-- | @INSERT@, @UPDATE@ and @DELETE@ all support returning either the number of
20+-- rows affected, or the actual rows modified. 'Projection' allows you to
21+-- project out of these returned rows, which can be useful if you want to log
22+-- exactly which rows were deleted, or to view a generated id (for example, if
23+-- using a column with an autoincrementing counter as a default value).
4824type Returning :: Type -> Type -> Type
4925data Returning names a where
50− Pure :: a -> Returning names a
51− Ap :: Returning names (a -> b) -> Returning names a -> Returning names b
52−
53− -- | Return the number of rows affected.
5426 NumberOfRowsAffected :: Returning names Int64
55−
56− -- | 'Projection' allows you to project out of the affected rows, which can
57− -- be useful if you want to log exactly which rows were deleted, or to view
58− -- a generated id (for example, if using a column with an autoincrementing
59− -- counter via 'Rel8.nextval').
60− Projection :: (Selects names exprs, Serializable returning a)
61− => (exprs -> returning)
27+ Projection :: (Selects names exprs, Serializable projection a)
28+ => (exprs -> projection)
6229 -> Returning names [a]
63−
64−
65−instance Functor (Returning names) where
66− fmap f = \case
67− Pure a -> Pure (f a)
68− Ap g a -> Ap (fmap (f .) g) a
69− m -> Ap (Pure f) m
70−
71−
72−instance Apply (Returning names) where
73− (<.>) = Ap
74−
75−
76−instance Applicative (Returning names) where
77− pure = Pure
78− (<*>) = Ap
79−
80−
81−projections :: ()
82− => TableSchema names -> Returning names a -> Maybe (NonEmpty Opaleye.PrimExpr)
83−projections schema@TableSchema {columns} = \case
84− Pure _ -> Nothing
85− Ap f a -> projections schema f <> projections schema a
86− NumberOfRowsAffected -> Nothing
87− Projection f -> Just (exprs (castTable (f (view columns))))
88−
89−
90−runReturning :: ()
91− => ((Int64 -> a) -> r)
92− -> (forall x. Hasql.Row x -> ([x] -> a) -> r)
93− -> Returning names a
94− -> r
95−runReturning rowCount rowList = \case
96− Pure a -> rowCount (const a)
97− Ap fs as ->
98− runReturning
99− (\withCount ->
100− runReturning
101− (\withCount' -> rowCount (withCount <*> withCount'))
102− (\decoder -> rowList decoder . liftA2 withCount length64)
103− as)
104− (\decoder withRows ->
105− runReturning
106− (\withCount -> rowList decoder $ withRows <*> withCount . length64)
107− (\decoder' withRows' ->
108− rowList (liftA2 (,) decoder decoder') $
109− withRows <$> fmap fst <*> withRows' . fmap snd)
110− as)
111− fs
112− NumberOfRowsAffected -> rowCount id
113− Projection (_ :: exprs -> returning) -> rowList decoder' id
114− where
115− decoder' = parse @returning
116− where
117− length64 :: Foldable f => f x -> Int64
118− length64 = fromIntegral . length
119−
120−
121−decodeReturning :: Returning names a -> Hasql.Result a
122−decodeReturning = runReturning
123− (<$> Hasql.rowsAffected)
124− (\decoder withRows -> withRows <$> Hasql.rowList decoder)
125−
126−
127−ppReturning :: TableSchema names -> Returning names a -> Doc
128−ppReturning schema returning = case projections schema returning of
129− Nothing -> mempty
130− Just columns ->
131− text "RETURNING" <+> Opaleye.commaV Opaleye.ppSqlExpr (toList sqlExprs)
132− where
133− sqlExprs = Opaleye.sqlExpr <$> columns
src/Rel8/Statement/SQL.hsdeleted−29
@@ -1,29 +0,0 @@
1−module Rel8.Statement.SQL
2− ( showDelete
3− , showInsert
4− , showUpdate
5− )
6−where
7−
8−-- base
9−import Prelude
10−
11−-- rel8
12−import Rel8.Statement.Delete ( Delete, ppDelete )
13−import Rel8.Statement.Insert ( Insert, ppInsert )
14−import Rel8.Statement.Update ( Update, ppUpdate )
15−
16−
17−-- | Convert a 'Delete' to a 'String' containing a @DELETE@ statement.
18−showDelete :: Delete a -> String
19−showDelete = show . ppDelete
20−
21−
22−-- | Convert an 'Insert' to a 'String' containing an @INSERT@ statement.
23−showInsert :: Insert a -> String
24−showInsert = show . ppInsert
25−
26−
27−-- | Convert an 'Update' to a 'String' containing an @UPDATE@ statement.
28−showUpdate :: Update a -> String
29−showUpdate = show . ppUpdate
src/Rel8/Statement/Select.hs+35−120
@@ -1,147 +1,62 @@
1−{-# language DeriveTraversable #-}
2−{-# language DerivingStrategies #-}
3−{-# language FlexibleContexts #-}
41{-# language MonoLocalBinds #-}
52{-# language ScopedTypeVariables #-}
6−{-# language StandaloneKindSignatures #-}
73{-# language TypeApplications #-}
84
95module Rel8.Statement.Select
106 ( select
11− , ppSelect
12−
13− , Optimized(..)
14− , ppPrimSelect
15− , ppRows
7+ , selectWithNames
168 )
179where
1810
1911-- base
20−import Data.Foldable ( toList )
21−import Data.Kind ( Type )
22−import Data.Void ( Void )
23−import Prelude hiding ( undefined )
12+import Control.Exception ( throwIO )
13+import Prelude
2414
2515-- hasql
16+import Hasql.Connection ( Connection )
2617import qualified Hasql.Decoders as Hasql
2718import qualified Hasql.Encoders as Hasql
19+import qualified Hasql.Session as Hasql
2820import qualified Hasql.Statement as Hasql
2921
30−-- opaleye
31−import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
32−import qualified Opaleye.Internal.HaskellDB.Sql as Opaleye
33−import qualified Opaleye.Internal.HaskellDB.Sql.Print as Opaleye
34−import qualified Opaleye.Internal.PrimQuery as Opaleye
35−import qualified Opaleye.Internal.Print as Opaleye
36−import qualified Opaleye.Internal.Optimize as Opaleye
37−import qualified Opaleye.Internal.QueryArr as Opaleye hiding ( Select )
38−import qualified Opaleye.Internal.Sql as Opaleye hiding ( Values )
39−import qualified Opaleye.Internal.Tag as Opaleye
40−
41−-- pretty
42−import Text.PrettyPrint ( Doc )
43−
4422-- rel8
45−import Rel8.Expr ( Expr )
46−import Rel8.Expr.Bool ( false )
47−import Rel8.Expr.Opaleye ( toPrimExpr )
4823import Rel8.Query ( Query )
49−import Rel8.Query.Opaleye ( toOpaleye )
24+import Rel8.Query.SQL ( sqlForQuery, sqlForQueryWithNames )
5025import Rel8.Schema.Name ( Selects )
51−import Rel8.Table ( Table )
52−import Rel8.Table.Cols ( toCols )
53−import Rel8.Table.Name ( namesFromLabels )
54−import Rel8.Table.Opaleye ( castTable, exprsWithNames )
55−import qualified Rel8.Table.Opaleye as T
5626import Rel8.Table.Serialize ( Serializable, parse )
57−import Rel8.Table.Undefined ( undefined )
5827
5928-- text
6029import qualified Data.Text as Text
6130import Data.Text.Encoding ( encodeUtf8 )
6231
6332
64−-- | Run a @SELECT@ statement, returning all rows.
33+-- | Run a @SELECT@ query, returning all rows.
6534select :: forall exprs a. Serializable exprs a
66− => Query exprs -> Hasql.Statement () [a]
67−select query = Hasql.Statement bytes params decode prepare
68− where
69− bytes = encodeUtf8 (Text.pack sql)
70− params = Hasql.noParams
71− decode = Hasql.rowList (parse @exprs @a)
72− prepare = False
73− sql = show doc
74− doc = ppSelect query
75−
76−
77−ppSelect :: Table Expr a => Query a -> Doc
78−ppSelect query =
79− Opaleye.ppSql $ primSelectWith names (toCols exprs') primQuery'
80− where
81− names = namesFromLabels
82− (exprs, primQuery, _) =
83− Opaleye.runSimpleQueryArrStart (toOpaleye query) ()
84− (exprs', primQuery') = case optimize primQuery of
85− Empty -> (undefined, Opaleye.Product (pure (pure Opaleye.Unit)) never)
86− Unit -> (exprs, Opaleye.Unit)
87− Optimized pq -> (exprs, pq)
88− never = pure (toPrimExpr false)
89−
90−
91−ppRows :: Table Expr a => Query a -> Doc
92−ppRows query = case optimize primQuery of
93− -- Special case VALUES because we can't use DEFAULT inside a SELECT
94− Optimized (Opaleye.Values symbols rows)
95− | eqSymbols symbols (toList (T.exprs a)) ->
96− Opaleye.ppValues_ (map Opaleye.sqlExpr <$> toList rows)
97− _ -> ppSelect query
98− where
99− (a, primQuery, _) = Opaleye.runSimpleQueryArrStart (toOpaleye query) ()
100−
101− eqSymbols (symbol : symbols) (Opaleye.AttrExpr symbol' : exprs)
102− | eqSymbol symbol symbol' = eqSymbols symbols exprs
103− | otherwise = False
104− eqSymbols [] [] = True
105− eqSymbols _ _ = False
106−
107− eqSymbol
108− (Opaleye.Symbol name (Opaleye.UnsafeTag tag))
109− (Opaleye.Symbol name' (Opaleye.UnsafeTag tag'))
110− = name == name' && tag == tag'
111−
112−
113−ppPrimSelect :: Query a -> (Optimized Doc, a)
114−ppPrimSelect query =
115− (Opaleye.ppSql . primSelect <$> optimize primQuery, a)
116− where
117− (a, primQuery, _) = Opaleye.runSimpleQueryArrStart (toOpaleye query) ()
118−
119−
120−type Optimized :: Type -> Type
121−data Optimized a = Empty | Unit | Optimized a
122− deriving stock (Functor, Foldable, Traversable, Show)
123−
124−
125−optimize :: Opaleye.PrimQuery' a -> Optimized (Opaleye.PrimQuery' Void)
126−optimize query = case Opaleye.removeEmpty (Opaleye.optimize query) of
127− Nothing -> Empty
128− Just Opaleye.Unit -> Unit
129− Just query' -> Optimized query'
130−
131−
132−primSelect :: Opaleye.PrimQuery' Void -> Opaleye.Select
133−primSelect = Opaleye.foldPrimQuery Opaleye.sqlQueryGenerator
134−
135−
136−primSelectWith :: Selects names exprs
137− => names -> exprs -> Opaleye.PrimQuery' Void -> Opaleye.Select
138−primSelectWith names exprs query =
139− Opaleye.SelectFrom $ Opaleye.newSelect
140− { Opaleye.attrs = Opaleye.SelectAttrs attrs
141− , Opaleye.tables = Opaleye.oneTable (primSelect query)
142− }
143− where
144− attrs = makeAttr <$> exprsWithNames names (castTable exprs)
145− where
146− makeAttr (label, expr) =
147− (Opaleye.sqlExpr expr, Just (Opaleye.SqlColumn label))
35+ => Connection -> Query exprs -> IO [a]
36+select c query = case sqlForQuery query of
37+ Nothing -> pure []
38+ Just sql -> Hasql.run session c >>= either throwIO pure
39+ where
40+ session = Hasql.statement () statement
41+ statement = Hasql.Statement bytes params decode prepare
42+ bytes = encodeUtf8 (Text.pack sql)
43+ params = Hasql.noParams
44+ decode = Hasql.rowList (parse @exprs @a)
45+ prepare = False
46+
47+
48+selectWithNames :: forall exprs a names.
49+ ( Selects names exprs
50+ , Serializable exprs a
51+ )
52+ => Connection -> names -> Query exprs -> IO [a]
53+selectWithNames c names query = case sqlForQueryWithNames names query of
54+ Nothing -> pure []
55+ Just sql -> Hasql.run session c >>= either throwIO pure
56+ where
57+ session = Hasql.statement () statement
58+ statement = Hasql.Statement bytes params decode prepare
59+ bytes = encodeUtf8 (Text.pack sql)
60+ params = Hasql.noParams
61+ decode = Hasql.rowList (parse @exprs @a)
62+ prepare = False
src/Rel8/Statement/Set.hsdeleted−33
@@ -1,33 +0,0 @@
1−{-# language MonoLocalBinds #-}
2−{-# language NamedFieldPuns #-}
3−
4−module Rel8.Statement.Set
5− ( ppSet
6− )
7−where
8−
9−-- base
10−import Data.Foldable ( toList )
11−import Prelude ()
12−
13−-- opaleye
14−import qualified Opaleye.Internal.HaskellDB.Sql.Print as Opaleye
15−import qualified Opaleye.Internal.Sql as Opaleye
16−
17−-- pretty
18−import Text.PrettyPrint ( Doc, (<+>), equals, text )
19−
20−-- rel8
21−import Rel8.Schema.Name ( Selects, ppColumn )
22−import Rel8.Schema.Table ( TableSchema(..) )
23−import Rel8.Table.Opaleye ( attributes, exprsWithNames )
24−
25−
26−ppSet :: Selects names exprs
27− => TableSchema names -> (exprs -> exprs) -> Doc
28−ppSet schema@TableSchema {columns} f =
29− text "SET" <+> Opaleye.commaV ppAssign (toList assigns)
30− where
31− assigns = exprsWithNames columns (f (attributes schema))
32− ppAssign (column, expr) =
33− ppColumn column <+> equals <+> Opaleye.ppSqlExpr (Opaleye.sqlExpr expr)
src/Rel8/Statement/Update.hs+60−38
@@ -1,37 +1,43 @@
1−{-# language DuplicateRecordFields #-}
21{-# language GADTs #-}
32{-# language NamedFieldPuns #-}
4−{-# language RecordWildCards #-}
3+{-# language ScopedTypeVariables #-}
54{-# language StandaloneKindSignatures #-}
6−{-# language StrictData #-}
5+{-# language TypeApplications #-}
76
87module Rel8.Statement.Update
98 ( Update(..)
109 , update
11− , ppUpdate
1210 )
1311where
1412
1513-- base
14+import Control.Exception ( throwIO )
1615import Data.Kind ( Type )
1716import Prelude
1817
1918-- hasql
19+import Hasql.Connection ( Connection )
20+import qualified Hasql.Decoders as Hasql
2021import qualified Hasql.Encoders as Hasql
22+import qualified Hasql.Session as Hasql
2123import qualified Hasql.Statement as Hasql
2224
23−-- pretty
24−import Text.PrettyPrint ( Doc, (<+>), ($$), text )
25+-- opaleye
26+import qualified Opaleye.Internal.Manipulation as Opaleye
27+
28+-- profunctors
29+import Data.Profunctor ( lmap )
2530
2631-- rel8
2732import Rel8.Expr ( Expr )
28−import Rel8.Query ( Query )
33+import Rel8.Expr.Opaleye ( toColumn, toPrimExpr )
2934import Rel8.Schema.Name ( Selects )
30−import Rel8.Schema.Table ( TableSchema(..), ppTable )
31−import Rel8.Statement.Returning ( Returning, decodeReturning, ppReturning )
32−import Rel8.Statement.Set ( ppSet )
33−import Rel8.Statement.Using ( ppFrom )
34−import Rel8.Statement.Where ( ppWhere )
35+import Rel8.Schema.Table ( TableSchema )
36+import Rel8.Statement.Returning ( Returning( Projection, NumberOfRowsAffected ) )
37+import Rel8.Table ( fromColumns, toColumns )
38+import Rel8.Table.Insert ( toInsert )
39+import Rel8.Table.Opaleye ( castTable, table, unpackspec )
40+import Rel8.Table.Serialize ( Serializable, parse )
3541
3642-- text
3743import qualified Data.Text as Text
@@ -44,12 +50,9 @@ data Update a where
4450 Update :: Selects names exprs =>
4551 { target :: TableSchema names
4652 -- ^ Which table to update.
47− , from :: Query from
48− -- ^ @FROM@ clause — this can be used to join against other tables,
49− -- and its results can be referenced in the @SET@ and @WHERE@ clauses.
50− , set :: from -> exprs -> exprs
53+ , set :: exprs -> exprs
5154 -- ^ How to update each selected row.
52− , updateWhere :: from -> exprs -> Expr Bool
55+ , updateWhere :: exprs -> Expr Bool
5356 -- ^ Which rows to select for update.
5457 , returning :: Returning names a
5558 -- ^ What to return from the @UPDATE@ statement.
@@ -57,27 +60,46 @@ data Update a where
5760 -> Update a
5861
5962
60−ppUpdate :: Update a -> Doc
61−ppUpdate Update {..} = case ppFrom from of
62− Nothing ->
63− text "UPDATE" <+> ppTable target $$
64− ppSet target id $$
65− text "WHERE false"
66− Just (fromDoc, i) ->
67− text "UPDATE" <+> ppTable target $$
68− ppSet target (set i) $$
69− fromDoc $$
70− ppWhere target (updateWhere i) $$
71− ppReturning target returning
63+-- | Run an @UPDATE@ statement.
64+update :: Connection -> Update a -> IO a
65+update c Update {target, set, updateWhere, returning} =
66+ case returning of
67+ NumberOfRowsAffected -> Hasql.run session c >>= either throwIO pure
68+ where
69+ session = Hasql.statement () statement
70+ statement = Hasql.Statement bytes params decode prepare
71+ bytes = encodeUtf8 $ Text.pack sql
72+ params = Hasql.noParams
73+ decode = Hasql.rowsAffected
74+ prepare = False
75+ sql = Opaleye.arrangeUpdateSql target' set' where'
76+ where
77+ target' = lmap toInsert $ table $ toColumns <$> target
78+ set' = toColumns . set . fromColumns
79+ where' = toColumn . toPrimExpr . updateWhere . fromColumns
7280
81+ Projection project -> Hasql.run session c >>= either throwIO pure
82+ where
83+ session = Hasql.statement () statement
84+ statement = Hasql.Statement bytes params decode prepare
85+ bytes = encodeUtf8 $ Text.pack sql
86+ params = Hasql.noParams
87+ decode = decoder project
88+ prepare = False
89+ sql =
90+ Opaleye.arrangeUpdateReturningSql
91+ unpackspec
92+ target'
93+ set'
94+ where'
95+ project'
96+ where
97+ target' = lmap toInsert $ table $ toColumns <$> target
98+ set' = toColumns . set . fromColumns
99+ where' = toColumn . toPrimExpr . updateWhere . fromColumns
100+ project' = castTable . toColumns . project . fromColumns
73101
74−-- | Run an @UPDATE@ statement.
75−update :: Update a -> Hasql.Statement () a
76−update u@Update {returning} = Hasql.Statement bytes params decode prepare
77102 where
78− bytes = encodeUtf8 $ Text.pack sql
79− params = Hasql.noParams
80− decode = decodeReturning returning
81− prepare = False
82− sql = show doc
83− doc = ppUpdate u
103+ decoder :: forall exprs projection a. Serializable projection a
104+ => (exprs -> projection) -> Hasql.Result [a]
105+ decoder _ = Hasql.rowList (parse @projection @a)
src/Rel8/Statement/Using.hsdeleted−36
@@ -1,36 +0,0 @@
1−module Rel8.Statement.Using
2− ( ppFrom
3− , ppUsing
4− )
5−where
6−
7−-- base
8−import Prelude
9−
10−-- pretty
11−import Text.PrettyPrint ( Doc, (<+>), parens, text )
12−
13−-- rel8
14−import Rel8.Query ( Query )
15−import Rel8.Schema.Table ( TableSchema(..), ppTable )
16−import Rel8.Statement.Select ( Optimized(..), ppPrimSelect )
17−
18−
19−ppFrom :: Query a -> Maybe (Doc, a)
20−ppFrom = ppJoin "FROM"
21−
22−
23−ppUsing :: Query a -> Maybe (Doc, a)
24−ppUsing = ppJoin "USING"
25−
26−
27−ppJoin :: String -> Query a -> Maybe (Doc, a)
28−ppJoin clause join = do
29− doc <- case ofrom of
30− Empty -> Nothing
31− Unit -> Just mempty
32− Optimized doc -> Just $ text clause <+> parens doc <+> ppTable alias
33− pure (doc, a)
34− where
35− alias = TableSchema {name = "T1", schema = Nothing, columns = ()}
36− (ofrom, a) = ppPrimSelect join
src/Rel8/Statement/View.hs+28−43
@@ -3,76 +3,61 @@
33
44module Rel8.Statement.View
55 ( createView
6− , createOrReplaceView
76 )
87where
98
109-- base
10+import Control.Exception ( throwIO )
11+import Control.Monad ( (>=>) )
12+import Data.Foldable ( fold )
13+import Data.Maybe ( fromMaybe )
1114import Prelude
1215
1316-- hasql
17+import Hasql.Connection ( Connection )
1418import qualified Hasql.Decoders as Hasql
1519import qualified Hasql.Encoders as Hasql
20+import qualified Hasql.Session as Hasql
1621import qualified Hasql.Statement as Hasql
1722
1823-- rel8
1924import Rel8.Query ( Query )
25+import Rel8.Query.SQL ( sqlForQueryWithNames )
2026import Rel8.Schema.Name ( Selects )
21−import Rel8.Schema.Table ( TableSchema )
22−import Rel8.Statement.Insert ( ppInto )
23−import Rel8.Statement.Select ( ppSelect )
24−
25−-- pretty
26−import Text.PrettyPrint ( Doc, (<+>), ($$), text )
27+import Rel8.Schema.Table ( TableSchema( TableSchema ) )
28+import Rel8.Table.Alternative ( emptyTable )
2729
2830-- text
2931import qualified Data.Text as Text
3032import Data.Text.Encoding ( encodeUtf8 )
3133
3234
33−data CreateView = Create | CreateOrReplace
34−
35−
3635-- | Given a 'TableSchema' and 'Query', @createView@ runs a @CREATE VIEW@
3736-- statement that will save the given query as a view. This can be useful if
3837-- you want to share Rel8 queries with other applications.
3938createView :: Selects names exprs
40− => TableSchema names -> Query exprs -> Hasql.Statement () ()
41−createView =
42− createViewGeneric Create
43−
44−
45−-- | Given a 'TableSchema' and 'Query', @createOrReplaceView@ runs a
46−-- @CREATE OR REPLACE VIEW@ statement that will save the given query
47−-- as a view, replacing the current view definition if it exists and
48−-- adheres to the restrictions in place for replacing a view in
49−-- PostgreSQL.
50−createOrReplaceView :: Selects names exprs
51− => TableSchema names -> Query exprs -> Hasql.Statement () ()
52−createOrReplaceView =
53− createViewGeneric CreateOrReplace
54−
55−
56−createViewGeneric :: Selects names exprs
57− => CreateView -> TableSchema names -> Query exprs -> Hasql.Statement () ()
58−createViewGeneric replace schema query =
59− Hasql.Statement bytes params decode prepare
39+ => TableSchema names -> Query exprs -> Connection -> IO ()
40+createView (TableSchema name mschema names) query =
41+ Hasql.run session >=> either throwIO pure
6042 where
43+ session = Hasql.statement () statement
44+ statement = Hasql.Statement bytes params decode prepare
6145 bytes = encodeUtf8 (Text.pack sql)
6246 params = Hasql.noParams
6347 decode = Hasql.noResult
6448 prepare = False
65− sql = show doc
66− doc = ppCreateView schema query replace
67−
68−
69−ppCreateView :: Selects names exprs
70− => TableSchema names -> Query exprs -> CreateView -> Doc
71−ppCreateView schema query replace =
72− createOrReplace replace <+>
73− ppInto schema $$
74− text "AS" <+>
75− ppSelect query
49+ sql = "CREATE VIEW " <> title <> " AS " <> select
50+ where
51+ title = case mschema of
52+ Nothing -> quote name
53+ Just schema -> quote schema <> "." <> quote name
54+ select = fromMaybe fallback $ sqlForQueryWithNames names query
55+ where
56+ fallback = fold $ sqlForQueryWithNames names emptyTable
57+
58+
59+quote :: String -> String
60+quote string = "\"" <> concatMap go string <> "\""
7661 where
77− createOrReplace Create = text "CREATE VIEW"
78− createOrReplace CreateOrReplace = text "CREATE OR REPLACE VIEW"
62+ go '"' = "\"\""
63+ go c = [c]
src/Rel8/Statement/Where.hsdeleted−31
@@ -1,31 +0,0 @@
1−{-# language MonoLocalBinds #-}
2−
3−module Rel8.Statement.Where
4− ( ppWhere
5− )
6−where
7−
8−-- base
9−import Prelude
10−
11−-- opaleye
12−import qualified Opaleye.Internal.HaskellDB.Sql.Print as Opaleye
13−import qualified Opaleye.Internal.Sql as Opaleye
14−
15−-- pretty
16−import Text.PrettyPrint ( Doc, (<+>), text )
17−
18−-- rel8
19−import Rel8.Expr ( Expr )
20−import Rel8.Expr.Opaleye ( toPrimExpr )
21−import Rel8.Schema.Name ( Selects )
22−import Rel8.Schema.Table ( TableSchema )
23−import Rel8.Table.Opaleye ( attributes )
24−
25−
26−ppWhere :: Selects names exprs
27− => TableSchema names -> (exprs -> Expr Bool) -> Doc
28−ppWhere schema where_ = text "WHERE" <+> ppExpr condition
29− where
30− ppExpr = Opaleye.ppSqlExpr . Opaleye.sqlExpr . toPrimExpr
31− condition = where_ (attributes schema)
src/Rel8/Table.hs+252−88
@@ -1,47 +1,77 @@
11{-# language AllowAmbiguousTypes #-}
22{-# language DataKinds #-}
33{-# language DefaultSignatures #-}
4+{-# language DisambiguateRecordFields #-}
45{-# language FlexibleContexts #-}
56{-# language FlexibleInstances #-}
67{-# language FunctionalDependencies #-}
8+{-# language LambdaCase #-}
9+{-# language NamedFieldPuns #-}
710{-# language ScopedTypeVariables #-}
811{-# language StandaloneKindSignatures #-}
912{-# language TypeApplications #-}
1013{-# language TypeFamilies #-}
14+{-# language TypeOperators #-}
1115{-# language UndecidableInstances #-}
1216
1317module Rel8.Table
14− ( Table
15− ( Columns, Context, fromColumns, toColumns
16− , FromExprs, fromResult, toResult
17− , Transpose
18− )
18+ ( Table (Columns, Context, Unreify, toColumns, fromColumns, reify, unreify)
1919 , Congruent
20− , TTable, TColumns, TContext, TFromExprs, TTranspose
21− , TSerialize
20+ , TTable, TColumns, TContext, TUnreify
2221 )
2322where
2423
2524-- base
25+import Data.Functor ( ($>) )
2626import Data.Functor.Identity ( Identity( Identity ) )
2727import Data.Kind ( Constraint, Type )
28+import Data.List.NonEmpty ( NonEmpty )
29+import Data.Proxy ( Proxy( Proxy ) )
30+import Data.Type.Equality ( (:~:)( Refl ) )
2831import GHC.Generics ( Generic, Rep, from, to )
2932import Prelude hiding ( null )
3033
3134-- rel8
3235import Rel8.FCF ( Eval, Exp )
33−import Rel8.Generic.Map ( Map )
34−import Rel8.Generic.Table.Record
35− ( GTable, GColumns, GContext, gfromColumns, gtoColumns
36− , GSerialize, gfromResult, gtoResult
36+import Rel8.Kind.Algebra ( KnownAlgebra )
37+import Rel8.Generic.Map ( GMap, GMappable, gmap, gunmap )
38+import Rel8.Generic.Table
39+ ( GGTable, GGColumns, GGContext, ggfromColumns, ggtoColumns
40+ , GAlgebra
3741 )
3842import Rel8.Generic.Record ( Record(..) )
43+import Rel8.Generic.Reify ( ARep )
44+import Rel8.Schema.Context.Label ( Labelable, labeler, unlabeler )
3945import Rel8.Schema.HTable ( HTable )
40−import Rel8.Schema.HTable.Identity ( HIdentity( HIdentity ) )
46+import Rel8.Schema.HTable.Either ( HEitherTable(..) )
47+import Rel8.Schema.HTable.Identity ( HIdentity(..), HType )
48+import Rel8.Schema.HTable.Label ( hlabel, hunlabel )
49+import Rel8.Schema.HTable.List ( HListTable )
50+import Rel8.Schema.HTable.Maybe ( HMaybeTable(..) )
51+import Rel8.Schema.HTable.NonEmpty ( HNonEmptyTable )
52+import Rel8.Schema.HTable.Nullify ( hnulls, hnullify, hunnullify )
53+import Rel8.Schema.HTable.These ( HTheseTable(..) )
54+import Rel8.Schema.HTable.Vectorize ( hvectorize, hunvectorize )
4155import qualified Rel8.Schema.Kind as K
4256import Rel8.Schema.Null ( Sql )
43−import Rel8.Schema.Result ( Result )
57+import Rel8.Schema.Reify
58+ ( Reify, Col( Reify ), hreify, hunreify
59+ , UnwrapReify
60+ , notReify
61+ )
62+import Rel8.Schema.Result
63+ ( Col( Result ), Result
64+ , relabel
65+ , null, nullifier, unnullifier
66+ , vectorizer, unvectorizer
67+ )
68+import Rel8.Schema.Spec ( KnownSpec )
4469import Rel8.Type ( DBType )
70+import Rel8.Type.Tag ( EitherTag( IsLeft, IsRight ), MaybeTag( IsJust ) )
71+
72+-- these
73+import Data.These ( These( This, That, These ) )
74+import Data.These.Combinators ( justHere, justThere )
4575
4676
4777-- | @Table@s are one of the foundational elements of Rel8, and describe data
@@ -56,102 +86,90 @@ import Rel8.Type ( DBType )
5686-- yourself, as anything that's an instance of 'Rel8.Rel8able' is always a
5787-- 'Table'.
5888type Table :: K.Context -> Type -> Constraint
59−class
60− ( HTable (Columns a)
61− , context ~ Context a
62− , a ~ Transpose context a
63− )
64− => Table context a | a -> context
65− where
89+class (HTable (Columns a), context ~ Context a) => Table context a | a -> context where
6690 -- | The 'HTable' functor that describes the schema of this table.
6791 type Columns a :: K.HTable
6892
6993 -- | The common context that all columns use as an interpretation.
7094 type Context a :: K.Context
7195
72− -- | The @FromExprs@ type family maps a type in the @Expr@ context to the
73− -- corresponding Haskell type.
74− type FromExprs a :: Type
75−
76− type Transpose (context' :: K.Context) a :: Type
96+ type Unreify a :: Type
7797
98+ toColumns :: a -> Columns a (Col context)
99+ fromColumns :: Columns a (Col context) -> a
78100
79− toColumns :: a -> Columns a context
80− fromColumns :: Columns a context -> a
101+ reify :: context :~: Reify ctx -> Unreify a -> a
102+ unreify :: context :~: Reify ctx -> a -> Unreify a
81103
82− fromResult :: Columns a Result -> FromExprs a
83− toResult :: FromExprs a -> Columns a Result
84−
85− type Columns a = GColumns TColumns (Rep (Record a))
86− type Context a = GContext TContext (Rep (Record a))
87− type FromExprs a = Map TFromExprs a
88− type Transpose context a = Map (TTranspose context) a
104+ type Columns a = Eval (GGColumns (GAlgebra (Rep (Record a))) TColumns (Rep (Record a)))
105+ type Context a = Eval (GGContext (GAlgebra (Rep (Record a))) TContext (Rep (Record a)))
106+ type Unreify a = DefaultUnreify a
89107
90108 default toColumns ::
91109 ( Generic (Record a)
92− , GTable (TTable context) TColumns (Rep (Record a))
93− , Columns a ~ GColumns TColumns (Rep (Record a))
110+ , KnownAlgebra (GAlgebra (Rep (Record a)))
111+ , Eval (GGTable (GAlgebra (Rep (Record a))) (TTable context) TColumns (Col context) (Rep (Record a)))
112+ , Columns a ~ Eval (GGColumns (GAlgebra (Rep (Record a))) TColumns (Rep (Record a)))
113+ , Context a ~ Eval (GGContext (GAlgebra (Rep (Record a))) TContext (Rep (Record a)))
94114 )
95− => a -> Columns a context
115+ => a -> Columns a (Col context)
96116 toColumns =
97− gtoColumns @(TTable context) @TColumns toColumns .
117+ ggtoColumns
118+ @(GAlgebra (Rep (Record a)))
119+ @(TTable context)
120+ @TColumns
121+ id
122+ id
123+ toColumns .
98124 from .
99125 Record
100126
101127 default fromColumns ::
102128 ( Generic (Record a)
103− , GTable (TTable context) TColumns (Rep (Record a))
104− , Columns a ~ GColumns TColumns (Rep (Record a))
129+ , KnownAlgebra (GAlgebra (Rep (Record a)))
130+ , Eval (GGTable (GAlgebra (Rep (Record a))) (TTable context) TColumns (Col context) (Rep (Record a)))
131+ , Columns a ~ Eval (GGColumns (GAlgebra (Rep (Record a))) TColumns (Rep (Record a)))
132+ , Context a ~ Eval (GGContext (GAlgebra (Rep (Record a))) TContext (Rep (Record a)))
105133 )
106− => Columns a context -> a
134+ => Columns a (Col context) -> a
107135 fromColumns =
108136 unrecord .
109137 to .
110− gfromColumns @(TTable context) @TColumns fromColumns
138+ ggfromColumns
139+ @(GAlgebra (Rep (Record a)))
140+ @(TTable context)
141+ @TColumns
142+ id
143+ id
144+ fromColumns
111145
112− default toResult ::
113− ( Generic (Record (FromExprs a))
114− , GSerialize TSerialize TColumns (Rep (Record a)) (Rep (Record (FromExprs a)))
115− , Columns a ~ GColumns TColumns (Rep (Record a))
146+ default reify ::
147+ ( Generic (Record a)
148+ , Generic (Record (Unreify a))
149+ , GMappable (TTable context) (Rep (Record a))
150+ , Rep (Record (Unreify a)) ~ GMap TUnreify (Rep (Record a))
116151 )
117− => FromExprs a -> Columns a Result
118− toResult =
119− gtoResult
120− @TSerialize
121− @TColumns
122− @(Rep (Record a))
123− @(Rep (Record (FromExprs a)))
124− (\(_ :: proxy x) -> toResult @(Context x) @x) .
152+ => context :~: Reify ctx -> Unreify a -> a
153+ reify Refl =
154+ unrecord .
155+ to .
156+ gunmap @(TTable context) (Proxy @TUnreify) (reify Refl) .
125157 from .
126158 Record
127159
128− default fromResult ::
129− ( Generic (Record (FromExprs a))
130− , GSerialize TSerialize TColumns (Rep (Record a)) (Rep (Record (FromExprs a)))
131− , Columns a ~ GColumns TColumns (Rep (Record a))
160+ default unreify ::
161+ ( Generic (Record a)
162+ , Generic (Record (Unreify a))
163+ , GMappable (TTable context) (Rep (Record a))
164+ , Rep (Record (Unreify a)) ~ GMap TUnreify (Rep (Record a))
132165 )
133− => Columns a Result -> FromExprs a
134− fromResult =
166+ => context :~: Reify ctx -> a -> Unreify a
167+ unreify Refl =
135168 unrecord .
136169 to .
137− gfromResult
138− @TSerialize
139− @TColumns
140− @(Rep (Record a))
141− @(Rep (Record (FromExprs a)))
142− (\(_ :: proxy x) -> fromResult @(Context x) @x)
143−
144−
145−instance Sql DBType a => Table Result (Identity a) where
146− type Columns (Identity a) = HIdentity a
147− type Context (Identity a) = Result
148− type FromExprs (Identity a) = a
149− type Transpose to (Identity a) = to a
150−
151− toColumns = HIdentity
152− fromColumns (HIdentity a) = a
153− toResult a = HIdentity (Identity a)
154− fromResult (HIdentity (Identity a)) = a
170+ gmap @(TTable context) (Proxy @TUnreify) (unreify Refl) .
171+ from .
172+ Record
155173
156174
157175data TTable :: K.Context -> Type -> Exp Constraint
@@ -166,32 +184,175 @@ data TContext :: Type -> Exp K.Context
166184type instance Eval (TContext a) = Context a
167185
168186
169−data TFromExprs :: Type -> Exp Type
170−type instance Eval (TFromExprs a) = FromExprs a
187+data TUnreify :: Type -> Exp Type
188+type instance Eval (TUnreify a) = Unreify a
171189
172190
173−data TTranspose :: K.Context -> Type -> Exp Type
174−type instance Eval (TTranspose context a) = Transpose context a
191+type DefaultUnreify :: Type -> Type
192+type family DefaultUnreify a where
193+ DefaultUnreify (t a b c d e f g) =
194+ t (Unreify a) (Unreify b) (Unreify c) (Unreify d) (Unreify e) (Unreify f) (Unreify g)
195+ DefaultUnreify (t a b c d e f) =
196+ t (Unreify a) (Unreify b) (Unreify c) (Unreify d) (Unreify e) (Unreify f)
197+ DefaultUnreify (t a b c d e) =
198+ t (Unreify a) (Unreify b) (Unreify c) (Unreify d) (Unreify e)
199+ DefaultUnreify (t a b c d) =
200+ t (Unreify a) (Unreify b) (Unreify c) (Unreify d)
201+ DefaultUnreify (t a b c) = t (Unreify a) (Unreify b) (Unreify c)
202+ DefaultUnreify (t a b) = t (Unreify a) (Unreify b)
203+ DefaultUnreify (t a) = t (Unreify a)
204+ DefaultUnreify a = ARep (GMap TUnreify (Rep a))
175205
176206
177−data TSerialize :: Type -> Type -> Exp Constraint
178−type instance Eval (TSerialize expr a) =
179− ( Table (Context expr) expr
180− , a ~ FromExprs expr
181− )
207+-- | Any 'HTable' is also a 'Table'.
208+instance HTable t => Table context (t (Col context)) where
209+ type Columns (t (Col context)) = t
210+ type Context (t (Col context)) = context
211+ type Unreify (t (Col context)) = t (Col (UnwrapReify context))
212+
213+ toColumns = id
214+ fromColumns = id
215+
216+ reify Refl = hreify
217+ unreify Refl = hunreify
182218
183219
184−instance (Table context a, Table context b) => Table context (a, b)
220+-- | Any context is trivially a table.
221+instance KnownSpec spec => Table context (Col context spec) where
222+ type Columns (Col context spec) = HIdentity spec
223+ type Context (Col context spec) = context
224+ type Unreify (Col context spec) = Col (UnwrapReify context) spec
225+
226+ toColumns = HIdentity
227+ fromColumns = unHIdentity
228+
229+ reify Refl = Reify
230+ unreify Refl (Reify a) = a
231+
232+
233+instance Sql DBType a => Table Result (Identity a) where
234+ type Columns (Identity a) = HType a
235+ type Context (Identity a) = Result
236+
237+ toColumns (Identity a) = HType (Result a)
238+ fromColumns (HType (Result a)) = Identity a
239+
240+ reify = notReify
241+ unreify = notReify
242+
243+
244+instance (Table Result a, Table Result b) => Table Result (Either a b) where
245+ type Columns (Either a b) = HEitherTable (Columns a) (Columns b)
246+ type Context (Either a b) = Result
247+
248+ toColumns = \case
249+ Left table -> HEitherTable
250+ { htag = HIdentity (Result IsLeft)
251+ , hleft = hlabel labeler (hnullify nullifier (toColumns table))
252+ , hright = hlabel labeler (hnulls (const null))
253+ }
254+ Right table -> HEitherTable
255+ { htag = HIdentity (Result IsRight)
256+ , hleft = hlabel labeler (hnulls (const null))
257+ , hright = hlabel labeler (hnullify nullifier (toColumns table))
258+ }
259+
260+ fromColumns HEitherTable {htag, hleft, hright} = case htag of
261+ HIdentity (Result tag) -> case tag of
262+ IsLeft -> maybe err (Left . fromColumns) $ hunnullify unnullifier (hunlabel unlabeler hleft)
263+ IsRight -> maybe err (Right . fromColumns) $ hunnullify unnullifier (hunlabel unlabeler hright)
264+ where
265+ err = error "Either.fromColumns: mismatch between tag and data"
266+
267+
268+instance Table Result a => Table Result [a] where
269+ type Columns [a] = HListTable (Columns a)
270+ type Context [a] = Result
271+
272+ toColumns = hvectorize vectorizer . fmap toColumns
273+ fromColumns = fmap fromColumns . hunvectorize unvectorizer
274+
275+
276+instance Table Result a => Table Result (Maybe a) where
277+ type Columns (Maybe a) = HMaybeTable (Columns a)
278+ type Context (Maybe a) = Result
279+
280+ toColumns = \case
281+ Nothing -> HMaybeTable
282+ { htag = HIdentity (Result Nothing)
283+ , hjust = hlabel labeler (hnulls (const null))
284+ }
285+ Just table -> HMaybeTable
286+ { htag = HIdentity (Result (Just IsJust))
287+ , hjust = hlabel labeler (hnullify nullifier (toColumns table))
288+ }
289+
290+ fromColumns HMaybeTable {htag, hjust} = case htag of
291+ HIdentity (Result tag) -> tag $>
292+ case hunnullify unnullifier (hunlabel unlabeler hjust) of
293+ Nothing -> error "Maybe.fromColumns: mismatch between tag and data"
294+ Just just -> fromColumns just
295+
296+
297+instance Table Result a => Table Result (NonEmpty a) where
298+ type Columns (NonEmpty a) = HNonEmptyTable (Columns a)
299+ type Context (NonEmpty a) = Result
300+
301+ toColumns = hvectorize vectorizer . fmap toColumns
302+ fromColumns = fmap fromColumns . hunvectorize unvectorizer
303+
304+
305+instance (Table Result a, Table Result b) => Table Result (These a b) where
306+ type Columns (These a b) = HTheseTable (Columns a) (Columns b)
307+ type Context (These a b) = Result
308+
309+ toColumns tables = HTheseTable
310+ { hhereTag = relabel hhereTag
311+ , hhere = hlabel labeler (hunlabel unlabeler (toColumns hhere))
312+ , hthereTag = relabel hthereTag
313+ , hthere = hlabel labeler (hunlabel unlabeler (toColumns hthere))
314+ }
315+ where
316+ HMaybeTable
317+ { htag = hhereTag
318+ , hjust = hhere
319+ } = toColumns (justHere tables)
320+ HMaybeTable
321+ { htag = hthereTag
322+ , hjust = hthere
323+ } = toColumns (justThere tables)
324+
325+ fromColumns HTheseTable {hhereTag, hhere, hthereTag, hthere} =
326+ case (fromColumns mhere, fromColumns mthere) of
327+ (Just a, Nothing) -> This (fromColumns a)
328+ (Nothing, Just b) -> That (fromColumns b)
329+ (Just a, Just b) -> These (fromColumns a) (fromColumns b)
330+ _ -> error "These.fromColumns: mismatch between tags and data"
331+ where
332+ mhere = HMaybeTable
333+ { htag = relabel hhereTag
334+ , hjust = hlabel labeler (hunlabel unlabeler hhere)
335+ }
336+ mthere = HMaybeTable
337+ { htag = relabel hthereTag
338+ , hjust = hlabel labeler (hunlabel unlabeler hthere)
339+ }
340+
341+
342+instance (Table context a, Table context b, Labelable context)
343+ => Table context (a, b)
185344
186345
187346instance
188347 ( Table context a, Table context b, Table context c
348+ , Labelable context
189349 )
190350 => Table context (a, b, c)
191351
192352
193353instance
194354 ( Table context a, Table context b, Table context c, Table context d
355+ , Labelable context
195356 )
196357 => Table context (a, b, c, d)
197358
@@ -199,6 +360,7 @@ instance
199360instance
200361 ( Table context a, Table context b, Table context c, Table context d
201362 , Table context e
363+ , Labelable context
202364 )
203365 => Table context (a, b, c, d, e)
204366
@@ -206,6 +368,7 @@ instance
206368instance
207369 ( Table context a, Table context b, Table context c, Table context d
208370 , Table context e, Table context f
371+ , Labelable context
209372 )
210373 => Table context (a, b, c, d, e, f)
211374
@@ -213,6 +376,7 @@ instance
213376instance
214377 ( Table context a, Table context b, Table context c, Table context d
215378 , Table context e, Table context f, Table context g
379+ , Labelable context
216380 )
217381 => Table context (a, b, c, d, e, f, g)
218382
src/Rel8/Table/ADT.hs+80−36
@@ -7,15 +7,16 @@
77{-# language ScopedTypeVariables #-}
88{-# language StandaloneKindSignatures #-}
99{-# language TypeApplications #-}
10−{-# language TypeFamilyDependencies #-}
10+{-# language TypeFamilies #-}
1111{-# language UndecidableInstances #-}
1212{-# language UndecidableSuperClasses #-}
1313
1414module Rel8.Table.ADT
1515 ( ADT( ADT )
16− , ADTable
16+ , ADTable, fromADT, toADT
1717 , BuildableADT
1818 , BuildADT, buildADT
19+ , InsertADT, insertADT
1920 , ConstructableADT
2021 , ConstructADT, constructADT
2122 , DeconstructADT, deconstructADT
@@ -27,7 +28,9 @@ where
2728
2829-- base
2930import Data.Kind ( Constraint, Type )
30−import GHC.Generics ( Generic, from, to )
31+import Data.Proxy ( Proxy( Proxy ) )
32+import Data.Type.Equality ( (:~:)( Refl ) )
33+import GHC.Generics ( Generic, Rep, from, to )
3134import GHC.TypeLits ( Symbol )
3235import Prelude
3336
@@ -38,71 +41,103 @@ import Rel8.FCF ( Eval, Exp )
3841import Rel8.Generic.Construction
3942 ( GGBuildable
4043 , GGBuild, ggbuild
44+ , GGInsert, gginsert
4145 , GGConstructable
4246 , GGConstruct, ggconstruct
4347 , GGDeconstruct, ggdeconstruct
4448 , GGName, ggname
4549 , GGAggregate, ggaggregate
4650 )
47−import Rel8.Generic.Record ( Record( Record ), unrecord )
51+import Rel8.Generic.Map ( GMappable, GMap, gmap, gunmap )
52+import Rel8.Generic.Record ( GRecordable, GRecord, grecord, gunrecord )
4853import Rel8.Generic.Rel8able
4954 ( Rel8able
5055 , GRep, GColumns, gfromColumns, gtoColumns
51− , GFromExprs, gfromResult, gtoResult
52− , TSerialize, deserialize, serialize
56+ , greify, gunreify
5357 )
5458import qualified Rel8.Generic.Table.ADT as G
5559import qualified Rel8.Kind.Algebra as K
60+import Rel8.Schema.Context ( Col )
5661import Rel8.Schema.HTable ( HTable )
62+import Rel8.Schema.Insert ( Insert )
5763import qualified Rel8.Schema.Kind as K
5864import Rel8.Schema.Name ( Name )
65+import Rel8.Schema.Reify ( Col( Reify ), Reify, hreify, hunreify )
5966import Rel8.Schema.Result ( Result )
60−import Rel8.Table ( Table, TColumns )
67+import Rel8.Table
68+ ( Table
69+ , fromColumns, toColumns, reify, unreify
70+ , TTable, TColumns, TUnreify
71+ )
6172
6273
6374type ADT :: K.Rel8able -> K.Rel8able
64−newtype ADT t context = ADT (GColumnsADT t context)
75+newtype ADT t context = ADT (GColumnsADT t (Col context))
6576
6677
6778instance ADTable t => Rel8able (ADT t) where
6879 type GColumns (ADT t) = GColumnsADT t
69− type GFromExprs (ADT t) = t Result
7080
71− gfromColumns _ = ADT
72− gtoColumns _ (ADT a) = a
81+ gfromColumns = ADT
82+ gtoColumns (ADT a) = a
7383
74− gfromResult =
75− unrecord .
76− to .
77− G.gfromResultADT
78− @TSerialize
79− @TColumns
80− @(Eval (ADTRep t Expr))
81− @(Eval (ADTRep t Result))
82− (\(_ :: proxy x) -> deserialize @_ @x)
84+ greify (ADT a) = ADT (hreify a)
85+ gunreify (ADT a) = ADT (hunreify a)
86+
87+
88+instance (ADTable t, context ~ Result) => Generic (ADT t context) where
89+ type Rep (ADT t context) = Rep (t context)
8390
84− gtoResult =
85− G.gtoResultADT
86− @TSerialize
91+ from =
92+ gmap @(TTable (Reify Result)) (Proxy @TUnreify) (unreify Refl) .
93+ gunrecord @(Rep (t (Reify Result))) .
94+ G.gfromColumnsADT
95+ @(TTable (Reify Result))
8796 @TColumns
88− @(Eval (ADTRep t Expr))
89− @(Eval (ADTRep t Result))
90− (\(_ :: proxy x) -> serialize @_ @x) .
91− from .
92− Record
97+ (\(Reify a) -> a)
98+ Reify
99+ fromColumns .
100+ hreify .
101+ (\(ADT a) -> a)
102+
103+ to =
104+ ADT .
105+ hunreify .
106+ G.gtoColumnsADT
107+ @(TTable (Reify Result))
108+ @TColumns
109+ (\(Reify a) -> a)
110+ Reify
111+ toColumns .
112+ grecord @(Rep (t (Reify Result))) .
113+ gunmap @(TTable (Reify Result)) (Proxy @TUnreify) (reify Refl)
114+
115+
116+fromADT :: ADTable t => ADT t Result -> t Result
117+fromADT = to . from
118+
119+
120+toADT :: ADTable t => t Result -> ADT t Result
121+toADT = to . from
93122
94123
95124type ADTable :: K.Rel8able -> Constraint
96125class
97− ( Generic (Record (t Result))
126+ ( Generic (t Result)
98127 , HTable (GColumnsADT t)
99− , G.GSerializeADT TSerialize TColumns (Eval (ADTRep t Expr)) (Eval (ADTRep t Result))
128+ , G.GTableADT (TTable (Reify Result)) TColumns (Col (Reify Result)) (GRecord (Rep (t (Reify Result))))
129+ , GRecordable (Rep (t (Reify Result)))
130+ , GMappable (TTable (Reify Result)) (Rep (t (Reify Result)))
131+ , GMap TUnreify (Rep (t (Reify Result))) ~ Rep (t Result)
100132 )
101133 => ADTable t
102134instance
103− ( Generic (Record (t Result))
135+ ( Generic (t Result)
104136 , HTable (GColumnsADT t)
105− , G.GSerializeADT TSerialize TColumns (Eval (ADTRep t Expr)) (Eval (ADTRep t Result))
137+ , G.GTableADT (TTable (Reify Result)) TColumns (Col (Reify Result)) (GRecord (Rep (t (Reify Result))))
138+ , GRecordable (Rep (t (Reify Result)))
139+ , GMappable (TTable (Reify Result)) (Rep (t (Reify Result)))
140+ , GMap TUnreify (Rep (t (Reify Result))) ~ Rep (t Result)
106141 )
107142 => ADTable t
108143
@@ -121,6 +156,15 @@ buildADT =
121156 ggbuild @'K.Sum @name @(ADTRep t) @(ADT t Expr) ADT
122157
123158
159+type InsertADT :: K.Rel8able -> Symbol -> Type
160+type InsertADT t name = GGInsert 'K.Sum name (ADTRep t) (ADT t Insert)
161+
162+
163+insertADT :: forall t name. BuildableADT t name => InsertADT t name
164+insertADT =
165+ gginsert @'K.Sum @name @(ADTRep t) @(ADT t Insert) ADT
166+
167+
124168type ConstructableADT :: K.Rel8able -> Constraint
125169class GGConstructable 'K.Sum (ADTRep t) => ConstructableADT t
126170instance GGConstructable 'K.Sum (ADTRep t) => ConstructableADT t
@@ -159,10 +203,10 @@ type AggregateADT t = forall r. GGAggregate 'K.Sum (ADTRep t) r
159203
160204
161205aggregateADT :: forall t. ConstructableADT t
162− => AggregateADT t -> ADT t Expr -> ADT t Aggregate
206+ => AggregateADT t -> ADT t Expr -> Aggregate (ADT t Expr)
163207aggregateADT f =
164− ggaggregate @'K.Sum @(ADTRep t) @(ADT t Expr) @(ADT t Aggregate) ADT (\(ADT a) -> a)
165− (f @(ADT t Aggregate))
208+ ggaggregate @'K.Sum @(ADTRep t) @(ADT t Expr) ADT (\(ADT a) -> a)
209+ (f @(Aggregate (ADT t Expr)))
166210
167211
168212data ADTRep :: K.Rel8able -> K.Context -> Exp (Type -> Type)
@@ -170,4 +214,4 @@ type instance Eval (ADTRep t context) = GRep t context
170214
171215
172216type GColumnsADT :: K.Rel8able -> K.HTable
173−type GColumnsADT t = G.GColumnsADT TColumns (GRep t Expr)
217+type GColumnsADT t = G.GColumnsADT TColumns (GRep t (Reify Result))
src/Rel8/Table/Aggregate.hs+36−37
@@ -1,13 +1,13 @@
11{-# language FlexibleContexts #-}
2−{-# language NamedFieldPuns #-}
32{-# language ScopedTypeVariables #-}
43{-# language TypeApplications #-}
54{-# language TypeFamilies #-}
65{-# language ViewPatterns #-}
76
87module Rel8.Table.Aggregate
9− ( groupBy, hgroupBy
8+ ( groupBy
109 , listAgg, nonEmptyAgg
10+ , listAggWithOrder, nonEmptyAggWithOrder
1111 )
1212where
1313
@@ -16,49 +16,32 @@ import Data.Functor.Identity ( Identity( Identity ) )
1616import Prelude
1717
1818-- rel8
19−import Rel8.Aggregate ( Aggregate, Aggregates )
20−import Rel8.Expr ( Expr )
19+import Rel8.Aggregate ( Aggregate, Col(..) )
20+import Rel8.Expr ( Expr, Col(..) )
2121import Rel8.Expr.Aggregate
2222 ( groupByExpr
23− , slistAggExpr
24− , snonEmptyAggExpr
23+ , listAggExpr
24+ , listAggExprWithOrder
25+ , nonEmptyAggExpr
26+ , nonEmptyAggExprWithOrder
2527 )
28+import Rel8.Order ( Order )
2629import Rel8.Schema.Dict ( Dict( Dict ) )
27−import Rel8.Schema.HTable ( HTable, hfield, htabulate )
30+import Rel8.Schema.HTable ( htabulate, hfield )
2831import Rel8.Schema.HTable.Vectorize ( hvectorize )
29−import Rel8.Schema.Null ( Sql )
30−import Rel8.Schema.Spec ( Spec( Spec, info ) )
31−import Rel8.Table ( toColumns, fromColumns )
32+import Rel8.Table ( Table, toColumns, fromColumns )
3233import Rel8.Table.Eq ( EqTable, eqTable )
3334import Rel8.Table.List ( ListTable )
3435import Rel8.Table.NonEmpty ( NonEmptyTable )
35−import Rel8.Type.Eq ( DBEq )
3636
3737
3838-- | Group equal tables together. This works by aggregating each column in the
3939-- given table with 'groupByExpr'.
40−--
41−-- For example, if we have a table of items, we could group the items by the
42−-- order they belong to:
43−--
44−-- @
45−-- itemsByOrder :: Query (OrderId Expr, ListTable Expr (Item Expr))
46−-- itemsByOrder = aggregate $ do
47−-- item <- each itemSchema
48−-- let orderId = groupBy (itemOrderId item)
49−-- let orderItems = listAgg item
50−-- pure (orderId, orderItems)
51−-- @
52−groupBy :: forall exprs aggregates. (EqTable exprs, Aggregates aggregates exprs)
53− => exprs -> aggregates
54−groupBy = fromColumns . hgroupBy (eqTable @exprs) . toColumns
55−
56−
57−hgroupBy :: HTable t => t (Dict (Sql DBEq)) -> t Expr -> t Aggregate
58−hgroupBy eqs exprs = htabulate $ \field ->
59− case hfield eqs field of
40+groupBy :: forall exprs. EqTable exprs => exprs -> Aggregate exprs
41+groupBy (toColumns -> exprs) = fromColumns $ htabulate $ \field ->
42+ case hfield (eqTable @exprs) field of
6043 Dict -> case hfield exprs field of
61− expr -> groupByExpr expr
44+ DB expr -> Aggregation $ groupByExpr expr
6245
6346
6447-- | Aggregate rows into a single row containing an array of all aggregated
@@ -71,22 +54,38 @@ hgroupBy eqs exprs = htabulate $ \field ->
7154-- items:
7255--
7356-- @
74−-- ordersWithItems :: Query (Order Expr, ListTable Expr (Item Expr))
57+-- ordersWithItems :: Query (Order Expr, ListTable (Item Expr))
7558-- ordersWithItems = do
7659-- order <- each orderSchema
7760-- items <- aggregate $ listAgg <$> itemsFromOrder order
7861-- return (order, items)
7962-- @
80−listAgg :: Aggregates aggregates exprs => exprs -> ListTable Aggregate aggregates
63+listAgg :: Table Expr a => a -> Aggregate (ListTable a)
8164listAgg (toColumns -> exprs) = fromColumns $
8265 hvectorize
83− (\Spec {info} (Identity a) -> slistAggExpr info a)
66+ (\_ (Identity (DB a)) -> Aggregation $ listAggExpr a)
8467 (pure exprs)
8568
8669
8770-- | Like 'listAgg', but the result is guaranteed to be a non-empty list.
88−nonEmptyAgg :: Aggregates aggregates exprs => exprs -> NonEmptyTable Aggregate aggregates
71+nonEmptyAgg :: Table Expr a => a -> Aggregate (NonEmptyTable a)
8972nonEmptyAgg (toColumns -> exprs) = fromColumns $
9073 hvectorize
91− (\Spec {info} (Identity a) -> snonEmptyAggExpr info a)
74+ (\_ (Identity (DB a)) -> Aggregation $ nonEmptyAggExpr a)
75+ (pure exprs)
76+
77+
78+listAggWithOrder :: Table Expr a
79+ => Order o -> o -> a -> Aggregate (ListTable a)
80+listAggWithOrder order o (toColumns -> exprs) = fromColumns $
81+ hvectorize
82+ (\_ (Identity (DB x)) -> Aggregation $ listAggExprWithOrder order o x)
83+ (pure exprs)
84+
85+
86+nonEmptyAggWithOrder :: Table Expr a
87+ => Order o -> o -> a -> Aggregate (NonEmptyTable a)
88+nonEmptyAggWithOrder order o (toColumns -> exprs) = fromColumns $
89+ hvectorize
90+ (\_ (Identity (DB x)) -> Aggregation $ nonEmptyAggExprWithOrder order o x)
9291 (pure exprs)
src/Rel8/Table/Bool.hs+6−5
@@ -13,7 +13,7 @@ where
1313import Prelude
1414
1515-- rel8
16−import Rel8.Expr ( Expr )
16+import Rel8.Expr ( Expr, Col(..) )
1717import Rel8.Expr.Bool ( boolExpr, caseExpr )
1818import Rel8.Expr.Null ( isNull, unsafeUnnullify )
1919import Rel8.Schema.HTable ( htabulate, hfield )
@@ -28,7 +28,8 @@ bool :: Table Expr a => a -> a -> Expr Bool -> a
2828bool (toColumns -> false) (toColumns -> true) condition =
2929 fromColumns $ htabulate $ \field ->
3030 case (hfield false field, hfield true field) of
31− (falseExpr, trueExpr) -> boolExpr falseExpr trueExpr condition
31+ (DB falseExpr, DB trueExpr) ->
32+ DB (boolExpr falseExpr trueExpr condition)
3233{-# INLINABLE bool #-}
3334
3435
@@ -38,9 +39,9 @@ bool (toColumns -> false) (toColumns -> true) condition =
3839case_ :: Table Expr a => [(Expr Bool, a)] -> a -> a
3940case_ (map (fmap toColumns) -> branches) (toColumns -> fallback) =
4041 fromColumns $ htabulate $ \field -> case hfield fallback field of
41− fallbackExpr ->
42− case map (fmap (`hfield` field)) branches of
43− branchExprs -> caseExpr branchExprs fallbackExpr
42+ DB fallbackExpr ->
43+ case map (fmap (unDB . (`hfield` field))) branches of
44+ branchExprs -> DB (caseExpr branchExprs fallbackExpr)
4445
4546
4647-- | Like 'maybe', but to eliminate @null@.
src/Rel8/Table/Cols.hsdeleted−50
@@ -1,50 +0,0 @@
1−{-# language DataKinds #-}
2−{-# language FlexibleInstances #-}
3−{-# language MultiParamTypeClasses #-}
4−{-# language StandaloneKindSignatures #-}
5−{-# language TypeFamilies #-}
6−{-# language UndecidableInstances #-}
7−
8−module Rel8.Table.Cols
9− ( Cols( Cols )
10− , fromCols
11− , toCols
12− )
13−where
14−
15−-- base
16−import Data.Kind ( Type )
17−import Prelude
18−
19−-- rel8
20−import qualified Rel8.Schema.Kind as K
21−import Rel8.Schema.HTable ( HTable )
22−import Rel8.Schema.Result ( Result )
23−import Rel8.Table ( Table(..) )
24−
25−
26−type Cols :: K.Context -> K.HTable -> Type
27−newtype Cols context columns = Cols (columns context)
28−
29−
30−instance (HTable columns, context ~ context') =>
31− Table context' (Cols context columns)
32− where
33− type Columns (Cols context columns) = columns
34− type Context (Cols context columns) = context
35− type FromExprs (Cols context columns) = Cols Result columns
36− type Transpose to (Cols context columns) = Cols to columns
37−
38− toColumns (Cols a) = a
39− fromColumns = Cols
40−
41− toResult (Cols a) = a
42− fromResult = Cols
43−
44−
45−fromCols :: Table context a => Cols context (Columns a) -> a
46−fromCols (Cols a) = fromColumns a
47−
48−
49−toCols :: Table context a => a -> Cols context (Columns a)
50−toCols = Cols . toColumns
src/Rel8/Table/Either.hs+152−147
@@ -18,226 +18,231 @@ module Rel8.Table.Either
1818 ( EitherTable(..)
1919 , eitherTable, leftTable, rightTable
2020 , isLeftTable, isRightTable
21− , aggregateEitherTable
22− , nameEitherTable
21+ , aggregateEitherTable, insertEitherTable, nameEitherTable
2322 )
2423where
2524
2625-- base
26+import Control.Applicative ( liftA2 )
2727import Data.Bifunctor ( Bifunctor, bimap )
28−import Data.Functor.Identity ( Identity( Identity ) )
28+import Data.Functor.Identity ( runIdentity )
2929import Data.Kind ( Type )
3030import Prelude hiding ( undefined )
3131
32−-- comonad
33−import Control.Comonad ( extract )
34−
3532-- rel8
36−import Rel8.Aggregate ( Aggregate )
33+import Rel8.Aggregate ( Aggregate, unsafeMakeAggregate )
3734import Rel8.Expr ( Expr )
38−import Rel8.Expr.Aggregate ( groupByExpr )
35+import Rel8.Expr.Opaleye ( fromPrimExpr, toPrimExpr )
3936import Rel8.Expr.Serialize ( litExpr )
40−import Rel8.Kind.Context ( Reifiable )
41−import Rel8.Schema.Context.Nullify ( Nullifiable )
42−import Rel8.Schema.Dict ( Dict( Dict ) )
37+import Rel8.Schema.Context.Label
38+ ( Labelable
39+ , HLabelable, hlabeler, hunlabeler
40+ )
41+import Rel8.Schema.Context.Nullify
42+ ( Nullifiable, ConstrainTag
43+ , HNullifiable, HConstrainTag
44+ , hencodeTag, hdecodeTag
45+ , hnullifier, hunnullifier
46+ )
47+import Rel8.Schema.HTable ( HTable )
4348import Rel8.Schema.HTable.Either ( HEitherTable(..) )
4449import Rel8.Schema.HTable.Identity ( HIdentity(..) )
4550import Rel8.Schema.HTable.Label ( hlabel, hunlabel )
46−import qualified Rel8.Schema.Kind as K
51+import Rel8.Schema.HTable.Nullify ( hnullify, hunnullify )
52+import Rel8.Schema.Insert ( Insert )
4753import Rel8.Schema.Name ( Name )
4854import Rel8.Table
4955 ( Table, Columns, Context, fromColumns, toColumns
50− , FromExprs, fromResult, toResult
51− , Transpose
56+ , reify, unreify
5257 )
5358import Rel8.Table.Bool ( bool )
5459import Rel8.Table.Eq ( EqTable, eqTable )
55−import Rel8.Table.Nullify ( Nullify, aggregateNullify, guard )
60+import Rel8.Table.Insert ( toInsert )
5661import Rel8.Table.Ord ( OrdTable, ordTable )
57−import Rel8.Table.Projection ( Biprojectable, Projectable, biproject, project )
58−import Rel8.Table.Serialize ( ToExprs )
62+import Rel8.Table.Recontextualize ( Recontextualize )
63+import Rel8.Table.Serialize ( FromExprs, ToExprs, fromResult, toResult )
64+import Rel8.Table.Tag ( Tag(..), fromExpr, fromName )
5965import Rel8.Table.Undefined ( undefined )
6066import Rel8.Type.Tag ( EitherTag( IsLeft, IsRight ), isLeft, isRight )
6167
6268-- semigroupoids
63−import Data.Functor.Apply ( Apply, (<.>) )
69+import Data.Functor.Apply ( Apply, (<.>), liftF3 )
6470import Data.Functor.Bind ( Bind, (>>-) )
6571
6672
67−-- | An @EitherTable a b@ is a Rel8 table that contains either the table @a@ or
68−-- the table @b@. You can construct an @EitherTable@ using 'leftTable' and
69−-- 'rightTable', and eliminate/pattern match using 'eitherTable'.
70−--
71−-- An @EitherTable@ is operationally the same as Haskell's 'Either' type, but
72−-- adapted to work with Rel8.
73−type EitherTable :: K.Context -> Type -> Type -> Type
74−data EitherTable context a b = EitherTable
75− { tag :: context EitherTag
76− , left :: Nullify context a
77− , right :: Nullify context b
73+type EitherTable :: Type -> Type -> Type
74+data EitherTable a b = EitherTable
75+ { tag :: Tag "isRight" EitherTag
76+ , left :: a
77+ , right :: b
7878 }
7979 deriving stock Functor
8080
8181
82−instance Biprojectable (EitherTable context) where
83− biproject f g (EitherTable tag a b) =
84− EitherTable tag (project f a) (project g b)
85−
86−
87−instance Nullifiable context => Bifunctor (EitherTable context) where
88− bimap f g (EitherTable tag a b) = EitherTable tag (fmap f a) (fmap g b)
89−
90−
91−instance Projectable (EitherTable context a) where
92− project f (EitherTable tag a b) = EitherTable tag a (project f b)
82+instance Bifunctor EitherTable where
83+ bimap f g (EitherTable tag a b) = EitherTable tag (f a) (g b)
9384
9485
95−instance (context ~ Expr, Table Expr a) => Apply (EitherTable context a) where
86+instance Table Expr a => Apply (EitherTable a) where
9687 EitherTable tag l1 f <.> EitherTable tag' l2 a =
97− EitherTable (tag <> tag') (bool l1 l2 (isLeft tag)) (f <.> a)
88+ EitherTable (tag <> tag') (bool l1 l2 (isLeft (expr tag))) (f a)
9889
9990
100−instance (context ~ Expr, Table Expr a) => Applicative (EitherTable context a) where
91+instance Table Expr a => Applicative (EitherTable a) where
10192 pure = rightTable
10293 (<*>) = (<.>)
10394
10495
105−instance (context ~ Expr, Table Expr a) => Bind (EitherTable context a) where
106− EitherTable tag l1 a >>- f = case f (extract a) of
96+instance Table Expr a => Bind (EitherTable a) where
97+ EitherTable tag l1 a >>- f = case f a of
10798 EitherTable tag' l2 b ->
108− EitherTable (tag <> tag') (bool l1 l2 (isRight tag)) b
99+ EitherTable (tag <> tag') (bool l1 l2 (isRight (expr tag))) b
109100
110101
111−instance (context ~ Expr, Table Expr a) => Monad (EitherTable context a) where
102+instance Table Expr a => Monad (EitherTable a) where
112103 (>>=) = (>>-)
113104
114105
115−instance (context ~ Expr, Table Expr a, Table Expr b) =>
116− Semigroup (EitherTable context a b)
117− where
106+instance (Table Expr a, Table Expr b) => Semigroup (EitherTable a b) where
118107 a <> b = bool a b (isRightTable a)
119108
120109
121110instance
122111 ( Table context a, Table context b
123− , Reifiable context, context ~ context'
124− )
125− => Table context' (EitherTable context a b)
126− where
127− type Columns (EitherTable context a b) = HEitherTable (Columns a) (Columns b)
128− type Context (EitherTable context a b) = Context a
129− type FromExprs (EitherTable context a b) = Either (FromExprs a) (FromExprs b)
130− type Transpose to (EitherTable context a b) =
131− EitherTable to (Transpose to a) (Transpose to b)
132−
133− toColumns EitherTable {tag, left, right} = HEitherTable
134− { htag = hlabel $ HIdentity tag
135− , hleft = hlabel $ guard tag (== IsLeft) isLeft $ toColumns left
136− , hright = hlabel $ guard tag (== IsRight) isRight $ toColumns right
137− }
138−
139− fromColumns HEitherTable {htag, hleft, hright} = EitherTable
140− { tag = unHIdentity $ hunlabel htag
141− , left = fromColumns $ hunlabel hleft
142− , right = fromColumns $ hunlabel hright
143− }
144−
145− toResult = \case
146− Left table -> HEitherTable
147− { htag = hlabel (HIdentity (Identity IsLeft))
148− , hleft = hlabel (toResult @_ @(Nullify context a) (Just table))
149− , hright = hlabel (toResult @_ @(Nullify context b) Nothing)
150− }
151− Right table -> HEitherTable
152− { htag = hlabel (HIdentity (Identity IsRight))
153− , hleft = hlabel (toResult @_ @(Nullify context a) Nothing)
154− , hright = hlabel (toResult @_ @(Nullify context b) (Just table))
155− }
156−
157− fromResult HEitherTable {htag, hleft, hright} = case hunlabel htag of
158− HIdentity (Identity tag) -> case tag of
159− IsLeft -> maybe err Left $ fromResult @_ @(Nullify context a) (hunlabel hleft)
160− IsRight -> maybe err Right $ fromResult @_ @(Nullify context b) (hunlabel hright)
161− where
162− err = error "Either.fromColumns: mismatch between tag and data"
163−
164−
165−instance (EqTable a, EqTable b, context ~ Expr) =>
166− EqTable (EitherTable context a b)
112+ , Labelable context, Nullifiable context, ConstrainTag context EitherTag
113+ ) =>
114+ Table context (EitherTable a b)
167115 where
168− eqTable = HEitherTable
169− { htag = hlabel (HIdentity Dict)
170− , hleft = hlabel (eqTable @(Nullify context a))
171− , hright = hlabel (eqTable @(Nullify context b))
172− }
116+ type Columns (EitherTable a b) = HEitherTable (Columns a) (Columns b)
117+ type Context (EitherTable a b) = Context a
173118
119+ toColumns = toColumns2 toColumns toColumns
120+ fromColumns = fromColumns2 fromColumns fromColumns
121+ reify = liftA2 bimap reify reify
122+ unreify = liftA2 bimap unreify unreify
174123
175−instance (OrdTable a, OrdTable b, context ~ Expr) =>
176− OrdTable (EitherTable context a b)
177− where
178− ordTable = HEitherTable
179− { htag = hlabel (HIdentity Dict)
180− , hleft = hlabel (ordTable @(Nullify context a))
181− , hright = hlabel (ordTable @(Nullify context b))
182− }
124+
125+instance
126+ ( Nullifiable from, Labelable from, ConstrainTag from EitherTag
127+ , Nullifiable to, Labelable to, ConstrainTag to EitherTag
128+ , Recontextualize from to a1 b1
129+ , Recontextualize from to a2 b2
130+ )
131+ => Recontextualize from to (EitherTable a1 a2) (EitherTable b1 b2)
132+
133+
134+instance (EqTable a, EqTable b) => EqTable (EitherTable a b) where
135+ eqTable = toColumns2 id id (rightTableWith (eqTable @a) (eqTable @b))
136+
137+
138+instance (OrdTable a, OrdTable b) => OrdTable (EitherTable a b) where
139+ ordTable = toColumns2 id id (rightTableWith (ordTable @a) (ordTable @b))
140+
141+
142+type instance FromExprs (EitherTable a b) = Either (FromExprs a) (FromExprs b)
183143
184144
185−instance (ToExprs exprs1 a, ToExprs exprs2 b, x ~ EitherTable Expr exprs1 exprs2) =>
145+instance (ToExprs exprs1 a, ToExprs exprs2 b, x ~ EitherTable exprs1 exprs2) =>
186146 ToExprs x (Either a b)
147+ where
148+ fromResult =
149+ bimap (fromResult @exprs1) (fromResult @exprs2) .
150+ fromColumns
151+ toResult =
152+ toColumns .
153+ bimap (toResult @exprs1) (toResult @exprs2)
187154
188155
189−-- | Test if an 'EitherTable' is a 'leftTable'.
190−isLeftTable :: EitherTable Expr a b -> Expr Bool
191−isLeftTable EitherTable {tag} = isLeft tag
156+isLeftTable :: EitherTable a b -> Expr Bool
157+isLeftTable = isLeft . expr . tag
192158
193159
194−-- | Test if an 'EitherTable' is a 'rightTable'.
195−isRightTable :: EitherTable Expr a b -> Expr Bool
196−isRightTable EitherTable {tag} = isRight tag
160+isRightTable :: EitherTable a b -> Expr Bool
161+isRightTable = isRight . expr . tag
197162
198163
199−-- | Pattern match/eliminate an 'EitherTable', by providing mappings from a
200−-- 'leftTable' and 'rightTable'.
201164eitherTable :: Table Expr c
202− => (a -> c) -> (b -> c) -> EitherTable Expr a b -> c
165+ => (a -> c) -> (b -> c) -> EitherTable a b -> c
203166eitherTable f g EitherTable {tag, left, right} =
204− bool (f (extract left)) (g (extract right)) (isRight tag)
167+ bool (f left) (g right) (isRight (expr tag))
168+
169+
170+leftTable :: Table Expr b => a -> EitherTable a b
171+leftTable a = EitherTable (fromExpr (litExpr IsLeft)) a undefined
205172
206173
207−-- | Construct a left 'EitherTable'. Like 'Left'.
208−leftTable :: Table Expr b => a -> EitherTable Expr a b
209−leftTable a = EitherTable (litExpr IsLeft) (pure a) undefined
174+rightTable :: Table Expr a => b -> EitherTable a b
175+rightTable = rightTableWith undefined
210176
211177
212−-- | Construct a right 'EitherTable'. Like 'Right'.
213−rightTable :: Table Expr a => b -> EitherTable Expr a b
214−rightTable = EitherTable (litExpr IsRight) undefined . pure
178+rightTableWith :: a -> b -> EitherTable a b
179+rightTableWith = EitherTable (fromExpr (litExpr IsRight))
215180
216181
217−-- | Lift a pair of aggregating functions to operate on an 'EitherTable'.
218−-- @leftTable@s and @rightTable@s are grouped separately.
219182aggregateEitherTable :: ()
220− => (exprs -> aggregates)
221− -> (exprs' -> aggregates')
222− -> EitherTable Expr exprs exprs'
223− -> EitherTable Aggregate aggregates aggregates'
224−aggregateEitherTable f g (EitherTable tag a b) = EitherTable
225− { tag = groupByExpr tag
226− , left = aggregateNullify f a
227− , right = aggregateNullify g b
183+ => (a -> Aggregate c)
184+ -> (b -> Aggregate d)
185+ -> EitherTable a b
186+ -> Aggregate (EitherTable c d)
187+aggregateEitherTable f g EitherTable {tag, left, right} =
188+ liftF3 EitherTable (tag <$ aggregate) (f left) (g right)
189+ where
190+ Tag {aggregator, expr} = tag
191+ aggregate = unsafeMakeAggregate toPrimExpr fromPrimExpr aggregator expr
192+
193+
194+insertEitherTable :: (Table Insert a, Table Insert b)
195+ => Either a b -> EitherTable a b
196+insertEitherTable = \case
197+ Left a -> EitherTable (fromExpr (litExpr IsLeft)) a (fromColumns (toInsert undefined))
198+ Right b -> EitherTable (fromExpr (litExpr IsRight)) (fromColumns (toInsert undefined)) b
199+
200+
201+nameEitherTable :: Name EitherTag -> a -> b -> EitherTable a b
202+nameEitherTable = EitherTable . fromName
203+
204+
205+toColumns2 ::
206+ ( HTable t
207+ , HTable u
208+ , HConstrainTag context EitherTag
209+ , HLabelable context
210+ , HNullifiable context
211+ )
212+ => (a -> t context)
213+ -> (b -> u context)
214+ -> EitherTable a b
215+ -> HEitherTable t u context
216+toColumns2 f g EitherTable {tag, left, right} = HEitherTable
217+ { htag
218+ , hleft = hlabel hlabeler $ hnullify (hnullifier tag isLeft) $ f left
219+ , hright = hlabel hlabeler $ hnullify (hnullifier tag isRight) $ g right
228220 }
221+ where
222+ htag = HIdentity (hencodeTag tag)
229223
230224
231−-- | Construct a 'EitherTable' in the 'Name' context. This can be useful if you
232−-- have a 'EitherTable' that you are storing in a table and need to construct a
233−-- 'TableSchema'.
234−nameEitherTable
235− :: Name EitherTag
236− -- ^ The name of the column to track whether a row is a 'leftTable' or
237− -- 'rightTable'.
238− -> a
239− -- ^ Names of the columns in the @a@ table.
240− -> b
241− -- ^ Names of the columns in the @b@ table.
242− -> EitherTable Name a b
243−nameEitherTable tag left right = EitherTable tag (pure left) (pure right)
225+fromColumns2 ::
226+ ( HTable t
227+ , HTable u
228+ , HConstrainTag context EitherTag
229+ , HLabelable context
230+ , HNullifiable context
231+ )
232+ => (t context -> a)
233+ -> (u context -> b)
234+ -> HEitherTable t u context
235+ -> EitherTable a b
236+fromColumns2 f g HEitherTable {htag, hleft, hright} = EitherTable
237+ { tag
238+ , left = f $ runIdentity $
239+ hunnullify (\a -> pure . hunnullifier a) $
240+ hunlabel hunlabeler
241+ hleft
242+ , right = g $ runIdentity $
243+ hunnullify (\a -> pure . hunnullifier a) $
244+ hunlabel hunlabeler
245+ hright
246+ }
247+ where
248+ tag = hdecodeTag $ unHIdentity htag
src/Rel8/Table/Eq.hs+39−12
@@ -11,6 +11,7 @@
1111{-# language TypeFamilies #-}
1212{-# language TypeOperators #-}
1313{-# language UndecidableInstances #-}
14+{-# language UndecidableSuperClasses #-}
1415{-# language ViewPatterns #-}
1516
1617module Rel8.Table.Eq
@@ -27,16 +28,24 @@ import GHC.Generics ( Rep )
2728import Prelude
2829
2930-- rel8
30−import Rel8.Expr ( Expr )
31+import Rel8.Expr ( Expr, Col(..) )
3132import Rel8.Expr.Bool ( (||.), (&&.) )
3233import Rel8.Expr.Eq ( (==.), (/=.) )
3334import Rel8.FCF ( Eval, Exp )
3435import Rel8.Generic.Record ( Record )
35−import Rel8.Generic.Table.Record ( GTable, GColumns, gtable )
36+import Rel8.Generic.Table
37+ ( GGTable, GGColumns, ggtable
38+ , GAlgebra
39+ )
40+import Rel8.Kind.Algebra ( KnownAlgebra )
3641import Rel8.Schema.Dict ( Dict( Dict ) )
37−import Rel8.Schema.HTable ( htabulateA, hfield )
38−import Rel8.Schema.HTable.Identity ( HIdentity( HIdentity ) )
42+import Rel8.Schema.HTable
43+ ( HTable, HConstrainTable
44+ , htabulateA, hfield, hdicts
45+ )
46+import Rel8.Schema.HTable.Identity ( HIdentity( HType ) )
3947import Rel8.Schema.Null ( Sql )
48+import Rel8.Schema.Spec.ConstrainDBType ( ConstrainDBType, nullifier )
4049import Rel8.Table ( Table, Columns, toColumns, TColumns )
4150import Rel8.Type.Eq ( DBEq )
4251
@@ -46,14 +55,22 @@ import Rel8.Type.Eq ( DBEq )
4655-- means "all columns in a 'Table' have an instance of 'DBEq'".
4756type EqTable :: Type -> Constraint
4857class Table Expr a => EqTable a where
49− eqTable :: Columns a (Dict (Sql DBEq))
58+ eqTable :: Columns a (Dict (ConstrainDBType DBEq))
5059
5160 default eqTable ::
52− ( GTable TEqTable TColumns (Rep (Record a))
53− , Columns a ~ GColumns TColumns (Rep (Record a))
61+ ( KnownAlgebra (GAlgebra (Rep (Record a)))
62+ , Eval (GGTable (GAlgebra (Rep (Record a))) TEqTable TColumns (Dict (ConstrainDBType DBEq)) (Rep (Record a)))
63+ , Columns a ~ Eval (GGColumns (GAlgebra (Rep (Record a))) TColumns (Rep (Record a)))
5464 )
55− => Columns a (Dict (Sql DBEq))
56− eqTable = gtable @TEqTable @TColumns @(Rep (Record a)) table
65+ => Columns a (Dict (ConstrainDBType DBEq))
66+ eqTable =
67+ ggtable
68+ @(GAlgebra (Rep (Record a)))
69+ @TEqTable
70+ @TColumns
71+ @(Rep (Record a))
72+ table
73+ nullifier
5774 where
5875 table (_ :: proxy x) = eqTable @x
5976
@@ -62,8 +79,18 @@ data TEqTable :: Type -> Exp Constraint
6279type instance Eval (TEqTable a) = EqTable a
6380
6481
82+instance
83+ ( HTable t
84+ , f ~ Col Expr
85+ , HConstrainTable t (ConstrainDBType DBEq)
86+ )
87+ => EqTable (t f)
88+ where
89+ eqTable = hdicts @(Columns (t f)) @(ConstrainDBType DBEq)
90+
91+
6592instance Sql DBEq a => EqTable (Expr a) where
66− eqTable = HIdentity Dict
93+ eqTable = HType Dict
6794
6895
6996instance (EqTable a, EqTable b) => EqTable (a, b)
@@ -97,7 +124,7 @@ instance
97124(toColumns -> as) ==: (toColumns -> bs) =
98125 foldl1' (&&.) $ getConst $ htabulateA $ \field ->
99126 case (hfield as field, hfield bs field) of
100− (a, b) -> case hfield (eqTable @a) field of
127+ (DB a, DB b) -> case hfield (eqTable @a) field of
101128 Dict -> Const (pure (a ==. b))
102129infix 4 ==:
103130
@@ -109,7 +136,7 @@ infix 4 ==:
109136(toColumns -> as) /=: (toColumns -> bs) =
110137 foldl1' (||.) $ getConst $ htabulateA $ \field ->
111138 case (hfield as field, hfield bs field) of
112− (a, b) -> case hfield (eqTable @a) field of
139+ (DB a, DB b) -> case hfield (eqTable @a) field of
113140 Dict -> Const (pure (a /=. b))
114141infix 4 /=:
115142
src/Rel8/Table/HKD.hs+120−68
@@ -13,9 +13,10 @@
1313
1414module Rel8.Table.HKD
1515 ( HKD( HKD )
16− , HKDable
16+ , HKDable, fromHKD, toHKD, HKDT(..)
1717 , BuildableHKD
1818 , BuildHKD, buildHKD
19+ , InsertHKD, insertHKD
1920 , ConstructableHKD
2021 , ConstructHKD, constructHKD
2122 , DeconstructHKD, deconstructHKD
@@ -27,6 +28,9 @@ where
2728
2829-- base
2930import Data.Kind ( Constraint, Type )
31+import Data.Proxy ( Proxy( Proxy ) )
32+import Data.Type.Equality ( (:~:)( Refl ) )
33+import Data.Void ( Void )
3034import GHC.Generics ( Generic, Rep, from, to )
3135import GHC.TypeLits ( Symbol )
3236import Prelude
@@ -40,124 +44,137 @@ import Rel8.Kind.Algebra ( KnownAlgebra )
4044import Rel8.Generic.Construction
4145 ( GGBuildable
4246 , GGBuild, ggbuild
47+ , GGInsert, gginsert
4348 , GGConstructable
4449 , GGConstruct, ggconstruct
4550 , GGDeconstruct, ggdeconstruct
4651 , GGName, ggname
4752 , GGAggregate, ggaggregate
4853 )
49−import Rel8.Generic.Map ( GMap )
50−import Rel8.Generic.Record
51− ( GRecord, GRecordable, grecord, gunrecord
52− , Record( Record ), unrecord
53− )
54+import Rel8.Generic.Map ( GMap, GMappable, gmap, gunmap )
55+import Rel8.Generic.Record ( GRecord, GRecordable, grecord, gunrecord )
5456import Rel8.Generic.Rel8able
5557 ( Rel8able
5658 , GColumns, gfromColumns, gtoColumns
57− , GFromExprs, gfromResult, gtoResult
59+ , greify, gunreify
60+ , TUnreifyContext
5861 )
5962import Rel8.Generic.Table
60− ( GGSerialize, GGColumns, GAlgebra, ggfromResult, ggtoResult
63+ ( GGTable, GGColumns, GGContext, ggfromColumns, ggtoColumns
64+ , GAlgebra
6165 )
62−import Rel8.Generic.Table.Record ( GTable, GContext )
63−import qualified Rel8.Generic.Table.Record as G
66+import Rel8.Schema.Context ( Col )
6467import qualified Rel8.Schema.Kind as K
6568import Rel8.Schema.HTable ( HTable )
69+import Rel8.Schema.Insert ( Insert )
6670import Rel8.Schema.Name ( Name )
71+import Rel8.Schema.Reify ( Col( Reify ), Reify, hreify, hunreify, notReify )
6772import Rel8.Schema.Result ( Result )
6873import Rel8.Table
69− ( Table, fromColumns, toColumns, fromResult, toResult
70− , TTable, TColumns, TContext
71− , TSerialize
74+ ( Table, Columns, Context, Unreify
75+ , fromColumns, toColumns, reify, unreify
76+ , TTable, TColumns, TUnreify
7277 )
78+import Rel8.Table.Serialize ( ToExprs, fromResult, toResult )
7379
7480
7581type GColumnsHKD :: Type -> K.HTable
7682type GColumnsHKD a =
77− Eval (GGColumns (GAlgebra (Rep a)) TColumns (GRecord (GMap (TColumn Expr) (Rep a))))
83+ Eval (GGColumns (GAlgebra (Rep a)) TColumns (GRecord (GMap (TColumn (Reify Result)) (Rep a))))
7884
7985
8086type HKD :: Type -> K.Rel8able
81−newtype HKD a f = HKD (GColumnsHKD a f)
87+newtype HKD a f = HKD (GColumnsHKD a (Col f))
8288
8389
8490instance HKDable a => Rel8able (HKD a) where
8591 type GColumns (HKD a) = GColumnsHKD a
86− type GFromExprs (HKD a) = a
87−
88− gfromColumns _ = HKD
89− gtoColumns _ (HKD a) = a
9092
91− gfromResult =
92− unrecord .
93− to .
94− ggfromResult
95− @(GAlgebra (Rep a))
96− @TSerialize
97− @TColumns
98− @(Eval (HKDRep a Expr))
99− @(Eval (HKDRep a Result))
100− (\(_ :: proxy x) -> fromResult @_ @x)
93+ gfromColumns = HKD
94+ gtoColumns (HKD a) = a
10195
102− gtoResult =
103− ggtoResult
104− @(GAlgebra (Rep a))
105− @TSerialize
106− @TColumns
107− @(Eval (HKDRep a Expr))
108− @(Eval (HKDRep a Result))
109− (\(_ :: proxy x) -> toResult @_ @x) .
110− from .
111− Record
96+ greify (HKD a) = HKD (hreify a)
97+ gunreify (HKD a) = HKD (hunreify a)
11298
11399
114100instance
115− ( GTable (TTable f) TColumns (GRecord (GMap (TColumn f) (Rep a)))
116− , G.GColumns TColumns (GRecord (GMap (TColumn f) (Rep a))) ~ GColumnsHKD a
117− , GContext TContext (GRecord (GMap (TColumn f) (Rep a))) ~ f
118− , GRecordable (GMap (TColumn f) (Rep a))
101+ ( KnownAlgebra (GAlgebra (Rep a))
102+ , HTable (GColumnsHKD a)
103+ , Eval (GGTable (GAlgebra (Rep a)) (TTable (Reify f)) TColumns (Col (Reify f)) (GRecord (GMap (TColumn (Reify f)) (Rep a))))
104+ , Eval (GGColumns (GAlgebra (Rep a)) TColumns (GRecord (GMap (TColumn (Reify f)) (Rep a)))) ~ GColumnsHKD a
105+ , Eval (GGContext (GAlgebra (Rep a)) TUnreifyContext (GRecord (GMap (TColumn (Reify f)) (Rep a)))) ~ f
106+ , GRecordable (GMap (TColumn (Reify f)) (Rep a))
107+ , GMappable (TTable (Reify f)) (GMap (TColumn (Reify f)) (Rep a))
108+ , GMap TUnreify (GMap (TColumn (Reify f)) (Rep a)) ~ GMap (TColumn f) (Rep a)
119109 )
120110 => Generic (HKD a f)
121111 where
122112 type Rep (HKD a f) = GMap (TColumn f) (Rep a)
123113
124114 from =
125− gunrecord @(GMap (TColumn f) (Rep a)) .
126− G.gfromColumns
127− @(TTable f)
115+ gmap @(TTable (Reify f)) (Proxy @TUnreify) (unreify Refl) .
116+ gunrecord @(GMap (TColumn (Reify f)) (Rep a)) .
117+ ggfromColumns
118+ @(GAlgebra (Rep a))
119+ @(TTable (Reify f))
128120 @TColumns
121+ (\(Reify a) -> a)
122+ Reify
129123 fromColumns .
124+ hreify .
130125 (\(HKD a) -> a)
131126
132127 to =
133128 HKD .
134− G.gtoColumns
135− @(TTable f)
129+ hunreify .
130+ ggtoColumns
131+ @(GAlgebra (Rep a))
132+ @(TTable (Reify f))
136133 @TColumns
134+ (\(Reify a) -> a)
135+ Reify
137136 toColumns .
138− grecord @(GMap (TColumn f) (Rep a))
137+ grecord @(GMap (TColumn (Reify f)) (Rep a)) .
138+ gunmap @(TTable (Reify f)) (Proxy @TUnreify) (reify Refl)
139+
140+
141+type HKDT :: Type -> Type
142+newtype HKDT a = HKDT
143+ { unHKDT :: a
144+ }
145+
146+
147+instance HKDable a => Table Result (HKDT a) where
148+ type Columns (HKDT a) = GColumnsHKD a
149+ type Context (HKDT a) = Result
150+ type Unreify (HKDT a) = Void
151+
152+ fromColumns = HKDT . fromHKD . HKD
153+ toColumns = (\(HKD a) -> a) . toHKD . (\(HKDT a) -> a)
154+ reify = notReify
155+ unreify = notReify
139156
140157
141−type HKDable :: Type -> Constraint
142−class
143− ( Generic (Record a)
144− , HTable (GColumns (HKD a))
145− , KnownAlgebra (GAlgebra (Rep a))
146− , Eval (GGSerialize (GAlgebra (Rep a)) TSerialize TColumns (Eval (HKDRep a Expr)) (Eval (HKDRep a Result)))
147− , GRecord (GMap (TColumn Result) (Rep a)) ~ Rep (Record a)
148− )
149− => HKDable a
150158instance
151− ( Generic (Record a)
152− , HTable (GColumns (HKD a))
153− , KnownAlgebra (GAlgebra (Rep a))
154− , Eval (GGSerialize (GAlgebra (Rep a)) TSerialize TColumns (Eval (HKDRep a Expr)) (Eval (HKDRep a Result)))
155− , GRecord (GMap (TColumn Result) (Rep a)) ~ Rep (Record a)
159+ ( Table Expr (HKD a Expr)
160+ , Columns (HKD a Expr) ~ GColumns (HKD a)
161+ , HKDable a
162+ , x ~ HKD a Expr
156163 )
157− => HKDable a
164+ => ToExprs x (HKDT a)
165+ where
166+ toResult = (\(HKD a) -> a) . toHKD . (\(HKDT a) -> a)
167+ fromResult = HKDT . fromHKD . HKD
168+
169+
170+fromHKD :: HKDable a => HKD a Result -> a
171+fromHKD = to . gunmap @Top (Proxy @(TColumn Result)) id . from
172+
173+
174+toHKD :: HKDable a => a -> HKD a Result
175+toHKD = to . gmap @Top (Proxy @(TColumn Result)) id . from
158176
159177
160−type Top_ :: Constraint
161178class Top_
162179instance Top_
163180
@@ -166,6 +183,32 @@ data Top :: Type -> Exp Constraint
166183type instance Eval (Top _) = Top_
167184
168185
186+class
187+ ( Generic a
188+ , HTable (GColumns (HKD a))
189+ , KnownAlgebra (GAlgebra (Rep a))
190+ , Eval (GGTable (GAlgebra (Rep a)) (TTable (Reify Result)) TColumns (Col (Reify Result)) (GRecord (GMap (TColumn (Reify Result)) (Rep a))))
191+ , Eval (GGContext (GAlgebra (Rep a)) TUnreifyContext (GRecord (GMap (TColumn (Reify Result)) (Rep a)))) ~ Result
192+ , GRecordable (GMap (TColumn (Reify Result)) (Rep a))
193+ , GMappable Top (Rep a)
194+ , GMappable (TTable (Reify Result)) (GMap (TColumn (Reify Result)) (Rep a))
195+ , GMap TUnreify (GMap (TColumn (Reify Result)) (Rep a)) ~ GMap (TColumn Result) (Rep a)
196+ )
197+ => HKDable a
198+instance
199+ ( Generic a
200+ , HTable (GColumns (HKD a))
201+ , KnownAlgebra (GAlgebra (Rep a))
202+ , Eval (GGTable (GAlgebra (Rep a)) (TTable (Reify Result)) TColumns (Col (Reify Result)) (GRecord (GMap (TColumn (Reify Result)) (Rep a))))
203+ , Eval (GGContext (GAlgebra (Rep a)) TUnreifyContext (GRecord (GMap (TColumn (Reify Result)) (Rep a)))) ~ Result
204+ , GRecordable (GMap (TColumn (Reify Result)) (Rep a))
205+ , GMappable Top (Rep a)
206+ , GMappable (TTable (Reify Result)) (GMap (TColumn (Reify Result)) (Rep a))
207+ , GMap TUnreify (GMap (TColumn (Reify Result)) (Rep a)) ~ GMap (TColumn Result) (Rep a)
208+ )
209+ => HKDable a
210+
211+
169212type BuildableHKD :: Type -> Symbol -> Constraint
170213class GGBuildable (GAlgebra (Rep a)) name (HKDRep a) => BuildableHKD a name
171214instance GGBuildable (GAlgebra (Rep a)) name (HKDRep a) => BuildableHKD a name
@@ -180,6 +223,15 @@ buildHKD =
180223 ggbuild @(GAlgebra (Rep a)) @name @(HKDRep a) @(HKD a Expr) HKD
181224
182225
226+type InsertHKD :: Type -> Symbol -> Type
227+type InsertHKD a name = GGInsert (GAlgebra (Rep a)) name (HKDRep a) (HKD a Insert)
228+
229+
230+insertHKD :: forall a name. BuildableHKD a name => InsertHKD a name
231+insertHKD =
232+ gginsert @(GAlgebra (Rep a)) @name @(HKDRep a) @(HKD a Insert) HKD
233+
234+
183235type ConstructableHKD :: Type -> Constraint
184236class GGConstructable (GAlgebra (Rep a)) (HKDRep a) => ConstructableHKD a
185237instance GGConstructable (GAlgebra (Rep a)) (HKDRep a) => ConstructableHKD a
@@ -217,10 +269,10 @@ type AggregateHKD a = forall r. GGAggregate (GAlgebra (Rep a)) (HKDRep a) r
217269
218270
219271aggregateHKD :: forall a. ConstructableHKD a
220− => AggregateHKD a -> HKD a Expr -> HKD a Aggregate
272+ => AggregateHKD a -> HKD a Expr -> Aggregate (HKD a Expr)
221273aggregateHKD f =
222− ggaggregate @(GAlgebra (Rep a)) @(HKDRep a) @(HKD a Expr) @(HKD a Aggregate) HKD (\(HKD a) -> a)
223− (f @(HKD a Aggregate))
274+ ggaggregate @(GAlgebra (Rep a)) @(HKDRep a) @(HKD a Expr) HKD (\(HKD a) -> a)
275+ (f @(Aggregate (HKD a Expr)))
224276
225277
226278data HKDRep :: Type -> K.Context -> Exp (Type -> Type)
src/Rel8/Table/Insert.hsnew file+51
@@ -0,0 +1,51 @@
1+{-# language FlexibleContexts #-}
2+{-# language NamedFieldPuns #-}
3+{-# language TypeFamilies #-}
4+{-# language ViewPatterns #-}
5+
6+module Rel8.Table.Insert
7+ ( toInsert
8+ , toInsertDefaults
9+ )
10+where
11+
12+-- base
13+import Prelude
14+
15+-- rel8
16+import Rel8.Expr ( Col(..) )
17+import Rel8.Kind.Necessity ( SNecessity( SOptional, SRequired ) )
18+import Rel8.Schema.HTable ( hfield, htabulate, hspecs )
19+import Rel8.Schema.Insert ( Inserts, Col(..) )
20+import Rel8.Schema.Spec ( SSpec(..) )
21+import Rel8.Table ( fromColumns, toColumns )
22+
23+
24+-- | @toInsert@ converts a 'Table' of 'Expr's into a 'Table' that can be used
25+-- with 'Rel8.insert'. This will override any columns that have default values
26+-- to use exactly what is given. If you want to use default values, you can
27+-- either override the result of @toInsert@, or use 'toInsertDefaults'.
28+toInsert :: Inserts exprs inserts => exprs -> inserts
29+toInsert (toColumns -> exprs) = fromColumns $ htabulate $ \field ->
30+ case hfield hspecs field of
31+ SSpec {necessity} -> case hfield exprs field of
32+ DB expr -> case necessity of
33+ SRequired -> RequiredInsert expr
34+ SOptional -> OptionalInsert (Just expr)
35+
36+
37+-- | @toInsertDefaults@ converts a 'Table' of 'Expr's into a 'Table' that can
38+-- be used with 'Rel8.insert'. Any columns that have a default value will
39+-- override whatever is in the input expression.
40+--
41+-- One example where this is useful is for any table that has a special @id@
42+-- column, which has a default value to draw a new value from a sequence. If we
43+-- use 'toInsertDefaults', we can provide a dummy value that will be replaced
44+-- with a call to @DEFAULT@.
45+toInsertDefaults :: Inserts exprs inserts => exprs -> inserts
46+toInsertDefaults (toColumns -> exprs) = fromColumns $ htabulate $ \field ->
47+ case hfield hspecs field of
48+ SSpec {necessity} -> case hfield exprs field of
49+ DB expr -> case necessity of
50+ SRequired -> RequiredInsert expr
51+ SOptional -> OptionalInsert Nothing
src/Rel8/Table/List.hs+62−72
@@ -1,4 +1,3 @@
1−{-# language DataKinds #-}
21{-# language FlexibleContexts #-}
32{-# language FlexibleInstances #-}
43{-# language MultiParamTypeClasses #-}
@@ -11,139 +10,130 @@
1110
1211module Rel8.Table.List
1312 ( ListTable(..)
14− , ($*)
15− , listTable
16− , nameListTable
13+ , listTable, insertListTable, nameListTable
1714 )
1815where
1916
2017-- base
2118import Data.Functor.Identity ( Identity( Identity ) )
2219import Data.Kind ( Type )
20+import Data.Type.Equality ( (:~:)( Refl ) )
2321import Prelude
2422
2523-- rel8
26−import Rel8.Expr ( Expr )
24+import Rel8.Expr ( Expr, Col(..) )
2725import Rel8.Expr.Array ( sappend, sempty, slistOf )
2826import Rel8.Schema.Dict ( Dict( Dict ) )
2927import Rel8.Schema.HTable.List ( HListTable )
30−import Rel8.Schema.HTable.Vectorize
31− ( hvectorize, hunvectorize
32− , happend, hempty
33− , hproject, hcolumn
34− )
35−import qualified Rel8.Schema.Kind as K
36−import Rel8.Schema.Name ( Name( Name ) )
28+import Rel8.Schema.HTable.Vectorize ( happend, hempty, hvectorize )
29+import Rel8.Schema.Insert ( Inserts )
30+import Rel8.Schema.Name ( Col( NameCol ), Name )
3731import Rel8.Schema.Null ( Nullity( Null, NotNull ) )
38−import Rel8.Schema.Result ( vectorizer, unvectorizer )
39−import Rel8.Schema.Spec ( Spec(..) )
32+import Rel8.Schema.Spec ( SSpec(..) )
33+import Rel8.Schema.Spec.ConstrainDBType ( dbTypeDict, dbTypeNullity )
34+import Rel8.Schema.Reify ( hreify, hunreify )
4035import Rel8.Table
4136 ( Table, Context, Columns, fromColumns, toColumns
42− , FromExprs, fromResult, toResult
43− , Transpose
37+ , reify, unreify
4438 )
4539import Rel8.Table.Alternative
4640 ( AltTable, (<|>:)
4741 , AlternativeTable, emptyTable
4842 )
4943import Rel8.Table.Eq ( EqTable, eqTable )
44+import Rel8.Table.Insert ( toInsert )
5045import Rel8.Table.Ord ( OrdTable, ordTable )
51−import Rel8.Table.Projection
52− ( Projectable, Projecting, Projection, project, apply
53− )
54−import Rel8.Table.Serialize ( ToExprs )
46+import Rel8.Table.Recontextualize ( Recontextualize )
47+import Rel8.Table.Serialize ( FromExprs, ToExprs, fromResult, toResult )
48+import Rel8.Table.Unreify ( Unreifies )
5549
5650
5751-- | A @ListTable@ value contains zero or more instances of @a@. You construct
5852-- @ListTable@s with 'Rel8.many' or 'Rel8.listAgg'.
59−type ListTable :: K.Context -> Type -> Type
60−newtype ListTable context a =
61− ListTable (HListTable (Columns a) (Context a))
62−
63−
64−instance Projectable (ListTable context) where
65− project f (ListTable a) = ListTable (hproject (apply f) a)
53+type ListTable :: Type -> Type
54+newtype ListTable a = ListTable (HListTable (Columns a) (Col (Context a)))
6655
6756
68−instance (Table context a, context ~ context') =>
69− Table context' (ListTable context a)
57+instance (Table context a, Unreifies context a) =>
58+ Table context (ListTable a)
7059 where
71− type Columns (ListTable context a) = HListTable (Columns a)
72− type Context (ListTable context a) = Context a
73− type FromExprs (ListTable context a) = [FromExprs a]
74− type Transpose to (ListTable context a) = ListTable to (Transpose to a)
60+ type Columns (ListTable a) = HListTable (Columns a)
61+ type Context (ListTable a) = Context a
7562
7663 fromColumns = ListTable
7764 toColumns (ListTable a) = a
78− fromResult = fmap (fromResult @_ @a) . hunvectorize unvectorizer
79− toResult = hvectorize vectorizer . fmap (toResult @_ @a)
65+
66+ reify Refl (ListTable a) = ListTable (hreify a)
67+ unreify Refl (ListTable a) = ListTable (hunreify a)
68+
69+
70+instance
71+ ( Unreifies from a, Unreifies to b
72+ , Recontextualize from to a b
73+ )
74+ => Recontextualize from to (ListTable a) (ListTable b)
8075
8176
82−instance (EqTable a, context ~ Expr) => EqTable (ListTable context a) where
77+instance EqTable a => EqTable (ListTable a) where
8378 eqTable =
8479 hvectorize
85− (\Spec {nullity} (Identity Dict) -> case nullity of
86− Null -> Dict
87− NotNull -> Dict)
80+ (\SSpec {} (Identity dict) -> case dbTypeDict dict of
81+ Dict -> case dbTypeNullity dict of
82+ Null -> Dict
83+ NotNull -> Dict)
8884 (Identity (eqTable @a))
8985
9086
91−instance (OrdTable a, context ~ Expr) => OrdTable (ListTable context a) where
87+instance OrdTable a => OrdTable (ListTable a) where
9288 ordTable =
9389 hvectorize
94− (\Spec {nullity} (Identity Dict) -> case nullity of
95− Null -> Dict
96− NotNull -> Dict)
90+ (\SSpec {} (Identity dict) -> case dbTypeDict dict of
91+ Dict -> case dbTypeNullity dict of
92+ Null -> Dict
93+ NotNull -> Dict)
9794 (Identity (ordTable @a))
9895
9996
100−instance (ToExprs exprs a, context ~ Expr) =>
101− ToExprs (ListTable context exprs) [a]
97+type instance FromExprs (ListTable a) = [FromExprs a]
10298
10399
104−instance context ~ Expr => AltTable (ListTable context) where
105− (<|>:) = (<>)
100+instance ToExprs exprs a => ToExprs (ListTable exprs) [a] where
101+ fromResult = fmap (fromResult @exprs) . fromColumns
102+ toResult = toColumns . fmap (toResult @exprs)
106103
107104
108−instance context ~ Expr => AlternativeTable (ListTable context) where
109− emptyTable = mempty
105+instance AltTable ListTable where
106+ (<|>:) = (<>)
110107
111108
112−instance (context ~ Expr, Table Expr a) => Semigroup (ListTable context a)
113− where
114− ListTable as <> ListTable bs = ListTable $ happend (const sappend) as bs
109+instance AlternativeTable ListTable where
110+ emptyTable = mempty
115111
116112
117−instance (context ~ Expr, Table Expr a) =>
118− Monoid (ListTable context a)
119− where
120− mempty = ListTable $ hempty $ \Spec {info} -> sempty info
113+instance Table Expr a => Semigroup (ListTable a) where
114+ ListTable as <> ListTable bs = ListTable $
115+ happend (\_ _ (DB a) (DB b) -> DB (sappend a b)) as bs
121116
122117
123−-- | Project a single expression out of a 'ListTable'.
124−($*) :: Projecting a (Expr b)
125− => Projection a (Expr b) -> ListTable Expr a -> Expr [b]
126−f $* ListTable a = hcolumn $ hproject (apply f) a
127−infixl 4 $*
118+instance Table Expr a => Monoid (ListTable a) where
119+ mempty = ListTable $ hempty $ \nullability info ->
120+ DB (sempty nullability info)
128121
129122
130−-- | Construct a @ListTable@ from a list of expressions.
131−listTable :: Table Expr a => [a] -> ListTable Expr a
123+listTable :: Table Expr a => [a] -> ListTable a
132124listTable =
133125 ListTable .
134− hvectorize (\Spec {info} -> slistOf info) .
126+ hvectorize (\SSpec {info} -> DB . slistOf info . fmap unDB) .
135127 fmap toColumns
136128
137129
138−-- | Construct a 'ListTable' in the 'Name' context. This can be useful if you
139−-- have a 'ListTable' that you are storing in a table and need to construct a
140−-- 'TableSchema'.
141−nameListTable
142− :: Table Name a
143− => a -- ^ The names of the columns of elements of the list.
144− -> ListTable Name a
130+insertListTable :: Inserts exprs inserts => [exprs] -> ListTable inserts
131+insertListTable = toInsert . listTable
132+
133+
134+nameListTable :: Table Name a => a -> ListTable a
145135nameListTable =
146136 ListTable .
147− hvectorize (\_ (Identity (Name a)) -> Name a) .
137+ hvectorize (\_ (Identity (NameCol a)) -> NameCol a) .
148138 pure .
149139 toColumns
src/Rel8/Table/Maybe.hs+139−121
@@ -3,6 +3,7 @@
33{-# language DerivingStrategies #-}
44{-# language FlexibleContexts #-}
55{-# language FlexibleInstances #-}
6+{-# language LambdaCase #-}
67{-# language MultiParamTypeClasses #-}
78{-# language NamedFieldPuns #-}
89{-# language ScopedTypeVariables #-}
@@ -15,42 +16,42 @@ module Rel8.Table.Maybe
1516 ( MaybeTable(..)
1617 , maybeTable, nothingTable, justTable
1718 , isNothingTable, isJustTable
18− , fromMaybeTable
1919 , ($?)
20− , aggregateMaybeTable
21− , nameMaybeTable
20+ , aggregateMaybeTable, insertMaybeTable, nameMaybeTable
2221 )
2322where
2423
2524-- base
26−import Data.Functor ( ($>) )
27−import Data.Functor.Identity ( Identity( Identity ) )
25+import Data.Functor.Identity ( runIdentity )
2826import Data.Kind ( Type )
29−import Data.Maybe ( fromMaybe, isJust )
3027import Prelude hiding ( null, undefined )
3128
32−-- comonad
33−import Control.Comonad ( extract )
34−
3529-- rel8
36−import Rel8.Aggregate ( Aggregate )
30+import Rel8.Aggregate ( Aggregate, unsafeMakeAggregate )
3731import Rel8.Expr ( Expr )
38−import Rel8.Expr.Aggregate ( groupByExpr )
3932import Rel8.Expr.Bool ( boolExpr )
4033import Rel8.Expr.Null ( isNull, isNonNull, null, nullify )
41−import Rel8.Kind.Context ( Reifiable )
42−import Rel8.Schema.Dict ( Dict( Dict ) )
43−import qualified Rel8.Schema.Kind as K
34+import Rel8.Expr.Opaleye ( fromPrimExpr, toPrimExpr )
35+import Rel8.Schema.Context.Label
36+ ( Labelable, HLabelable, hlabeler, hunlabeler
37+ )
38+import Rel8.Schema.Context.Nullify
39+ ( Nullifiable, ConstrainTag
40+ , HNullifiable, HConstrainTag
41+ , hencodeTag, hdecodeTag
42+ , hnullifier, hunnullifier
43+ )
44+import Rel8.Schema.HTable ( HTable )
4445import Rel8.Schema.HTable.Identity ( HIdentity(..) )
4546import Rel8.Schema.HTable.Label ( hlabel, hunlabel )
4647import Rel8.Schema.HTable.Maybe ( HMaybeTable(..) )
48+import Rel8.Schema.HTable.Nullify ( hnullify, hunnullify )
49+import Rel8.Schema.Insert ( Insert )
4750import Rel8.Schema.Name ( Name )
48−import Rel8.Schema.Null ( Nullity( Null, NotNull ), Sql, nullable )
49−import qualified Rel8.Schema.Null as N
51+import Rel8.Schema.Null ( Nullify, Nullity( Null, NotNull ), Sql, nullable )
5052import Rel8.Table
5153 ( Table, Columns, Context, fromColumns, toColumns
52− , FromExprs, fromResult, toResult
53− , Transpose
54+ , reify, unreify
5455 )
5556import Rel8.Table.Alternative
5657 ( AltTable, (<|>:)
@@ -58,16 +59,17 @@ import Rel8.Table.Alternative
5859 )
5960import Rel8.Table.Bool ( bool )
6061import Rel8.Table.Eq ( EqTable, eqTable )
62+import Rel8.Table.Insert ( toInsert )
6163import Rel8.Table.Ord ( OrdTable, ordTable )
62−import Rel8.Table.Projection ( Projectable, project )
63−import Rel8.Table.Nullify ( Nullify, aggregateNullify, guard )
64−import Rel8.Table.Serialize ( ToExprs )
64+import Rel8.Table.Recontextualize ( Recontextualize )
65+import Rel8.Table.Serialize ( FromExprs, ToExprs, fromResult, toResult )
66+import Rel8.Table.Tag ( Tag(..), fromExpr, fromName )
6567import Rel8.Table.Undefined ( undefined )
6668import Rel8.Type ( DBType )
67−import Rel8.Type.Tag ( MaybeTag( IsJust ) )
69+import Rel8.Type.Tag ( MaybeTag )
6870
6971-- semigroupoids
70−import Data.Functor.Apply ( Apply, (<.>) )
72+import Data.Functor.Apply ( Apply, (<.>), liftF2 )
7173import Data.Functor.Bind ( Bind, (>>-) )
7274
7375
@@ -79,168 +81,184 @@ import Data.Functor.Bind ( Bind, (>>-) )
7981-- entirely of nulls, you can't distinguish if you matched an all null row, or
8082-- if the match failed. For this reason @MaybeTable@ contains an extra field -
8183-- a "nullTag" - to track whether or not the outer join produced any rows.
82−type MaybeTable :: K.Context -> Type -> Type
83−data MaybeTable context a = MaybeTable
84− { tag :: context (Maybe MaybeTag)
85− , just :: Nullify context a
84+type MaybeTable :: Type -> Type
85+data MaybeTable a = MaybeTable
86+ { tag :: Tag "isJust" (Maybe MaybeTag)
87+ , just :: a
8688 }
8789 deriving stock Functor
8890
8991
90−instance Projectable (MaybeTable context) where
91− project f (MaybeTable tag a) = MaybeTable tag (project f a)
92−
93−
94−instance context ~ Expr => Apply (MaybeTable context) where
95− MaybeTable tag f <.> MaybeTable tag' a = MaybeTable (tag <> tag') (f <.> a)
92+instance Apply MaybeTable where
93+ MaybeTable tag f <.> MaybeTable tag' a = MaybeTable (tag <> tag') (f a)
9694
9795
9896-- | Has the same behavior as the @Applicative@ instance for @Maybe@. See also:
9997-- 'Rel8.traverseMaybeTable'.
100−instance context ~ Expr => Applicative (MaybeTable context) where
98+instance Applicative MaybeTable where
10199 (<*>) = (<.>)
102100 pure = justTable
103101
104102
105−instance context ~ Expr => Bind (MaybeTable context) where
106− MaybeTable tag a >>- f = case f (extract a) of
103+instance Bind MaybeTable where
104+ MaybeTable tag a >>- f = case f a of
107105 MaybeTable tag' b -> MaybeTable (tag <> tag') b
108106
109107
110−-- | Has the same behavior as the @Monad@ instance for @Maybe@.
111−instance context ~ Expr => Monad (MaybeTable context) where
108+-- | Has the same behavior as the @Monad@ instance for @Maybe@. See also:
109+-- 'Rel8.bindMaybeTable'.
110+instance Monad MaybeTable where
112111 (>>=) = (>>-)
113112
114113
115−instance context ~ Expr => AltTable (MaybeTable context) where
116− ma <|>: mb = bool ma mb (isNothingTable ma)
114+instance AltTable MaybeTable where
115+ ma@(MaybeTable tag a) <|>: MaybeTable tag' b = MaybeTable
116+ { tag = (tag <> tag')
117+ { expr = boolExpr (expr tag) (expr tag') condition
118+ }
119+ , just = bool a b condition
120+ }
121+ where
122+ condition = isNothingTable ma
117123
118124
119−instance context ~ Expr => AlternativeTable (MaybeTable context) where
125+instance AlternativeTable MaybeTable where
120126 emptyTable = nothingTable
121127
122128
123−instance (context ~ Expr, Table Expr a, Semigroup a) =>
124− Semigroup (MaybeTable context a)
125− where
129+instance (Table Expr a, Semigroup a) => Semigroup (MaybeTable a) where
126130 ma <> mb = maybeTable mb (\a -> maybeTable ma (justTable . (a <>)) mb) ma
127131
128132
129−instance (context ~ Expr, Table Expr a, Semigroup a) =>
130− Monoid (MaybeTable context a)
131− where
133+instance (Table Expr a, Semigroup a) => Monoid (MaybeTable a) where
132134 mempty = nothingTable
133135
134136
135−instance (Table context a, Reifiable context, context ~ context') =>
136− Table context' (MaybeTable context a)
137+instance
138+ ( Table context a
139+ , Labelable context, Nullifiable context
140+ , ConstrainTag context MaybeTag
141+ ) => Table context (MaybeTable a)
137142 where
138− type Columns (MaybeTable context a) = HMaybeTable (Columns a)
139− type Context (MaybeTable context a) = Context a
140− type FromExprs (MaybeTable context a) = Maybe (FromExprs a)
141− type Transpose to (MaybeTable context a) = MaybeTable to (Transpose to a)
142−
143− toColumns MaybeTable {tag, just} = HMaybeTable
144− { htag = hlabel $ HIdentity tag
145− , hjust = hlabel $ guard tag isJust isNonNull $ toColumns just
146− }
143+ type Columns (MaybeTable a) = HMaybeTable (Columns a)
144+ type Context (MaybeTable a) = Context a
147145
148− fromColumns HMaybeTable {htag, hjust} = MaybeTable
149− { tag = unHIdentity $ hunlabel htag
150− , just = fromColumns $ hunlabel hjust
151− }
146+ toColumns = toColumns1 toColumns
147+ fromColumns = fromColumns1 fromColumns
148+ reify = fmap fmap reify
149+ unreify = fmap fmap unreify
152150
153− toResult ma = HMaybeTable
154− { htag = hlabel (HIdentity (Identity (IsJust <$ ma)))
155− , hjust = hlabel (toResult @_ @(Nullify context a) ma)
156− }
157151
158− fromResult HMaybeTable {htag, hjust} = case hunlabel htag of
159− HIdentity (Identity tag) -> tag $>
160− fromMaybe err (fromResult @_ @(Nullify context a) (hunlabel hjust))
161− where
162− err = error "Maybe.fromColumns: mismatch between tag and data"
152+instance
153+ ( Labelable from, Nullifiable from, ConstrainTag from MaybeTag
154+ , Labelable to, Nullifiable to, ConstrainTag to MaybeTag
155+ , Recontextualize from to a b
156+ )
157+ => Recontextualize from to (MaybeTable a) (MaybeTable b)
163158
164159
165−instance (EqTable a, context ~ Expr) => EqTable (MaybeTable context a) where
166− eqTable = HMaybeTable
167− { htag = hlabel (HIdentity Dict)
168− , hjust = hlabel (eqTable @(Nullify context a))
169− }
160+instance EqTable a => EqTable (MaybeTable a) where
161+ eqTable = toColumns1 id (justTable (eqTable @a))
170162
171163
172−instance (OrdTable a, context ~ Expr) => OrdTable (MaybeTable context a) where
173− ordTable = HMaybeTable
174− { htag = hlabel (HIdentity Dict)
175− , hjust = hlabel (ordTable @(Nullify context a))
176− }
164+instance OrdTable a => OrdTable (MaybeTable a) where
165+ ordTable = toColumns1 id (justTable (ordTable @a))
177166
178167
179−instance (ToExprs exprs a, context ~ Expr) =>
180− ToExprs (MaybeTable context exprs) (Maybe a)
168+type instance FromExprs (MaybeTable a) = Maybe (FromExprs a)
169+
170+
171+instance ToExprs exprs a => ToExprs (MaybeTable exprs) (Maybe a) where
172+ fromResult = fmap (fromResult @exprs) . fromColumns
173+ toResult = toColumns . fmap (toResult @exprs)
181174
182175
183176-- | Check if a @MaybeTable@ is absent of any row. Like 'Data.Maybe.isNothing'.
184−isNothingTable :: MaybeTable Expr a -> Expr Bool
185−isNothingTable (MaybeTable tag _) = isNull tag
177+isNothingTable :: MaybeTable a -> Expr Bool
178+isNothingTable (MaybeTable tag _) = isNull (expr tag)
186179
187180
188181-- | Check if a @MaybeTable@ contains a row. Like 'Data.Maybe.isJust'.
189−isJustTable :: MaybeTable Expr a -> Expr Bool
190−isJustTable (MaybeTable tag _) = isNonNull tag
182+isJustTable :: MaybeTable a -> Expr Bool
183+isJustTable (MaybeTable tag _) = isNonNull (expr tag)
191184
192185
193186-- | Perform case analysis on a 'MaybeTable'. Like 'maybe'.
194−maybeTable :: Table Expr b => b -> (a -> b) -> MaybeTable Expr a -> b
195−maybeTable b f ma@(MaybeTable _ a) = bool (f (extract a)) b (isNothingTable ma)
187+maybeTable :: Table Expr b => b -> (a -> b) -> MaybeTable a -> b
188+maybeTable b f ma@(MaybeTable _ a) = bool (f a) b (isNothingTable ma)
196189{-# INLINABLE maybeTable #-}
197190
198191
199192-- | The null table. Like 'Nothing'.
200−nothingTable :: Table Expr a => MaybeTable Expr a
201−nothingTable = MaybeTable null (pure undefined)
193+nothingTable :: Table Expr a => MaybeTable a
194+nothingTable = MaybeTable (fromExpr null) undefined
202195
203196
204197-- | Lift any table into 'MaybeTable'. Like 'Just'. Note you can also use
205198-- 'pure'.
206−justTable :: a -> MaybeTable Expr a
207−justTable = MaybeTable mempty . pure
208−
209−
210−-- | 'Data.Maybe.fromMaybe' for 'MaybeTable's.
211−fromMaybeTable :: Table Expr a => a -> MaybeTable Expr a -> a
212−fromMaybeTable fallback = maybeTable fallback id
199+justTable :: a -> MaybeTable a
200+justTable = MaybeTable (fromExpr mempty)
213201
214202
215203-- | Project a single expression out of a 'MaybeTable'. You can think of this
216204-- operator like the '$' operator, but it also has the ability to return
217205-- @null@.
218206($?) :: forall a b. Sql DBType b
219− => (a -> Expr b) -> MaybeTable Expr a -> Expr (N.Nullify b)
207+ => (a -> Expr b) -> MaybeTable a -> Expr (Nullify b)
220208f $? ma@(MaybeTable _ a) = case nullable @b of
221− Null -> boolExpr (f (extract a)) null (isNothingTable ma)
222− NotNull -> boolExpr (nullify (f (extract a))) null (isNothingTable ma)
209+ Null -> boolExpr (f a) null (isNothingTable ma)
210+ NotNull -> boolExpr (nullify (f a)) null (isNothingTable ma)
223211infixl 4 $?
224212
225213
226−-- | Lift an aggregating function to operate on a 'MaybeTable'.
227−-- @nothingTable@s and @justTable@s are grouped separately.
228214aggregateMaybeTable :: ()
229− => (exprs -> aggregates)
230− -> MaybeTable Expr exprs
231− -> MaybeTable Aggregate aggregates
232−aggregateMaybeTable f (MaybeTable tag a) =
233− MaybeTable (groupByExpr tag) (aggregateNullify f a)
234−
235−
236−-- | Construct a 'MaybeTable' in the 'Name' context. This can be useful if you
237−-- have a 'MaybeTable' that you are storing in a table and need to construct a
238−-- 'TableSchema'.
239−nameMaybeTable
240− :: Name (Maybe MaybeTag)
241− -- ^ The name of the column to track whether a row is a 'justTable' or
242− -- 'nothingTable'.
243− -> a
244− -- ^ Names of the columns in @a@.
245− -> MaybeTable Name a
246−nameMaybeTable tag = MaybeTable tag . pure
215+ => (a -> Aggregate b) -> MaybeTable a -> Aggregate (MaybeTable b)
216+aggregateMaybeTable f MaybeTable {tag = tag@Tag {aggregator, expr}, just} =
217+ liftF2 MaybeTable (tag <$ aggregate) (f just)
218+ where
219+ aggregate = unsafeMakeAggregate toPrimExpr fromPrimExpr aggregator expr
220+
221+
222+insertMaybeTable :: Table Insert a => Maybe a -> MaybeTable a
223+insertMaybeTable = \case
224+ Nothing -> MaybeTable (fromExpr null) (fromColumns (toInsert undefined))
225+ Just a -> justTable a
226+
227+
228+nameMaybeTable :: Name (Maybe MaybeTag) -> a -> MaybeTable a
229+nameMaybeTable = MaybeTable . fromName
230+
231+
232+toColumns1 ::
233+ ( HTable t
234+ , HConstrainTag context MaybeTag
235+ , HLabelable context
236+ , HNullifiable context
237+ )
238+ => (a -> t context)
239+ -> MaybeTable a
240+ -> HMaybeTable t context
241+toColumns1 f MaybeTable {tag, just} = HMaybeTable
242+ { htag
243+ , hjust = hlabel hlabeler $ hnullify (hnullifier tag isNonNull) $ f just
244+ }
245+ where
246+ htag = HIdentity (hencodeTag tag)
247+
248+
249+fromColumns1 ::
250+ ( HTable t
251+ , HConstrainTag context MaybeTag
252+ , HLabelable context
253+ , HNullifiable context
254+ )
255+ => (t context -> a)
256+ -> HMaybeTable t context
257+ -> MaybeTable a
258+fromColumns1 f HMaybeTable {htag = HIdentity htag, hjust} = MaybeTable
259+ { tag
260+ , just = f $ runIdentity $
261+ hunnullify (\a -> pure . hunnullifier a) (hunlabel hunlabeler hjust)
262+ }
263+ where
264+ tag = hdecodeTag htag
src/Rel8/Table/Name.hs+22−36
@@ -1,17 +1,14 @@
1−{-# language DataKinds #-}
21{-# language FlexibleContexts #-}
3−{-# language FlexibleInstances #-}
4−{-# language MultiParamTypeClasses #-}
52{-# language NamedFieldPuns #-}
63{-# language ScopedTypeVariables #-}
74{-# language TypeApplications #-}
85{-# language TypeFamilies #-}
9−{-# language UndecidableInstances #-}
106{-# language ViewPatterns #-}
117
128module Rel8.Table.Name
139 ( namesFromLabels
1410 , namesFromLabelsWith
11+ , showExprs
1512 , showLabels
1613 , showNames
1714 )
@@ -20,60 +17,49 @@ where
2017-- base
2118import Data.Foldable ( fold )
2219import Data.Functor.Const ( Const( Const ), getConst )
23−import Data.List.NonEmpty ( NonEmpty, intersperse, nonEmpty )
24−import Data.Maybe ( fromMaybe )
20+import Data.List.NonEmpty ( NonEmpty, intersperse )
2521import Prelude
2622
23+-- opaleye
24+import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
25+
2726-- rel8
27+import Rel8.Expr ( Expr, Col(..) )
28+import Rel8.Expr.Opaleye ( toPrimExpr )
29+import Rel8.Kind.Labels ( renderLabels )
2830import Rel8.Schema.HTable ( htabulate, htabulateA, hfield, hspecs )
29−import Rel8.Schema.Name ( Name( Name ) )
30−import Rel8.Schema.Spec ( Spec(..) )
31−import Rel8.Table ( Table(..) )
31+import Rel8.Schema.Name ( Name, Col(..) )
32+import Rel8.Schema.Spec ( SSpec(..) )
33+import Rel8.Table ( Table, Columns, Context, fromColumns, toColumns )
3234
3335
34−-- | Construct a table in the 'Name' context containing the names of all
35−-- columns. Nested column names will be combined with @/@.
36−--
37−-- See also: 'namesFromLabelsWith'.
3836namesFromLabels :: Table Name a => a
3937namesFromLabels = namesFromLabelsWith go
4038 where
4139 go = fold . intersperse "/"
4240
4341
44−-- | Construct a table in the 'Name' context containing the names of all
45−-- columns. The supplied function can be used to transform column names.
46−--
47−-- This function can be used to generically derive the columns for a
48−-- 'TableSchema'. For example,
49−--
50−-- @
51−-- myTableSchema :: TableSchema (MyTable Name)
52−-- myTableSchema = TableSchema
53−-- { columns = namesFromLabelsWith last
54−-- }
55−-- @
56−--
57−-- will construct a 'TableSchema' where each columns names exactly corresponds
58−-- to the name of the Haskell field.
5942namesFromLabelsWith :: Table Name a
6043 => (NonEmpty String -> String) -> a
6144namesFromLabelsWith f = fromColumns $ htabulate $ \field ->
6245 case hfield hspecs field of
63− Spec {labels} -> Name (f (renderLabels labels))
46+ SSpec {labels} -> NameCol (f (renderLabels labels))
47+
48+
49+showExprs :: Table Expr a => a -> [(String, Opaleye.PrimExpr)]
50+showExprs as = case (namesFromLabels, toColumns as) of
51+ (names, exprs) -> getConst $ htabulateA $ \field ->
52+ case (hfield names field, hfield exprs field) of
53+ (NameCol name, DB expr) -> Const [(name, toPrimExpr expr)]
6454
6555
6656showLabels :: forall a. Table (Context a) a => a -> [NonEmpty String]
6757showLabels _ = getConst $
6858 htabulateA @(Columns a) $ \field -> case hfield hspecs field of
69− Spec {labels} -> Const (pure (renderLabels labels))
59+ SSpec {labels} -> Const [renderLabels labels]
7060
7161
72−showNames :: forall a. Table Name a => a -> NonEmpty String
62+showNames :: forall a. Table Name a => a -> [String]
7363showNames (toColumns -> names) = getConst $
7464 htabulateA @(Columns a) $ \field -> case hfield names field of
75− Name name -> Const (pure name)
76−
77−
78−renderLabels :: [String] -> NonEmpty String
79−renderLabels labels = fromMaybe (pure "anon") (nonEmpty labels )
65+ NameCol name -> Const [name]
src/Rel8/Table/NonEmpty.hs+61−73
@@ -1,4 +1,3 @@
1−{-# language DataKinds #-}
21{-# language FlexibleContexts #-}
32{-# language FlexibleInstances #-}
43{-# language MultiParamTypeClasses #-}
@@ -11,9 +10,7 @@
1110
1211module Rel8.Table.NonEmpty
1312 ( NonEmptyTable(..)
14− , ($+)
15− , nonEmptyTable
16− , nameNonEmptyTable
13+ , nonEmptyTable, insertNonEmptyTable, nameNonEmptyTable
1714 )
1815where
1916
@@ -21,123 +18,114 @@ where
2118import Data.Functor.Identity ( Identity( Identity ) )
2219import Data.Kind ( Type )
2320import Data.List.NonEmpty ( NonEmpty )
24−import Prelude hiding ( id )
21+import Data.Type.Equality ( (:~:)( Refl ) )
22+import Prelude
2523
2624-- rel8
27−import Rel8.Expr ( Expr )
25+import Rel8.Expr ( Expr, Col(..) )
2826import Rel8.Expr.Array ( sappend1, snonEmptyOf )
2927import Rel8.Schema.Dict ( Dict( Dict ) )
3028import Rel8.Schema.HTable.NonEmpty ( HNonEmptyTable )
31−import Rel8.Schema.HTable.Vectorize
32− ( hvectorize, hunvectorize
33− , happend
34− , hproject, hcolumn
35− )
36−import qualified Rel8.Schema.Kind as K
37−import Rel8.Schema.Name ( Name( Name ) )
29+import Rel8.Schema.HTable.Vectorize ( happend, hvectorize )
30+import Rel8.Schema.Insert ( Inserts )
31+import Rel8.Schema.Name ( Col( NameCol ), Name )
3832import Rel8.Schema.Null ( Nullity( Null, NotNull ) )
39−import Rel8.Schema.Result ( vectorizer, unvectorizer )
40−import Rel8.Schema.Spec ( Spec(..) )
33+import Rel8.Schema.Reify ( hreify, hunreify )
34+import Rel8.Schema.Spec ( SSpec(..) )
35+import Rel8.Schema.Spec.ConstrainDBType ( dbTypeDict, dbTypeNullity )
4136import Rel8.Table
4237 ( Table, Context, Columns, fromColumns, toColumns
43− , FromExprs, fromResult, toResult
44− , Transpose
38+ , reify, unreify
4539 )
4640import Rel8.Table.Alternative ( AltTable, (<|>:) )
4741import Rel8.Table.Eq ( EqTable, eqTable )
42+import Rel8.Table.Insert ( toInsert )
4843import Rel8.Table.Ord ( OrdTable, ordTable )
49−import Rel8.Table.Projection
50− ( Projectable, Projecting, Projection, project, apply
51− )
52−import Rel8.Table.Serialize ( ToExprs )
44+import Rel8.Table.Recontextualize ( Recontextualize )
45+import Rel8.Table.Serialize ( FromExprs, ToExprs, fromResult, toResult )
46+import Rel8.Table.Unreify ( Unreifies )
5347
5448
5549-- | A @NonEmptyTable@ value contains one or more instances of @a@. You
5650-- construct @NonEmptyTable@s with 'Rel8.some' or 'nonEmptyAgg'.
57−type NonEmptyTable :: K.Context -> Type -> Type
58−newtype NonEmptyTable context a =
59− NonEmptyTable (HNonEmptyTable (Columns a) (Context a))
60−
51+type NonEmptyTable :: Type -> Type
52+newtype NonEmptyTable a =
53+ NonEmptyTable (HNonEmptyTable (Columns a) (Col (Context a)))
6154
62−instance Projectable (NonEmptyTable context) where
63− project f (NonEmptyTable a) = NonEmptyTable (hproject (apply f) a)
6455
65−
66−instance (Table context a, context ~ context') =>
67− Table context' (NonEmptyTable context a)
56+instance (Table context a, Unreifies context a) =>
57+ Table context (NonEmptyTable a)
6858 where
69− type Columns (NonEmptyTable context a) = HNonEmptyTable (Columns a)
70− type Context (NonEmptyTable context a) = Context a
71− type FromExprs (NonEmptyTable context a) = NonEmpty (FromExprs a)
72− type Transpose to (NonEmptyTable context a) =
73− NonEmptyTable to (Transpose to a)
59+ type Columns (NonEmptyTable a) = HNonEmptyTable (Columns a)
60+ type Context (NonEmptyTable a) = Context a
7461
7562 fromColumns = NonEmptyTable
7663 toColumns (NonEmptyTable a) = a
77− fromResult = fmap (fromResult @_ @a) . hunvectorize unvectorizer
78− toResult = hvectorize vectorizer . fmap (toResult @_ @a)
7964
65+ reify Refl (NonEmptyTable a) = NonEmptyTable (hreify a)
66+ unreify Refl (NonEmptyTable a) = NonEmptyTable (hunreify a)
8067
81−instance (EqTable a, context ~ Expr) =>
82− EqTable (NonEmptyTable context a)
83− where
68+
69+instance
70+ ( Unreifies from a, Unreifies to b
71+ , Recontextualize from to a b
72+ )
73+ => Recontextualize from to (NonEmptyTable a) (NonEmptyTable b)
74+
75+
76+instance EqTable a => EqTable (NonEmptyTable a) where
8477 eqTable =
8578 hvectorize
86− (\Spec {nullity} (Identity Dict) -> case nullity of
87− Null -> Dict
88− NotNull -> Dict)
79+ (\SSpec {} (Identity dict) -> case dbTypeDict dict of
80+ Dict -> case dbTypeNullity dict of
81+ Null -> Dict
82+ NotNull -> Dict)
8983 (Identity (eqTable @a))
9084
9185
92−instance (OrdTable a, context ~ Expr) =>
93− OrdTable (NonEmptyTable context a)
94− where
86+instance OrdTable a => OrdTable (NonEmptyTable a) where
9587 ordTable =
9688 hvectorize
97− (\Spec {nullity} (Identity Dict) -> case nullity of
98− Null -> Dict
99− NotNull -> Dict)
89+ (\SSpec {} (Identity dict) -> case dbTypeDict dict of
90+ Dict -> case dbTypeNullity dict of
91+ Null -> Dict
92+ NotNull -> Dict)
10093 (Identity (ordTable @a))
10194
10295
103−instance (ToExprs exprs a, context ~ Expr) =>
104− ToExprs (NonEmptyTable context exprs) (NonEmpty a)
96+type instance FromExprs (NonEmptyTable a) = NonEmpty (FromExprs a)
10597
10698
107−instance context ~ Expr => AltTable (NonEmptyTable context) where
108− (<|>:) = (<>)
99+instance ToExprs exprs a => ToExprs (NonEmptyTable exprs) (NonEmpty a)
100+ where
101+ fromResult = fmap (fromResult @exprs) . fromColumns
102+ toResult = toColumns . fmap (toResult @exprs)
109103
110104
111−instance (Table Expr a, context ~ Expr) => Semigroup (NonEmptyTable context a)
112− where
113− NonEmptyTable as <> NonEmptyTable bs = NonEmptyTable $
114− happend (const sappend1) as bs
105+instance AltTable NonEmptyTable where
106+ (<|>:) = (<>)
115107
116108
117−-- | Project a single expression out of a 'NonEmptyTable'.
118−($+) :: Projecting a (Expr b)
119− => Projection a (Expr b) -> NonEmptyTable Expr a -> Expr (NonEmpty b)
120−f $+ NonEmptyTable a = hcolumn $ hproject (apply f) a
121−infixl 4 $+
109+instance Table Expr a => Semigroup (NonEmptyTable a) where
110+ NonEmptyTable as <> NonEmptyTable bs = NonEmptyTable $
111+ happend (\_ _ (DB a) (DB b) -> DB (sappend1 a b)) as bs
122112
123113
124−-- | Construct a @NonEmptyTable@ from a non-empty list of expressions.
125−nonEmptyTable :: Table Expr a => NonEmpty a -> NonEmptyTable Expr a
114+nonEmptyTable :: Table Expr a => NonEmpty a -> NonEmptyTable a
126115nonEmptyTable =
127116 NonEmptyTable .
128− hvectorize (\Spec {info} -> snonEmptyOf info) .
117+ hvectorize (\SSpec {info} -> DB . snonEmptyOf info . fmap unDB) .
129118 fmap toColumns
130119
131120
132−-- | Construct a 'NonEmptyTable' in the 'Name' context. This can be useful if
133−-- you have a 'NonEmptyTable' that you are storing in a table and need to
134−-- construct a 'TableSchema'.
135−nameNonEmptyTable
136− :: Table Name a
137− => a -- ^ The names of the columns of elements of the list.
138− -> NonEmptyTable Name a
121+insertNonEmptyTable :: Inserts exprs inserts
122+ => NonEmpty exprs -> NonEmptyTable inserts
123+insertNonEmptyTable = toInsert . nonEmptyTable
124+
125+
126+nameNonEmptyTable :: Table Name a => a -> NonEmptyTable a
139127nameNonEmptyTable =
140128 NonEmptyTable .
141− hvectorize (\_ (Identity (Name a)) -> Name a) .
129+ hvectorize (\_ (Identity (NameCol a)) -> NameCol a) .
142130 pure .
143131 toColumns
src/Rel8/Table/Null.hsdeleted−147
@@ -1,147 +0,0 @@
1−{-# language DataKinds #-}
2−{-# language FlexibleContexts #-}
3−{-# language FlexibleInstances #-}
4−{-# language MultiParamTypeClasses #-}
5−{-# language ScopedTypeVariables #-}
6−{-# language StandaloneKindSignatures #-}
7−{-# language TypeApplications #-}
8−{-# language TypeFamilies #-}
9−{-# language UndecidableInstances #-}
10−
11−module Rel8.Table.Null
12− ( NullTable(..)
13− , nullableTable, nullTable, nullifyTable, unsafeUnnullifyTable
14− , isNullTable, isNonNullTable
15− , nameNullTable
16− , toMaybeTable, toNullTable
17− )
18−where
19−
20−-- base
21−import Data.Kind ( Type )
22−import Prelude hiding ( null, undefined )
23−
24−-- comonad
25−import Control.Comonad ( extract )
26−
27−-- rel8
28−import Rel8.Expr ( Expr )
29−import Rel8.Expr.Bool ( not_ )
30−import Rel8.Kind.Context ( Reifiable )
31−import qualified Rel8.Schema.Kind as K
32−import Rel8.Schema.Name ( Name )
33−import Rel8.Table
34− ( Table, Columns, Context, fromColumns, toColumns
35− , FromExprs, fromResult, toResult
36− , Transpose
37− )
38−import Rel8.Table.Alternative
39− ( AltTable, (<|>:)
40− , AlternativeTable, emptyTable
41− )
42−import Rel8.Table.Bool ( bool )
43−import Rel8.Table.Eq ( EqTable, eqTable )
44−import Rel8.Table.Maybe ( MaybeTable, justTable, maybeTable, nothingTable )
45−import Rel8.Table.Nullify ( Nullify, isNull )
46−import Rel8.Table.Ord ( OrdTable, ordTable )
47−import Rel8.Table.Projection ( Projectable, project )
48−import Rel8.Table.Serialize ( ToExprs )
49−import Rel8.Table.Undefined ( undefined )
50−
51−
52−-- | @NullTable t@ is the table @t@, but where all the columns in @t@ have the
53−-- possibility of being 'Rel8.null'. This is very similar to
54−-- 'Rel8.MaybeTable', except that it does not use an extra tag field, so it
55−-- cannot distinguish between @Nothing@ and @Just Nothing@ if nested. In other
56−-- words, if all of the columns of the @t@ passed to @NullTable@ are already
57−-- nullable, then @NullTable@ has no effect.
58−type NullTable :: K.Context -> Type -> Type
59−newtype NullTable context a = NullTable (Nullify context a)
60−
61−
62−instance Projectable (NullTable context) where
63− project f (NullTable a) = NullTable (project f a)
64−
65−
66−instance context ~ Expr => AltTable (NullTable context) where
67− ma <|>: mb = bool ma mb (isNullTable ma)
68−
69−
70−instance context ~ Expr => AlternativeTable (NullTable context) where
71− emptyTable = nullTable
72−
73−
74−instance (Table context a, Reifiable context, context ~ context') =>
75− Table context' (NullTable context a)
76− where
77− type Columns (NullTable context a) = Columns (Nullify context a)
78− type Context (NullTable context a) = Context (Nullify context a)
79− type FromExprs (NullTable context a) = FromExprs (Nullify context a)
80− type Transpose to (NullTable context a) = NullTable to (Transpose to a)
81−
82− toColumns (NullTable a) = toColumns a
83− fromColumns = NullTable . fromColumns
84−
85− toResult = toResult @_ @(Nullify context a)
86− fromResult = fromResult @_ @(Nullify context a)
87−
88−
89−instance (EqTable a, context ~ Expr) => EqTable (NullTable context a) where
90− eqTable = eqTable @(Nullify context a)
91−
92−
93−instance (OrdTable a, context ~ Expr) => OrdTable (NullTable context a) where
94− ordTable = ordTable @(Nullify context a)
95−
96−
97−instance (ToExprs exprs a, context ~ Expr) =>
98− ToExprs (NullTable context exprs) (Maybe a)
99−
100−
101−-- | Check if any of the non-nullable fields of @a@ are 'Rel8.null' under the
102−-- 'NullTable'. Returns 'Rel8.false' if @a@ has no non-nullable fields.
103−isNullTable :: Table Expr a => NullTable Expr a -> Expr Bool
104−isNullTable (NullTable a) = isNull a
105−
106−
107−-- | The inverse of 'isNullTable'.
108−isNonNullTable :: Table Expr a => NullTable Expr a -> Expr Bool
109−isNonNullTable = not_ . isNullTable
110−
111−
112−-- | Like 'Rel8.nullable'.
113−nullableTable :: (Table Expr a, Table Expr b)
114− => b -> (a -> b) -> NullTable Expr a -> b
115−nullableTable b f ma@(NullTable a) = bool (f (extract a)) b (isNullTable ma)
116−
117−
118−-- | The null table. Like 'Rel8.null'.
119−nullTable :: Table Expr a => NullTable Expr a
120−nullTable = NullTable (pure undefined)
121−
122−
123−-- | Lift any table into 'NullTable'. Like 'Rel8.nullify'.
124−nullifyTable :: a -> NullTable Expr a
125−nullifyTable = NullTable . pure
126−
127−
128−unsafeUnnullifyTable :: NullTable Expr a -> a
129−unsafeUnnullifyTable (NullTable a) = extract a
130−
131−
132−-- | Construct a 'NullTable' in the 'Name' context. This can be useful if you
133−-- have a 'NullTable' that you are storing in a table and need to construct a
134−-- 'TableSchema'.
135−nameNullTable :: a -> NullTable Name a
136−nameNullTable = NullTable . pure
137−
138−
139−-- | Convert a 'NullTable' to a 'MaybeTable'.
140−toMaybeTable :: Table Expr a => NullTable Expr a -> MaybeTable Expr a
141−toMaybeTable = nullableTable nothingTable justTable
142−
143−
144−-- | Convert a 'MaybeTable' to a 'NullTable'. Note that if the underlying @a@
145−-- has no non-nullable fields, this is a lossy conversion.
146−toNullTable :: Table Expr a => MaybeTable Expr a -> NullTable Expr a
147−toNullTable = maybeTable nullTable nullifyTable
src/Rel8/Table/Nullify.hsdeleted−211
@@ -1,211 +0,0 @@
1−{-# language DataKinds #-}
2−{-# language FlexibleContexts #-}
3−{-# language FlexibleInstances #-}
4−{-# language LambdaCase #-}
5−{-# language MultiParamTypeClasses #-}
6−{-# language NamedFieldPuns #-}
7−{-# language ScopedTypeVariables #-}
8−{-# language StandaloneKindSignatures #-}
9−{-# language TypeApplications #-}
10−{-# language TypeFamilies #-}
11−{-# language UndecidableInstances #-}
12−
13−module Rel8.Table.Nullify
14− ( Nullify
15− , aggregateNullify
16− , guard
17− , isNull
18− )
19−where
20−
21−-- base
22−import Control.Applicative ( liftA2 )
23−import Data.Functor.Const ( Const( Const ), getConst )
24−import Data.Functor.Identity ( runIdentity )
25−import Data.Kind ( Type )
26−import Prelude
27−
28−-- comonad
29−import Control.Comonad ( Comonad, duplicate, extract, ComonadApply, (<@>) )
30−
31−-- rel8
32−import Rel8.Aggregate ( Aggregate )
33−import Rel8.Expr ( Expr )
34−import Rel8.Expr.Bool ( (||.), false )
35−import qualified Rel8.Expr.Null as Expr
36−import Rel8.Kind.Context ( Reifiable, contextSing )
37−import Rel8.Schema.Context.Nullify
38− ( Nullifiability( NAggregate, NExpr )
39− , NonNullifiability
40− , Nullifiable, nullifiability
41− , nullifiableOrNot, absurd
42− , guarder
43− , nullifier
44− , unnullifier
45− )
46−import Rel8.Schema.Dict ( Dict( Dict ) )
47−import Rel8.Schema.HTable ( HTable )
48−import Rel8.Schema.HTable.Nullify
49− ( HNullify, hnulls, hnullify, hunnullify
50− , hguard
51− , hproject
52− )
53−import qualified Rel8.Schema.Kind as K
54−import Rel8.Schema.Null ( Nullity( NotNull, Null ) )
55−import qualified Rel8.Schema.Result as R
56−import Rel8.Table
57− ( Table, Columns, Context, toColumns, fromColumns
58− , FromExprs, fromResult, toResult
59− , Transpose
60− )
61−import Rel8.Schema.Spec ( Spec( Spec, nullity ) )
62−import Rel8.Table.Eq ( EqTable, eqTable )
63−import Rel8.Table.Ord ( OrdTable, ordTable )
64−import Rel8.Table.Projection ( Projectable, apply, project )
65−
66−-- semigroupoids
67−import Data.Functor.Apply ( Apply, (<.>), liftF2 )
68−import Data.Functor.Bind ( Bind, (>>-) )
69−import Data.Functor.Extend ( Extend, duplicated )
70−
71−
72−type Nullify :: K.Context -> Type -> Type
73−data Nullify context a
74− = Table (Nullifiability context) a
75− | Fields (NonNullifiability context) (HNullify (Columns a) (Context a))
76−
77−
78−instance Projectable (Nullify context) where
79− project f = \case
80− Table nullifiable a -> Table nullifiable (fromColumns (apply f (toColumns a)))
81− Fields nonNullifiable a -> Fields nonNullifiable (hproject (apply f) a)
82−
83−
84−instance Nullifiable context => Functor (Nullify context) where
85− fmap f = \case
86− Table nullifiable a -> Table nullifiable (f a)
87− Fields notNullifiable _ -> absurd nullifiability notNullifiable
88−
89−
90−instance Nullifiable context => Foldable (Nullify context) where
91− foldMap f = \case
92− Table _ a -> f a
93− Fields notNullifiable _ -> absurd nullifiability notNullifiable
94−
95−
96−instance Nullifiable context => Traversable (Nullify context) where
97− traverse f = \case
98− Table nullifiable a -> Table nullifiable <$> f a
99− Fields notNullifiable _ -> absurd nullifiability notNullifiable
100−
101−
102−instance Nullifiable context => Apply (Nullify context) where
103− liftF2 f = \case
104− Table nullifiable a -> \case
105− Table _ b -> Table nullifiable (f a b)
106− Fields notNullifiable _ -> absurd nullifiable notNullifiable
107− Fields notNullifiable _ -> absurd nullifiability notNullifiable
108−
109−
110−instance Nullifiable context => Applicative (Nullify context) where
111− pure = Table nullifiability
112− liftA2 = liftF2
113−
114−
115−instance Nullifiable context => Bind (Nullify context) where
116− Table _ a >>- f = f a
117− Fields notNullifiable _ >>- _ = absurd nullifiability notNullifiable
118−
119−
120−instance Nullifiable context => Monad (Nullify context) where
121− (>>=) = (>>-)
122−
123−
124−instance Nullifiable context => Extend (Nullify context) where
125− duplicated = \case
126− Table nullifiable a -> Table nullifiable (Table nullifiable a)
127− Fields notNullifiable _ -> absurd nullifiability notNullifiable
128−
129−
130−instance Nullifiable context => Comonad (Nullify context) where
131− extract = \case
132− Table _ a -> a
133− Fields notNullifiable _ -> absurd nullifiability notNullifiable
134− duplicate = duplicated
135−
136−
137−instance Nullifiable context => ComonadApply (Nullify context) where
138− (<@>) = (<.>)
139−
140−
141−instance (Table context a, Reifiable context, context ~ context') =>
142− Table context' (Nullify context a)
143− where
144− type Columns (Nullify context a) = HNullify (Columns a)
145− type Context (Nullify context a) = Context a
146− type FromExprs (Nullify context a) = Maybe (FromExprs a)
147− type Transpose to (Nullify context a) = Nullify to (Transpose to a)
148−
149− fromColumns = case nullifiableOrNot contextSing of
150− Left notNullifiable -> Fields notNullifiable
151− Right nullifiable ->
152− Table nullifiable .
153− fromColumns .
154− runIdentity .
155− hunnullify (\spec -> pure . unnullifier nullifiable spec)
156−
157− toColumns = \case
158− Table nullifiable a -> hnullify (nullifier nullifiable) (toColumns a)
159− Fields _ a -> a
160−
161− fromResult = fmap (fromResult @_ @a) . hunnullify R.unnullifier
162−
163− toResult =
164− maybe (hnulls (const R.null)) (hnullify R.nullifier) .
165− fmap (toResult @_ @a)
166−
167−
168−instance (EqTable a, context ~ Expr) => EqTable (Nullify context a) where
169− eqTable = hnullify (\_ Dict -> Dict) (eqTable @a)
170−
171−
172−instance (OrdTable a, context ~ Expr) => OrdTable (Nullify context a) where
173− ordTable = hnullify (\_ Dict -> Dict) (ordTable @a)
174−
175−
176−aggregateNullify :: ()
177− => (exprs -> aggregates)
178− -> Nullify Expr exprs
179− -> Nullify Aggregate aggregates
180−aggregateNullify f = \case
181− Table _ a -> Table NAggregate (f a)
182− Fields notNullifiable _ -> absurd NExpr notNullifiable
183−
184−
185−guard :: (Reifiable context, HTable t)
186− => context tag
187− -> (tag -> Bool)
188− -> (Expr tag -> Expr Bool)
189− -> HNullify t context
190− -> HNullify t context
191−guard tag isNonNull isNonNullExpr =
192− hguard (guarder contextSing tag isNonNull isNonNullExpr)
193−
194−
195−isNull :: forall a. Table Expr a => Nullify Expr a -> Expr Bool
196−isNull =
197− maybe false getAny .
198− getConst .
199− hunnullify (\Spec {nullity} a -> Const $ case nullity of
200− NotNull -> Just $ Any $ Expr.isNull a
201− Null -> Nothing) .
202− toColumns
203−
204−
205−newtype Any = Any
206− { getAny :: Expr Bool
207− }
208−
209−
210−instance Semigroup Any where
211− Any a <> Any b = Any (a ||. b)
src/Rel8/Table/Opaleye.hs+75−84
@@ -1,150 +1,141 @@
11{-# language BlockArguments #-}
2−{-# language DataKinds #-}
32{-# language DisambiguateRecordFields #-}
43{-# language FlexibleContexts #-}
54{-# language NamedFieldPuns #-}
6−{-# language RankNTypes #-}
75{-# language TypeFamilies #-}
86{-# language ViewPatterns #-}
97
10−{-# options_ghc -Wno-deprecations #-}
11−
128module Rel8.Table.Opaleye
139 ( aggregator
14− , attributes
1510 , binaryspec
1611 , distinctspec
17− , exprs
18− , exprsWithNames
1912 , table
2013 , tableFields
2114 , unpackspec
2215 , valuesspec
23− , view
2416 , castTable
2517 )
2618where
2719
2820-- base
29−import Data.Functor.Const ( Const( Const ), getConst )
30−import Data.List.NonEmpty ( NonEmpty )
31−import Prelude
21+import Prelude hiding ( undefined )
3222
3323-- opaleye
34−import qualified Opaleye.Adaptors as Opaleye
35−import qualified Opaleye.Field as Opaleye ( Field_ )
3624import qualified Opaleye.Internal.Aggregate as Opaleye
25+import qualified Opaleye.Internal.Binary as Opaleye
26+import qualified Opaleye.Internal.Distinct as Opaleye
3727import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
28+import qualified Opaleye.Internal.PackMap as Opaleye
29+import qualified Opaleye.Internal.Unpackspec as Opaleye
3830import qualified Opaleye.Internal.Values as Opaleye
39−import qualified Opaleye.Table as Opaleye
31+import qualified Opaleye.Internal.Table as Opaleye
4032
4133-- profunctors
4234import Data.Profunctor ( dimap, lmap )
4335
4436-- rel8
45−import Rel8.Aggregate ( Aggregate( Aggregate ), Aggregates )
46−import Rel8.Expr ( Expr )
37+import Rel8.Aggregate ( Aggregate( Aggregate ) )
38+import Rel8.Expr ( Expr, Col(..) )
4739import Rel8.Expr.Opaleye
4840 ( fromPrimExpr, toPrimExpr
49− , scastExpr, traverseFieldP
41+ , traversePrimExpr
42+ , fromColumn, toColumn
43+ , scastExpr
5044 )
51−import Rel8.Schema.HTable ( htabulateA, hfield, hspecs, htabulate,
52− htraverseP, htraversePWithField )
53−import Rel8.Schema.Name ( Name( Name ), Selects, ppColumn )
54−import Rel8.Schema.Spec ( Spec(..) )
55−import Rel8.Schema.Table ( TableSchema(..), ppTable )
45+import Rel8.Kind.Necessity ( SNecessity( SRequired, SOptional ) )
46+import Rel8.Schema.HTable ( htabulateA, hfield, htraverse, hspecs, htabulate )
47+import Rel8.Schema.Insert ( Insert, Inserts, Col(..) )
48+import Rel8.Schema.Name ( Name, Selects, Col(..) )
49+import Rel8.Schema.Spec ( SSpec(..) )
50+import Rel8.Schema.Table ( TableSchema(..) )
5651import Rel8.Table ( Table, fromColumns, toColumns )
57−import Rel8.Type.Information ( typeName )
52+import Rel8.Table.Undefined ( undefined )
5853
5954-- semigroupoids
6055import Data.Functor.Apply ( WrappedApplicative(..) )
61−import Data.Profunctor.Product ( ProductProfunctor )
62−
63−
64−aggregator :: Aggregates aggregates exprs => Opaleye.Aggregator aggregates exprs
65−aggregator = dimap toColumns fromColumns $
66− htraverseP $
67− lmap (\(Aggregate a) -> (a, ())) Opaleye.aggregatorApply
6856
6957
70−attributes :: Selects names exprs => TableSchema names -> exprs
71−attributes schema@TableSchema {columns} = fromColumns $ htabulate $ \field ->
72− case hfield (toColumns columns) field of
73− Name column -> fromPrimExpr $ Opaleye.ConstExpr $
74− Opaleye.OtherLit $
75− show (ppTable schema) <> "." <> show (ppColumn column)
76−
77−
78−fromOpaleyespec :: (ProductProfunctor p, Table Expr a)
79− => p (Opaleye.Field_ n x) (Opaleye.Field_ n x)
80− -> p a a
81−fromOpaleyespec x =
82− dimap toColumns fromColumns (htraverseP (traverseFieldP x))
58+aggregator :: Opaleye.Aggregator (Aggregate exprs) exprs
59+aggregator = Opaleye.Aggregator $ Opaleye.PackMap $
60+ \f (Aggregate (Opaleye.Aggregator (Opaleye.PackMap inner))) -> inner f ()
8361
8462
8563binaryspec :: Table Expr a => Opaleye.Binaryspec a a
86−binaryspec = fromOpaleyespec Opaleye.binaryspecField
64+binaryspec = Opaleye.Binaryspec $ Opaleye.PackMap $ \f (as, bs) ->
65+ fmap fromColumns $ unwrapApplicative $ htabulateA $ \field ->
66+ WrapApplicative $
67+ case (hfield (toColumns as) field, hfield (toColumns bs) field) of
68+ (DB a, DB b) -> DB . fromPrimExpr <$> f (toPrimExpr a, toPrimExpr b)
8769
8870
8971distinctspec :: Table Expr a => Opaleye.Distinctspec a a
90−distinctspec = fromOpaleyespec Opaleye.distinctspecField
91−
92−
93−exprs :: Table Expr a => a -> NonEmpty Opaleye.PrimExpr
94−exprs (toColumns -> as) = getConst $ htabulateA $ \field ->
95− case hfield as field of
96− expr -> Const (pure (toPrimExpr expr))
97−
98−
99−exprsWithNames :: Selects names exprs
100− => names -> exprs -> NonEmpty (String, Opaleye.PrimExpr)
101−exprsWithNames names as = getConst $ htabulateA $ \field ->
102− case (hfield (toColumns names) field, hfield (toColumns as) field) of
103− (Name name, expr) -> Const (pure (name, toPrimExpr expr))
104−
105−
106−table :: Selects names exprs => TableSchema names -> Opaleye.Table exprs exprs
72+distinctspec =
73+ Opaleye.Distinctspec $ Opaleye.Aggregator $ Opaleye.PackMap $ \f ->
74+ fmap fromColumns .
75+ unwrapApplicative .
76+ htraverse
77+ (\(DB a) ->
78+ WrapApplicative $ DB . fromPrimExpr <$> f (Nothing, toPrimExpr a)) .
79+ toColumns
80+
81+
82+table ::(Selects names exprs, Inserts exprs inserts)
83+ => TableSchema names -> Opaleye.Table inserts exprs
10784table (TableSchema name schema columns) =
10885 case schema of
109− Nothing -> Opaleye.table name (tableFields columns)
110− Just schemaName -> Opaleye.tableWithSchema schemaName name (tableFields columns)
86+ Nothing -> Opaleye.Table name (tableFields columns)
87+ Just schemaName -> Opaleye.TableWithSchema schemaName name (tableFields columns)
11188
11289
113−tableFields :: Selects names exprs
114− => names -> Opaleye.TableFields exprs exprs
90+tableFields :: (Selects names exprs, Inserts exprs inserts)
91+ => names -> Opaleye.TableFields inserts exprs
11592tableFields (toColumns -> names) = dimap toColumns fromColumns $
11693 unwrapApplicative $ htabulateA $ \field -> WrapApplicative $
117− case hfield names field of
118− name -> lmap (`hfield` field) (go name)
94+ case hfield hspecs field of
95+ specs -> case hfield names field of
96+ name -> lmap (`hfield` field) (go specs name)
11997 where
120− go :: Name a -> Opaleye.TableFields (Expr a) (Expr a)
121− go (Name name) =
122− traverseFieldP $
123− Opaleye.requiredTableField name
98+ go :: SSpec spec -> Col Name spec -> Opaleye.TableFields (Col Insert spec) (Col Expr spec)
99+ go SSpec {necessity} (NameCol name) = case necessity of
100+ SRequired ->
101+ lmap (\(RequiredInsert a) -> toColumn $ toPrimExpr a) $
102+ DB . fromPrimExpr . fromColumn <$>
103+ Opaleye.requiredTableField name
104+ SOptional ->
105+ lmap (\(OptionalInsert ma) -> toColumn . toPrimExpr <$> ma) $
106+ DB . fromPrimExpr . fromColumn <$>
107+ Opaleye.optionalTableField name
124108
125109
126110unpackspec :: Table Expr a => Opaleye.Unpackspec a a
127−unpackspec = fromOpaleyespec Opaleye.unpackspecField
111+unpackspec = Opaleye.Unpackspec $ Opaleye.PackMap $ \f ->
112+ fmap fromColumns .
113+ unwrapApplicative .
114+ htraverse (\(DB a) -> WrapApplicative $ DB <$> traversePrimExpr f a) .
115+ toColumns
128116{-# INLINABLE unpackspec #-}
129117
130118
131−valuesspec :: Table Expr a => Opaleye.Valuesspec a a
132−valuesspec = dimap toColumns fromColumns $
133− htraversePWithField (traverseFieldP . Opaleye.valuesspecFieldType . typeName)
134− where typeName = Rel8.Type.Information.typeName . info . hfield hspecs
119+valuesspec :: Table Expr a => Opaleye.ValuesspecSafe a a
120+valuesspec = Opaleye.ValuesspecSafe (toPackMap undefined) unpackspec
135121
136122
137−view :: Selects names exprs => names -> exprs
138−view columns = fromColumns $ htabulate $ \field ->
139− case hfield (toColumns columns) field of
140− Name column -> fromPrimExpr $ Opaleye.BaseTableAttrExpr column
123+toPackMap :: Table Expr a
124+ => a -> Opaleye.PackMap Opaleye.PrimExpr Opaleye.PrimExpr () a
125+toPackMap as = Opaleye.PackMap $ \f () ->
126+ fmap fromColumns $
127+ unwrapApplicative .
128+ htraverse (\(DB a) -> WrapApplicative $ DB <$> traversePrimExpr f a) $
129+ toColumns as
141130
142131
143132-- | Transform a table by adding 'CAST' to all columns. This is most useful for
144133-- finalising a SELECT or RETURNING statement, guaranteed that the output
145134-- matches what is encoded in each columns TypeInformation.
146135castTable :: Table Expr a => a -> a
147−castTable (toColumns -> as) = fromColumns $ htabulate \field ->
148− case hfield hspecs field of
149− Spec {info} -> case hfield as field of
150− expr -> scastExpr info expr
136+castTable (toColumns -> as) = fromColumns $ htabulate \i ->
137+ case hfield hspecs i of
138+ SSpec{info} ->
139+ case hfield as i of
140+ DB expr ->
141+ DB (scastExpr info expr)
src/Rel8/Table/Ord.hs+45−16
@@ -10,6 +10,7 @@
1010{-# language TypeFamilies #-}
1111{-# language TypeOperators #-}
1212{-# language UndecidableInstances #-}
13+{-# language UndecidableSuperClasses #-}
1314{-# language ViewPatterns #-}
1415
1516module Rel8.Table.Ord
@@ -24,20 +25,29 @@ import GHC.Generics ( Rep )
2425import Prelude hiding ( seq )
2526
2627-- rel8
27−import Rel8.Expr ( Expr )
28+import Rel8.Expr ( Expr, Col(..) )
2829import Rel8.Expr.Bool ( (||.), (&&.), false, true )
2930import Rel8.Expr.Eq ( (==.) )
3031import Rel8.Expr.Ord ( (<.), (>.) )
3132import Rel8.FCF ( Eval, Exp )
3233import Rel8.Generic.Record ( Record )
33−import Rel8.Generic.Table.Record ( GTable, GColumns, gtable )
34+import Rel8.Generic.Table
35+ ( GGTable, GGColumns, ggtable
36+ , GAlgebra
37+ )
38+import Rel8.Kind.Algebra ( KnownAlgebra )
3439import Rel8.Schema.Dict ( Dict( Dict ) )
35−import Rel8.Schema.HTable ( htabulateA, hfield )
36−import Rel8.Schema.HTable.Identity ( HIdentity( HIdentity ) )
40+import Rel8.Schema.HTable
41+ ( HTable, HConstrainTable
42+ , htabulateA, hfield, hdicts
43+ )
44+import Rel8.Schema.HTable.Identity ( HIdentity( HType ) )
3745import Rel8.Schema.Null (Sql)
46+import Rel8.Schema.Spec.ConstrainDBType ( ConstrainDBType, nullifier )
3847import Rel8.Table ( Columns, toColumns, TColumns )
3948import Rel8.Table.Bool ( bool )
4049import Rel8.Table.Eq ( EqTable )
50+import Rel8.Type.Eq ( DBEq )
4151import Rel8.Type.Ord ( DBOrd )
4252
4353
@@ -46,14 +56,22 @@ import Rel8.Type.Ord ( DBOrd )
4656-- columns in a 'Table' have an instance of 'DBOrd'".
4757type OrdTable :: Type -> Constraint
4858class EqTable a => OrdTable a where
49− ordTable :: Columns a (Dict (Sql DBOrd))
59+ ordTable :: Columns a (Dict (ConstrainDBType DBOrd))
5060
5161 default ordTable ::
52− ( GTable TOrdTable TColumns (Rep (Record a))
53− , Columns a ~ GColumns TColumns (Rep (Record a))
62+ ( KnownAlgebra (GAlgebra (Rep (Record a)))
63+ , Eval (GGTable (GAlgebra (Rep (Record a))) TOrdTable TColumns (Dict (ConstrainDBType DBOrd)) (Rep (Record a)))
64+ , Columns a ~ Eval (GGColumns (GAlgebra (Rep (Record a))) TColumns (Rep (Record a)))
5465 )
55− => Columns a (Dict (Sql DBOrd))
56− ordTable = gtable @TOrdTable @TColumns @(Rep (Record a)) table
66+ => Columns a (Dict (ConstrainDBType DBOrd))
67+ ordTable =
68+ ggtable
69+ @(GAlgebra (Rep (Record a)))
70+ @TOrdTable
71+ @TColumns
72+ @(Rep (Record a))
73+ table
74+ nullifier
5775 where
5876 table (_ :: proxy x) = ordTable @x
5977
@@ -62,8 +80,19 @@ data TOrdTable :: Type -> Exp Constraint
6280type instance Eval (TOrdTable a) = OrdTable a
6381
6482
83+instance
84+ ( HTable t
85+ , f ~ Col Expr
86+ , HConstrainTable t (ConstrainDBType DBEq)
87+ , HConstrainTable t (ConstrainDBType DBOrd)
88+ )
89+ => OrdTable (t f)
90+ where
91+ ordTable = hdicts @(Columns (t f)) @(ConstrainDBType DBOrd)
92+
93+
6594instance Sql DBOrd a => OrdTable (Expr a) where
66− ordTable = HIdentity Dict
95+ ordTable = HType Dict
6796
6897
6998instance (OrdTable a, OrdTable b) => OrdTable (a, b)
@@ -98,7 +127,7 @@ instance
98127(toColumns -> as) <: (toColumns -> bs) =
99128 foldr @[] go false $ getConst $ htabulateA $ \field ->
100129 case (hfield as field, hfield bs field) of
101− (a, b) -> case hfield (ordTable @a) field of
130+ (DB a, DB b) -> case hfield (ordTable @a) field of
102131 Dict -> Const [(a <. b, a ==. b)]
103132 where
104133 go (lt, eq) a = lt ||. (eq &&. a)
@@ -111,7 +140,7 @@ infix 4 <:
111140(toColumns -> as) <=: (toColumns -> bs) =
112141 foldr @[] go true $ getConst $ htabulateA $ \field ->
113142 case (hfield as field, hfield bs field) of
114− (a, b) -> case hfield (ordTable @a) field of
143+ (DB a, DB b) -> case hfield (ordTable @a) field of
115144 Dict -> Const [(a <. b, a ==. b)]
116145 where
117146 go (lt, eq) a = lt ||. (eq &&. a)
@@ -124,7 +153,7 @@ infix 4 <=:
124153(toColumns -> as) >: (toColumns -> bs) =
125154 foldr @[] go false $ getConst $ htabulateA $ \field ->
126155 case (hfield as field, hfield bs field) of
127− (a, b) -> case hfield (ordTable @a) field of
156+ (DB a, DB b) -> case hfield (ordTable @a) field of
128157 Dict -> Const [(a >. b, a ==. b)]
129158 where
130159 go (gt, eq) a = gt ||. (eq &&. a)
@@ -137,7 +166,7 @@ infix 4 >:
137166(toColumns -> as) >=: (toColumns -> bs) =
138167 foldr @[] go true $ getConst $ htabulateA $ \field ->
139168 case (hfield as field, hfield bs field) of
140− (a, b) -> case hfield (ordTable @a) field of
169+ (DB a, DB b) -> case hfield (ordTable @a) field of
141170 Dict -> Const [(a >. b, a ==. b)]
142171 where
143172 go (gt, eq) a = gt ||. (eq &&. a)
@@ -146,9 +175,9 @@ infix 4 >=:
146175
147176-- | Given two 'Table's, return the table that sorts before the other.
148177least :: OrdTable a => a -> a -> a
149−least a b = bool b a (a <: b)
178+least a b = bool a b (a <: b)
150179
151180
152181-- | Given two 'Table's, return the table that sorts after the other.
153182greatest :: OrdTable a => a -> a -> a
154−greatest a b = bool b a (a >: b)
183+greatest a b = bool a b (a >: b)
src/Rel8/Table/Order.hs+16−13
@@ -1,5 +1,4 @@
11{-# language DataKinds #-}
2−{-# language NamedFieldPuns #-}
32{-# language ScopedTypeVariables #-}
43{-# language TypeApplications #-}
54{-# language TypeFamilies #-}
@@ -16,14 +15,16 @@ import Data.Functor.Contravariant ( (>$<), contramap )
1615import Prelude
1716
1817-- rel8
18+import Rel8.Expr ( unDB )
1919import Rel8.Expr.Order ( asc, desc, nullsFirst, nullsLast )
2020import Rel8.Order ( Order )
2121import Rel8.Schema.Dict ( Dict( Dict ) )
2222import Rel8.Schema.HTable (htabulateA, hfield, hspecs)
2323import Rel8.Schema.Null ( Nullity( Null, NotNull ) )
24−import Rel8.Schema.Spec ( Spec( Spec, nullity ) )
24+import Rel8.Schema.Spec ( SSpec( SSpec ) )
25+import Rel8.Schema.Spec.ConstrainDBType ( dbTypeDict, dbTypeNullity )
2526import Rel8.Table ( Columns, toColumns )
26−import Rel8.Table.Ord ( OrdTable, ordTable )
27+import Rel8.Table.Ord
2728
2829
2930-- | Construct an 'Order' for a 'Table' by sorting all columns into ascending
@@ -31,11 +32,12 @@ import Rel8.Table.Ord ( OrdTable, ordTable )
3132ascTable :: forall a. OrdTable a => Order a
3233ascTable = contramap toColumns $ getConst $
3334 htabulateA @(Columns a) $ \field -> case hfield hspecs field of
34− Spec {nullity} -> case hfield (ordTable @a) field of
35− Dict -> Const $ (`hfield` field) >$<
36− case nullity of
37− Null -> nullsFirst asc
38− NotNull -> asc
35+ SSpec {} -> case hfield (ordTable @a) field of
36+ dict@Dict -> case dbTypeDict dict of
37+ Dict -> Const $ unDB . (`hfield` field) >$<
38+ case dbTypeNullity dict of
39+ Null -> nullsFirst asc
40+ NotNull -> asc
3941
4042
4143-- | Construct an 'Order' for a 'Table' by sorting all columns into descending
@@ -43,8 +45,9 @@ ascTable = contramap toColumns $ getConst $
4345descTable :: forall a. OrdTable a => Order a
4446descTable = contramap toColumns $ getConst $
4547 htabulateA @(Columns a) $ \field -> case hfield hspecs field of
46− Spec {nullity} -> case hfield (ordTable @a) field of
47− Dict -> Const $ (`hfield` field) >$<
48− case nullity of
49− Null -> nullsLast desc
50− NotNull -> desc
48+ SSpec {} -> case hfield (ordTable @a) field of
49+ dict@Dict -> case dbTypeDict dict of
50+ Dict -> Const $ unDB . (`hfield` field) >$<
51+ case dbTypeNullity dict of
52+ Null -> nullsLast desc
53+ NotNull -> desc
src/Rel8/Table/Projection.hsdeleted−73
@@ -1,73 +0,0 @@
1−{-# language FlexibleContexts #-}
2−{-# language FlexibleInstances #-}
3−{-# language MonoLocalBinds #-}
4−{-# language MultiParamTypeClasses #-}
5−{-# language StandaloneKindSignatures #-}
6−{-# language UndecidableInstances #-}
7−
8−module Rel8.Table.Projection
9− ( Projection
10− , Projectable( project )
11− , Biprojectable( biproject )
12− , Projecting
13− , apply
14− )
15−where
16−
17−-- base
18−import Data.Kind ( Constraint, Type )
19−import Prelude
20−
21−-- rel8
22−import Rel8.Schema.Field ( Field( Field ), fields )
23−import Rel8.Schema.HTable ( hfield, htabulate )
24−import Rel8.Table ( Columns, Context, Transpose, toColumns )
25−import Rel8.Table.Transpose ( Transposes )
26−
27−
28−-- | The constraint @'Projecting' a b@ ensures that @'Projection' a b@ is a
29−-- usable 'Projection'.
30−type Projecting :: Type -> Type -> Constraint
31−class
32− ( Transposes (Context a) (Field a) a (Transpose (Field a) a)
33− , Transposes (Context a) (Field a) b (Transpose (Field a) b)
34− )
35− => Projecting a b
36−instance
37− ( Transposes (Context a) (Field a) a (Transpose (Field a) a)
38− , Transposes (Context a) (Field a) b (Transpose (Field a) b)
39− )
40− => Projecting a b
41−
42−
43−-- | A @'Projection' a b@s is a special type of function @a -> b@ whereby the
44−-- resulting @b@ is guaranteed to be composed only from columns contained in
45−-- @a@.
46−type Projection :: Type -> Type -> Type
47−type Projection a b = Transpose (Field a) a -> Transpose (Field a) b
48−
49−
50−-- | @'Projectable' f@ means that @f@ is a kind of functor on 'Rel8.Table's
51−-- that allows the mapping of a 'Projection' over its underlying columns.
52−type Projectable :: (Type -> Type) -> Constraint
53−class Projectable f where
54− -- | Map a 'Projection' over @f@.
55− project :: Projecting a b
56− => Projection a b -> f a -> f b
57−
58−
59−-- | @'Biprojectable' p@ means that @p@ is a kind of bifunctor on
60−-- 'Rel8.Table's that allows the mapping of a pair of 'Projection's over its
61−-- underlying columns.
62−type Biprojectable :: (Type -> Type -> Type) -> Constraint
63−class Biprojectable p where
64− -- | Map a pair of 'Projection's over @p@.
65− biproject :: (Projecting a b, Projecting c d)
66− => Projection a b -> Projection c d -> p a c -> p b d
67−
68−
69−apply :: Projecting a b
70− => Projection a b -> Columns a context -> Columns b context
71−apply f a = case toColumns (f fields) of
72− bs -> htabulate $ \field -> case hfield bs field of
73− Field field' -> hfield a field'
src/Rel8/Table/Recontextualize.hsnew file+87
@@ -0,0 +1,87 @@
1+{-# language DataKinds #-}
2+{-# language FlexibleInstances #-}
3+{-# language FunctionalDependencies #-}
4+{-# language StandaloneKindSignatures #-}
5+{-# language TypeFamilies #-}
6+{-# language UndecidableInstances #-}
7+{-# language UndecidableSuperClasses #-}
8+
9+module Rel8.Table.Recontextualize
10+ ( Recontextualize
11+ )
12+where
13+
14+-- base
15+import Data.Functor.Identity ( Identity )
16+import Data.Kind ( Constraint, Type )
17+import Prelude ()
18+
19+-- rel8
20+import Rel8.Schema.Context ( Col )
21+import Rel8.Schema.Context.Label ( Labelable )
22+import Rel8.Schema.HTable ( HTable )
23+import qualified Rel8.Schema.Kind as K
24+import Rel8.Schema.Null ( Sql )
25+import Rel8.Schema.Result ( Result )
26+import Rel8.Table ( Table, Congruent )
27+import Rel8.Type ( DBType )
28+
29+
30+type Recontextualize :: K.Context -> K.Context -> Type -> Type -> Constraint
31+class
32+ ( Table from a
33+ , Table to b
34+ , Congruent a b
35+ , Recontextualize from from a a
36+ , Recontextualize to to b b
37+ , Recontextualize to from b a
38+ ) => Recontextualize from to a b
39+ | a -> from
40+ , b -> to
41+ , a to -> b
42+ , b from -> a
43+
44+
45+instance Sql DBType a => Recontextualize Result Result (Identity a) (Identity a)
46+
47+
48+instance HTable t => Recontextualize from to (t (Col from)) (t (Col to))
49+
50+
51+instance
52+ ( Recontextualize from to a1 b1
53+ , Recontextualize from to a2 b2
54+ , Labelable from
55+ , Labelable to
56+ )
57+ => Recontextualize from to (a1, a2) (b1, b2)
58+
59+
60+instance
61+ ( Recontextualize from to a1 b1
62+ , Recontextualize from to a2 b2
63+ , Recontextualize from to a3 b3
64+ , Labelable from, Labelable to
65+ )
66+ => Recontextualize from to (a1, a2, a3) (b1, b2, b3)
67+
68+
69+instance
70+ ( Recontextualize from to a1 b1
71+ , Recontextualize from to a2 b2
72+ , Recontextualize from to a3 b3
73+ , Recontextualize from to a4 b4
74+ , Labelable from, Labelable to
75+ )
76+ => Recontextualize from to (a1, a2, a3, a4) (b1, b2, b3, b4)
77+
78+
79+instance
80+ ( Recontextualize from to a1 b1
81+ , Recontextualize from to a2 b2
82+ , Recontextualize from to a3 b3
83+ , Recontextualize from to a4 b4
84+ , Recontextualize from to a5 b5
85+ , Labelable from, Labelable to
86+ )
87+ => Recontextualize from to (a1, a2, a3, a4, a5) (b1, b2, b3, b4, b5)
src/Rel8/Table/Rel8able.hs+85−29
@@ -1,6 +1,6 @@
11{-# language DataKinds #-}
22{-# language FlexibleInstances #-}
3−{-# language MultiParamTypeClasses #-}
3+{-# language FunctionalDependencies #-}
44{-# language ScopedTypeVariables #-}
55{-# language StandaloneKindSignatures #-}
66{-# language TypeApplications #-}
@@ -15,78 +15,134 @@ module Rel8.Table.Rel8able
1515where
1616
1717-- base
18−import Prelude ()
18+import Data.Kind ( Constraint, Type )
19+import Data.Type.Equality ( (:~:)( Refl ) )
20+import Prelude
1921
2022-- rel8
2123import Rel8.Expr ( Expr )
2224import qualified Rel8.Kind.Algebra as K
23−import Rel8.Kind.Context ( Reifiable, contextSing )
25+import Rel8.Kind.Context
26+ ( SContext( SReify )
27+ , Reifiable, contextSing
28+ , sLabelable, sReifiable
29+ )
2430import Rel8.Generic.Rel8able
2531 ( Rel8able, Algebra
2632 , GColumns, gfromColumns, gtoColumns
27− , GFromExprs, gfromResult, gtoResult
33+ , greify, gunreify
2834 )
35+import Rel8.Schema.Context ( Col )
36+import Rel8.Schema.Context.Label ( Labelable )
37+import Rel8.Schema.Dict ( Dict( Dict ) )
2938import qualified Rel8.Schema.Kind as K
3039import Rel8.Schema.HTable ( HConstrainTable, hdicts )
31−import Rel8.Schema.Null ( Sql )
40+import Rel8.Schema.Reify ( hreify, hunreify, UnwrapReify )
3241import Rel8.Schema.Result ( Result )
3342import Rel8.Table
34− ( Table, Columns, Context, fromColumns, toColumns
35− , FromExprs, fromResult, toResult
36− , Transpose
43+ ( Table, Columns, Context, Congruent, fromColumns, toColumns
44+ , Unreify, reify, unreify
3745 )
38−import Rel8.Table.ADT ( ADT )
46+import Rel8.Schema.Spec.ConstrainDBType ( ConstrainDBType )
47+import Rel8.Table.ADT ( ADT( ADT ), ADTable, fromADT, toADT )
3948import Rel8.Table.Eq ( EqTable, eqTable )
49+import Rel8.Table.HKD ( HKD )
4050import Rel8.Table.Ord ( OrdTable, ordTable )
41−import Rel8.Table.Serialize ( ToExprs )
51+import Rel8.Table.Recontextualize ( Recontextualize )
52+import Rel8.Table.Serialize ( FromExprs, ToExprs, fromResult, toResult )
4253import Rel8.Type.Eq ( DBEq )
4354import Rel8.Type.Ord ( DBOrd )
4455
4556
46−instance (Rel8able t, Reifiable context, context ~ context') =>
47− Table context' (t context)
57+instance (Rel8able t, Labelable context, Reifiable context) =>
58+ Table context (t context)
4859 where
4960 type Columns (t context) = GColumns t
5061 type Context (t context) = context
51− type FromExprs (t context) = GFromExprs t
52− type Transpose to (t context) = t to
62+ type Unreify (t context) = t (UnwrapReify context)
63+
64+ fromColumns = gunreify . gfromColumns . hreify
65+ toColumns = hunreify . gtoColumns . greify
66+
67+ reify Refl = case contextSing @context of
68+ SReify context -> case sLabelable context of
69+ Dict -> case sReifiable context of
70+ Dict -> greify
71+
72+ unreify Refl = case contextSing @context of
73+ SReify context -> case sLabelable context of
74+ Dict -> case sReifiable context of
75+ Dict -> gunreify
76+
5377
54− fromColumns = gfromColumns contextSing
55− toColumns = gtoColumns contextSing
56− fromResult = gfromResult @t
57− toResult = gtoResult @t
78+instance
79+ ( Rel8able t
80+ , Labelable from, Reifiable from
81+ , Labelable to, Reifiable to
82+ , Congruent (t from) (t to)
83+ )
84+ => Recontextualize from to (t from) (t to)
5885
5986
6087instance
6188 ( context ~ Expr
6289 , Rel8able t
63− , HConstrainTable (Columns (t context)) (Sql DBEq)
90+ , HConstrainTable (Columns (t context)) (ConstrainDBType DBEq)
6491 )
6592 => EqTable (t context)
6693 where
67− eqTable = hdicts @(Columns (t context)) @(Sql DBEq)
94+ eqTable = hdicts @(Columns (t context)) @(ConstrainDBType DBEq)
6895
6996
7097instance
7198 ( context ~ Expr
7299 , Rel8able t
73− , HConstrainTable (Columns (t context)) (Sql DBEq)
74− , HConstrainTable (Columns (t context)) (Sql DBOrd)
100+ , HConstrainTable (Columns (t context)) (ConstrainDBType DBEq)
101+ , HConstrainTable (Columns (t context)) (ConstrainDBType DBOrd)
75102 )
76103 => OrdTable (t context)
77104 where
78− ordTable = hdicts @(Columns (t context)) @(Sql DBOrd)
105+ ordTable = hdicts @(Columns (t context)) @(ConstrainDBType DBOrd)
106+
107+
108+type instance FromExprs (t Expr) = FromExprs' t
79109
80110
81111instance
82− ( Rel8able t', t' ~ Choose (Algebra t) t
83− , x ~ t' Expr
112+ ( x ~ t' Expr
84113 , result ~ Result
114+ , ToExprs' (Algebra t) t' t
85115 )
86116 => ToExprs x (t result)
117+ where
118+ fromResult = fromResult' @(Algebra t) @t'
119+ toResult = toResult' @(Algebra t) @t'
87120
88121
89−type Choose :: K.Algebra -> K.Rel8able -> K.Rel8able
90−type family Choose algebra t where
91− Choose 'K.Sum t = ADT t
92− Choose 'K.Product t = t
122+type FromExprs' :: K.Rel8able -> Type
123+type family FromExprs' t where
124+ FromExprs' (ADT t) = t Result
125+ FromExprs' (HKD a) = a
126+ FromExprs' t = t Result
127+
128+
129+type ToExprs' :: K.Algebra -> K.Rel8able -> K.Rel8able -> Constraint
130+class (algebra ~ Algebra t, Rel8able t') =>
131+ ToExprs' algebra t' t | algebra t -> t'
132+ where
133+ fromResult' :: GColumns t' (Col Result) -> t Result
134+ toResult' :: t Result -> GColumns t' (Col Result)
135+
136+
137+instance (Algebra t ~ 'K.Product, Rel8able t, t ~ t') =>
138+ ToExprs' 'K.Product t' t
139+ where
140+ fromResult' = fromColumns
141+ toResult' = toColumns
142+
143+
144+instance (Algebra t ~ 'K.Sum, ADTable t, t' ~ ADT t) =>
145+ ToExprs' 'K.Sum t' t
146+ where
147+ fromResult' = fromADT . ADT
148+ toResult' = (\(ADT a) -> a) . toADT
src/Rel8/Table/Serialize.hs+119−24
@@ -1,4 +1,7 @@
11{-# language AllowAmbiguousTypes #-}
2+{-# language DataKinds #-}
3+{-# language DefaultSignatures #-}
4+{-# language DisambiguateRecordFields #-}
25{-# language FlexibleContexts #-}
36{-# language FlexibleInstances #-}
47{-# language FunctionalDependencies #-}
@@ -7,54 +10,111 @@
710{-# language StandaloneKindSignatures #-}
811{-# language TypeApplications #-}
912{-# language TypeFamilies #-}
13+{-# language TypeOperators #-}
1014{-# language UndecidableInstances #-}
1115
1216module Rel8.Table.Serialize
13− ( Serializable, lit, litHTable, parse
14− , ToExprs
17+ ( Serializable, lit, parse
18+ , ToExprs(..), FromExprs
19+ , TToExprs
1520 )
1621where
1722
1823-- base
19−import Data.Functor.Identity ( Identity( Identity ) )
2024import Data.Kind ( Constraint, Type )
2125import Data.List.NonEmpty ( NonEmpty )
26+import GHC.Generics ( Generic, Rep, from, to )
2227import Prelude
2328
2429-- hasql
2530import qualified Hasql.Decoders as Hasql
2631
2732-- rel8
28−import Rel8.Expr ( Expr )
33+import Rel8.Expr ( Expr, Col(..) )
2934import Rel8.Expr.Serialize ( slitExpr, sparseValue )
35+import Rel8.FCF ( Eval, Exp )
36+import Rel8.Generic.Record ( Record(..) )
37+import Rel8.Generic.Table
38+ ( GGToExprs, GGColumns, ggfromResult, ggtoResult
39+ , GAlgebra
40+ )
41+import Rel8.Kind.Algebra ( KnownAlgebra )
3042import Rel8.Schema.HTable ( HTable, htabulate, htabulateA, hfield, hspecs )
43+import Rel8.Schema.HTable.Identity ( HIdentity( HType ) )
3144import Rel8.Schema.Null ( NotNull, Sql )
32−import Rel8.Schema.Result ( Result )
33−import Rel8.Schema.Spec ( Spec(..) )
34−import Rel8.Table ( Table, fromColumns, FromExprs, fromResult, toResult )
45+import Rel8.Schema.Result ( Col( Result ), Result )
46+import Rel8.Schema.Spec ( SSpec(..), KnownSpec )
47+import Rel8.Table ( Table, Columns, fromColumns, toColumns, TColumns )
3548import Rel8.Type ( DBType )
3649
3750-- semigroupoids
3851import Data.Functor.Apply ( WrappedApplicative(..) )
3952
4053
41−-- | @ToExprs exprs a@ is evidence that the types @exprs@ and @a@ describe
42−-- essentially the same type, but @exprs@ is in the 'Expr' context, and @a@ is
43−-- a normal Haskell type.
4454type ToExprs :: Type -> Type -> Constraint
45−class Table Expr exprs => ToExprs exprs a
46−
47−
48−instance {-# OVERLAPPABLE #-} (Sql DBType a, x ~ Expr a) => ToExprs x a
49−
50−
51−instance (Sql DBType a, x ~ [a]) => ToExprs (Expr x) [a]
55+class Table Expr exprs => ToExprs exprs a where
56+ fromResult :: Columns exprs (Col Result) -> a
57+ toResult :: a -> Columns exprs (Col Result)
58+
59+ default fromResult ::
60+ ( Generic (Record a)
61+ , KnownAlgebra (GAlgebra (Rep (Record exprs)))
62+ , Eval (GGToExprs (GAlgebra (Rep (Record exprs))) TToExprs TColumns (Rep (Record exprs)) (Rep (Record a)))
63+ , Columns exprs ~ Eval (GGColumns (GAlgebra (Rep (Record exprs))) TColumns (Rep (Record exprs)))
64+ )
65+ => Columns exprs (Col Result) -> a
66+ fromResult =
67+ unrecord .
68+ to .
69+ ggfromResult
70+ @(GAlgebra (Rep (Record exprs)))
71+ @TToExprs
72+ @TColumns
73+ @(Rep (Record exprs))
74+ (\(_ :: proxy expr) -> fromResult @expr)
75+
76+ default toResult ::
77+ ( Generic (Record a)
78+ , KnownAlgebra (GAlgebra (Rep (Record exprs)))
79+ , Eval (GGToExprs (GAlgebra (Rep (Record exprs))) TToExprs TColumns (Rep (Record exprs)) (Rep (Record a)))
80+ , Columns exprs ~ Eval (GGColumns (GAlgebra (Rep (Record exprs))) TColumns (Rep (Record exprs)))
81+ )
82+ => a -> Columns exprs (Col Result)
83+ toResult =
84+ ggtoResult
85+ @(GAlgebra (Rep (Record exprs)))
86+ @TToExprs
87+ @TColumns
88+ @(Rep (Record exprs))
89+ (\(_ :: proxy expr) -> toResult @expr) .
90+ from .
91+ Record
92+
93+
94+data TToExprs :: Type -> Type -> Exp Constraint
95+type instance Eval (TToExprs exprs a) = ToExprs exprs a
96+
97+
98+instance {-# OVERLAPPABLE #-} (Sql DBType a, x ~ Expr a) => ToExprs x a where
99+ fromResult (HType (Result a)) = a
100+ toResult = HType . Result
101+
102+
103+instance (Sql DBType a, x ~ [a]) => ToExprs (Expr x) [a] where
104+ fromResult (HType (Result a)) = a
105+ toResult = HType . Result
52106
53107
54108instance (Sql DBType a, NotNull a, x ~ Maybe a) => ToExprs (Expr x) (Maybe a)
109+ where
110+ fromResult (HType (Result a)) = a
111+ toResult = HType . Result
55112
56113
57114instance (Sql DBType a, NotNull a, x ~ NonEmpty a) => ToExprs (Expr x) (NonEmpty a)
115+ where
116+ fromResult (HType (Result a)) = a
117+ toResult = HType . Result
58118
59119
60120instance (ToExprs exprs1 a, ToExprs exprs2 b, x ~ (exprs1, exprs2)) =>
@@ -116,6 +176,41 @@ instance
116176 => ToExprs x (a, b, c, d, e, f, g)
117177
118178
179+instance (HTable t, result ~ Col Result, x ~ t (Col Expr)) =>
180+ ToExprs x (t result)
181+ where
182+ fromResult = id
183+ toResult = id
184+
185+
186+instance (KnownSpec spec, x ~ Col Expr spec) =>
187+ ToExprs x (Col Result spec)
188+ where
189+ fromResult = fromColumns
190+ toResult = toColumns
191+
192+
193+type FromExprs :: Type -> Type
194+type family FromExprs a
195+type instance FromExprs (Expr a) = a
196+type instance FromExprs (Col Expr spec) = Col Result spec
197+type instance FromExprs (a, b) = (FromExprs a, FromExprs b)
198+type instance FromExprs (a, b, c) = (FromExprs a, FromExprs b, FromExprs c)
199+type instance FromExprs (a, b, c, d) =
200+ (FromExprs a, FromExprs b, FromExprs c, FromExprs d)
201+type instance FromExprs (a, b, c, d, e) =
202+ (FromExprs a, FromExprs b, FromExprs c, FromExprs d, FromExprs e)
203+type instance FromExprs (a, b, c, d, e, f) =
204+ ( FromExprs a, FromExprs b, FromExprs c, FromExprs d, FromExprs e
205+ , FromExprs f
206+ )
207+type instance FromExprs (a, b, c, d, e, f, g) =
208+ ( FromExprs a, FromExprs b, FromExprs c, FromExprs d, FromExprs e
209+ , FromExprs f, FromExprs g
210+ )
211+type instance FromExprs (t (Col Expr)) = t (Col Result)
212+
213+
119214-- | @Serializable@ witnesses the one-to-one correspondence between the type
120215-- @sql@, which contains SQL expressions, and the type @haskell@, which
121216-- contains the Haskell decoding of rows containing @sql@ SQL expressions.
@@ -128,21 +223,21 @@ instance {-# OVERLAPPING #-} Sql DBType a => Serializable (Expr a) a
128223-- | Use @lit@ to turn literal Haskell values into expressions. @lit@ is
129224-- capable of lifting single @Expr@s to full tables.
130225lit :: forall exprs a. Serializable exprs a => a -> exprs
131−lit = fromColumns . litHTable . toResult @_ @exprs
226+lit = fromColumns . litHTable . toResult @exprs
132227
133228
134229parse :: forall exprs a. Serializable exprs a => Hasql.Row a
135−parse = fromResult @_ @exprs <$> parseHTable
230+parse = fromResult @exprs <$> parseHTable
136231
137232
138−litHTable :: HTable t => t Result -> t Expr
233+litHTable :: HTable t => t (Col Result) -> t (Col Expr)
139234litHTable as = htabulate $ \field ->
140235 case hfield hspecs field of
141− Spec {nullity, info} -> case hfield as field of
142− Identity value -> slitExpr nullity info value
236+ SSpec {nullity, info} -> case hfield as field of
237+ Result value -> DB (slitExpr nullity info value)
143238
144239
145−parseHTable :: HTable t => Hasql.Row (t Result)
240+parseHTable :: HTable t => Hasql.Row (t (Col Result))
146241parseHTable = unwrapApplicative $ htabulateA $ \field ->
147242 WrapApplicative $ case hfield hspecs field of
148− Spec {nullity, info} -> Identity <$> sparseValue nullity info
243+ SSpec {nullity, info} -> Result <$> sparseValue nullity info
src/Rel8/Table/Tag.hsnew file+97
@@ -0,0 +1,97 @@
1+{-# language DataKinds #-}
2+{-# language FlexibleInstances #-}
3+{-# language GADTs #-}
4+{-# language InstanceSigs #-}
5+{-# language NamedFieldPuns #-}
6+{-# language ScopedTypeVariables #-}
7+{-# language StandaloneKindSignatures #-}
8+{-# language TypeApplications #-}
9+{-# language UndecidableInstances #-}
10+
11+module Rel8.Table.Tag
12+ ( Tag(..), Taggable
13+ , fromAggregate
14+ , fromExpr
15+ , fromName
16+ )
17+where
18+
19+-- base
20+import Control.Applicative ( (<|>), empty )
21+import Data.Kind ( Constraint, Type )
22+import Data.Foldable ( fold )
23+import Data.Monoid ( getFirst )
24+import Data.Proxy ( Proxy( Proxy ) )
25+import GHC.TypeLits ( KnownSymbol, Symbol, symbolVal )
26+import Prelude
27+
28+-- rel8
29+import Rel8.Aggregate ( Aggregate, Aggregator, foldInputs )
30+import Rel8.Expr ( Expr )
31+import Rel8.Expr.Opaleye ( fromPrimExpr )
32+import Rel8.Schema.Name ( Name( Name ) )
33+import Rel8.Schema.Null ( Sql )
34+import Rel8.Type.Monoid ( DBMonoid )
35+
36+
37+type Tag :: Symbol -> Type -> Type
38+data Tag label a = Tag
39+ { expr :: Expr a
40+ , aggregator :: Maybe Aggregator
41+ , name :: Name a
42+ }
43+
44+
45+type Taggable :: Type -> Constraint
46+class Taggable a where
47+ tappend :: KnownSymbol label => Tag label a -> Tag label a -> Tag label a
48+ tempty :: KnownSymbol label => Tag label a
49+
50+
51+instance Sql DBMonoid a => Taggable a where
52+ tappend :: forall label. KnownSymbol label
53+ => Tag label a -> Tag label a -> Tag label a
54+ tappend a b = Tag
55+ { expr = expr a <> expr b
56+ , aggregator = aggregator a <|> aggregator b
57+ , name = case (name a, symbolVal (Proxy @label)) of
58+ (Name x, y)
59+ | x == y -> name b
60+ | otherwise -> name a
61+ }
62+ {-# INLINABLE tappend #-}
63+
64+ tempty :: forall label. KnownSymbol label => Tag label a
65+ tempty = Tag
66+ { expr = mempty
67+ , aggregator = empty
68+ , name = Name (symbolVal (Proxy @label))
69+ }
70+ {-# INLINABLE tempty #-}
71+
72+
73+instance (KnownSymbol label, Taggable a) => Semigroup (Tag label a) where
74+ (<>) = tappend
75+
76+
77+instance (KnownSymbol label, Taggable a) => Monoid (Tag label a) where
78+ mempty = tempty
79+
80+
81+fromAggregate :: forall a label. (KnownSymbol label, Taggable a)
82+ => Aggregate (Expr a) -> Tag label a
83+fromAggregate = fold . getFirst . foldInputs go
84+ where
85+ go aggregator primExpr = pure $ (tempty @a @label)
86+ { expr = fromPrimExpr primExpr
87+ , aggregator
88+ }
89+
90+
91+fromExpr :: forall label a. (KnownSymbol label, Taggable a)
92+ => Expr a -> Tag label a
93+fromExpr expr = (tempty @a @label) {expr}
94+
95+
96+fromName :: forall a label. Taggable a => Name a -> Tag label a
97+fromName name = (tempty @a @"") {name}
src/Rel8/Table/These.hs+164−201
@@ -5,6 +5,7 @@
55{-# language FlexibleInstances #-}
66{-# language MultiParamTypeClasses #-}
77{-# language NamedFieldPuns #-}
8+{-# language RecordWildCards #-}
89{-# language ScopedTypeVariables #-}
910{-# language StandaloneKindSignatures #-}
1011{-# language TupleSections #-}
@@ -20,107 +21,92 @@ module Rel8.Table.These
2021 , isThisTable, isThatTable, isThoseTable
2122 , hasHereTable, hasThereTable
2223 , justHereTable, justThereTable
23− , alignMaybeTable
24− , aggregateTheseTable
25− , nameTheseTable
24+ , aggregateTheseTable, insertTheseTable, nameTheseTable
2625 )
2726where
2827
2928-- base
29+import Control.Applicative ( liftA2 )
3030import Data.Bifunctor ( Bifunctor, bimap )
31+import Data.Functor.Identity ( runIdentity )
3132import Data.Kind ( Type )
32−import Data.Maybe ( isJust )
33−import Prelude hiding ( null, undefined )
33+import Prelude hiding ( undefined )
3434
3535-- rel8
3636import Rel8.Aggregate ( Aggregate )
3737import Rel8.Expr ( Expr )
38−import Rel8.Expr.Bool ( (&&.), (||.), boolExpr, not_ )
39−import Rel8.Expr.Null ( null, isNonNull )
40−import Rel8.Kind.Context ( Reifiable )
41−import Rel8.Schema.Context.Nullify ( Nullifiable )
42−import Rel8.Schema.Dict ( Dict( Dict ) )
43−import Rel8.Schema.HTable.Label ( hlabel, hrelabel, hunlabel )
38+import Rel8.Expr.Bool ( (&&.), not_ )
39+import Rel8.Expr.Null ( isNonNull )
40+import Rel8.Schema.Context.Label
41+ ( Labelable
42+ , HLabelable, hlabeler, hunlabeler
43+ )
44+import Rel8.Schema.Context.Nullify
45+ ( Nullifiable, ConstrainTag
46+ , HNullifiable, HConstrainTag
47+ , hencodeTag, hdecodeTag
48+ , hnullifier, hunnullifier
49+ )
50+import Rel8.Schema.HTable ( HTable )
51+import Rel8.Schema.HTable.Label ( hlabel, hunlabel )
4452import Rel8.Schema.HTable.Identity ( HIdentity(..) )
45−import Rel8.Schema.HTable.Maybe ( HMaybeTable(..) )
53+import Rel8.Schema.HTable.Nullify ( hnullify, hunnullify )
4654import Rel8.Schema.HTable.These ( HTheseTable(..) )
47−import qualified Rel8.Schema.Kind as K
55+import Rel8.Schema.Insert ( Insert )
4856import Rel8.Schema.Name ( Name )
4957import Rel8.Table
5058 ( Table, Columns, Context, fromColumns, toColumns
51− , FromExprs, fromResult, toResult
52− , Transpose
59+ , reify, unreify
5360 )
5461import Rel8.Table.Eq ( EqTable, eqTable )
5562import Rel8.Table.Maybe
5663 ( MaybeTable(..)
5764 , maybeTable, justTable, nothingTable
5865 , isJustTable
59− , aggregateMaybeTable
60− , nameMaybeTable
66+ , aggregateMaybeTable, insertMaybeTable, nameMaybeTable
6167 )
62−import Rel8.Table.Nullify ( Nullify, guard )
6368import Rel8.Table.Ord ( OrdTable, ordTable )
64−import Rel8.Table.Projection ( Biprojectable, Projectable, biproject, project )
65−import Rel8.Table.Serialize ( ToExprs )
69+import Rel8.Table.Recontextualize ( Recontextualize )
70+import Rel8.Table.Serialize ( FromExprs, ToExprs, fromResult, toResult )
71+import Rel8.Table.Tag ( Tag(..) )
6672import Rel8.Table.Undefined ( undefined )
6773import Rel8.Type.Tag ( MaybeTag )
6874
6975-- semigroupoids
70−import Data.Functor.Apply ( Apply, (<.>) )
76+import Data.Functor.Apply ( Apply, (<.>), liftF2 )
7177import Data.Functor.Bind ( Bind, (>>-) )
7278
7379-- these
74−import Data.These ( These( This, That, These ) )
80+import Data.These ( These )
7581import Data.These.Combinators ( justHere, justThere )
7682
7783
78−-- | @TheseTable a b@ is a Rel8 table that contains either the table @a@, the
79−-- table @b@, or both tables @a@ and @b@. You can construct @TheseTable@s using
80−-- 'thisTable', 'thatTable' and 'thoseTable'. @TheseTable@s can be
81−-- eliminated/pattern matched using 'theseTable'.
82−--
83−-- @TheseTable@ is operationally the same as Haskell's 'These' type, but
84−-- adapted to work with Rel8.
85−type TheseTable :: K.Context -> Type -> Type -> Type
86−data TheseTable context a b = TheseTable
87− { here :: MaybeTable context a
88− , there :: MaybeTable context b
84+type TheseTable :: Type -> Type -> Type
85+data TheseTable a b = TheseTable
86+ { here :: MaybeTable a
87+ , there :: MaybeTable b
8988 }
9089 deriving stock Functor
9190
9291
93−instance Biprojectable (TheseTable context) where
94− biproject f g (TheseTable a b) = TheseTable (project f a) (project g b)
95−
96−
97−instance Nullifiable context => Bifunctor (TheseTable context) where
92+instance Bifunctor TheseTable where
9893 bimap f g (TheseTable a b) = TheseTable (fmap f a) (fmap g b)
9994
10095
101−instance Projectable (TheseTable context a) where
102− project f (TheseTable a b) = TheseTable a (project f b)
103−
104−
105−instance (context ~ Expr, Table Expr a, Semigroup a) =>
106− Apply (TheseTable context a)
107− where
96+instance (Table Expr a, Semigroup a) => Apply (TheseTable a) where
10897 fs <.> as = TheseTable
10998 { here = here fs <> here as
11099 , there = there fs <.> there as
111100 }
112101
113102
114−instance (context ~ Expr, Table Expr a, Semigroup a) =>
115− Applicative (TheseTable context a)
103+instance (Table Expr a, Semigroup a) => Applicative (TheseTable a)
116104 where
117105 pure = thatTable
118106 (<*>) = (<.>)
119107
120108
121−instance (context ~ Expr, Table Expr a, Semigroup a) =>
122− Bind (TheseTable context a)
123− where
109+instance (Table Expr a, Semigroup a) => Bind (TheseTable a) where
124110 TheseTable here1 ma >>- f = case ma >>- f' of
125111 mtb -> TheseTable
126112 { here = maybeTable here1 ((here1 <>) . fst) mtb
@@ -131,14 +117,12 @@ instance (context ~ Expr, Table Expr a, Semigroup a) =>
131117 TheseTable here2 mb -> (here2,) <$> mb
132118
133119
134−instance (context ~ Expr, Table Expr a, Semigroup a) =>
135− Monad (TheseTable context a)
136− where
120+instance (Table Expr a, Semigroup a) => Monad (TheseTable a) where
137121 (>>=) = (>>-)
138122
139123
140−instance (context ~ Expr, Table Expr a, Table Expr b, Semigroup a, Semigroup b) =>
141− Semigroup (TheseTable context a b)
124+instance (Table Expr a, Table Expr b, Semigroup a, Semigroup b) =>
125+ Semigroup (TheseTable a b)
142126 where
143127 a <> b = TheseTable
144128 { here = here a <> here b
@@ -148,175 +132,99 @@ instance (context ~ Expr, Table Expr a, Table Expr b, Semigroup a, Semigroup b)
148132
149133instance
150134 ( Table context a, Table context b
151− , Reifiable context, context ~ context'
152− )
153− => Table context' (TheseTable context a b)
135+ , Labelable context, Nullifiable context, ConstrainTag context MaybeTag
136+ ) => Table context (TheseTable a b)
154137 where
155− type Columns (TheseTable context a b) = HTheseTable (Columns a) (Columns b)
156− type Context (TheseTable context a b) = Context a
157− type FromExprs (TheseTable context a b) =
158− These (FromExprs a) (FromExprs b)
159− type Transpose to (TheseTable context a b) =
160− TheseTable to (Transpose to a) (Transpose to b)
161−
162− toColumns TheseTable {here, there} = HTheseTable
163− { hhereTag = hlabel $ HIdentity $ tag here
164− , hhere =
165− hlabel $ guard (tag here) isJust isNonNull $ toColumns $ just here
166− , hthereTag = hlabel $ HIdentity $ tag there
167− , hthere =
168− hlabel $ guard (tag there) isJust isNonNull $ toColumns $ just there
169− }
138+ type Columns (TheseTable a b) = HTheseTable (Columns a) (Columns b)
139+ type Context (TheseTable a b) = Context a
170140
171− fromColumns HTheseTable {hhereTag, hhere, hthereTag, hthere} = TheseTable
172− { here = MaybeTable
173− { tag = unHIdentity $ hunlabel hhereTag
174− , just = fromColumns $ hunlabel hhere
175− }
176− , there = MaybeTable
177− { tag = unHIdentity $ hunlabel hthereTag
178− , just = fromColumns $ hunlabel hthere
179− }
180− }
141+ toColumns = toColumns2 toColumns toColumns
142+ fromColumns = fromColumns2 fromColumns fromColumns
143+ reify = liftA2 bimap reify reify
144+ unreify = liftA2 bimap unreify unreify
181145
182− toResult tables = HTheseTable
183− { hhereTag = hrelabel hhereTag
184− , hhere = hrelabel hhere
185− , hthereTag = hrelabel hthereTag
186− , hthere = hrelabel hthere
187− }
188− where
189− HMaybeTable
190− { htag = hhereTag
191− , hjust = hhere
192− } = toResult @_ @(MaybeTable context a) (justHere tables)
193− HMaybeTable
194− { htag = hthereTag
195− , hjust = hthere
196− } = toResult @_ @(MaybeTable context b) (justThere tables)
197−
198− fromResult HTheseTable {hhereTag, hhere, hthereTag, hthere} =
199− case (here, there) of
200− (Just a, Nothing) -> This a
201− (Nothing, Just b) -> That b
202− (Just a, Just b) -> These a b
203− _ -> error "These.fromColumns: mismatch between tags and data"
204− where
205− here = fromResult @_ @(MaybeTable context a) mhere
206− there = fromResult @_ @(MaybeTable context b) mthere
207− mhere = HMaybeTable
208− { htag = hrelabel hhereTag
209− , hjust = hrelabel hhere
210− }
211− mthere = HMaybeTable
212− { htag = hrelabel hthereTag
213− , hjust = hrelabel hthere
214− }
215−
216−
217−instance (EqTable a, EqTable b, context ~ Expr) =>
218− EqTable (TheseTable context a b)
219− where
220− eqTable = HTheseTable
221− { hhereTag = hlabel (HIdentity Dict)
222− , hhere = hlabel (eqTable @(Nullify context a))
223− , hthereTag = hlabel (HIdentity Dict)
224− , hthere = hlabel (eqTable @(Nullify context b))
225− }
226146
147+instance
148+ ( Labelable from, Nullifiable from, ConstrainTag from MaybeTag
149+ , Labelable to, Nullifiable to, ConstrainTag to MaybeTag
150+ , Recontextualize from to a1 b1
151+ , Recontextualize from to a2 b2
152+ ) =>
153+ Recontextualize from to (TheseTable a1 a2) (TheseTable b1 b2)
154+
155+
156+instance (EqTable a, EqTable b) => EqTable (TheseTable a b) where
157+ eqTable = toColumns2 id id (thoseTable (eqTable @a) (eqTable @b))
227158
228−instance (OrdTable a, OrdTable b, context ~ Expr) =>
229− OrdTable (TheseTable context a b)
230− where
231− ordTable = HTheseTable
232− { hhereTag = hlabel (HIdentity Dict)
233− , hhere = hlabel (ordTable @(Nullify context a))
234− , hthereTag = hlabel (HIdentity Dict)
235− , hthere = hlabel (ordTable @(Nullify context b))
236− }
237159
160+instance (OrdTable a, OrdTable b) => OrdTable (TheseTable a b) where
161+ ordTable = toColumns2 id id (thoseTable (ordTable @a) (ordTable @b))
238162
239−instance (ToExprs exprs1 a, ToExprs exprs2 b, x ~ TheseTable Expr exprs1 exprs2) =>
163+
164+type instance FromExprs (TheseTable a b) = These (FromExprs a) (FromExprs b)
165+
166+
167+instance (ToExprs exprs1 a, ToExprs exprs2 b, x ~ TheseTable exprs1 exprs2) =>
240168 ToExprs x (These a b)
169+ where
170+ fromResult =
171+ bimap (fromResult @exprs1) (fromResult @exprs2) .
172+ fromColumns
173+ toResult =
174+ toColumns .
175+ bimap (toResult @exprs1) (toResult @exprs2)
176+
177+
178+toHereTag :: Tag "isJust" a -> Tag "hasHere" a
179+toHereTag Tag {..} = Tag {..}
241180
242181
243−-- | Test if a 'TheseTable' was constructed with 'thisTable'.
244−--
245−-- Corresponds to 'Data.These.Combinators.isThis'.
246−isThisTable :: TheseTable Expr a b -> Expr Bool
182+toThereTag :: Tag "isJust" a -> Tag "hasThere" a
183+toThereTag Tag {..} = Tag {..}
184+
185+
186+isThisTable :: TheseTable a b -> Expr Bool
247187isThisTable a = hasHereTable a &&. not_ (hasThereTable a)
248188
249189
250−-- | Test if a 'TheseTable' was constructed with 'thatTable'.
251−--
252−-- Corresponds to 'Data.These.Combinators.isThat'.
253−isThatTable :: TheseTable Expr a b -> Expr Bool
190+isThatTable :: TheseTable a b -> Expr Bool
254191isThatTable a = not_ (hasHereTable a) &&. hasThereTable a
255192
256193
257−-- | Test if a 'TheseTable' was constructed with 'thoseTable'.
258−--
259−-- Corresponds to 'Data.These.Combinators.isThese'.
260−isThoseTable :: TheseTable Expr a b -> Expr Bool
194+isThoseTable :: TheseTable a b -> Expr Bool
261195isThoseTable a = hasHereTable a &&. hasThereTable a
262196
263197
264−-- | Test if the @a@ side of @TheseTable a b@ is present.
265−--
266−-- Corresponds to 'Data.These.Combinators.hasHere'.
267−hasHereTable :: TheseTable Expr a b -> Expr Bool
198+hasHereTable :: TheseTable a b -> Expr Bool
268199hasHereTable TheseTable {here} = isJustTable here
269200
270201
271−-- | Test if the @b@ table of @TheseTable a b@ is present.
272−--
273−-- Corresponds to 'Data.These.Combinators.hasThere'.
274−hasThereTable :: TheseTable Expr a b -> Expr Bool
202+hasThereTable :: TheseTable a b -> Expr Bool
275203hasThereTable TheseTable {there} = isJustTable there
276204
277205
278−-- | Attempt to project out the @a@ table of a @TheseTable a b@.
279−--
280−-- Corresponds to 'Data.These.Combinators.justHere'.
281−justHereTable :: TheseTable context a b -> MaybeTable context a
206+justHereTable :: TheseTable a b -> MaybeTable a
282207justHereTable = here
283208
284209
285−-- | Attempt to project out the @b@ table of a @TheseTable a b@.
286−--
287−-- Corresponds to 'Data.These.Combinators.justThere'.
288−justThereTable :: TheseTable context a b -> MaybeTable context b
210+justThereTable :: TheseTable a b -> MaybeTable b
289211justThereTable = there
290212
291213
292−-- | Construct a @TheseTable@ from two 'MaybeTable's.
293−alignMaybeTable :: ()
294− => MaybeTable Expr a
295− -> MaybeTable Expr b
296− -> MaybeTable Expr (TheseTable Expr a b)
297−alignMaybeTable a b = MaybeTable tag (pure (TheseTable a b))
298− where
299− tag = boolExpr null mempty (isJustTable a ||. isJustTable b)
300−
301−
302−-- | Construct a @TheseTable@. Corresponds to 'This'.
303−thisTable :: Table Expr b => a -> TheseTable Expr a b
214+thisTable :: Table Expr b => a -> TheseTable a b
304215thisTable a = TheseTable (justTable a) nothingTable
305216
306217
307−-- | Construct a @TheseTable@. Corresponds to 'That'.
308−thatTable :: Table Expr a => b -> TheseTable Expr a b
218+thatTable :: Table Expr a => b -> TheseTable a b
309219thatTable b = TheseTable nothingTable (justTable b)
310220
311221
312−-- | Construct a @TheseTable@. Corresponds to 'These'.
313−thoseTable :: a -> b -> TheseTable Expr a b
222+thoseTable :: a -> b -> TheseTable a b
314223thoseTable a b = TheseTable (justTable a) (justTable b)
315224
316225
317−-- | Pattern match on a 'TheseTable'. Corresponds to 'these'.
318226theseTable :: Table Expr c
319− => (a -> c) -> (b -> c) -> (a -> b -> c) -> TheseTable Expr a b -> c
227+ => (a -> c) -> (b -> c) -> (a -> b -> c) -> TheseTable a b -> c
320228theseTable f g h TheseTable {here, there} =
321229 maybeTable
322230 (maybeTable undefined f here)
@@ -324,34 +232,89 @@ theseTable f g h TheseTable {here, there} =
324232 there
325233
326234
327−-- | Lift a pair of aggregating functions to operate on an 'TheseTable'.
328−-- @thisTable@s, @thatTable@s and @thoseTable@s are grouped separately.
329235aggregateTheseTable :: ()
330− => (exprs -> aggregates)
331− -> (exprs' -> aggregates')
332− -> TheseTable Expr exprs exprs'
333− -> TheseTable Aggregate aggregates aggregates'
334−aggregateTheseTable f g (TheseTable here there) = TheseTable
335− { here = aggregateMaybeTable f here
336− , there = aggregateMaybeTable g there
337− }
236+ => (a -> Aggregate c)
237+ -> (b -> Aggregate d)
238+ -> TheseTable a b
239+ -> Aggregate (TheseTable c d)
240+aggregateTheseTable f g TheseTable {here, there} =
241+ liftF2 TheseTable (aggregateMaybeTable f here) (aggregateMaybeTable g there)
242+
243+
244+insertTheseTable :: (Table Insert a, Table Insert b)
245+ => These a b -> TheseTable a b
246+insertTheseTable =
247+ TheseTable <$> insertMaybeTable . justHere <*> insertMaybeTable . justThere
338248
339249
340−-- | Construct a 'TheseTable' in the 'Name' context. This can be useful if you
341−-- have a 'TheseTable' that you are storing in a table and need to construct a
342−-- 'TableSchema'.
343250nameTheseTable :: ()
344251 => Name (Maybe MaybeTag)
345− -- ^ The name of the column to track the presence of the @a@ table.
346252 -> Name (Maybe MaybeTag)
347− -- ^ The name of the column to track the presence of the @b@ table.
348253 -> a
349− -- ^ Names of the columns in the @a@ table.
350254 -> b
351− -- ^ Names of the columns in the @b@ table.
352− -> TheseTable Name a b
255+ -> TheseTable a b
353256nameTheseTable here there a b =
354257 TheseTable
355258 { here = nameMaybeTable here a
356259 , there = nameMaybeTable there b
357260 }
261+
262+
263+toColumns2 ::
264+ ( HTable t
265+ , HTable u
266+ , HConstrainTag context MaybeTag
267+ , HLabelable context
268+ , HNullifiable context
269+ )
270+ => (a -> t context)
271+ -> (b -> u context)
272+ -> TheseTable a b
273+ -> HTheseTable t u context
274+toColumns2 f g TheseTable {here, there} = HTheseTable
275+ { hhereTag = HIdentity $ hencodeTag (toHereTag (tag here))
276+ , hhere =
277+ hlabel hlabeler $ hnullify (hnullifier (tag here) isNonNull) $ f (just here)
278+ , hthereTag = HIdentity $ hencodeTag (toThereTag (tag there))
279+ , hthere =
280+ hlabel hlabeler $ hnullify (hnullifier (tag there) isNonNull) $ g (just there)
281+ }
282+
283+
284+fromColumns2 ::
285+ ( HTable t
286+ , HTable u
287+ , HConstrainTag context MaybeTag
288+ , HLabelable context
289+ , HNullifiable context
290+ )
291+ => (t context -> a)
292+ -> (u context -> b)
293+ -> HTheseTable t u context
294+ -> TheseTable a b
295+fromColumns2 f g HTheseTable {hhereTag, hhere, hthereTag, hthere} = TheseTable
296+ { here =
297+ let
298+ tag = hdecodeTag $ unHIdentity hhereTag
299+ in
300+ MaybeTable
301+ { tag
302+ , just = f $
303+ runIdentity $
304+ hunnullify (\a -> pure . hunnullifier a) $
305+ hunlabel hunlabeler
306+ hhere
307+ }
308+ , there =
309+ let
310+ tag = hdecodeTag $ unHIdentity hthereTag
311+ in
312+ MaybeTable
313+ { tag
314+ , just = g $
315+ runIdentity $
316+ hunnullify (\a -> pure . hunnullifier a) $
317+ hunlabel hunlabeler
318+ hthere
319+ }
320+ }
src/Rel8/Table/Transpose.hsdeleted−46
@@ -1,46 +0,0 @@
1−{-# language DataKinds #-}
2−{-# language FlexibleInstances #-}
3−{-# language FunctionalDependencies #-}
4−{-# language StandaloneKindSignatures #-}
5−{-# language TypeFamilies #-}
6−{-# language UndecidableInstances #-}
7−
8−module Rel8.Table.Transpose
9− ( Transposes
10− )
11−where
12−
13−-- base
14−import Data.Kind ( Constraint, Type )
15−import Prelude ()
16−
17−-- rel8
18−import qualified Rel8.Schema.Kind as K
19−import Rel8.Table ( Table, Transpose, Congruent )
20−
21−
22−-- | @'Transposes' from to a b@ means that @a@ and @b@ are 'Table's, in the
23−-- @from@ and @to@ contexts respectively, which share the same underlying
24−-- structure. In other words, @b@ is a version of @a@ transposed from the
25−-- @from@ context to the @to@ context (and vice versa).
26−type Transposes :: K.Context -> K.Context -> Type -> Type -> Constraint
27−class
28− ( Table from a
29− , Table to b
30− , Congruent a b
31− , b ~ Transpose to a
32− , a ~ Transpose from b
33− )
34− => Transposes from to a b
35− | a -> from
36− , b -> to
37− , a to -> b
38− , b from -> a
39−instance
40− ( Table from a
41− , Table to b
42− , Congruent a b
43− , b ~ Transpose to a
44− , a ~ Transpose from b
45− )
46− => Transposes from to a b
src/Rel8/Table/Undefined.hs+5−5
@@ -11,16 +11,16 @@ where
1111import Prelude hiding ( undefined )
1212
1313-- rel8
14−import Rel8.Expr ( Expr )
14+import Rel8.Expr ( Expr, Col(..) )
1515import Rel8.Expr.Null ( snull, unsafeUnnullify )
1616import Rel8.Schema.HTable ( htabulate, hfield, hspecs )
1717import Rel8.Schema.Null ( Nullity( Null, NotNull ) )
18−import Rel8.Schema.Spec ( Spec(..) )
18+import Rel8.Schema.Spec ( SSpec(..) )
1919import Rel8.Table ( Table, fromColumns )
2020
2121
2222undefined :: Table Expr a => a
2323undefined = fromColumns $ htabulate $ \field -> case hfield hspecs field of
24− Spec {nullity, info} -> case nullity of
25− Null -> snull info
26− NotNull -> unsafeUnnullify (snull info)
24+ SSpec {nullity, info} -> case nullity of
25+ Null -> DB (snull info)
26+ NotNull -> DB (unsafeUnnullify (snull info))
src/Rel8/Table/Unreify.hsnew file+106
@@ -0,0 +1,106 @@
1+{-# language DataKinds #-}
2+{-# language FlexibleContexts #-}
3+{-# language FlexibleInstances #-}
4+{-# language GADTs #-}
5+{-# language LambdaCase #-}
6+{-# language MultiParamTypeClasses #-}
7+{-# language QuantifiedConstraints #-}
8+{-# language RankNTypes #-}
9+{-# language StandaloneKindSignatures #-}
10+{-# language TypeFamilies #-}
11+{-# language UndecidableInstances #-}
12+
13+-- | This module implements some machinery for implementing methods of the
14+-- 'Table' class for a particular special (but important) class of polymorphic
15+-- @Table@ types.
16+--
17+-- This special case is characterised by a @newtype@ wrapper around a bare
18+-- 'HTable' which is constructed by applying a type family to the polymorphic
19+-- type variable.
20+--
21+-- Examples of this class of @Table@ include @ListTable@ and @NonEmptyTable@.
22+--
23+-- The tricky part about implementing @Table@ for these types is 'reify' and
24+-- 'unreify'. There is no guarantee in general that @'Unreify' a@ is itself
25+-- a @Table@, let alone a @Table@ with the same 'Columns' as @a@
26+-- (e.g., @Unreify (AColumn Result Bool) = Bool@, and @Bool@ is not a
27+-- @Table@)
28+
29+module Rel8.Table.Unreify
30+ ( Unreifiable, Unreifiability(..), unreifiability
31+ , Unreifies
32+ )
33+where
34+
35+-- base
36+import Data.Kind ( Constraint, Type )
37+import Prelude ()
38+
39+-- rel8
40+import Rel8.Aggregate ( Aggregate )
41+import Rel8.Expr ( Expr )
42+import Rel8.Kind.Context ( SContext(..), Reifiable, sReifiable )
43+import Rel8.Schema.Dict ( Dict( Dict ) )
44+import Rel8.Schema.Insert ( Insert )
45+import qualified Rel8.Schema.Kind as K
46+import Rel8.Schema.Name ( Name )
47+import Rel8.Schema.Reify ( Reify )
48+import Rel8.Schema.Result ( Result )
49+import Rel8.Table ( Table, Context, Congruent, Unreify )
50+
51+
52+type Unreifies :: K.Context -> Type -> Constraint
53+type family Unreifies context a where
54+ Unreifies (Reify context) a = Unreifier context a
55+ Unreifies _ _ = ()
56+
57+
58+type Unreifiable :: Type -> Constraint
59+class
60+ ( Context a ~ Reify Aggregate => Unreifier Aggregate a
61+ , Context a ~ Reify Expr => Unreifier Expr a
62+ , Context a ~ Reify Insert => Unreifier Insert a
63+ , Context a ~ Reify Name => Unreifier Name a
64+ , (forall ctx. (Context a ~ Reify (Reify ctx), Reifiable ctx) => Unreifier (Reify ctx) a)
65+ )
66+ => Unreifiable a
67+instance
68+ ( Context a ~ Reify Aggregate => Unreifier Aggregate a
69+ , Context a ~ Reify Expr => Unreifier Expr a
70+ , Context a ~ Reify Insert => Unreifier Insert a
71+ , Context a ~ Reify Name => Unreifier Name a
72+ , (forall ctx. (Context a ~ Reify (Reify ctx), Reifiable ctx) => Unreifier (Reify ctx) a)
73+ )
74+ => Unreifiable a
75+
76+
77+type Unreifier :: K.Context -> Type -> Constraint
78+class
79+ ( Table context (Unreify a)
80+ , Congruent a (Unreify a)
81+ )
82+ => Unreifier context a
83+instance
84+ ( Table context (Unreify a)
85+ , Congruent a (Unreify a)
86+ )
87+ => Unreifier context a
88+
89+
90+type Unreifiability :: K.Context -> Type -> Type
91+data Unreifiability context a where
92+ UResult :: Unreifiability Result a
93+ Unreifiability :: Unreifier context a
94+ => SContext context -> Unreifiability context a
95+
96+
97+unreifiability :: (Context a ~ Reify context, Unreifiable a)
98+ => SContext context -> Unreifiability context a
99+unreifiability = \case
100+ SAggregate -> Unreifiability SAggregate
101+ SExpr -> Unreifiability SExpr
102+ SInsert -> Unreifiability SInsert
103+ SName -> Unreifiability SName
104+ SResult -> UResult
105+ SReify context -> case sReifiable context of
106+ Dict -> Unreifiability (SReify context)
src/Rel8/Table/Window.hsdeleted−43
@@ -1,43 +0,0 @@
1−{-# language MonoLocalBinds #-}
2−
3−module Rel8.Table.Window
4− ( cumulative
5− , cumulative_
6− , currentRow
7− )
8−where
9−
10−-- base
11−import Prelude
12−
13−-- opaleye
14−import qualified Opaleye.Window as Opaleye
15−
16−-- rel8
17−import Rel8.Aggregate ( Aggregates )
18−import qualified Rel8.Expr.Window as Expr
19−import Rel8.Schema.HTable ( hfield, htabulateA )
20−import Rel8.Table ( fromColumns, toColumns )
21−import Rel8.Window ( Window( Window ) )
22−
23−
24−-- | 'cumulative' allows the use of aggregation functions in 'Window'
25−-- expressions. In particular, @'cumulative' 'Rel8.sum'@
26−-- (when combined with 'Rel8.Window.orderPartitionBy') gives a running total,
27−-- also known as a \"cumulative sum\", hence the name @cumulative@.
28−cumulative :: Aggregates aggregates exprs => (a -> aggregates) -> Window a exprs
29−cumulative f =
30− fmap fromColumns $
31− htabulateA $ \field ->
32− Expr.cumulative ((`hfield` field) . toColumns . f)
33−
34−
35−-- | A version of 'cumulative' for use with nullary aggregators like
36−-- 'Rel8.Expr.Aggregate.countStar'.
37−cumulative_ :: Aggregates aggregates exprs => aggregates -> Window a exprs
38−cumulative_ = cumulative . const
39−
40−
41−-- | Return every column of the current row of a window query.
42−currentRow :: Window a a
43−currentRow = Window $ Opaleye.over (Opaleye.noWindowFunction id) mempty mempty
src/Rel8/Tabulate.hs+246−530
@@ -1,640 +1,356 @@
1+{-# language DeriveFunctor #-}
2+{-# language DerivingStrategies #-}
13{-# language FlexibleContexts #-}
2−{-# language MonoLocalBinds #-}
3−{-# language ScopedTypeVariables #-}
4−{-# language StandaloneKindSignatures #-}
5−{-# language TypeApplications #-}
64{-# language TupleSections #-}
7−{-# language UndecidableInstances #-}
8−
9−-- | "Rel8.Tabulate" provides an alternative API ('Tabulation') for writing
10−-- queries that complements the main "Rel8" API ('Query').
115
126module Rel8.Tabulate
13− (
14− Tabulation
15−
16− -- * Interfacing with 'Query's
7+ ( Tabulation
8+ , runTabulation
9+ , tabulate
10+ , tabulateA
1711 , fromQuery
18− , toQuery
1912 , liftQuery
20− , through
13+ , prebind
14+ , postbind
15+ , indexed
16+ , ifilter
2117 , lookup
22−
23− -- * Aggregation and Ordering
24− , aggregate
25− , distinct
26− , order
27−
28− -- ** Magic 'Tabulation's
29− -- $magic
30− , count
31− , optional
32− , many
33− , some
34− , exists
35− , present
36− , absent
37−
38− -- * Natural joins
3918 , align
4019 , alignWith
4120 , leftAlign
4221 , leftAlignWith
43− , rightAlign
44− , rightAlignWith
4522 , zip
4623 , zipWith
4724 , similarity
4825 , difference
26+ , aggregateTabulation
27+ , optionalTabulation
28+ , manyTabulation
29+ , someTabulation
4930 )
5031where
5132
5233-- base
53−import Control.Applicative ( (<|>), empty, liftA2 )
54−import Control.Monad ( liftM2 )
55−import Data.Bifunctor ( Bifunctor, bimap, first, second )
34+import Control.Applicative ( liftA2 )
35+import Control.Monad ( join, liftM2 )
36+import Data.Bifunctor ( bimap, first )
5637import Data.Foldable ( traverse_ )
57−import Data.Function ( on )
58−import Data.Functor.Contravariant ( Contravariant, (>$<), contramap )
59−import Data.Int ( Int64 )
60−import Data.Kind ( Type )
61−import Data.Maybe ( fromJust, fromMaybe )
62−import Prelude hiding ( lookup, zip, zipWith )
63−
64−-- bifunctors
65−import Data.Bifunctor.Clown ( Clown( Clown ), runClown )
66−
67−-- comonad
68−import Control.Comonad ( extract )
69−
70−-- opaleye
71−import qualified Opaleye.Aggregate as Opaleye
72−import qualified Opaleye.Order as Opaleye ( orderBy, distinctOnExplicit )
73−
74−-- profunctors
75−import Data.Profunctor ( dimap, lmap )
76−
77−-- product-profunctors
78−import Data.Profunctor.Product
79− ( ProductProfunctor, (***!)
80− , SumProfunctor, (+++!)
81− )
82−import qualified Data.Profunctor.Product as PP
38+import Data.Maybe ( fromMaybe )
39+import Prelude hiding ( filter, lookup, undefined, zip, zipWith )
8340
8441-- rel8
85−import Rel8.Aggregate ( Aggregates )
42+import Rel8.Aggregate ( Aggregate )
8643import Rel8.Expr ( Expr )
87−import Rel8.Expr.Aggregate ( countStar )
88−import Rel8.Expr.Bool ( true )
89−import Rel8.Order ( Order( Order ) )
44+import Rel8.Expr.Bool ( not_, true )
9045import Rel8.Query ( Query )
91−import qualified Rel8.Query.Exists as Q ( exists, present, absent )
92−import Rel8.Query.Filter ( where_ )
93−import Rel8.Query.List ( catNonEmptyTable )
94−import qualified Rel8.Query.Maybe as Q ( optional )
95−import Rel8.Query.Opaleye ( mapOpaleye, unsafePeekQuery )
96−import Rel8.Query.Rebind ( rebind )
46+import Rel8.Query.Aggregate ( aggregate )
47+import Rel8.Query.Exists ( withBy, withoutBy )
48+import Rel8.Query.Filter ( filter, where_ )
49+import Rel8.Query.Maybe ( optional )
9750import Rel8.Query.These ( alignBy )
98−import Rel8.Table ( Table, fromColumns, toColumns )
99−import Rel8.Table.Aggregate ( hgroupBy, listAgg, nonEmptyAgg )
100−import Rel8.Table.Alternative
101− ( AltTable, (<|>:)
102− , AlternativeTable, emptyTable
103− )
104−import Rel8.Table.Cols ( fromCols, toCols )
105−import Rel8.Table.Eq ( EqTable, (==:), eqTable )
106−import Rel8.Table.List ( ListTable( ListTable ) )
107−import Rel8.Table.Maybe ( MaybeTable( MaybeTable ), maybeTable )
108−import Rel8.Table.NonEmpty ( NonEmptyTable( NonEmptyTable ) )
109−import Rel8.Table.Opaleye ( aggregator, unpackspec )
110−import Rel8.Table.Ord ( OrdTable )
111−import Rel8.Table.Order ( ascTable )
112−import Rel8.Table.Projection
113− ( Biprojectable, biproject
114− , Projectable, project
115− , apply
116− )
117−import Rel8.Table.These ( TheseTable( TheseTable ), theseTable )
51+import Rel8.Table ( Table )
52+import Rel8.Table.Aggregate ( groupBy, listAgg, nonEmptyAgg )
53+import Rel8.Table.Eq ( EqTable, (==:) )
54+import Rel8.Table.List ( ListTable )
55+import Rel8.Table.Maybe ( MaybeTable, maybeTable )
56+import Rel8.Table.NonEmpty ( NonEmptyTable )
57+import Rel8.Table.These ( TheseTable, theseTable )
58+import Rel8.Table.Undefined ( undefined )
11859
11960-- semigroupoids
12061import Data.Functor.Apply ( Apply, liftF2 )
121−import Data.Functor.Bind ( Bind, (>>-) )
122−
123−
124−type Key :: Type -> Type
125−type Key = Maybe
126−
127−
128−cat :: Table Expr k => Key k -> Query k
129−cat = maybe emptyTable pure
130−
131−
132−key :: (ProductProfunctor p, SumProfunctor p)
133− => p a b -> p (Key a) (Key b)
134−key a = dimap from to (PP.empty +++! a)
135− where
136− from = maybe (Left ()) Right
137− to = either (const Nothing) Just
138−
62+import Data.Functor.Bind ( Bind )
63+import qualified Data.Functor.Bind
64+import Data.Semigroup.Traversable.Class ( bitraverse1 )
13965
140−keyed :: (ProductProfunctor p, SumProfunctor p)
141− => p k l -> p a b -> p (Key k, a) (Key l, b)
142−keyed k a = key k ***! a
14366
144−
145−type Predicate :: Type -> Type
146−newtype Predicate a = Predicate (Maybe (a -> Expr Bool))
147−
148−
149−instance Contravariant Predicate where
150− contramap f (Predicate a) = Predicate (lmap f <$> a)
151−
152−
153−instance Semigroup (Predicate k) where
154− Predicate ma <> Predicate mb = Predicate $ ma <|> mb
155−
156−
157−instance Monoid (Predicate k) where
158− mempty = Predicate Nothing
159−
160−
161−match :: EqTable k => Key k -> Predicate k
162−match = Predicate . fmap (==:)
163−
164−
165−ensure :: Predicate k -> Key k -> Query ()
166−ensure (Predicate mp) = traverse_ (\k -> traverse_ (\p -> where_ (p k)) mp)
167−
168−
169−-- | A @'Tabulation' k a@ is like a @'Query' a@, except that each row also
170−-- has a key @k@ in addition to the value @a@. 'Tabulation's can be composed
171−-- monadically just like 'Query's, but the resulting join is more like a
172−-- @NATURAL JOIN@ (based on the common key column(s) @k@) than the
173−-- @CROSS JOIN@ given by 'Query'.
174−--
175−-- Another way to think of @'Tabulation' k a@ is as analogous to @Map k a@ in
176−-- the same way @'Query' a@ is analogous to @[a]@. However, there's nothing
177−-- stopping a 'Tabulation' from containing multiple rows with the same key, so
178−-- technically @Map k (NonEmpty a)@ is more accurate.
67+-- | @'Tabulation' k a@ is denotionally a @MultiMap k a@ — a @Map@ where each
68+-- key @k@ corresponds to potentially multiple @a@ (i.e., @'Query' a@). This
69+-- @MultiMap@ supports 'lookup' and other operations you would expect it to.
17970--
180−-- 'Tabulation's can be created from 'Query's with 'fromQuery' and 'liftQuery'
181−-- and converted back to 'Query's with 'lookup' and 'toQuery' (though note the
182−-- caveats that come with the latter).
183−type Tabulation :: Type -> Type -> Type
184−newtype Tabulation k a = Tabulation (Predicate k -> Query (Key k, a))
71+-- \"Identity\" 'Tabulation's are created using 'tabulate'. 'Tabulation's can
72+-- be composed with 'Query's with 'prebind' or 'postbind' to form new
73+-- 'Tabulation's.
74+newtype Tabulation k a = Tabulation (k -> Query (Maybe k, a))
75+ deriving stock Functor
18576
18677
187−instance Biprojectable Tabulation where
188− biproject f g =
189− bimap
190− (fromColumns . apply f . toColumns)
191− (fromColumns . apply g . toColumns)
192−
193−
194−instance Bifunctor Tabulation where
195− bimap f g (Tabulation a) = Tabulation $ \p ->
196− bimap (fmap f) g <$> a (f >$< p)
197−
198−
199−instance Functor (Tabulation k) where
200− fmap = second
201−
202−
203−instance Projectable (Tabulation k) where
204− project f = fmap (fromColumns . apply f . toColumns)
205−
206−
207−-- | If @'Tabulation' k a@ is @Map k (NonEmpty a)@, then @(<.>)@ is
208−-- @intersectionWith (liftA2 (<*>))@
20978instance EqTable k => Apply (Tabulation k) where
21079 liftF2 = liftA2
21180
21281
213−-- | @pure = 'liftQuery' . pure@
21482instance EqTable k => Applicative (Tabulation k) where
21583 pure = liftQuery . pure
21684 liftA2 = liftM2
21785
21886
21987instance EqTable k => Bind (Tabulation k) where
220− Tabulation as >>- f = Tabulation $ \p -> do
221− (k, a) <- as p
222− case f a of
223− Tabulation bs -> do
224− let p' = match k
225− (k', b) <- bs (p' <> p)
226− ensure p' k'
227− pure (k' <|> k, b)
88+ join = join
22889
22990
23091instance EqTable k => Monad (Tabulation k) where
231− (>>=) = (>>-)
232−
233−
234−-- | If @'Tabulation' k a@ is @Map k (NonEmpty a)@, then @(<|>:)@ is
235−-- @unionWith (<>)@.
236−instance EqTable k => AltTable (Tabulation k) where
237− tas <|>: tbs = do
238− eas <- peek tas
239− ebs <- peek tbs
240− case (eas, ebs) of
241− (Left as, Left bs) -> liftQuery $ as <|>: bs
242− (Right as, Right bs) -> fromQuery $ as <|>: bs
243− _ -> catNonEmptyTable `through` ((<>) `on` some) tas tbs
244−
245−
246−instance EqTable k => AlternativeTable (Tabulation k) where
247− emptyTable = Tabulation $ const $ fmap (empty,) emptyTable
248−
249−
250−-- | If @'Tabulation' k a@ is @Map k (NonEmpty a)@, then @(<>)@ is
251−-- @unionWith (liftA2 (<>))@.
252−instance (EqTable k, Table Expr a, Semigroup a) => Semigroup (Tabulation k a)
253− where
254− (<>) = alignWith (theseTable id id (<>))
255−
256−
257−instance (EqTable k, Table Expr a, Semigroup a) => Monoid (Tabulation k a)
258− where
259− mempty = emptyTable
260−
261−
262−-- | Any 'Query' of key-value pairs @(k, a)@ can be a @'Tabulation' k a@.
263−fromQuery :: Query (k, a) -> Tabulation k a
264−fromQuery = Tabulation . const . fmap (first pure)
265−
266−
267−-- | Convert a @'Tabulation' k a@ back into a 'Query' of key-value pairs.
268−--
269−-- Note that the result of a 'toQuery' is undefined (will always return zero
270−-- rows) on 'Tabulation's constructed with 'liftQuery' or 'pure'. So while
271−-- @toQuery . fromQuery@ is always @id@, @fromQuery . toQuery@ is not.
272−--
273−-- A safer, more predictable alternative to 'toQuery' is to use 'lookup' with
274−-- an explicit set of keys:
92+ Tabulation as >>= f = Tabulation $ \i -> do
93+ (mk, a) <- as i
94+ case mk of
95+ Nothing -> case f a of
96+ Tabulation bs -> bs i
97+ Just k -> case f a of
98+ Tabulation bs -> do
99+ (mk', b) <- bs k
100+ case mk' of
101+ Nothing -> pure (mk, b)
102+ Just k' -> do
103+ where_ $ k ==: k'
104+ pure (mk', b)
105+
106+
107+-- | This "undoes" 'fromQuery'.
275108--
276109-- @
277−-- do
278−-- k <- keys
279−-- a <- lookup k tabulation
280−-- pure (k, a)
110+-- 'runTabulation' . 'fromQuery' = id
111+-- 'fromQuery' . 'runTabulation' = id
281112-- @
282113--
283−-- Having said that, in practice, most legitimate uses of 'Tabulation' will
284−-- have a well-defined 'toQuery'. It would be possible in theory to encode
285−-- the necessary invariants at the type level using an indexed monad, but we
286−-- would lose the ability to use @do@-notation, which is the main benefit
287−-- of having 'Tabulation' as a monad in the first place.
288−--
289−-- In particular, @'toQuery' t@ is well-defined for any 'Tabulation' @t@
290−-- defined as @t = fromQuery _@. @'toQuery' t@ is also well-defined for any
291−-- 'Tabulation' @t@ defined as @t = t' >>= _@ or @t = t' *> _@ where
292−-- @'toQuery' t'@ is well-defined. There are other valid permutations too.
293−-- Generally, anything that uses 'fromQuery' at some point, unless wrapped in
294−-- a top-level 'present' or 'absent', will have a well-defined 'toQuery'.
295−toQuery :: Table Expr k => Tabulation k a -> Query (k, a)
296−toQuery (Tabulation f) = do
297− (mk, a) <- f mempty
298− k <- cat mk
299− pure (k, a)
300−
301−
302−-- | A @'Query' a@ can be treated as a @'Tabulation' k a@ where the given @a@
303−-- values exist at every possible key @k@.
114+-- Note however that it produces nonsense when passed a 'Tabulation' that was
115+-- made with from 'liftQuery' or 'pure'. In such cases the returned 'Query'
116+-- will always produce zero rows.
117+runTabulation :: EqTable k => Tabulation k a -> Query (k, a)
118+runTabulation (Tabulation f) = do
119+ (mk, a) <- f i
120+ case mk of
121+ Nothing -> do
122+ -- Opaleye tries to be too clever optimising "WHERE FALSE" and generates
123+ -- invalid SQL, so we use "WHERE NOT TRUE" instead
124+ where_ $ not_ true
125+ pure (i, a)
126+ Just k -> pure (k, a)
127+ where
128+ i = undefined
129+
130+
304131liftQuery :: Query a -> Tabulation k a
305−liftQuery = Tabulation . const . fmap (empty,)
132+liftQuery query = Tabulation $ const $ fmap (Nothing,) query
306133
307134
308−-- | Run a Kleisli arrow in the the 'Query' monad \"through\" a 'Tabulation'.
309−-- Useful for 'Rel8.filter'ing a 'Tabulation'.
135+-- | 'tabulate' creates an \"identity\" @'Tabulation' k a@ that allows @a@ be
136+-- indexed by one or more of its columns @k@. Some examples:
310137--
311−-- @
312−-- 'Rel8.filter' ((>=. 30) . userAge) `'through'` usersById
313−-- @
314−through :: (a -> Query b) -> Tabulation k a -> Tabulation k b
315−through f (Tabulation as) = Tabulation $ \p -> do
316− (k, a) <- as p
317− b <- f a
318− pure (k, b)
319−infixr 1 `through`
138+-- [Tabulation by primary key]:
139+-- @
140+-- projectsById :: Project 'Expr' -> 'Tabulation' ('Expr' ProjectId) (Project 'Expr')
141+-- projectsById = 'tabulate' projectId
142+-- @
143+--
144+-- Note: the nature of primary keys means that each key will be mapped to a
145+-- singleton value in this case.
146+--
147+-- [Tabulation by other unique key]:
148+-- @
149+-- projectsByName :: Project 'Expr' -> 'Tabulation' ('Expr' Text) (Project 'Expr')
150+-- projectsByName = 'tabulate' projectName
151+-- @
152+--
153+-- [Tabulation by foreign key (tabulate a child table by parent key)]:
154+-- @
155+-- revisionsByProjectId :: Revision 'Expr' -> 'Tabulation' ('Expr' ProjectId) (Revision 'Expr')
156+-- revisionsByProjectId = 'tabulate' revisionProjectId
157+-- @
158+tabulate :: (a -> k) -> a -> Tabulation k a
159+tabulate key a = fromQuery $ pure (key a, a)
320160
321161
322−-- | @'lookup' k t@ returns the value(s) at the key @k@ in the tabulation @t@.
323−lookup :: EqTable k => k -> Tabulation k a -> Query a
324−lookup k (Tabulation f) = do
325− (k', a) <- f p
326− ensure p k'
327− pure a
328− where
329− p = match (pure k)
162+-- | Like 'tabulate' but takes a monadic 'Query' function instead of a pure
163+-- one. This means you can filter rows while calculating the key, which is
164+-- useful in conjunction with 'Rel8.Extra.catNulls'.
165+tabulateA :: (a -> Query k) -> a -> Tabulation k a
166+tabulateA key a = fromQuery $ (,a) <$> key a
330167
331168
332−-- | 'aggregate' aggregates the values within each key of a
333−-- 'Tabulation'. There is an implicit @GROUP BY@ on all the key columns.
334−aggregate :: forall k aggregates exprs.
335− ( EqTable k
336− , Aggregates aggregates exprs
337− )
338− => Tabulation k aggregates -> Tabulation k exprs
339−aggregate (Tabulation f) = Tabulation $
340− mapOpaleye (Opaleye.aggregate (keyed haggregator aggregator)) .
341− fmap (first (fmap (hgroupBy (eqTable @k) . toColumns))) .
342− f
343− where
344− haggregator = dimap fromColumns fromCols aggregator
169+-- | Analgous to 'Data.Map.Strict.fromList'.
170+fromQuery :: Query (k, a) -> Tabulation k a
171+fromQuery = Tabulation . const . fmap (first Just)
345172
346173
347−-- | 'distinct' ensures a 'Tabulation' has at most one value for
348−-- each key, i.e., it drops duplicates. In general it keeps only the
349−-- \"first\" value it encounters for each key, but note that \"first\" is
350−-- undefined unless you first call 'order'.
351−distinct :: EqTable k => Tabulation k a -> Tabulation k a
352−distinct (Tabulation f) = Tabulation $
353− mapOpaleye (Opaleye.distinctOnExplicit (key unpackspec) fst) . f
174+indexed :: Tabulation k a -> Tabulation k (k, a)
175+indexed (Tabulation query) = Tabulation $ \i ->
176+ (\(mk, a) -> (mk, (fromMaybe i mk, a))) <$> query i
354177
355178
356−-- | 'order' orders the /values/ of a 'Tabulation' within their
357−-- respective keys. This specifies a defined order for 'distinct'.
358−-- It also defines the order of the lists produced by 'many' and
359−-- 'some'.
360−order :: OrdTable k => Order a -> Tabulation k a -> Tabulation k a
361−order ordering (Tabulation f) =
362− Tabulation $ mapOpaleye (Opaleye.orderBy ordering') . f
363− where
364− Order ordering' = runClown (keyed (Clown ascTable) (Clown ordering))
179+ifilter :: (k -> a -> Expr Bool) -> Tabulation k a -> Tabulation k a
180+ifilter f tabulation = snd <$> do
181+ filter (uncurry f) `postbind` indexed tabulation
365182
366183
367−-- $magic
368−--
369−-- Some of the following combinators produce \"magic\" 'Tabulation's. Let's
370−-- use 'count' as an example to demonstrate this concept. Consider
371−-- the following:
372−--
373−-- @
374−-- count $ fromQuery $ values
375−-- [ (lit 'a', lit True)
376−-- , (lit 'a', lit False)
377−-- , (lit 'b', lit True)
378−-- ]
379−-- @
380−--
381−-- You might expect this to be equivalent to the following 'Tabulation':
382−--
383−-- @
384−-- fromQuery $ values
385−-- [ (lit 'a', 2)
386−-- , (lit 'b', 1)
387−-- ]
388−-- @
389−--
390−-- However, it isn't quite. While the resulting 'Tabulation' does effectively
391−-- contain the above entries, it also behaves as though it contained the value
392−-- @0@ at every other possible key.
393−--
394−-- This means you can do:
395−--
396−-- @
397−-- do
398−-- user <- usersById
399−-- orderCount <- count ordersByUserId
400−-- @
401−--
402−-- To see how many orders a user has (getting @0@ if they have no orders).
184+-- | Map a 'Query' over the input side of a 'Tabulation'.
185+prebind :: (a -> Tabulation k b) -> Query a -> Tabulation k b
186+prebind f as = Tabulation $ \k -> do
187+ a <- as
188+ case f a of
189+ Tabulation query -> query k
190+infixr 1 `prebind`
403191
404192
405−-- | 'count' returns a count of how many entries are in the given
406−-- 'Tabulation' at each key.
407−--
408−-- The resulting 'Tabulation' is \"magic\" in that the value @0@ exists at
409−-- every possible key that wasn't in the given 'Tabulation'.
410−count :: EqTable k => Tabulation k a -> Tabulation k (Expr Int64)
411−count =
412− fmap (maybeTable 0 id) .
413− optional .
414− aggregate .
415− fmap (const countStar)
416−
417−
418−-- | 'optional' produces a \"magic\" 'Tabulation' whereby each
419−-- entry in the given 'Tabulation' is wrapped in 'Rel8.justTable', and every
420−-- other possible key contains a single 'Rel8.nothingTable'.
421−--
422−-- This is used to implement 'leftAlignWith'.
423−optional :: Tabulation k a -> Tabulation k (MaybeTable Expr a)
424−optional (Tabulation f) = Tabulation $ \p -> case p of
425− Predicate Nothing -> fmap pure <$> f p
426− _ -> fmap (\m -> (empty, snd <$> m)) $ Q.optional $ do
427− (k, a) <- f p
428− ensure p k
429− pure (k, a)
430−
431−
432−-- | 'many' aggregates each entry with a particular key into a
433−-- single entry with all of the values contained in a 'ListTable'.
434−--
435−-- 'order' can be used to give this 'ListTable' a defined order.
436−--
437−-- The resulting 'Tabulation' is \"magic\" in that the value
438−-- @'Rel8.listTable []'@ exists at every possible key that wasn't in the given
439−-- 'Tabulation'.
440−many :: (EqTable k, Table Expr a)
441− => Tabulation k a -> Tabulation k (ListTable Expr a)
442−many =
443− fmap (maybeTable mempty (\(ListTable a) -> ListTable a)) .
444− optional .
445− aggregate .
446− fmap (listAgg . toCols)
447−
448−
449−-- | 'some' aggregates each entry with a particular key into a
450−-- single entry with all of the values contained in a 'NonEmptyTable'.
451−--
452−-- 'order' can be used to give this 'NonEmptyTable' a defined order.
453−some :: (EqTable k, Table Expr a)
454− => Tabulation k a -> Tabulation k (NonEmptyTable Expr a)
455−some =
456− fmap (\(NonEmptyTable a) -> NonEmptyTable a) .
457− aggregate .
458− fmap (nonEmptyAgg . toCols)
459−
460−
461−-- | 'exists' produces a \"magic\" 'Tabulation' which contains the
462−-- value 'Rel8.true' at each key in the given 'Tabulation', and the value
463−-- 'Rel8.false' at every other possible key.
464−exists :: Tabulation k a -> Tabulation k (Expr Bool)
465−exists (Tabulation f) = Tabulation $ \p -> case p of
466− Predicate Nothing -> (true <$) <$> f p
467− _ -> fmap (empty,) $ Q.exists $ do
468− (k, _) <- f p
469− ensure p k
470−
471−
472−-- | 'present' produces a 'Tabulation' where a single @()@ row
473−-- exists for every key that was present in the given 'Tabulation'.
474−--
475−-- This is used to implement 'similarity'.
476−present :: Tabulation k a -> Tabulation k ()
477−present (Tabulation f) = Tabulation $ \p -> do
478− Q.present $ do
479− (k, _) <- f p
480− ensure p k
481− pure (empty, ())
193+-- | Map a 'Query' over the output side of a 'Tabulation'.
194+postbind :: (a -> Query b) -> Tabulation k a -> Tabulation k b
195+postbind f (Tabulation as) = Tabulation $ \i -> do
196+ (k, a) <- as i
197+ case f a of
198+ bs -> do
199+ b <- bs
200+ pure (k, b)
201+infixr 1 `postbind`
482202
483203
484−-- | 'absent' produces a 'Tabulation' where a single @()@ row exists
485−-- at every possible key that absent from the given 'Tabulation'.
486−--
487−-- This is used to implement 'difference'.
488−absent :: Tabulation k a -> Tabulation k ()
489−absent (Tabulation f) = Tabulation $ \p -> do
490− Q.absent $ do
491− (k, _) <- f p
492− ensure p k
493− pure (empty, ())
204+-- | Note that because 'Tabulation' is a @MultiMap@, the 'Query' returned by
205+-- 'lookup' can and often does contain multiple results.
206+lookup :: EqTable k => k -> Tabulation k a -> Query a
207+lookup key (Tabulation query) = do
208+ (mk, a) <- query key
209+ traverse_ (where_ . (key ==:)) mk
210+ pure a
494211
495212
496−-- | Performs a @NATURAL FULL OUTER JOIN@ based on the common key columns.
213+-- | Analagous to
214+-- [@align@](https://hackage.haskell.org/package/semialign/docs/Data-Semialign.html#v:align).
497215--
498−-- Analogous to 'Data.Semialign.align'.
499−align :: EqTable k
500− => Tabulation k a -> Tabulation k b -> Tabulation k (TheseTable Expr a b)
216+-- If 'zip' makes an @INNER JOIN@, then 'align' makes a @FULL OUTER JOIN@.
217+align :: (EqTable k, Table Expr a, Table Expr b)
218+ => Tabulation k a -> Tabulation k b -> Tabulation k (TheseTable a b)
501219align = alignWith id
502220
503221
504−-- | Performs a @NATURAL FULL OUTER JOIN@ based on the common key columns.
222+-- | Analagous to
223+-- [@alignWith@](https://hackage.haskell.org/package/semialign/docs/Data-Semialign.html#v:alignWith).
505224--
506−-- Analogous to 'Data.Semialign.alignWith'.
507−alignWith :: EqTable k
508− => (TheseTable Expr a b -> c)
225+-- See 'zipWith' and 'align'.
226+alignWith :: (EqTable k, Table Expr a, Table Expr b)
227+ => (TheseTable a b -> c)
509228 -> Tabulation k a -> Tabulation k b -> Tabulation k c
510−alignWith f (Tabulation as) (Tabulation bs) = Tabulation $ \p -> do
511− tkab <- liftF2 (alignBy condition) as bs p
512− k <- traverse (rebind "key") $ recover $ bimap fst fst tkab
513− let
514− tab = bimap snd snd tkab
515− pure (k, f tab)
516− where
517− condition (k, _) (k', _) = fromMaybe true (liftA2 (==:) k k')
518− recover (TheseTable mma@(MaybeTable _ ma) mmb@(MaybeTable _ mb)) =
519− case extract ma of
520− Nothing -> extract mb
521− Just a -> case extract mb of
522− Nothing -> extract ma
523− Just b -> case a <$ mma <|>: b <$ mmb of
524− MaybeTable _ c -> pure (extract c)
525−
526−
527−-- | Performs a @NATURAL LEFT OUTER JOIN@ based on the common key columns.
528−--
529−-- Analogous to 'Data.Semialign.rpadZip'.
530−--
531−-- Note that you can achieve the same effect with 'optional' and the
532−-- 'Applicative' instance for 'Tabulation', i.e., this is just
533−-- @\left right -> liftA2 (,) left (optional right). You can also
534−-- use @do@-notation.
229+alignWith f kas kbs = do
230+ as <- toQuery kas
231+ bs <- toQuery kbs
232+ fromQuery $ do
233+ tkab <- alignBy (\(l, _) (m, _) -> l ==: m) as bs
234+ let
235+ k' = theseTable fst fst (const fst) tkab
236+ tab = bimap snd snd tkab
237+ pure (k', f tab)
238+
239+
240+-- | If 'zip' makes an @INNER JOIN@, then 'leftAlign' makes a @LEFT JOIN@.
241+-- This means it will return at least one row for every row in the left
242+-- 'Tabulation', even if there is no corresponding row in the right (hence the
243+-- 'Rel8.MaybeTable').
244+--
245+-- Analagous to
246+-- [@rpadZip@](https://hackage.haskell.org/package/semialign/docs/Data-Semialign.html#v:rpadZip).
535247leftAlign :: EqTable k
536− => Tabulation k a -> Tabulation k b -> Tabulation k (a, MaybeTable Expr b)
248+ => Tabulation k a -> Tabulation k b -> Tabulation k (a, MaybeTable b)
537249leftAlign = leftAlignWith (,)
538250
539251
540−-- | Performs a @NATURAL LEFT OUTER JOIN@ based on the common key columns.
252+-- | See 'zipWith' and 'leftAlign'.
541253--
542−-- Analogous to 'Data.Semialign.rpadZipWith'.
543−--
544−-- Note that you can achieve the same effect with 'optional' and the
545−-- 'Applicative' instance for 'Tabulation', i.e., this is just
546−-- @\f left right -> liftA2 f left (optional right). You can also
547−-- use @do@-notation.
254+-- Analagous to
255+-- [@rpadZipWith@](https://hackage.haskell.org/package/semialign/docs/Data-Semialign.html#v:rpadZipWith).
548256leftAlignWith :: EqTable k
549− => (a -> MaybeTable Expr b -> c)
257+ => (a -> MaybeTable b -> c)
550258 -> Tabulation k a -> Tabulation k b -> Tabulation k c
551−leftAlignWith f left right = liftA2 f left (optional right)
259+leftAlignWith f left right = liftA2 f left (optionalTabulation right)
552260
553261
554−-- | Performs a @NATURAL RIGHT OUTER JOIN@ based on the common key columns.
555−--
556−-- Analogous to 'Data.Semialign.lpadZip'.
262+-- | Analagous to
263+-- [@zip@](https://hackage.haskell.org/package/semialign/docs/Data-Semialign.html#v:zip).
557264--
558−-- Note that you can achieve the same effect with 'optional' and the
559−-- 'Applicative' instance for 'Tabulation', i.e., this is just
560−-- @\left right -> liftA2 (flip (,)) right (optional left). You can
561−-- also use @do@-notation.
562−rightAlign :: EqTable k
563− => Tabulation k a -> Tabulation k b -> Tabulation k (MaybeTable Expr a, b)
564−rightAlign = rightAlignWith (,)
565−
566−
567−-- | Performs a @NATURAL RIGHT OUTER JOIN@ based on the common key columns.
265+-- There are multiple correct ways of understanding what this does.
568266--
569−-- Analogous to 'Data.Semialign.lpadZipWith'.
267+-- You can think of it as @'Data.Map.Strict.intersectionWith'
268+-- ('Control.Applicative.liftA2' (,))@. That is, @intersect@ the two
269+-- `Tabulation`s by matching their keys together (with 'Rel8.==:'), and combine
270+-- their values (remembering that 'Tabulation' is a 'MultiMap' so that the
271+-- values are keys) by getting their cartesian product.
570272--
571−-- Note that you can achieve the same effect with 'optional' and the
572−-- 'Applicative' instance for 'Tabulation', i.e., this is just
573−-- @\f left right -> liftA2 (flip f) right (optional left). You can
574−-- also use @do@-notation.
575−rightAlignWith :: EqTable k
576− => (MaybeTable Expr a -> b -> c)
577− -> Tabulation k a -> Tabulation k b -> Tabulation k c
578−rightAlignWith f left right = liftA2 (flip f) right (optional left)
579−
580−
581−-- | Performs a @NATURAL INNER JOIN@ based on the common key columns.
273+-- You can think of it as performing a cross product of the underlying 'Query's
274+-- of the given 'Tabulation's and filtering the results for 'match'ing keys.
582275--
583−-- Analagous to 'Data.Semialign.zip'.
276+-- You can think of it as a natural join in SQL terms.
584277--
585−-- Note that you can achieve the same effect with the 'Applicative' instance
586−-- of 'Tabulation', i.e., this is just @'liftA2 (,)'@. You can also use
587−-- @do@-notation.
278+-- The size of the resulting 'Tabulation' will be \(\sum_{k} min(n_k, m_k) \)
279+-- in terms of the number of keys, but \(\sum_{k} n_k \times m_k\) in terms of
280+-- the number of values.
588281zip :: EqTable k
589282 => Tabulation k a -> Tabulation k b -> Tabulation k (a, b)
590283zip = zipWith (,)
591284
592285
593−-- | Performs a @NATURAL INNER JOIN@ based on the common key columns.
286+-- | Analagous to
287+-- [@zipWith@](https://hackage.haskell.org/package/semialign/docs/Data-Semialign.html#v:zipWith).
594288--
595−-- Analagous to 'Data.Semialign.zipWith'.
596−--
597−-- Note that you can achieve the same effect with the 'Applicative' instance
598−-- of 'Tabulation', i.e., this is just @'liftA2'@. You can also use
599−-- @do@-notation.
289+-- See 'zip'.
600290zipWith :: EqTable k
601291 => (a -> b -> c) -> Tabulation k a -> Tabulation k b -> Tabulation k c
602292zipWith = liftA2
603293
604294
605−-- | Performs a [@NATURAL SEMI JOIN@](https://en.wikipedia.org/wiki/Relational_algebra#Semijoin_%28%E2%8B%89%29%28%E2%8B%8A%29)
606−-- based on the common key columns.
295+-- | 'similarity' returns all the entries in the left 'Tabulation' that have a
296+-- corresponding entry in the right 'Tabulation'. This corresponds to a
297+-- semijoin in relational algebra.
607298--
608−-- The result is a subset of the left tabulation where only entries which have
609−-- a corresponding entry in the right tabulation are kept.
299+-- This differs from @'zipWith' const x y@ when the right 'Tabulation' @y@
300+-- contains an entry with multiple rows. For 'similarity', the entries in the
301+-- resulting 'Tabulation' will contain the same number of rows as their
302+-- respective entries in the left 'Tabulation' @x@. With `zipWith const x y`,
303+-- each entry would contain the /product/ of the number of rows of their
304+-- respective entries in @x@ and @y@.
610305--
611−-- Note that you can achieve a similar effect with 'present' and the
612−-- 'Applicative' instance of 'Tabulation', i.e., this is just
613−-- @\left right -> left <* present right@. You can also use
614−-- @do@-notation.
306+-- See 'Rel8.with'.
615307similarity :: EqTable k => Tabulation k a -> Tabulation k b -> Tabulation k a
616−similarity a b = a <* present b
308+similarity kas kbs = do
309+ as <- toQuery kas
310+ bs <- toQuery kbs
311+ fromQuery $ as >>= withBy (\(k, _) (l, _) -> k ==: l) bs
617312
618313
619−-- | Performs a [@NATURAL ANTI JOIN@](https://en.wikipedia.org/wiki/Relational_algebra#Antijoin_%28%E2%96%B7%29)
620−-- based on the common key columns.
621−--
622−-- The result is a subset of the left tabulation where only entries which do
623−-- not have a corresponding entry in the right tabulation are kept.
314+-- | 'difference' returns all the entries in the left 'Tabulation' that don't
315+-- exist in the right 'Tabulation'. This corresponds to an antijoin in
316+-- relational algebra.
624317--
625−-- Note that you can achieve a similar effect with 'absent' and the
626−-- 'Applicative' instance of 'Tabulation', i.e., this is just
627−-- @\left right -> left <* absent right@. You can also use
628−-- @do@-notation.
318+-- See 'Rel8.without'.
629319difference :: EqTable k => Tabulation k a -> Tabulation k b -> Tabulation k a
630−difference a b = a <* absent b
320+difference kas kbs = do
321+ as <- toQuery kas
322+ bs <- toQuery kbs
323+ fromQuery $ as >>= withoutBy (\(k, _) (l, _) -> k ==: l) bs
324+
325+
326+aggregateTabulation :: EqTable k
327+ => Tabulation k (Aggregate a) -> Tabulation k a
328+aggregateTabulation kas = do
329+ as <- toQuery kas
330+ fromQuery $ aggregate $ bitraverse1 groupBy id <$> as
331+
332+
333+optionalTabulation :: EqTable k
334+ => Tabulation k a -> Tabulation k (MaybeTable a)
335+optionalTabulation as = Tabulation $ \k -> do
336+ ma <- optional $ lookup k as
337+ pure (Just k, ma)
338+
339+
340+manyTabulation :: (EqTable k, Table Expr a)
341+ => Tabulation k a -> Tabulation k (ListTable a)
342+manyTabulation =
343+ fmap (maybeTable mempty id) .
344+ optionalTabulation .
345+ aggregateTabulation .
346+ fmap listAgg
347+
348+
349+someTabulation :: (EqTable k, Table Expr a)
350+ => Tabulation k a -> Tabulation k (NonEmptyTable a)
351+someTabulation = aggregateTabulation . fmap nonEmptyAgg
631352
632353
633−-- | 'Tabulation's can be produced with either 'fromQuery' or 'liftQuery', and
634−-- in some cases we might want to treat these differently. 'peek' uses
635−-- 'unsafePeekQuery' to determine which type of 'Tabulation' we have.
636−peek :: Tabulation k a -> Tabulation k (Either (Query a) (Query (k, a)))
637−peek (Tabulation f) = Tabulation $ \p ->
638− pure $ (empty,) $ case unsafePeekQuery (f p) of
639− (Nothing, _) -> Left $ fmap snd (f p)
640− (Just _, _) -> Right $ fmap (first fromJust) (f p)
354+toQuery :: Tabulation k a -> Tabulation k (Query (k, a))
355+toQuery (Tabulation as) = Tabulation $ \k ->
356+ pure (Nothing, first (fromMaybe k) <$> as k)
src/Rel8/Type.hs+8−9
@@ -1,4 +1,3 @@
1−{-# language FlexibleContexts #-}
21{-# language FlexibleInstances #-}
32{-# language MonoLocalBinds #-}
43{-# language MultiWayIf #-}
@@ -128,10 +127,10 @@ instance DBType Int64 where
128127instance DBType Float where
129128 typeInformation = TypeInformation
130129 { encode = \x -> Opaleye.ConstExpr
131− if | x == (1 / 0) -> Opaleye.OtherLit "'Infinity'"
132− | isNaN x -> Opaleye.OtherLit "'NaN'"
133− | x == (-1 / 0) -> Opaleye.OtherLit "'-Infinity'"
134− | otherwise -> Opaleye.NumericLit $ realToFrac x
130+ if | x == (1 /0) -> Opaleye.OtherLit "'Infinity'"
131+ | isNaN x -> Opaleye.OtherLit "'NaN'"
132+ | x == (-1/0) -> Opaleye.OtherLit "'-Infinity'"
133+ | otherwise -> Opaleye.NumericLit $ realToFrac x
135134 , decode = Hasql.float4
136135 , typeName = "float4"
137136 }
@@ -141,10 +140,10 @@ instance DBType Float where
141140instance DBType Double where
142141 typeInformation = TypeInformation
143142 { encode = \x -> Opaleye.ConstExpr
144− if | x == (1 / 0) -> Opaleye.OtherLit "'Infinity'"
145− | isNaN x -> Opaleye.OtherLit "'NaN'"
146− | x == (-1 / 0) -> Opaleye.OtherLit "'-Infinity'"
147− | otherwise -> Opaleye.NumericLit $ realToFrac x
143+ if | x == (1 /0) -> Opaleye.OtherLit "'Infinity'"
144+ | isNaN x -> Opaleye.OtherLit "'NaN'"
145+ | x == (-1/0) -> Opaleye.OtherLit "'-Infinity'"
146+ | otherwise -> Opaleye.NumericLit $ realToFrac x
148147 , decode = Hasql.float8
149148 , typeName = "float8"
150149 }
src/Rel8/Type/Array.hs+26−46
@@ -1,13 +1,12 @@
11{-# language GADTs #-}
2−{-# language LambdaCase #-}
32{-# language NamedFieldPuns #-}
43{-# language OverloadedStrings #-}
5−{-# language ViewPatterns #-}
64
75module Rel8.Type.Array
8− ( array, encodeArrayElement, extractArrayElement
6+ ( array
97 , listTypeInformation
108 , nonEmptyTypeInformation
9+ , fromPrimArray, toPrimArray, zipPrimArraysWith
1110 )
1211where
1312
@@ -29,9 +28,10 @@ import Rel8.Type.Information ( TypeInformation(..), parseTypeInformation )
2928
3029array :: Foldable f
3130 => TypeInformation a -> f Opaleye.PrimExpr -> Opaleye.PrimExpr
32−array info =
33− Opaleye.CastExpr (arrayType info <> "[]") .
34− Opaleye.ArrayExpr . map (encodeArrayElement info) . toList
31+array TypeInformation {typeName} =
32+ fromPrimArray .
33+ Opaleye.CastExpr (typeName <> "[]") .
34+ Opaleye.ArrayExpr . toList
3535{-# INLINABLE array #-}
3636
3737
@@ -39,23 +39,19 @@ listTypeInformation :: ()
3939 => Nullity a
4040 -> TypeInformation (Unnullify a)
4141 -> TypeInformation [a]
42−listTypeInformation nullity info@TypeInformation {encode, decode} =
43− TypeInformation
44− { decode = case nullity of
45− Null ->
46− Hasql.listArray (decodeArrayElement info (Hasql.nullable decode))
47− NotNull ->
48− Hasql.listArray (decodeArrayElement info (Hasql.nonNullable decode))
49− , encode = case nullity of
50− Null ->
51− Opaleye.ArrayExpr .
52− fmap (encodeArrayElement info . maybe null encode)
53− NotNull ->
54− Opaleye.ArrayExpr .
55− fmap (encodeArrayElement info . encode)
56− , typeName = arrayType info <> "[]"
57− }
42+listTypeInformation nullity info =
43+ case info of
44+ TypeInformation{ encode, decode } -> TypeInformation
45+ { decode = row $ case nullity of
46+ Null -> Hasql.listArray (Hasql.nullable decode)
47+ NotNull -> Hasql.listArray (Hasql.nonNullable decode)
48+ , encode = case nullity of
49+ Null -> array info . fmap (maybe null encode)
50+ NotNull -> array info . fmap encode
51+ , typeName = "record"
52+ }
5853 where
54+ row = Hasql.composite . Hasql.field . Hasql.nonNullable
5955 null = Opaleye.ConstExpr Opaleye.NullLit
6056
6157
@@ -70,31 +66,15 @@ nonEmptyTypeInformation nullity =
7066 message = "failed to decode NonEmptyList: got empty list"
7167
7268
73−isArray :: TypeInformation a -> Bool
74−isArray = \case
75− (reverse . typeName -> ']' : '[' : _) -> True
76− _ -> False
69+fromPrimArray :: Opaleye.PrimExpr -> Opaleye.PrimExpr
70+fromPrimArray = Opaleye.UnExpr (Opaleye.UnOpOther "ROW")
7771
7872
79−arrayType :: TypeInformation a -> String
80−arrayType info
81− | isArray info = "record"
82− | otherwise = typeName info
73+toPrimArray :: Opaleye.PrimExpr -> Opaleye.PrimExpr
74+toPrimArray a = Opaleye.CompositeExpr a "f1"
8375
8476
85−decodeArrayElement :: TypeInformation a -> Hasql.NullableOrNot Hasql.Value x -> Hasql.NullableOrNot Hasql.Value x
86−decodeArrayElement info
87− | isArray info = Hasql.nonNullable . Hasql.composite . Hasql.field
88− | otherwise = id
89−
90−
91−encodeArrayElement :: TypeInformation a -> Opaleye.PrimExpr -> Opaleye.PrimExpr
92−encodeArrayElement info
93− | isArray info = Opaleye.UnExpr (Opaleye.UnOpOther "ROW")
94− | otherwise = id
95−
96−
97−extractArrayElement :: TypeInformation a -> Opaleye.PrimExpr -> Opaleye.PrimExpr
98−extractArrayElement info
99− | isArray info = flip Opaleye.CompositeExpr "f1"
100− | otherwise = id
77+zipPrimArraysWith :: ()
78+ => (Opaleye.PrimExpr -> Opaleye.PrimExpr -> Opaleye.PrimExpr)
79+ -> Opaleye.PrimExpr -> Opaleye.PrimExpr -> Opaleye.PrimExpr
80+zipPrimArraysWith f a b = fromPrimArray (f (toPrimArray a) (toPrimArray b))
src/Rel8/Type/Array1D.hsnew file+139
@@ -0,0 +1,139 @@
1+{-# language DataKinds #-}
2+{-# language DeriveTraversable #-}
3+{-# language DerivingStrategies #-}
4+{-# language FlexibleContexts #-}
5+{-# language FlexibleInstances #-}
6+{-# language GeneralizedNewtypeDeriving #-}
7+{-# language NamedFieldPuns #-}
8+{-# language StandaloneKindSignatures #-}
9+{-# language TypeFamilies #-}
10+{-# language UndecidableInstances #-}
11+
12+{-# options_ghc -fno-warn-redundant-constraints #-}
13+
14+module Rel8.Type.Array1D
15+ ( Array1D( Array1D )
16+ , NotArray
17+ , getArray1D
18+ )
19+where
20+
21+-- aeson
22+import Data.Aeson
23+ ( ToJSON
24+ , ToJSON1
25+ , ToJSONKey
26+ , FromJSON
27+ , FromJSON1
28+ , FromJSONKey
29+ )
30+
31+-- base
32+import Control.Applicative ( Alternative, (<|>) )
33+import Control.Monad ( MonadPlus )
34+import Data.Functor.Classes ( Eq1, Ord1, Read1, Show1 )
35+import Data.Kind ( Type )
36+import GHC.Exts ( IsList )
37+import Prelude hiding ( null )
38+
39+-- hasql
40+import qualified Hasql.Decoders as Hasql
41+
42+-- opaleye
43+import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
44+
45+-- rel8
46+import Rel8.Expr.Opaleye ( zipPrimExprsWith )
47+import Rel8.Expr.Serialize ( litExpr )
48+import Rel8.Schema.Null ( Unnullify, Nullity( Null, NotNull ), Sql, nullable )
49+import Rel8.Type ( DBType, typeInformation )
50+import Rel8.Type.Eq ( DBEq )
51+import Rel8.Type.Information ( TypeInformation(..) )
52+import Rel8.Type.Monoid ( DBMonoid, memptyExpr )
53+import Rel8.Type.Ord ( DBMax, DBMin, DBOrd )
54+import Rel8.Type.Semigroup ( DBSemigroup, (<>.) )
55+
56+-- semigroupoids
57+import Data.Functor.Alt ( Alt, (<!>) )
58+import Data.Functor.Apply ( Apply )
59+import Data.Functor.Bind ( Bind )
60+import Data.Functor.Plus ( Plus )
61+
62+-- semialign
63+import Data.Align ( Align )
64+import Data.Semialign ( Semialign )
65+import Data.Zip ( Repeat, Unzip, Zip )
66+
67+
68+-- | A one dimensional array.
69+newtype Array1D a = Array1D [a]
70+ deriving stock Traversable
71+ deriving newtype
72+ ( Eq, Ord, Read, Show, Semigroup, Monoid, IsList
73+ , Functor, Foldable
74+ , Eq1, Ord1, Read1, Show1
75+ , FromJSON1, ToJSON1, FromJSON, FromJSONKey, ToJSON, ToJSONKey
76+ , Apply, Applicative, Alternative, Plus, Bind, Monad, MonadPlus
77+ , Align, Semialign, Repeat, Unzip, Zip
78+ )
79+
80+
81+instance Alt Array1D where
82+ (<!>) = (<|>)
83+
84+
85+getArray1D :: Array1D a -> [a]
86+getArray1D (Array1D a) = a
87+
88+
89+type IsArray1D :: Type -> Bool
90+type family IsArray1D a where
91+ IsArray1D (Array1D _) = 'True
92+ IsArray1D _ = 'False
93+
94+
95+class IsArray1D a ~ 'False => NotArray a
96+instance IsArray1D a ~ 'False => NotArray a
97+
98+
99+array1DTypeInformation :: Sql NotArray a
100+ => Nullity a
101+ -> TypeInformation (Unnullify a)
102+ -> TypeInformation (Array1D a)
103+array1DTypeInformation nullity info =
104+ case info of
105+ TypeInformation{ encode, decode, typeName } -> TypeInformation
106+ { decode = case nullity of
107+ Null -> Array1D <$> Hasql.listArray (Hasql.nullable decode)
108+ NotNull -> Array1D <$> Hasql.listArray (Hasql.nonNullable decode)
109+ , encode = case nullity of
110+ Null -> Opaleye.ArrayExpr . fmap (maybe null encode) . getArray1D
111+ NotNull -> Opaleye.ArrayExpr . fmap encode . getArray1D
112+ , typeName = typeName <> "[]"
113+ }
114+ where
115+ null = Opaleye.ConstExpr Opaleye.NullLit
116+
117+
118+instance (Sql DBType a, Sql NotArray a) => DBType (Array1D a) where
119+ typeInformation = array1DTypeInformation nullable typeInformation
120+
121+
122+instance (Sql DBEq a, Sql NotArray a) => DBEq (Array1D a)
123+
124+
125+instance (Sql DBOrd a, Sql NotArray a) => DBOrd (Array1D a)
126+
127+
128+instance (Sql DBMax a, Sql NotArray a) => DBMax (Array1D a)
129+
130+
131+instance (Sql DBMin a, Sql NotArray a) => DBMin (Array1D a)
132+
133+
134+instance (Sql DBType a, Sql NotArray a) => DBSemigroup (Array1D a) where
135+ (<>.) = zipPrimExprsWith (Opaleye.BinExpr (Opaleye.:||))
136+
137+
138+instance (Sql DBType a, Sql NotArray a) => DBMonoid (Array1D a) where
139+ memptyExpr = litExpr mempty
src/Rel8/Type/Composite.hs+19−34
@@ -20,7 +20,6 @@ where
2020
2121-- base
2222import Data.Functor.Const ( Const( Const ), getConst )
23−import Data.Functor.Identity ( Identity( Identity ) )
2423import Data.Kind ( Constraint, Type )
2524import Prelude
2625
@@ -31,19 +30,19 @@ import qualified Hasql.Decoders as Hasql
3130import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
3231
3332-- rel8
34−import Rel8.Expr ( Expr )
33+import Rel8.Expr ( Col( DB ), Expr )
3534import Rel8.Expr.Opaleye ( castExpr, fromPrimExpr, toPrimExpr )
36−import Rel8.Schema.HTable ( HTable, hfield, hspecs, htabulate, htabulateA )
37−import Rel8.Schema.Name ( Name( Name ) )
35+import Rel8.Schema.HTable ( hfield, hspecs, htabulate, htabulateA )
36+import Rel8.Schema.Name ( Col( NameCol ), Name )
3837import Rel8.Schema.Null ( Nullity( Null, NotNull ) )
39−import Rel8.Schema.Result ( Result )
40−import Rel8.Schema.Spec ( Spec( Spec, nullity, info ) )
41−import Rel8.Table ( fromColumns, toColumns, fromResult, toResult )
38+import Rel8.Schema.Result ( Col( Result ), Result )
39+import Rel8.Schema.Spec ( SSpec( SSpec, nullity, info ) )
40+import Rel8.Table ( Table, fromColumns, toColumns )
4241import Rel8.Table.Eq ( EqTable )
43−import Rel8.Table.HKD ( HKD, HKDable )
42+import Rel8.Table.HKD ( HKD, HKDable, fromHKD, toHKD )
4443import Rel8.Table.Ord ( OrdTable )
4544import Rel8.Table.Rel8able ()
46−import Rel8.Table.Serialize ( litHTable )
45+import Rel8.Table.Serialize ( lit )
4746import Rel8.Type ( DBType, typeInformation )
4847import Rel8.Type.Eq ( DBEq )
4948import Rel8.Type.Information ( TypeInformation(..) )
@@ -68,8 +67,8 @@ newtype Composite a = Composite
6867
6968instance DBComposite a => DBType (Composite a) where
7069 typeInformation = TypeInformation
71− { decode = Hasql.composite (Composite . fromResult @_ @(HKD a Expr) <$> decoder)
72− , encode = encoder . litHTable . toResult @_ @(HKD a Expr) . unComposite
70+ { decode = Hasql.composite (Composite . fromHKD <$> decoder)
71+ , encode = encoder . lit . toColumns . toHKD . unComposite
7372 , typeName = compositeTypeName @a
7473 }
7574
@@ -86,50 +85,36 @@ instance (DBComposite a, OrdTable (HKD a Expr)) => DBMax (Composite a)
8685instance (DBComposite a, OrdTable (HKD a Expr)) => DBMin (Composite a)
8786
8887
89−-- | 'DBComposite' is used to associate composite type metadata with a Haskell
90−-- type.
9188type DBComposite :: Type -> Constraint
9289class (DBType a, HKDable a) => DBComposite a where
93− -- | The names of all fields in the composite type that @a@ maps to.
9490 compositeFields :: HKD a Name
95−
96− -- | The name of the composite type that @a@ maps to.
9791 compositeTypeName :: String
9892
9993
100−-- | Collapse a 'HKD' into a PostgreSQL composite type.
101−--
102−-- 'HKD' values are represented in queries by having a column for each field in
103−-- the corresponding Haskell type. 'compose' collapses these columns into a
104−-- single column expression, by combining them into a PostgreSQL composite
105−-- type.
10694compose :: DBComposite a => HKD a Expr -> Expr a
107−compose = castExpr . fromPrimExpr . encoder . toColumns
95+compose = castExpr . fromPrimExpr . encoder
10896
10997
110−-- | Expand a composite type into a 'HKD'.
111−--
112−-- 'decompose' is the inverse of 'compose'.
11398decompose :: forall a. DBComposite a => Expr a -> HKD a Expr
11499decompose (toPrimExpr -> a) = fromColumns $ htabulate \field ->
115100 case hfield names field of
116− Name name -> case hfield hspecs field of
117− Spec {} -> fromPrimExpr $ Opaleye.CompositeExpr a name
101+ NameCol name -> case hfield hspecs field of
102+ SSpec {} -> DB $ fromPrimExpr $ Opaleye.CompositeExpr a name
118103 where
119104 names = toColumns (compositeFields @a)
120105
121106
122−decoder :: HTable t => Hasql.Composite (t Result)
123−decoder = unwrapApplicative $ htabulateA \field ->
107+decoder :: Table Result a => Hasql.Composite a
108+decoder = fmap fromColumns $ unwrapApplicative $ htabulateA \field ->
124109 case hfield hspecs field of
125− Spec {nullity, info} -> WrapApplicative $ Identity <$>
110+ SSpec {nullity, info} -> WrapApplicative $ Result <$>
126111 case nullity of
127112 Null -> Hasql.field $ Hasql.nullable $ decode info
128113 NotNull -> Hasql.field $ Hasql.nonNullable $ decode info
129114
130115
131−encoder :: HTable t => t Expr -> Opaleye.PrimExpr
132−encoder a = Opaleye.FunExpr "ROW" exprs
116+encoder :: Table Expr a => a -> Opaleye.PrimExpr
117+encoder (toColumns -> a) = Opaleye.FunExpr "ROW" exprs
133118 where
134119 exprs = getConst $ htabulateA \field -> case hfield a field of
135− expr -> Const [toPrimExpr expr]
120+ DB (toPrimExpr -> expr) -> Const [expr]
src/Rel8/Type/Enum.hs−8
@@ -91,22 +91,14 @@ instance DBEnum a => DBMax (Enum a)
9191instance DBEnum a => DBMin (Enum a)
9292
9393
94−-- | @DBEnum@ contains the necessary metadata to describe a PostgreSQL @enum@ type.
9594type DBEnum :: Type -> Constraint
9695class (DBType a, Enumable a) => DBEnum a where
97− -- | Map Haskell values to the corresponding element of the @enum@ type. The
98− -- default implementation of this method will use the exact name of the
99− -- Haskell constructors.
10096 enumValue :: a -> String
10197 enumValue = gshow @(Rep a) . from
10298
103− -- | The name of the PostgreSQL @enum@ type that @a@ maps to.
10499 enumTypeName :: String
105100
106101
107−-- | Types that are sum types, where each constructor is unary (that is, has no
108−-- fields).
109−type Enumable :: Type -> Constraint
110102class (Generic a, GEnumable (Rep a)) => Enumable a
111103instance (Generic a, GEnumable (Rep a)) => Enumable a
112104
src/Rel8/Type/JSONBEncoded.hs−4
@@ -1,5 +1,3 @@
1−{-# language StandaloneKindSignatures #-}
2−
31module Rel8.Type.JSONBEncoded ( JSONBEncoded(..) ) where
42
53-- aeson
@@ -8,7 +6,6 @@ import Data.Aeson.Types ( parseEither )
86
97-- base
108import Data.Bifunctor ( first )
11−import Data.Kind ( Type )
129import Prelude
1310
1411-- hasql
@@ -23,7 +20,6 @@ import Data.Text ( pack )
2320
2421
2522-- | Like 'Rel8.JSONEncoded', but works for @jsonb@ columns.
26−type JSONBEncoded :: Type -> Type
2723newtype JSONBEncoded a = JSONBEncoded { fromJSONBEncoded :: a }
2824
2925
src/Rel8/Type/JSONEncoded.hs−4
@@ -1,5 +1,3 @@
1−{-# language StandaloneKindSignatures #-}
2−
31module Rel8.Type.JSONEncoded ( JSONEncoded(..) ) where
42
53-- aeson
@@ -7,7 +5,6 @@ import Data.Aeson ( FromJSON, ToJSON, parseJSON, toJSON )
75import Data.Aeson.Types ( parseEither )
86
97-- base
10−import Data.Kind ( Type )
118import Prelude
129
1310-- rel8
@@ -18,7 +15,6 @@ import Rel8.Type.Information ( parseTypeInformation )
1815-- | A deriving-via helper type for column types that store a Haskell value
1916-- using a JSON encoding described by @aeson@'s 'ToJSON' and 'FromJSON' type
2017-- classes.
21−type JSONEncoded :: Type -> Type
2218newtype JSONEncoded a = JSONEncoded { fromJSONEncoded :: a }
2319
2420
src/Rel8/Type/Monoid.hs+2−2
@@ -27,7 +27,7 @@ import Data.CaseInsensitive ( CI )
2727import {-# SOURCE #-} Rel8.Expr ( Expr )
2828import Rel8.Expr.Array ( sempty )
2929import Rel8.Expr.Serialize ( litExpr )
30−import Rel8.Schema.Null ( Sql )
30+import Rel8.Schema.Null ( Sql, nullable )
3131import Rel8.Type ( DBType, typeInformation )
3232import Rel8.Type.Semigroup ( DBSemigroup )
3333
@@ -48,7 +48,7 @@ class DBSemigroup a => DBMonoid a where
4848
4949
5050instance Sql DBType a => DBMonoid [a] where
51− memptyExpr = sempty typeInformation
51+ memptyExpr = sempty nullable typeInformation
5252
5353
5454instance DBMonoid CalendarDiffTime where
src/Rel8/Type/Num.hs+1−4
@@ -18,7 +18,6 @@ import Prelude
1818
1919-- rel8
2020import Rel8.Type ( DBType )
21−import Rel8.Type.Ord ( DBOrd )
2221
2322-- scientific
2423import Data.Scientific ( Scientific )
@@ -40,14 +39,13 @@ instance DBNum Scientific
4039-- expressions. This is a Rel8 concept, and allows us to provide
4140-- 'fromIntegral'.
4241type DBIntegral :: Type -> Constraint
43−class (DBNum a, DBOrd a) => DBIntegral a
42+class DBNum a => DBIntegral a
4443instance DBIntegral Int16
4544instance DBIntegral Int32
4645instance DBIntegral Int64
4746
4847
4948-- | The class of database types that support the @/@ operator.
50−type DBFractional :: Type -> Constraint
5149class DBNum a => DBFractional a
5250instance DBFractional Float
5351instance DBFractional Double
@@ -55,7 +53,6 @@ instance DBFractional Scientific
5553
5654
5755-- | The class of database types that support the @/@ operator.
58−type DBFloating :: Type -> Constraint
5956class DBFractional a => DBFloating a
6057instance DBFloating Float
6158instance DBFloating Double
src/Rel8/Type/Ord.hs+2
@@ -75,6 +75,7 @@ instance Sql DBOrd a => DBOrd (NonEmpty a)
7575-- | The class of database types that support the @max@ aggregation function.
7676type DBMax :: Type -> Constraint
7777class DBOrd a => DBMax a
78+instance DBMax Bool
7879instance DBMax Char
7980instance DBMax Int16
8081instance DBMax Int32
@@ -100,6 +101,7 @@ instance Sql DBMax a => DBMax (NonEmpty a)
100101-- | The class of database types that support the @min@ aggregation function.
101102type DBMin :: Type -> Constraint
102103class DBOrd a => DBMin a
104+instance DBMin Bool
103105instance DBMin Char
104106instance DBMin Int16
105107instance DBMin Int32
src/Rel8/Type/ReadShow.hs−3
@@ -1,12 +1,10 @@
11{-# language ScopedTypeVariables #-}
2−{-# language StandaloneKindSignatures #-}
32{-# language TypeApplications #-}
43{-# language ViewPatterns #-}
54
65module Rel8.Type.ReadShow ( ReadShow(..) ) where
76
87-- base
9−import Data.Kind ( Type )
108import Data.Proxy ( Proxy( Proxy ) )
119import Data.Typeable ( Typeable, typeRep )
1210import Prelude
@@ -22,7 +20,6 @@ import qualified Data.Text as Text
2220
2321-- | A deriving-via helper type for column types that store a Haskell value
2422-- using a Haskell's 'Read' and 'Show' type classes.
25−type ReadShow :: Type -> Type
2623newtype ReadShow a = ReadShow { fromReadShow :: a }
2724
2825
src/Rel8/Type/Semigroup.hs+7−4
@@ -13,9 +13,10 @@ module Rel8.Type.Semigroup
1313where
1414
1515-- base
16+import Data.Function ( on )
1617import Data.Kind ( Constraint, Type )
1718import Data.List.NonEmpty ( NonEmpty )
18−import Prelude ()
19+import Prelude
1920
2021-- bytestring
2122import Data.ByteString ( ByteString )
@@ -29,10 +30,10 @@ import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
2930
3031-- rel8
3132import {-# SOURCE #-} Rel8.Expr ( Expr )
32−import Rel8.Expr.Array ( sappend, sappend1 )
3333import Rel8.Expr.Opaleye ( zipPrimExprsWith )
3434import Rel8.Schema.Null ( Sql )
3535import Rel8.Type ( DBType )
36+import Rel8.Type.Array ( fromPrimArray, toPrimArray )
3637
3738-- text
3839import Data.Text ( Text )
@@ -52,11 +53,13 @@ class DBType a => DBSemigroup a where
5253
5354
5455instance Sql DBType a => DBSemigroup [a] where
55− (<>.) = sappend
56+ (<>.) = zipPrimExprsWith do
57+ (fromPrimArray .) . Opaleye.BinExpr (Opaleye.:||) `on` toPrimArray
5658
5759
5860instance Sql DBType a => DBSemigroup (NonEmpty a) where
59− (<>.) = sappend1
61+ (<>.) = zipPrimExprsWith do
62+ (fromPrimArray .) . Opaleye.BinExpr (Opaleye.:||) `on` toPrimArray
6063
6164
6265instance DBSemigroup CalendarDiffTime where
src/Rel8/Type/Tag.hs+1−2
@@ -21,7 +21,7 @@ import Prelude
2121import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
2222
2323-- rel8
24−import Rel8.Expr ( Expr )
24+import {-# SOURCE #-} Rel8.Expr ( Expr )
2525import Rel8.Expr.Eq ( (==.) )
2626import Rel8.Expr.Opaleye ( zipPrimExprsWith )
2727import Rel8.Expr.Serialize ( litExpr )
@@ -90,7 +90,6 @@ instance DBMonoid MaybeTag where
9090 memptyExpr = litExpr mempty
9191
9292
93−type Tag :: Type
9493newtype Tag = Tag Text
9594 deriving newtype
9695 ( Eq, Ord, Read, Show
src/Rel8/Window.hsdeleted−97
@@ -1,97 +0,0 @@
1−{-# language DerivingVia #-}
2−{-# language FlexibleContexts #-}
3−{-# language GeneralizedNewtypeDeriving #-}
4−{-# language ScopedTypeVariables #-}
5−{-# language StandaloneKindSignatures #-}
6−{-# language TypeApplications #-}
7−
8−module Rel8.Window
9− ( Window(..)
10− , Partition
11− , over
12− , partitionBy
13− , orderPartitionBy
14− )
15−where
16−
17−-- base
18−import Data.Functor.Const ( Const( Const ), getConst )
19−import Data.Functor.Contravariant ( Contravariant, contramap )
20−import Data.Kind ( Type )
21−import Prelude
22−
23−-- opaleye
24−import qualified Opaleye.Internal.Window as Opaleye
25−import qualified Opaleye.Internal.PackMap as Opaleye
26−
27−-- profunctors
28−import Data.Profunctor ( Profunctor )
29−
30−-- product-profunctors
31−import Data.Profunctor.Product ( ProductProfunctor, (****), purePP )
32−
33−-- rel8
34−import Rel8.Expr.Opaleye ( toColumn, toPrimExpr )
35−import Rel8.Order( Order( Order ) )
36−import Rel8.Schema.HTable ( hfield, htabulateA )
37−import Rel8.Table ( Columns, toColumns )
38−import Rel8.Table.Eq ( EqTable )
39−
40−-- semigroupoids
41−import Data.Functor.Apply ( Apply, WrappedApplicative(..) )
42−
43−
44−-- | 'Window' is an applicative functor that represents expressions that
45−-- contain
46−-- [window functions](https://www.postgresql.org/docs/current/tutorial-window.html).
47−-- 'Rel8.Query.Window.window' can be used to
48−-- evaluate these expressions over a particular query.
49−type Window :: Type -> Type -> Type
50−newtype Window a b = Window (Opaleye.Windows a b)
51− deriving newtype (Profunctor)
52− deriving newtype (Functor, Applicative)
53− deriving (Apply) via (WrappedApplicative (Window a))
54−
55−
56−instance ProductProfunctor Window where
57− purePP = pure
58− (****) = (<*>)
59−
60−
61−-- | In PostgreSQL, window functions must specify the \"window\" or
62−-- \"partition\" over which they operate. The syntax for this looks like:
63−-- @SUM(salary) OVER (PARTITION BY department)@. The Rel8 type 'Partition'
64−-- represents everything that comes after @OVER@.
65−--
66−-- 'Partition' is a 'Monoid', so 'Window's created with 'partitionBy' and
67−-- 'orderWindowBy' can be combined using '<>'.
68−type Partition :: Type -> Type
69−newtype Partition a = Partition (Opaleye.Window a)
70− deriving newtype (Contravariant, Semigroup, Monoid)
71−
72−
73−-- | 'over' adds a 'Partition' to a 'Window' expression.
74−--
75−-- @@@
76−-- 'Rel8.Table.Window.cumulative' ('Rel8.Expr.Aggregate.sum' . salary) `over` 'partitionBy' department <> 'orderPartitionBy' (salary >$< 'Rel8.desc')
77−-- @@@
78−over :: Window a b -> Partition a -> Window a b
79−over (Window (Opaleye.Windows (Opaleye.PackMap w))) (Partition p) =
80− Window $ Opaleye.Windows $ Opaleye.PackMap $ \f ->
81− w (\(o, p') -> f (o, p' <> p))
82−infixl 1 `over`
83−
84−
85−-- | Restricts a window function to operate only the group of rows that share
86−-- the same value(s) for the given expression(s).
87−partitionBy :: forall b a. EqTable b => (a -> b) -> Partition a
88−partitionBy f =
89− Partition $ contramap (toColumns . f) $ getConst $
90− htabulateA @(Columns b) $ \field ->
91− Const $ Opaleye.partitionBy (toColumn . toPrimExpr . (`hfield` field))
92−
93−
94−-- | Controls the order in which rows are processed by window functions. This
95−-- does not need to match the ordering of the overall query.
96−orderPartitionBy :: Order a -> Partition a
97−orderPartitionBy (Order ordering) = Partition $ Opaleye.orderPartitionBy ordering
tests/Main.hs+159−323
@@ -1,11 +1,12 @@
1−{-# language BangPatterns #-}
21{-# language BlockArguments #-}
2+{-# language DataKinds #-}
33{-# language DeriveAnyClass #-}
44{-# language DeriveGeneric #-}
55{-# language DerivingStrategies #-}
6+{-# language DisambiguateRecordFields #-}
67{-# language FlexibleContexts #-}
78{-# language FlexibleInstances #-}
8−{-# language MonoLocalBinds #-}
9+{-# language GADTs #-}
910{-# language NamedFieldPuns #-}
1011{-# language OverloadedStrings #-}
1112{-# language RecordWildCards #-}
@@ -13,15 +14,17 @@
1314{-# language StandaloneDeriving #-}
1415{-# language TypeApplications #-}
1516
17+{-# options_ghc -fno-warn-redundant-constraints #-}
18+
1619module Main
1720 ( main
1821 )
1922where
2023
2124-- base
22−import Control.Applicative ( empty, liftA2, liftA3 )
23−import Control.Exception ( bracket, throwIO )
24−import Control.Monad ( (>=>), void )
25+import Control.Applicative ( liftA2, liftA3 )
26+import Control.Monad (void)
27+import Control.Monad.IO.Class ( MonadIO, liftIO )
2528import Data.Bifunctor ( bimap )
2629import Data.Foldable ( for_ )
2730import Data.Int ( Int32, Int64 )
@@ -35,27 +38,25 @@ import GHC.Generics ( Generic )
3538import qualified Data.ByteString.Lazy
3639
3740-- case-insensitive
38−import Data.CaseInsensitive ( mk )
41+import Data.CaseInsensitive (mk)
3942
4043-- containers
41−import Data.Containers.ListUtils ( nubOrdOn )
4244import qualified Data.Map.Strict as Map
4345
4446-- hasql
45−import Hasql.Connection ( Connection, acquire, release )
47+import Hasql.Connection ( Connection, acquire, release )
4648import Hasql.Session ( sql, run )
4749
48−-- hasql-transaction
49−import Hasql.Transaction ( Transaction, condemn, statement )
50−import qualified Hasql.Transaction.Sessions as Hasql
51−
5250-- hedgehog
5351import Hedgehog ( property, (===), forAll, cover, diff, evalM, PropertyT, TestT, test, Gen )
5452import qualified Hedgehog.Gen as Gen
5553import qualified Hedgehog.Range as Range
5654
57−-- mmorph
58−import Control.Monad.Morph ( hoist )
55+-- lifted-base
56+import Control.Exception.Lifted ( bracket, throwIO, bracket_ )
57+
58+-- monad-control
59+import Control.Monad.Trans.Control ( MonadBaseControl )
5960
6061-- rel8
6162import Rel8 ( Result )
@@ -71,16 +72,12 @@ import Test.Tasty
7172import Test.Tasty.Hedgehog ( testProperty )
7273
7374-- text
74−import Data.Text ( Text, pack, unpack )
75+import Data.Text (Text, pack)
7576import qualified Data.Text.Lazy
76−import Data.Text.Encoding ( decodeUtf8 )
7777
7878-- time
7979import Data.Time
8080
81−-- transformers
82−import Control.Monad.Trans.Class ( lift )
83−
8481-- tmp-postgres
8582import qualified Database.Postgres.Temp as TmpPostgres
8683
@@ -116,17 +113,14 @@ tests =
116113 , testCatMaybeTable getTestDatabase
117114 , testCatMaybe getTestDatabase
118115 , testMaybeTable getTestDatabase
119− , testAggregateMaybeTable getTestDatabase
120116 , testNestedTables getTestDatabase
121117 , testMaybeTableApplicative getTestDatabase
122118 , testLogicalFixities getTestDatabase
123119 , testUpdate getTestDatabase
124120 , testDelete getTestDatabase
125− , testUpsert getTestDatabase
126121 , testSelectNestedPairs getTestDatabase
127122 , testSelectArray getTestDatabase
128123 , testNestedMaybeTable getTestDatabase
129− , testEvaluate getTestDatabase
130124 ]
131125
132126 where
@@ -138,29 +132,25 @@ tests =
138132 flip run conn do
139133 sql "CREATE EXTENSION citext"
140134 sql "CREATE TABLE test_table ( column1 text not null, column2 bool not null )"
141− sql "CREATE TABLE unique_table ( \"key\" text not null unique, \"value\" text not null )"
142− sql "CREATE SEQUENCE test_seq"
143135
144136 return db
145137
146138 stopTestDatabase = TmpPostgres.stop
147139
148140
149−connect :: TmpPostgres.DB -> IO Connection
150−connect = acquire . TmpPostgres.toConnectionString >=> either (maybe empty (fail . unpack . decodeUtf8)) pure
151−
152−
153141databasePropertyTest
154142 :: TestName
155− -> ((TestT Transaction () -> PropertyT IO ()) -> PropertyT IO ())
143+ -> (((Connection -> TestT IO ()) -> PropertyT IO ()) -> PropertyT IO ())
156144 -> IO TmpPostgres.DB -> TestTree
157145databasePropertyTest testName f getTestDatabase =
158− withResource (connect =<< getTestDatabase) release $ \c ->
146+ withResource connect release $ \c ->
159147 testProperty testName $ property do
160− connection <- lift c
161− f $ test . hoist \m -> do
162− e <- run (Hasql.transaction Hasql.Serializable Hasql.Write (m <* condemn)) connection
163− either throwIO pure e
148+ connection <- liftIO c
149+ f \g -> test $ rollingBack connection $ g connection
150+
151+ where
152+
153+ connect = either (error . show) return =<< acquire . TmpPostgres.toConnectionString =<< getTestDatabase
164154
165155
166156data TestTable f = TestTable
@@ -192,17 +182,18 @@ testSelectTestTable :: IO TmpPostgres.DB -> TestTree
192182testSelectTestTable = databasePropertyTest "Can SELECT TestTable" \transaction -> do
193183 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
194184
195− transaction do
196− selected <- lift do
197− statement () $ Rel8.insert Rel8.Insert
198− { into = testTableSchema
199− , rows = Rel8.values $ map Rel8.lit rows
200− , onConflict = Rel8.DoNothing
201− , returning = pure ()
202− }
185+ transaction \connection -> do
186+ void do
187+ liftIO $ Rel8.insert connection
188+ Rel8.Insert
189+ { into = testTableSchema
190+ , rows = map (Rel8.toInsert . Rel8.lit) rows
191+ , onConflict = Rel8.DoNothing
192+ , returning = Rel8.NumberOfRowsAffected
193+ }
203194
204− statement () $ Rel8.select do
205− Rel8.each testTableSchema
195+ selected <- liftIO $ Rel8.select connection do
196+ Rel8.each testTableSchema
206197
207198 sort selected === sort rows
208199
@@ -219,12 +210,11 @@ testWhere_ = databasePropertyTest "WHERE (Rel8.where_)" \transaction -> do
219210
220211 let expected = filter (\t -> testTableColumn2 t == magicBool) rows
221212
222− transaction do
223− selected <- lift do
224− statement () $ Rel8.select do
225− t <- Rel8.values $ Rel8.lit <$> rows
226− Rel8.where_ $ testTableColumn2 t Rel8.==. Rel8.lit magicBool
227− return t
213+ transaction \connection -> do
214+ selected <- liftIO $ Rel8.select connection do
215+ t <- Rel8.values $ Rel8.lit <$> rows
216+ Rel8.where_ $ testTableColumn2 t Rel8.==. Rel8.lit magicBool
217+ return t
228218
229219 sort selected === sort expected
230220
@@ -237,12 +227,11 @@ testFilter :: IO TmpPostgres.DB -> TestTree
237227testFilter = databasePropertyTest "filter" \transaction -> do
238228 rows <- forAll $ Gen.list (Range.linear 1 10) genTestTable
239229
240− transaction do
230+ transaction \connection -> do
241231 let expected = filter testTableColumn2 rows
242232
243− selected <- lift do
244− statement () $ Rel8.select do
245− Rel8.filter testTableColumn2 =<< Rel8.values (Rel8.lit <$> rows)
233+ selected <- liftIO $ Rel8.select connection
234+ $ Rel8.filter testTableColumn2 =<< Rel8.values (Rel8.lit <$> rows)
246235
247236 sort selected === sort expected
248237
@@ -257,10 +246,9 @@ testLimit = databasePropertyTest "LIMIT (Rel8.limit)" \transaction -> do
257246
258247 n <- forAll $ Gen.integral (Range.linear 0 10)
259248
260− transaction do
261− selected <- lift do
262− statement () $ Rel8.select do
263− Rel8.limit n $ Rel8.values (Rel8.lit <$> rows)
249+ transaction \connection -> do
250+ selected <- liftIO $ Rel8.select connection do
251+ Rel8.limit n $ Rel8.values (Rel8.lit <$> rows)
264252
265253 diff (length selected) (<=) (fromIntegral n)
266254
@@ -278,10 +266,9 @@ testUnion = databasePropertyTest "UNION (Rel8.union)" \transaction -> evalM do
278266 left <- forAll $ Gen.list (Range.linear 0 10) genTestTable
279267 right <- forAll $ Gen.list (Range.linear 0 10) genTestTable
280268
281− transaction do
282− selected <- lift do
283− statement () $ Rel8.select do
284− Rel8.values (Rel8.lit <$> nub left) `Rel8.union` Rel8.values (Rel8.lit <$> nub right)
269+ transaction \connection -> do
270+ selected <- liftIO $ Rel8.select connection do
271+ Rel8.values (Rel8.lit <$> nub left) `Rel8.union` Rel8.values (Rel8.lit <$> nub right)
285272
286273 sort selected === sort (nub (left ++ right))
287274
@@ -290,11 +277,9 @@ testDistinct :: IO TmpPostgres.DB -> TestTree
290277testDistinct = databasePropertyTest "DISTINCT (Rel8.distinct)" \transaction -> do
291278 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
292279
293− transaction do
294− selected <- lift do
295− statement () $ Rel8.select do
296− Rel8.distinct do
297− Rel8.values (Rel8.lit <$> rows)
280+ transaction \connection -> do
281+ selected <- liftIO $ Rel8.select connection $ Rel8.distinct do
282+ Rel8.values (Rel8.lit <$> rows)
298283
299284 sort selected === nub (sort rows)
300285
@@ -307,10 +292,8 @@ testExists :: IO TmpPostgres.DB -> TestTree
307292testExists = databasePropertyTest "EXISTS (Rel8.exists)" \transaction -> do
308293 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
309294
310− transaction do
311− exists <- lift do
312− statement () $ Rel8.select do
313− Rel8.exists $ Rel8.values $ Rel8.lit <$> rows
295+ transaction \connection -> do
296+ exists <- liftIO $ Rel8.select connection $ Rel8.exists $ Rel8.values $ Rel8.lit <$> rows
314297
315298 case rows of
316299 [] -> exists === [False]
@@ -321,10 +304,9 @@ testOptional :: IO TmpPostgres.DB -> TestTree
321304testOptional = databasePropertyTest "Rel8.optional" \transaction -> do
322305 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
323306
324− transaction do
325− selected <- lift do
326− statement () $ Rel8.select do
327− Rel8.optional $ Rel8.values (Rel8.lit <$> rows)
307+ transaction \connection -> do
308+ selected <- liftIO $ Rel8.select connection do
309+ Rel8.optional $ Rel8.values (Rel8.lit <$> rows)
328310
329311 case rows of
330312 [] -> selected === [Nothing]
@@ -335,10 +317,9 @@ testAnd :: IO TmpPostgres.DB -> TestTree
335317testAnd = databasePropertyTest "AND (&&.)" \transaction -> do
336318 (x, y) <- forAll $ liftA2 (,) Gen.bool Gen.bool
337319
338− transaction do
339− [result] <- lift do
340− statement () $ Rel8.select do
341− pure $ Rel8.lit x Rel8.&&. Rel8.lit y
320+ transaction \connection -> do
321+ [result] <- liftIO $ Rel8.select connection $ pure $
322+ Rel8.lit x Rel8.&&. Rel8.lit y
342323
343324 result === (x && y)
344325
@@ -347,10 +328,9 @@ testOr :: IO TmpPostgres.DB -> TestTree
347328testOr = databasePropertyTest "OR (||.)" \transaction -> do
348329 (x, y) <- forAll $ liftA2 (,) Gen.bool Gen.bool
349330
350− transaction do
351− [result] <- lift do
352− statement () $ Rel8.select $ pure $
353− Rel8.lit x Rel8.||. Rel8.lit y
331+ transaction \connection -> do
332+ [result] <- liftIO $ Rel8.select connection $ pure $
333+ Rel8.lit x Rel8.||. Rel8.lit y
354334
355335 result === (x || y)
356336
@@ -359,10 +339,9 @@ testLogicalFixities :: IO TmpPostgres.DB -> TestTree
359339testLogicalFixities = databasePropertyTest "Logical operator fixities" \transaction -> do
360340 (u, v, w, x) <- forAll $ (,,,) <$> Gen.bool <*> Gen.bool <*> Gen.bool <*> Gen.bool
361341
362− transaction do
363− [result] <- lift do
364− statement () $ Rel8.select do
365− pure $ Rel8.lit u Rel8.||. Rel8.lit v Rel8.&&. Rel8.lit w Rel8.==. Rel8.lit x
342+ transaction \connection -> do
343+ [result] <- liftIO $ Rel8.select connection $ pure $
344+ Rel8.lit u Rel8.||. Rel8.lit v Rel8.&&. Rel8.lit w Rel8.==. Rel8.lit x
366345
367346 result === (u || v && w == x)
368347
@@ -371,10 +350,9 @@ testNot :: IO TmpPostgres.DB -> TestTree
371350testNot = databasePropertyTest "NOT (not_)" \transaction -> do
372351 x <- forAll Gen.bool
373352
374− transaction do
375− [result] <- lift do
376− statement () $ Rel8.select do
377− pure $ Rel8.not_ $ Rel8.lit x
353+ transaction \connection -> do
354+ [result] <- liftIO $ Rel8.select connection $ pure $
355+ Rel8.not_ $ Rel8.lit x
378356
379357 result === not x
380358
@@ -383,10 +361,9 @@ testBool :: IO TmpPostgres.DB -> TestTree
383361testBool = databasePropertyTest "ifThenElse_" \transaction -> do
384362 (x, y, z) <- forAll $ liftA3 (,,) Gen.bool Gen.bool Gen.bool
385363
386− transaction do
387− [result] <- lift do
388− statement () $ Rel8.select do
389− pure $ Rel8.bool (Rel8.lit z) (Rel8.lit y) (Rel8.lit x)
364+ transaction \connection -> do
365+ [result] <- liftIO $ Rel8.select connection $ pure $
366+ Rel8.bool (Rel8.lit z) (Rel8.lit y) (Rel8.lit x)
390367
391368 result === if x then y else z
392369
@@ -398,10 +375,9 @@ testAp = databasePropertyTest "Cartesian product (<*>)" \transaction -> do
398375 (Gen.list (Range.linear 1 10) genTestTable)
399376 (Gen.list (Range.linear 1 10) genTestTable)
400377
401− transaction do
402− result <- lift do
403− statement () $ Rel8.select do
404− liftA2 (,) (Rel8.values (Rel8.lit <$> rows1)) (Rel8.values (Rel8.lit <$> rows2))
378+ transaction \connection -> do
379+ result <- liftIO $ Rel8.select connection $ do
380+ liftA2 (,) (Rel8.values (Rel8.lit <$> rows1)) (Rel8.values (Rel8.lit <$> rows2))
405381
406382 sort result === sort (liftA2 (,) rows1 rows2)
407383
@@ -430,22 +406,21 @@ testDBType getTestDatabase = testGroup "DBType instances"
430406 where
431407 dbTypeTest :: (Eq a, Show a, Rel8.DBType a) => TestName -> Gen a -> TestTree
432408 dbTypeTest name generator = testGroup name
433− [ databasePropertyTest name (t generator) getTestDatabase
434− , databasePropertyTest ("Maybe " <> name) (t (Gen.maybe generator)) getTestDatabase
409+ [ databasePropertyTest name (t (==) generator) getTestDatabase
410+ , databasePropertyTest ("Maybe " <> name) (t (==) (Gen.maybe generator)) getTestDatabase
435411 ]
436412
437− t :: forall a b. (Eq a, Show a, Rel8.Sql Rel8.DBType a)
438− => Gen a
439− -> (TestT Transaction () -> PropertyT IO b)
413+ t :: forall a b. (Show a, Rel8.Sql Rel8.DBType a)
414+ => (a -> a -> Bool)
415+ -> Gen a
416+ -> ((Connection -> TestT IO ()) -> PropertyT IO b)
440417 -> PropertyT IO b
441− t generator transaction = do
418+ t eq generator transaction = do
442419 x <- forAll generator
443420
444− transaction do
445− [res] <- lift do
446− statement () $ Rel8.select do
447− pure (Rel8.litExpr x)
448− diff res (==) x
421+ transaction \connection -> do
422+ [res] <- liftIO $ Rel8.select connection $ pure (Rel8.litExpr x)
423+ diff res eq x
449424
450425 genDay :: Gen Day
451426 genDay = do
@@ -487,38 +462,39 @@ testDBEq getTestDatabase = testGroup "DBEq instances"
487462
488463 t :: forall a. (Eq a, Show a, Rel8.Sql Rel8.DBEq a)
489464 => Gen a
490− -> (TestT Transaction () -> PropertyT IO ())
465+ -> ((Connection -> TestT IO ()) -> PropertyT IO ())
491466 -> PropertyT IO ()
492467 t generator transaction = do
493468 (x, y) <- forAll (liftA2 (,) generator generator)
494469
495− transaction do
496− [res] <- lift do
497− statement () $ Rel8.select do
498− pure $ Rel8.litExpr x Rel8.==. Rel8.litExpr y
470+ transaction \connection -> do
471+ [res] <- liftIO $ Rel8.select connection $ pure $ Rel8.litExpr x Rel8.==. Rel8.litExpr y
499472 res === (x == y)
500473
474+ cover 1 "Equal" $ x == y
475+ cover 1 "Not Equal" $ x /= y
476+
501477
502478testTableEquality :: IO TmpPostgres.DB -> TestTree
503479testTableEquality = databasePropertyTest "TestTable equality" \transaction -> do
504480 (x, y) <- forAll $ liftA2 (,) genTestTable genTestTable
505481
506− transaction do
507− [eq] <- lift do
508− statement () $ Rel8.select do
509− pure $ Rel8.lit x Rel8.==: Rel8.lit y
482+ transaction \connection -> do
483+ [eq] <- liftIO $ Rel8.select connection do
484+ pure $ Rel8.lit x Rel8.==: Rel8.lit y
510485
511486 eq === (x == y)
512487
488+ cover 1 "Equal" $ x == y
489+ cover 1 "Not Equal" $ x /= y
490+
513491
514492testFromString :: IO TmpPostgres.DB -> TestTree
515493testFromString = databasePropertyTest "FromString" \transaction -> do
516494 str <- forAll $ Gen.list (Range.linear 0 10) Gen.unicode
517495
518− transaction do
519− [result] <- lift do
520− statement () $ Rel8.select do
521− pure $ fromString str
496+ transaction \connection -> do
497+ [result] <- liftIO $ Rel8.select connection $ pure $ fromString str
522498 result === pack str
523499
524500
@@ -526,11 +502,10 @@ testCatMaybeTable :: IO TmpPostgres.DB -> TestTree
526502testCatMaybeTable = databasePropertyTest "catMaybeTable" \transaction -> do
527503 rows <- forAll $ Gen.list (Range.linear 0 10) genTestTable
528504
529− transaction do
530− selected <- lift do
531− statement () $ Rel8.select do
532− testTable <- Rel8.values $ Rel8.lit <$> rows
533− Rel8.catMaybeTable $ Rel8.bool Rel8.nothingTable (pure testTable) (testTableColumn2 testTable)
505+ transaction \connection -> do
506+ selected <- liftIO $ Rel8.select connection do
507+ testTable <- Rel8.values $ Rel8.lit <$> rows
508+ Rel8.catMaybeTable $ Rel8.bool Rel8.nothingTable (pure testTable) (testTableColumn2 testTable)
534509
535510 sort selected === sort (filter testTableColumn2 rows)
536511
@@ -539,10 +514,9 @@ testCatMaybe :: IO TmpPostgres.DB -> TestTree
539514testCatMaybe = databasePropertyTest "catMaybe" \transaction -> evalM do
540515 rows <- forAll $ Gen.list (Range.linear 0 10) $ Gen.maybe Gen.bool
541516
542− transaction do
543− selected <- lift do
544− statement () $ Rel8.select do
545− Rel8.catNull =<< Rel8.values (map Rel8.lit rows)
517+ transaction \connection -> do
518+ selected <- evalM $ liftIO $ Rel8.select connection do
519+ Rel8.catNull =<< Rel8.values (map Rel8.lit rows)
546520
547521 sort selected === sort (catMaybes rows)
548522
@@ -551,44 +525,21 @@ testMaybeTable :: IO TmpPostgres.DB -> TestTree
551525testMaybeTable = databasePropertyTest "maybeTable" \transaction -> evalM do
552526 (rows, def) <- forAll $ liftA2 (,) (Gen.list (Range.linear 0 10) genTestTable) genTestTable
553527
554− transaction do
555− selected <- lift do
556− statement () $ Rel8.select do
557− Rel8.maybeTable (Rel8.lit def) id <$> Rel8.optional (Rel8.values (Rel8.lit <$> rows))
528+ transaction \connection -> do
529+ selected <- liftIO $ Rel8.select connection $
530+ Rel8.maybeTable (Rel8.lit def) id <$> Rel8.optional (Rel8.values (Rel8.lit <$> rows))
558531
559532 case rows of
560533 [] -> selected === [def]
561534 _ -> sort selected === sort rows
562535
563536
564−testAggregateMaybeTable :: IO TmpPostgres.DB -> TestTree
565−testAggregateMaybeTable = databasePropertyTest "aggregateMaybeTable" \transaction -> evalM do
566− rows <- forAll $ Gen.list (Range.linear 0 10) (Gen.maybe (Gen.int64 (Range.linear 0 10)))
567−
568− let
569− aggregate = go 0 False False
570− where
571− go !n nothing _ (Just a : as) = go (n + a) nothing True as
572− go n _ just (Nothing : as) = go n True just as
573− go _ False False [] = []
574− go _ True False [] = [Nothing]
575− go n False True [] = [Just n]
576− go n True True [] = [Nothing, Just n]
577−
578− transaction do
579− selected <- lift do
580− statement () $ Rel8.select do
581− Rel8.aggregate $ Rel8.aggregateMaybeTable Rel8.sum <$> Rel8.values (Rel8.lit <$> rows)
582−
583− sort selected === aggregate rows
584−
585−
586537data TwoTestTables f =
587538 TwoTestTables
588539 { testTable1 :: TestTable f
589540 , testTable2 :: TestTable f
590541 }
591− deriving stock Generic
542+ deriving stock Generic
592543 deriving anyclass Rel8.Rel8able
593544
594545
@@ -603,10 +554,9 @@ testNestedTables = databasePropertyTest "Nested TestTables" \transaction -> eval
603554 Gen.list (Range.linear 0 10) $
604555 liftA2 TwoTestTables genTestTable genTestTable
605556
606− transaction do
607− selected <- lift do
608− statement () $ Rel8.select do
609− Rel8.values (Rel8.lit <$> rows)
557+ transaction \connection -> do
558+ selected <- liftIO $ Rel8.select connection do
559+ Rel8.values (Rel8.lit <$> rows)
610560
611561 sort selected === sort rows
612562
@@ -616,12 +566,11 @@ testMaybeTableApplicative = databasePropertyTest "MaybeTable (<*>)" \transaction
616566 rows1 <- genRows
617567 rows2 <- genRows
618568
619− transaction do
620− selected <- lift do
621− statement () $ Rel8.select do
622− as <- Rel8.optional (Rel8.values (Rel8.lit <$> rows1))
623− bs <- Rel8.optional (Rel8.values (Rel8.lit <$> rows2))
624− pure $ liftA2 (,) as bs
569+ transaction \connection -> do
570+ selected <- liftIO $ Rel8.select connection do
571+ as <- Rel8.optional (Rel8.values (Rel8.lit <$> rows1))
572+ bs <- Rel8.optional (Rel8.values (Rel8.lit <$> rows2))
573+ pure $ liftA2 (,) as bs
625574
626575 case (rows1, rows2) of
627576 ([], []) -> selected === [Nothing]
@@ -633,6 +582,14 @@ testMaybeTableApplicative = databasePropertyTest "MaybeTable (<*>)" \transaction
633582 genRows = forAll do
634583 Gen.list (Range.linear 0 10) $ liftA2 TestTable (Gen.text (Range.linear 0 10) Gen.unicode) (pure True)
635584
585+rollingBack
586+ :: (MonadBaseControl IO m, MonadIO m)
587+ => Connection -> m a -> m a
588+rollingBack connection =
589+ bracket_
590+ (liftIO (run (sql "BEGIN") connection))
591+ (liftIO (run (sql "ROLLBACK") connection))
592+
636593
637594genTestTable :: Gen (TestTable Result)
638595genTestTable = do
@@ -645,19 +602,19 @@ testUpdate :: IO TmpPostgres.DB -> TestTree
645602testUpdate = databasePropertyTest "Can UPDATE TestTable" \transaction -> do
646603 rows <- forAll $ Gen.map (Range.linear 0 5) $ liftA2 (,) genTestTable genTestTable
647604
648− transaction do
649− selected <- lift do
650− statement () $ Rel8.insert Rel8.Insert
605+ transaction \connection -> do
606+ void $ liftIO $ Rel8.insert connection
607+ Rel8.Insert
651608 { into = testTableSchema
652− , rows = Rel8.values $ map Rel8.lit $ Map.keys rows
609+ , rows = map (Rel8.toInsert . Rel8.lit) $ Map.keys rows
653610 , onConflict = Rel8.DoNothing
654− , returning = pure ()
611+ , returning = Rel8.NumberOfRowsAffected
655612 }
656613
657− statement () $ Rel8.update Rel8.Update
614+ void $ liftIO $ Rel8.update connection
615+ Rel8.Update
658616 { target = testTableSchema
659− , from = pure ()
660− , set = \_ r ->
617+ , set = \r ->
661618 let updates = map (bimap Rel8.lit Rel8.lit) $ Map.toList rows
662619 in
663620 foldl
@@ -671,12 +628,12 @@ testUpdate = databasePropertyTest "Can UPDATE TestTable" \transaction -> do
671628 )
672629 r
673630 updates
674− , updateWhere = \_ _ -> Rel8.lit True
675− , returning = pure ()
631+ , updateWhere = \_ -> Rel8.lit True
632+ , returning = Rel8.NumberOfRowsAffected
676633 }
677634
678− statement () $ Rel8.select do
679− Rel8.each testTableSchema
635+ selected <- liftIO $ Rel8.select connection do
636+ Rel8.each testTableSchema
680637
681638 sort selected === sort (Map.elems rows)
682639
@@ -689,96 +646,29 @@ testDelete :: IO TmpPostgres.DB -> TestTree
689646testDelete = databasePropertyTest "Can DELETE TestTable" \transaction -> do
690647 rows <- forAll $ Gen.list (Range.linear 0 5) genTestTable
691648
692− transaction do
693− (deleted, selected) <- lift do
694− statement () $ Rel8.insert Rel8.Insert
649+ transaction \connection -> do
650+ void $ liftIO $ Rel8.insert connection
651+ Rel8.Insert
695652 { into = testTableSchema
696− , rows = Rel8.values $ map Rel8.lit rows
653+ , rows = map (Rel8.toInsert . Rel8.lit) rows
697654 , onConflict = Rel8.DoNothing
698− , returning = pure ()
655+ , returning = Rel8.NumberOfRowsAffected
699656 }
700657
701− deleted <- statement () $ Rel8.delete Rel8.Delete
658+ deleted <-
659+ liftIO $ Rel8.delete connection
660+ Rel8.Delete
702661 { from = testTableSchema
703− , using = pure ()
704− , deleteWhere = const testTableColumn2
662+ , deleteWhere = testTableColumn2
705663 , returning = Rel8.Projection id
706664 }
707665
708− selected <- statement () $ Rel8.select do
709− Rel8.each testTableSchema
710−
711− pure (deleted, selected)
666+ selected <- liftIO $ Rel8.select connection do
667+ Rel8.each testTableSchema
712668
713669 sort (deleted <> selected) === sort rows
714670
715671
716−data UniqueTable f = UniqueTable
717− { uniqueTableKey :: Rel8.Column f Text
718− , uniqueTableValue :: Rel8.Column f Text
719− }
720− deriving stock Generic
721− deriving anyclass Rel8.Rel8able
722−
723−
724−deriving stock instance Eq (UniqueTable Result)
725−deriving stock instance Ord (UniqueTable Result)
726−deriving stock instance Show (UniqueTable Result)
727−
728−
729−uniqueTableSchema :: Rel8.TableSchema (UniqueTable Rel8.Name)
730−uniqueTableSchema =
731− Rel8.TableSchema
732− { name = "unique_table"
733− , schema = Nothing
734− , columns = UniqueTable
735− { uniqueTableKey = "key"
736− , uniqueTableValue = "value"
737− }
738− }
739−
740−
741−genUniqueTable :: Gen (UniqueTable Result)
742−genUniqueTable = do
743− uniqueTableKey <- Gen.text (Range.linear 0 5) Gen.alphaNum
744− uniqueTableValue <- Gen.text (Range.linear 0 5) Gen.alphaNum
745− pure UniqueTable {..}
746−
747−
748−testUpsert :: IO TmpPostgres.DB -> TestTree
749−testUpsert = databasePropertyTest "Can UPSERT UniqueTable" \transaction -> do
750− as <- unique $ forAll $ Gen.list (Range.linear 0 20) genUniqueTable
751− bs <- unique $ forAll $ Gen.list (Range.linear 0 20) genUniqueTable
752−
753− transaction do
754− selected <- lift do
755− statement () $ Rel8.insert Rel8.Insert
756− { into = uniqueTableSchema
757− , rows = Rel8.values $ Rel8.lit <$> as
758− , onConflict = Rel8.DoNothing
759− , returning = pure ()
760− }
761−
762− statement () $ Rel8.insert Rel8.Insert
763− { into = uniqueTableSchema
764− , rows = Rel8.values $ Rel8.lit <$> bs
765− , onConflict = Rel8.DoUpdate Rel8.Upsert
766− { index = uniqueTableKey
767− , set = \UniqueTable {uniqueTableValue} old -> old {uniqueTableValue}
768− , updateWhere = \_ _ -> Rel8.true
769− }
770− , returning = pure ()
771− }
772−
773− statement () $ Rel8.select do
774− Rel8.each uniqueTableSchema
775−
776− fromUniqueTables selected === fromUniqueTables bs <> fromUniqueTables as
777− where
778− unique = fmap (nubOrdOn uniqueTableKey)
779− fromUniqueTables = Map.fromList . map \(UniqueTable key value) -> (key, value)
780−
781−
782672newtype HKNestedPair f = HKNestedPair { pairOne :: (TestTable f, TestTable f) }
783673 deriving stock Generic
784674 deriving anyclass Rel8.Rel8able
@@ -792,10 +682,9 @@ testSelectNestedPairs :: IO TmpPostgres.DB -> TestTree
792682testSelectNestedPairs = databasePropertyTest "Can SELECT nested pairs" \transaction -> do
793683 rows <- forAll $ Gen.list (Range.linear 0 10) $ HKNestedPair <$> liftA2 (,) genTestTable genTestTable
794684
795− transaction do
796− selected <- lift do
797− statement () $ Rel8.select do
798− Rel8.values $ map Rel8.lit rows
685+ transaction \connection -> do
686+ selected <- liftIO $ Rel8.select connection do
687+ Rel8.values $ map Rel8.lit rows
799688
800689 sort selected === sort rows
801690
@@ -804,23 +693,12 @@ testSelectArray :: IO TmpPostgres.DB -> TestTree
804693testSelectArray = databasePropertyTest "Can SELECT Arrays (with aggregation)" \transaction -> do
805694 rows <- forAll $ Gen.list (Range.linear 1 10) Gen.bool
806695
807− transaction do
808− selected <- lift do
809− statement () $ Rel8.select do
810− Rel8.many $ Rel8.values (map Rel8.lit rows)
696+ transaction \connection -> do
697+ selected <- liftIO $ Rel8.select connection $ Rel8.aggregate do
698+ Rel8.listAgg <$> Rel8.values (map Rel8.lit rows)
811699
812700 selected === [foldMap pure rows]
813701
814− selected' <- lift do
815− statement () $ Rel8.select do
816− a <- Rel8.catListTable =<< do
817− Rel8.many $ Rel8.values (map Rel8.lit rows)
818− b <- Rel8.catListTable =<< do
819− Rel8.many $ Rel8.values (map Rel8.lit rows)
820− pure (a, b)
821−
822− selected' === liftA2 (,) rows rows
823−
824702
825703data NestedMaybeTable f = NestedMaybeTable
826704 { nmt1 :: Rel8.Column f Bool
@@ -839,51 +717,9 @@ testNestedMaybeTable :: IO TmpPostgres.DB -> TestTree
839717testNestedMaybeTable = databasePropertyTest "Can nest MaybeTable within other tables" \transaction -> do
840718 let example = NestedMaybeTable { nmt1 = True, nmt2 = Just (TestTable "Hi" True) }
841719
842− transaction do
843− selected <- lift do
844− statement () $ Rel8.select do
845− x <- Rel8.values [Rel8.lit example]
846− pure $ Rel8.maybeTable (Rel8.lit False) (\_ -> Rel8.lit True) (nmt2 x)
720+ transaction \connection -> do
721+ selected <- liftIO $ Rel8.select connection do
722+ x <- Rel8.values [Rel8.lit example]
723+ pure $ Rel8.maybeTable (Rel8.lit False) (\_ -> Rel8.lit True) (nmt2 x)
847724
848725 selected === [True]
849−
850−
851−testEvaluate :: IO TmpPostgres.DB -> TestTree
852−testEvaluate = databasePropertyTest "evaluate has the evaluation order we expect" \transaction -> do
853−
854− transaction do
855− selected <- lift do
856− statement () $ Rel8.select do
857− x <- Rel8.values (Rel8.lit <$> ['a', 'b', 'c'])
858− y <- Rel8.evaluate (Rel8.nextval "test_seq")
859− pure (x, (y, y))
860−
861− normalize selected ===
862− [ ('a', (0, 0))
863− , ('b', (1, 1))
864− , ('c', (2, 2))
865− ]
866−
867− selected' <- lift do
868− statement () $ Rel8.select do
869− x <- Rel8.values (Rel8.lit <$> ['a', 'b', 'c'])
870− y <- Rel8.values (Rel8.lit <$> ['d', 'e', 'f'])
871− z <- Rel8.evaluate (Rel8.nextval "test_seq")
872− pure ((x, y), (z, z))
873−
874− normalize selected' ===
875− [ (('a', 'd'), (0, 0))
876− , (('a', 'e'), (1, 1))
877− , (('a', 'f'), (2, 2))
878− , (('b', 'd'), (3, 3))
879− , (('b', 'e'), (4, 4))
880− , (('b', 'f'), (5, 5))
881− , (('c', 'd'), (6, 6))
882− , (('c', 'e'), (7, 7))
883− , (('c', 'f'), (8, 8))
884− ]
885−
886− where
887− normalize :: [(x, (Int64, Int64))] -> [(x, (Int64, Int64))]
888− normalize [] = []
889− normalize xs@((_, (i, _)) : _) = map (fmap (\(a, b) -> (a - i, b - i))) xs