de48a39 · squeal · git.iko.soy

git.iko.soy/squeal

RelationsType ~> RelationProduct

commitde48a39206e2cadf4d7261a82ba8b63d0d0a4ed3 authorEitan Chatav <eitan.chatav@gmail.com> dateSun 24 Dec 2017, 12:07 (9 years ago) parent5f11e01

3 files changed+10−10

compare with dev

unifiedsplit

squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+3−3 squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+2−2 squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+5−5

squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+3−3

@@ -177,7 +177,7 @@ values from primitive expression using arithmetic, logical,

177177and other operations.

178178-}

179179newtype Expression

180− (relation :: RelationsType)

180+ (relation :: RelationProduct)

181181 (grouping :: Grouping)

182182 (params :: [NullityType])

183183 (ty :: NullityType)

@@ -964,7 +964,7 @@ tables

964964-- | A `Table` from a schema without its alias with an `IsLabel` instance

965965-- to call a table reference by its alias.

966966newtype Table

967− (schema :: RelationsType)

967+ (schema :: RelationProduct)

968968 (columns :: RelationType)

969969 = UnsafeTable { renderTable :: ByteString }

970970 deriving (GHC.Generic,Show,Eq,Ord,NFData)

@@ -972,7 +972,7 @@ newtype Table

972972-- | A `HasTable` constraint indicates a table reference.

973973class KnownSymbol table => HasTable

974974 (table :: Symbol)

975− (tables :: RelationsType)

975+ (tables :: RelationProduct)

976976 (columns :: RelationType)

977977 | table tables -> columns where

978978 getTable :: Alias table -> Table tables columns

squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+2−2

@@ -421,7 +421,7 @@ Table Expressions

421421data TableExpression

422422 (schema :: SchemaType)

423423 (params :: [NullityType])

424− (tables :: RelationsType)

424+ (tables :: RelationProduct)

425425 (grouping :: Grouping)

426426 = TableExpression

427427 { fromClause :: FromClause schema params tables

@@ -669,7 +669,7 @@ Grouping

669669-- column @col@; otherwise @By2 (\#tab \! \#col)@ will reference a table

670670-- qualified column @tab.col@.

671671data By

672− (tables :: RelationsType)

672+ (tables :: RelationProduct)

673673 (by :: (Symbol,Symbol)) where

674674 By

675675 :: (HasUnique table tables columns, HasColumn column columns ty)

squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+5−5

@@ -39,7 +39,7 @@ module Squeal.PostgreSQL.Schema

3939 , ColumnType

4040 , ColumnsType

4141 , RelationType

42− , RelationsType

42+ , RelationProduct

4343 , TableType

4444 , SchemaType

4545 , Grouping (..)

@@ -148,7 +148,7 @@ type ColumnType = (ColumnConstraint,NullityType)

148148type ColumnsType = [(Symbol,ColumnType)]

149149

150150type RelationType = [(Symbol,NullityType)]

151−type RelationsType = [(Symbol,RelationType)]

151+type RelationProduct = [(Symbol,RelationType)]

152152

153153type TableType = (TableConstraints,ColumnsType)

154154type SchemaType = [(Symbol,TableType)]

@@ -164,7 +164,7 @@ type family UnconstrainColumns (columns :: ColumnsType) :: RelationType where

164164type family UnconstrainTable (table :: TableType) :: ColumnsType where

165165 UnconstrainTable (constraints :=> columns) = columns

166166

167−type family UnconstrainSchema (schema :: SchemaType) :: RelationsType where

167+type family UnconstrainSchema (schema :: SchemaType) :: RelationProduct where

168168 UnconstrainSchema '[] = '[]

169169 UnconstrainSchema (tab ::: constraints :=> columns ': tables) =

170170 tab ::: UnconstrainColumns columns ': UnconstrainSchema tables

@@ -293,10 +293,10 @@ type family NullifyColumns (columns :: RelationType) :: RelationType where

293293 NullifyColumns (column ::: ty ': columns) =

294294 column ::: NullifyType ty ': NullifyColumns columns

295295

296−-- | `NullifyTables` is an idempotent that nullifies a `RelationsType`

296+-- | `NullifyTables` is an idempotent that nullifies a `RelationProduct`

297297-- used to nullify the left or right hand side of an outer join

298298-- in a `Squeal.PostgreSQL.Query.FromClause`.

299−type family NullifyTables (tables :: RelationsType) :: RelationsType where

299+type family NullifyTables (tables :: RelationProduct) :: RelationProduct where

300300 NullifyTables '[] = '[]

301301 NullifyTables (table ::: columns ': tables) =

302302 table ::: NullifyColumns columns ': NullifyTables tables