05564f4 · rel8 · git.iko.soy

git.iko.soy/rel8

Only export Rel8

commit05564f48517245c59c799346d3c9b98f1ce9da1c authorOllie Charles <ollie@ocharles.org.uk> dateWed 24 Mar 2021, 13:01 (6 years ago) parent38a9aec

3 files changed+56−73

compare with master

unifiedsplit

rel8.cabal+1−2 src/Rel8.hs+54−40 tests/Main.hs+1−31

rel8.cabal+1−2

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

4343 src

4444 exposed-modules:

4545 Rel8

46−

46+ other-modules:

4747 Rel8.Aggregate

4848

4949 Rel8.Expr

@@ -161,7 +161,6 @@ library

161161 Rel8.Type.Sum

162162 Rel8.Type.Tag

163163

164− other-modules:

165164 Rel8.Opaque

166165 Rel8.Schema.Structure

167166

src/Rel8.hs+54−40

@@ -37,6 +37,13 @@ module Rel8

3737 , DBFractional

3838

3939 -- * Tables and higher-kinded tables

40+ , Rel8able

41+ , Column

42+ , HMaybe

43+ , HList

44+ , HNonEmpty

45+ , HThese

46+

4047 , Table

4148 , AltTable((<|>:))

4249 , EqTable, (==:), (/=:)

@@ -88,6 +95,7 @@ module Rel8

8895

8996 -- ** Table schemas

9097 , TableSchema(..)

98+ , Name

9199

92100 -- * Expressions

93101 , Expr

@@ -103,6 +111,7 @@ module Rel8

103111 , catNullable

104112

105113 -- ** Boolean operations

114+ , DBEq

106115 , true, false, not_

107116 , (&&.), and_

108117 , (||.), or_

@@ -220,74 +229,79 @@ module Rel8

220229 , HTable

221230 , Labelable

222231 , Context

232+ , IsMaybe

223233 ) where

224234

225235-- base

226236import Prelude ()

227237

228238-- rel8

229−import Rel8.Type

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

239+import Rel8.Aggregate

236240import Rel8.Expr

241+import Rel8.Expr.Aggregate

237242import Rel8.Expr.Bool

238243import Rel8.Expr.Eq

239244import 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

240250import Rel8.Query

241−import Rel8.Query.SQL (showQuery)

251+import Rel8.Query.Aggregate

252+import Rel8.Query.Distinct

242253import Rel8.Query.Each

243−import Rel8.Query.Values

244−import Rel8.Query.Filter

254+import Rel8.Query.Either

245255import Rel8.Query.Exists

246−import Rel8.Query.Distinct

256+import Rel8.Query.Filter

247257import 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

253258import Rel8.Query.List

254−import Rel8.Table.NonEmpty

255−import Rel8.Table.List

259+import Rel8.Query.Maybe

260+import Rel8.Query.Null

256261import Rel8.Query.Order

257−import Rel8.Order

258−import Rel8.Table.Serialize

259−import Rel8.Statement.Select

260−import Rel8.Statement.Insert

262+import Rel8.Query.SQL (showQuery)

263+import Rel8.Query.Set

264+import Rel8.Query.These

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

261273import Rel8.Statement.Delete

274+import Rel8.Statement.Insert

262275import Rel8.Statement.Returning

276+import Rel8.Statement.Select

263277import Rel8.Statement.Update

278+import Rel8.Table

264279import 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

279280import Rel8.Table.Alternative

280−import Rel8.Table.Either

281281import Rel8.Table.Bool

282−import Rel8.Query.Either

282+import Rel8.Table.Either

283283import Rel8.Table.Eq

284+import Rel8.Table.Insert

285+import Rel8.Table.List

286+import Rel8.Table.Maybe

287+import Rel8.Table.NonEmpty

284288import Rel8.Table.Ord

285289import Rel8.Table.Order

286−import Rel8.Expr.Serialize

287−import Rel8.Table.Insert

290+import Rel8.Table.Recontextualize

291+import Rel8.Table.Serialize

292+import Rel8.Table.These

293+import Rel8.Type

294+import Rel8.Type.Eq

295+import Rel8.Type.Information

288296import Rel8.Type.JSONEncoded

289297import Rel8.Type.JSONBEncoded

298+import Rel8.Type.Monoid

299+import Rel8.Type.Num

300+import Rel8.Type.Ord

290301import Rel8.Type.ReadShow

302+import Rel8.Type.Semigroup

303+import Rel8.Type.String

304+import Rel8.Type.Sum

291305

292306

293307-- $setup

tests/Main.hs+1−31

@@ -60,37 +60,7 @@ import Control.Exception.Lifted ( bracket, throwIO, bracket_ )

6060import Control.Monad.Trans.Control ( MonadBaseControl )

6161

6262-- rel8

63−import qualified Rel8.Expr as 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

63+import qualified Rel8

9464

9565-- scientific

9666import Data.Scientific ( Scientific )