on master help sign in
Only export Rel8
05564f4Ollie Charles
rel8.cabal+1−2
@@ -43,7 +43,7 @@ library
43 src
43 src
44 exposed-modules:
44 exposed-modules:
45 Rel8
45 Rel8
46−
46+ other-modules:
47 Rel8.Aggregate
47 Rel8.Aggregate
48
48
49 Rel8.Expr
49 Rel8.Expr
@@ -161,7 +161,6 @@ library
161 Rel8.Type.Sum
161 Rel8.Type.Sum
162 Rel8.Type.Tag
162 Rel8.Type.Tag
163
163
164− other-modules:
165 Rel8.Opaque
164 Rel8.Opaque
166 Rel8.Schema.Structure
165 Rel8.Schema.Structure
167
166
src/Rel8.hs+54−40
@@ -37,6 +37,13 @@ module Rel8
37 , DBFractional
37 , DBFractional
38
38
39 -- * Tables and higher-kinded tables
39 -- * Tables and higher-kinded tables
40+ , Rel8able
41+ , Column
42+ , HMaybe
43+ , HList
44+ , HNonEmpty
45+ , HThese
46+
40 , Table
47 , Table
41 , AltTable((<|>:))
48 , AltTable((<|>:))
42 , EqTable, (==:), (/=:)
49 , EqTable, (==:), (/=:)
@@ -88,6 +95,7 @@ module Rel8
88
95
89 -- ** Table schemas
96 -- ** Table schemas
90 , TableSchema(..)
97 , TableSchema(..)
98+ , Name
91
99
92 -- * Expressions
100 -- * Expressions
93 , Expr
101 , Expr
@@ -103,6 +111,7 @@ module Rel8
103 , catNullable
111 , catNullable
104
112
105 -- ** Boolean operations
113 -- ** Boolean operations
114+ , DBEq
106 , true, false, not_
115 , true, false, not_
107 , (&&.), and_
116 , (&&.), and_
108 , (||.), or_
117 , (||.), or_
@@ -220,74 +229,79 @@ module Rel8
220 , HTable
229 , HTable
221 , Labelable
230 , Labelable
222 , Context
231 , Context
232+ , IsMaybe
223 ) where
233 ) where
224
234
225-- base
235-- base
226import Prelude ()
236import Prelude ()
227
237
228-- rel8
238-- rel8
229−import Rel8.Type
239+import Rel8.Aggregate
230−import Rel8.Type.Information
231−import Rel8.Type.Ord
232−import Rel8.Type.Semigroup
233−import Rel8.Type.Monoid
234−import Rel8.Type.Num
235−import Rel8.Table
236import Rel8.Expr
240import Rel8.Expr
241+import Rel8.Expr.Aggregate
237import Rel8.Expr.Bool
242import Rel8.Expr.Bool
238import Rel8.Expr.Eq
243import Rel8.Expr.Eq
239import Rel8.Expr.Function
244import Rel8.Expr.Function
245+import Rel8.Expr.Null
246+import Rel8.Expr.Ord
247+import Rel8.Expr.Order
248+import Rel8.Expr.Serialize
249+import Rel8.Order
240import Rel8.Query
250import Rel8.Query
241−import Rel8.Query.SQL (showQuery)
251+import Rel8.Query.Aggregate
252+import Rel8.Query.Distinct
242import Rel8.Query.Each
253import Rel8.Query.Each
243−import Rel8.Query.Values
254+import Rel8.Query.Either
244−import Rel8.Query.Filter
245import Rel8.Query.Exists
255import Rel8.Query.Exists
246−import Rel8.Query.Distinct
256+import Rel8.Query.Filter
247import Rel8.Query.Limit
257import Rel8.Query.Limit
248−import Rel8.Query.Set
249−import Rel8.Table.Maybe
250−import Rel8.Query.Maybe
251−import Rel8.Aggregate
252−import Rel8.Query.Aggregate
253import Rel8.Query.List
258import Rel8.Query.List
254−import Rel8.Table.NonEmpty
259+import Rel8.Query.Maybe
255−import Rel8.Table.List
260+import Rel8.Query.Null
256import Rel8.Query.Order
261import Rel8.Query.Order
257−import Rel8.Order
262+import Rel8.Query.SQL (showQuery)
258−import Rel8.Table.Serialize
263+import Rel8.Query.Set
259−import Rel8.Statement.Select
264+import Rel8.Query.These
260−import Rel8.Statement.Insert
265+import Rel8.Query.Values
266+import Rel8.Schema.Column
267+import Rel8.Schema.Context (Name)
268+import Rel8.Schema.Context.Label
269+import Rel8.Schema.Generic
270+import Rel8.Schema.HTable
271+import Rel8.Schema.Nullability
272+import Rel8.Schema.Table
261import Rel8.Statement.Delete
273import Rel8.Statement.Delete
274+import Rel8.Statement.Insert
262import Rel8.Statement.Returning
275import Rel8.Statement.Returning
276+import Rel8.Statement.Select
263import Rel8.Statement.Update
277import Rel8.Statement.Update
278+import Rel8.Table
264import Rel8.Table.Aggregate
279import Rel8.Table.Aggregate
265−import Rel8.Expr.Aggregate
266−import Rel8.Type.String
267−import Rel8.Type.Sum
268−import Rel8.Expr.Null
269−import Rel8.Query.Null
270−import Rel8.Expr.Order
271−import Rel8.Schema.Nullability
272−import Rel8.Schema.HTable
273−import Rel8.Schema.Context.Label
274−import Rel8.Schema.Table
275−import Rel8.Table.These
276−import Rel8.Query.These
277−import Rel8.Table.Recontextualize
278−import Rel8.Expr.Ord
279import Rel8.Table.Alternative
280import Rel8.Table.Alternative
280−import Rel8.Table.Either
281import Rel8.Table.Bool
281import Rel8.Table.Bool
282−import Rel8.Query.Either
282+import Rel8.Table.Either
283import Rel8.Table.Eq
283import Rel8.Table.Eq
284+import Rel8.Table.Insert
285+import Rel8.Table.List
286+import Rel8.Table.Maybe
287+import Rel8.Table.NonEmpty
284import Rel8.Table.Ord
288import Rel8.Table.Ord
285import Rel8.Table.Order
289import Rel8.Table.Order
286−import Rel8.Expr.Serialize
290+import Rel8.Table.Recontextualize
291+import Rel8.Table.Serialize
287−import Rel8.Table.Insert
292+import Rel8.Table.These
293+import Rel8.Type
294+import Rel8.Type.Eq
295+import Rel8.Type.Information
288import Rel8.Type.JSONEncoded
296import Rel8.Type.JSONEncoded
289import Rel8.Type.JSONBEncoded
297import Rel8.Type.JSONBEncoded
298+import Rel8.Type.Monoid
299+import Rel8.Type.Num
300+import Rel8.Type.Ord
290import Rel8.Type.ReadShow
301import Rel8.Type.ReadShow
302+import Rel8.Type.Semigroup
303+import Rel8.Type.String
304+import Rel8.Type.Sum
291
305
292
306
293-- $setup
307-- $setup
tests/Main.hs+1−31
@@ -60,37 +60,7 @@ import Control.Exception.Lifted ( bracket, throwIO, bracket_ )
60import Control.Monad.Trans.Control ( MonadBaseControl )
60import Control.Monad.Trans.Control ( MonadBaseControl )
61
61
62-- rel8
62-- rel8
63−import qualified Rel8.Expr as Rel8
63+import qualified Rel8
64−import qualified Rel8.Expr.Bool as Rel8
65−import qualified Rel8.Expr.Eq as Rel8
66−import qualified Rel8.Query.Aggregate as Rel8
67−import qualified Rel8.Query.Distinct as Rel8
68−import qualified Rel8.Query.Each as Rel8
69−import qualified Rel8.Query.Exists as Rel8
70−import qualified Rel8.Query.Filter as Rel8
71−import qualified Rel8.Query.Limit as Rel8
72−import qualified Rel8.Query.Maybe as Rel8
73−import qualified Rel8.Query.Null as Rel8
74−import qualified Rel8.Query.Set as Rel8
75−import qualified Rel8.Query.Values as Rel8
76−import qualified Rel8.Schema.Column as Rel8
77−import qualified Rel8.Schema.Context as Rel8
78−import qualified Rel8.Schema.Generic as Rel8
79−import qualified Rel8.Schema.Nullability as Rel8
80−import qualified Rel8.Schema.Table as Rel8
81−import qualified Rel8.Statement.Delete as Rel8
82−import qualified Rel8.Statement.Insert as Rel8
83−import qualified Rel8.Statement.Returning as Rel8
84−import qualified Rel8.Statement.Select as Rel8
85−import qualified Rel8.Statement.Update as Rel8
86−import qualified Rel8.Table.Aggregate as Rel8
87−import qualified Rel8.Table.Bool as Rel8
88−import qualified Rel8.Table.Eq as Rel8
89−import qualified Rel8.Table.Insert as Rel8
90−import qualified Rel8.Table.Maybe as Rel8
91−import qualified Rel8.Table.Serialize as Rel8
92−import qualified Rel8.Type as Rel8
93−import qualified Rel8.Type.Eq as Rel8
94
64
95-- scientific
65-- scientific
96import Data.Scientific ( Scientific )
66import Data.Scientific ( Scientific )