git.iko.soy/rel8
on master help sign in
Reverse dependency between Rel8.Schema.Context and Rel8.Schema.Result
commitc8341c140ff86ec29eb26c6bd99684c0012e0d50 authorShane O'Brien <shane.obrien@circuithub.com> dateFri 30 Apr 2021, 15:15 (6 years ago) parent66dc44d
8 files changed+20−24
compare with master
unifiedsplit
src/Rel8/Generic/Table/ADT.hs+1−2 src/Rel8/Schema/Context.hs+1−9 src/Rel8/Schema/Context/Label.hs+2−2 src/Rel8/Schema/Context/Result.hs+1−3 src/Rel8/Schema/Field.hs+1−2 src/Rel8/Schema/Result.hs+12−2 src/Rel8/Table.hs+1−2 src/Rel8/Table/Serialize.hs+1−2
src/Rel8/Generic/Table/ADT.hs+1−2
@@ -36,7 +36,6 @@ import Rel8.Generic.Table.Record
3636 ( GTable, GColumns, gtable
3737 , GToExprs, gfromResult, gtoResult
3838 )
39−import Rel8.Schema.Context ( Col( Result ) )
4039import Rel8.Schema.Context.Label ( HLabelable, hlabeler, labeler, unlabeler )
4140import Rel8.Schema.Context.Result ( null, nullifier, unnullifier )
4241import Rel8.Schema.HTable ( HTable, hmap )
@@ -47,7 +46,7 @@ import Rel8.Schema.HTable.Type ( HType( HType ) )
4746import qualified Rel8.Schema.Kind as K
4847import Rel8.Schema.Null ( Nullify )
4948import Rel8.Schema.Spec ( Spec( Spec ), SSpec )
50−import Rel8.Schema.Result ( Result )
49+import Rel8.Schema.Result ( Col( Result ), Result )
5150import Rel8.Type.Tag ( Tag( Tag ) )
5251
5352-- text
src/Rel8/Schema/Context.hs+1−9
@@ -1,10 +1,9 @@
11{-# language DataKinds #-}
2−{-# language GADTs #-}
32{-# language StandaloneKindSignatures #-}
43{-# language TypeFamilies #-}
54
65module Rel8.Schema.Context
7− ( Interpretation(..), Col( Result )
6+ ( Interpretation( Col )
87 )
98where
109
@@ -14,15 +13,8 @@ import Prelude ()
1413
1514-- rel8
1615import Rel8.Schema.Kind ( Context, HContext )
17−import Rel8.Schema.Result ( Result )
18−import Rel8.Schema.Spec ( Spec( Spec ) )
1916
2017
2118type Interpretation :: Context -> Constraint
2219class Interpretation context where
2320 data Col context :: HContext
24−
25−
26−instance Interpretation Result where
27− data Col Result _spec where
28− Result :: a -> Col Result ('Spec labels necessity a)
src/Rel8/Schema/Context/Label.hs+2−2
@@ -15,11 +15,11 @@ import Data.Kind ( Constraint )
1515import Prelude hiding ( null )
1616
1717-- rel8
18−import Rel8.Schema.Context ( Interpretation, Col(..) )
18+import Rel8.Schema.Context ( Interpretation )
1919import Rel8.Schema.Dict ( Dict( Dict ) )
2020import Rel8.Schema.Kind ( Context, HContext )
2121import Rel8.Schema.Spec ( Spec( Spec ) )
22−import Rel8.Schema.Result ( Result )
22+import Rel8.Schema.Result ( Col( Result ), Result )
2323import Rel8.Schema.Spec.ConstrainDBType ( ConstrainDBType )
2424
2525
src/Rel8/Schema/Context/Result.hs+1−3
@@ -1,7 +1,6 @@
11{-# language DataKinds #-}
22{-# language NamedFieldPuns #-}
33{-# language TypeFamilies #-}
4−{-# language UndecidableInstances #-}
54
65module Rel8.Schema.Context.Result
76 ( relabel
@@ -14,10 +13,9 @@ where
1413import Prelude hiding ( null )
1514
1615-- rel8
17−import Rel8.Schema.Context ( Col(..) )
1816import Rel8.Schema.HTable.Identity ( HIdentity(..) )
1917import Rel8.Schema.Null ( Nullify, Nullity( Null, NotNull ) )
20−import Rel8.Schema.Result ( Result )
18+import Rel8.Schema.Result ( Col( Result ), Result )
2119import Rel8.Schema.Spec ( Spec( Spec ), SSpec(..) )
2220
2321
src/Rel8/Schema/Field.hs+1−2
@@ -32,7 +32,6 @@ import Rel8.Kind.Necessity
3232 , SNecessity( SRequired, SOptional )
3333 , KnownNecessity, necessitySing
3434 )
35−import Rel8.Schema.Context ( Col(..) )
3635import Rel8.Schema.HTable.Either ( HEitherTable )
3736import Rel8.Schema.HTable.List ( HListTable )
3837import Rel8.Schema.HTable.Maybe ( HMaybeTable )
@@ -44,7 +43,7 @@ import qualified Rel8.Schema.Kind as K
4443import Rel8.Schema.Name ( Name(..), Col(..) )
4544import Rel8.Schema.Null ( Sql )
4645import Rel8.Schema.Reify ( Reify, Col(..), hreify, hunreify )
47−import Rel8.Schema.Result ( Result )
46+import Rel8.Schema.Result ( Col( Result ), Result )
4847import Rel8.Schema.Spec ( Spec( Spec ) )
4948import Rel8.Table
5049 ( Table, Columns, Congruent, Context, fromColumns, toColumns
src/Rel8/Schema/Result.hs+12−2
@@ -1,16 +1,26 @@
11{-# language DataKinds #-}
2+{-# language GADTs #-}
23{-# language StandaloneKindSignatures #-}
4+{-# language TypeFamilies #-}
35
46module Rel8.Schema.Result
5− ( Result
6− ) where
7+ ( Col( Result ), Result
8+ )
9+where
710
811-- base
912import Prelude ()
1013
1114-- rel8
15+import Rel8.Schema.Context ( Interpretation( Col ) )
1216import Rel8.Schema.Kind ( Context )
17+import Rel8.Schema.Spec ( Spec( Spec ) )
1318
1419
1520type Result :: Context
1621data Result a
22+
23+
24+instance Interpretation Result where
25+ data Col Result _spec where
26+ Result :: a -> Col Result ('Spec labels necessity a)
src/Rel8/Table.hs+1−2
@@ -41,7 +41,6 @@ import Rel8.Generic.Table
4141 )
4242import Rel8.Generic.Record ( Record(..) )
4343import Rel8.Generic.Reify ( ARep )
44−import Rel8.Schema.Context ( Col(..) )
4544import Rel8.Schema.Context.Label ( Labelable, labeler, unlabeler )
4645import Rel8.Schema.Context.Result
4746 ( relabel
@@ -66,7 +65,7 @@ import Rel8.Schema.Reify
6665 , UnwrapReify
6766 , notReify
6867 )
69−import Rel8.Schema.Result ( Result )
68+import Rel8.Schema.Result ( Col( Result ), Result )
7069import Rel8.Schema.Spec ( KnownSpec )
7170import Rel8.Type ( DBType )
7271import Rel8.Type.Tag ( EitherTag( IsLeft, IsRight ), MaybeTag( IsJust ) )
src/Rel8/Table/Serialize.hs+1−2
@@ -41,11 +41,10 @@ import Rel8.Generic.Table
4141 , GAlgebra
4242 )
4343import Rel8.Kind.Algebra ( KnownAlgebra )
44−import Rel8.Schema.Context ( Col(..) )
4544import Rel8.Schema.HTable ( HTable, htabulate, htabulateA, hfield, hspecs )
4645import Rel8.Schema.HTable.Type ( HType(..) )
4746import Rel8.Schema.Null ( NotNull, Sql )
48−import Rel8.Schema.Result ( Result )
47+import Rel8.Schema.Result ( Col( Result ), Result )
4948import Rel8.Schema.Spec ( SSpec(..), KnownSpec )
5049import Rel8.Table ( Table, Columns, fromColumns, toColumns, TColumns )
5150import Rel8.Table.Either ( EitherTable )