d4c4121 · squeal · git.iko.soy

git.iko.soy/squeal

Unrolled some type families

commitd4c4121b597e803bb5f3298c49fc3e6d7dd2bf1b authoriko <ilyakooo0@gmail.com> dateThu 17 Oct 2019, 18:53 (7 years ago) parent045aae6

3 files changed+77−11

compare with dev

unifiedsplit

squeal-postgresql/src/Squeal/PostgreSQL/List.hs+11−2 squeal-postgresql/src/Squeal/PostgreSQL/PG.hs+19−2 squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+47−7

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

@@ -84,7 +84,12 @@ infixl 9 *:

8484-- | @Elem@ is a promoted `Data.List.elem`.

8585type family Elem x xs where

8686 Elem x '[] = 'False

87− Elem x (x ': xs) = 'True

87+ Elem x (x ': _) = 'True

88+ Elem x (_ ': x ': _) = 'True

89+ Elem x (_ ': _ ': x ': _) = 'True

90+ Elem x (_ ': _ ': _ ': x ': _) = 'True

91+ Elem x (_ ': _ ': _ ': _ ': x ': _) = 'True

92+ Elem x (_ ': _ ': _ ': _ ': _ ': x ': _) = 'True

8893 Elem x (_ ': xs) = Elem x xs

8994

9095-- | @In x xs@ is a constraint that proves that @x@ is in @xs@.

@@ -99,5 +104,9 @@ Length '[Char,String,Bool,Double] :: Nat

99104= 4

100105-}

101106type family Length (xs :: [k]) :: Nat where

102− Length (x : xs) = 1 + Length xs

107+ Length (_ ': _ ': _ ': _ ': _ : xs) = 5 + Length xs

108+ Length (_ ': _ ': _ ': _ : xs) = 4 + Length xs

109+ Length (_ ': _ ': _ : xs) = 3 + Length xs

110+ Length (_ ': _ : xs) = 2 + Length xs

111+ Length (_ : xs) = 1 + Length xs

103112 Length '[] = 0

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

@@ -178,8 +178,16 @@ type family RowPG (hask :: Type) :: RowType where

178178

179179-- | `RowOf` applies `NullPG` to the fields of a list.

180180type family RowOf (record :: [(Symbol, Type)]) :: RowType where

181− RowOf '[] = '[]

181+ RowOf (col ::: ty ': col1 ::: ty1 ': col2 ::: ty2 ': col3 ::: ty3 ': col4 ::: ty4 ': record) =

182+ col ::: NullPG ty ': col1 ::: NullPG ty1 ': col2 ::: NullPG ty2 ': col3 ::: NullPG ty3 ': col4 ::: NullPG ty4 ': RowOf record

183+ RowOf (col ::: ty ': col1 ::: ty1 ': col2 ::: ty2 ': col3 ::: ty3 ': record) =

184+ col ::: NullPG ty ': col1 ::: NullPG ty1 ': col2 ::: NullPG ty2 ': col3 ::: NullPG ty3 ': RowOf record

185+ RowOf (col ::: ty ': col1 ::: ty1 ': col2 ::: ty2 ': record) =

186+ col ::: NullPG ty ': col1 ::: NullPG ty1 ': col2 ::: NullPG ty2 ': RowOf record

187+ RowOf (col ::: ty ': col1 ::: ty1 ': record) =

188+ col ::: NullPG ty ': col1::: NullPG ty1 ': RowOf record

182189 RowOf (col ::: ty ': record) = col ::: NullPG ty ': RowOf record

190+ RowOf '[] = '[]

183191

184192{- | `NullPG` turns a Haskell type into a `NullityType`.

185193

@@ -206,8 +214,17 @@ type family TuplePG (hask :: Type) :: [NullityType] where

206214

207215-- | `TupleOf` turns a list of Haskell `Type`s into a list of `NullityType`s.

208216type family TupleOf (tuple :: [Type]) :: [NullityType] where

209− TupleOf '[] = '[]

217+ TupleOf (hask ': hask1 ': hask2 ': hask3 ': hask4 ': hask5 ': tuple) =

218+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': NullPG hask3 ': NullPG hask4 ': NullPG hask5 ': TupleOf tuple

219+ TupleOf (hask ': hask1 ': hask2 ': hask3 ': hask4 ': tuple) =

220+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': NullPG hask3 ': NullPG hask4 ': TupleOf tuple

221+ TupleOf (hask ': hask1 ': hask2 ': hask3 ': tuple) =

222+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': NullPG hask3 ': TupleOf tuple

223+ TupleOf (hask ': hask1 ': hask2 ': tuple) =

224+ NullPG hask ': NullPG hask1 ': NullPG hask2 ': TupleOf tuple

225+ TupleOf (hask ': hask1 ': tuple) = NullPG hask ': NullPG hask1 ': TupleOf tuple

210226 TupleOf (hask ': tuple) = NullPG hask ': TupleOf tuple

227+ TupleOf '[] = '[]

211228

212229-- | `TupleCodeOf` takes the `SOP.Code` of a haskell `Type`

213230-- and if it's a simple product returns it, otherwise giving a `TypeError`.

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

@@ -260,9 +260,19 @@ type FromType = [(Symbol,RowType)]

260260

261261-- | `ColumnsToRow` removes column constraints.

262262type family ColumnsToRow (columns :: ColumnsType) :: RowType where

263− ColumnsToRow '[] = '[]

264− ColumnsToRow (column ::: constraint :=> ty ': columns) =

263+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': column3 ::: _ :=> ty3 ': column4 ::: _ :=> ty4 ': column5 ::: _ :=> ty5 ': columns) =

264+ column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': column5 ::: ty5 ': ColumnsToRow columns

265+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': column3 ::: _ :=> ty3 ': column4 ::: _ :=> ty4 ': columns) =

266+ column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': ColumnsToRow columns

267+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': column3 ::: _ :=> ty3 ': columns) =

268+ column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': ColumnsToRow columns

269+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': column2 ::: _ :=> ty2 ': columns) =

270+ column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': ColumnsToRow columns

271+ ColumnsToRow (column ::: _ :=> ty ': column1 ::: _ :=> ty1 ': columns) =

272+ column ::: ty ': column1 ::: ty1 ': ColumnsToRow columns

273+ ColumnsToRow (column ::: _ :=> ty ': columns) =

265274 column ::: ty ': ColumnsToRow columns

275+ ColumnsToRow '[] = '[]

266276

267277-- | `TableToColumns` removes table constraints.

268278type family TableToColumns (table :: TableType) :: ColumnsType where

@@ -295,14 +305,24 @@ instance ty0 ~ ty1 => SamePGType

295305

296306-- | `AllNotNull` is a constraint that proves a `ColumnsType` has no @NULL@s.

297307type family AllNotNull (columns :: ColumnsType) :: Constraint where

308+ AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

309+ AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

310+ AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

311+ AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

312+ AllNotNull (_ ::: _ :=> 'NotNull _ ': _ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

313+ AllNotNull (_ ::: _ :=> 'NotNull _ ': columns) = AllNotNull columns

298314 AllNotNull '[] = ()

299− AllNotNull (column ::: def :=> 'NotNull ty ': columns) = AllNotNull columns

300315

301316-- | `NotAllNull` is a constraint that proves a `ColumnsType` has some

302317-- @NOT NULL@.

303318type family NotAllNull (columns :: ColumnsType) :: Constraint where

304− NotAllNull (column ::: def :=> 'NotNull ty ': columns) = ()

305− NotAllNull (column ::: def :=> 'Null ty ': columns) = NotAllNull columns

319+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

320+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

321+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

322+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

323+ NotAllNull (_ ::: _ :=> _ _ ': _ ::: _ :=> 'NotNull _ ': _) = ()

324+ NotAllNull (_ ::: _ :=> 'NotNull _ ': _) = ()

325+ NotAllNull (_ ::: _ :=> 'Null _ ': columns) = NotAllNull columns

306326

307327-- | `NullifyType` is an idempotent that nullifies a `NullityType`.

308328type family NullifyType (ty :: NullityType) :: NullityType where

@@ -311,17 +331,37 @@ type family NullifyType (ty :: NullityType) :: NullityType where

311331

312332-- | `NullifyRow` is an idempotent that nullifies a `RowType`.

313333type family NullifyRow (columns :: RowType) :: RowType where

314− NullifyRow '[] = '[]

334+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': column5 ::: ty5 ': columns) =

335+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': column4 ::: NullifyType ty4 ': column5 ::: NullifyType ty5 ': NullifyRow columns

336+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': column4 ::: ty4 ': columns) =

337+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': column4 ::: NullifyType ty4 ': NullifyRow columns

338+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': column3 ::: ty3 ': columns) =

339+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': column3 ::: NullifyType ty3 ': NullifyRow columns

340+ NullifyRow (column ::: ty ': column1 ::: ty1 ': column2 ::: ty2 ': columns) =

341+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': column2 ::: NullifyType ty2 ': NullifyRow columns

342+ NullifyRow (column ::: ty ': column1 ::: ty1 ': columns) =

343+ column ::: NullifyType ty ': column1 ::: NullifyType ty1 ': NullifyRow columns

315344 NullifyRow (column ::: ty ': columns) =

316345 column ::: NullifyType ty ': NullifyRow columns

346+ NullifyRow '[] = '[]

317347

318348-- | `NullifyFrom` is an idempotent that nullifies a `FromType`

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

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

321351type family NullifyFrom (tables :: FromType) :: FromType where

322− NullifyFrom '[] = '[]

352+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': table4 ::: columns4 ': table5 ::: columns5 ': tables) =

353+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': table4 ::: NullifyRow columns5 ': table5 ::: NullifyRow columns4 ': NullifyFrom tables

354+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': table4 ::: columns4 ': tables) =

355+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': table4 ::: NullifyRow columns4 ': NullifyFrom tables

356+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': table3 ::: columns3 ': tables) =

357+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': table3 ::: NullifyRow columns3 ': NullifyFrom tables

358+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': table2 ::: columns2 ': tables) =

359+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': table2 ::: NullifyRow columns2 ': NullifyFrom tables

360+ NullifyFrom (table ::: columns ': table1 ::: columns1 ': tables) =

361+ table ::: NullifyRow columns ': table1 ::: NullifyRow columns1 ': NullifyFrom tables

323362 NullifyFrom (table ::: columns ': tables) =

324363 table ::: NullifyRow columns ': NullifyFrom tables

364+ NullifyFrom '[] = '[]

325365

326366-- | @Create alias x xs@ adds @alias ::: x@ to the end of @xs@ and is used in

327367-- `Squeal.PostgreSQL.Definition.createTable` statements and in @ALTER TABLE@