Skip to content

Commit

Permalink
Move some ListTable operations to Rel8.Array to avoid name clashes (#286
Browse files Browse the repository at this point in the history
)
  • Loading branch information
shane-circuithub authored Oct 20, 2023
1 parent 9fb4166 commit bfb437f
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 11 deletions.
1 change: 1 addition & 0 deletions rel8.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ library
src
exposed-modules:
Rel8
Rel8.Array
Rel8.Expr.Num
Rel8.Expr.Text
Rel8.Expr.Time
Expand Down
10 changes: 0 additions & 10 deletions src/Rel8.hs
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ module Rel8
, manyExpr
, catListTable
, catList
, head, headExpr
, index, indexExpr
, last, lastExpr
, length, lengthExpr

-- ** @NonEmptyTable@
, NonEmptyTable
Expand All @@ -114,10 +110,6 @@ module Rel8
, someExpr
, catNonEmptyTable
, catNonEmpty
, head1, head1Expr
, index1, index1Expr
, last1, last1Expr
, length1, length1Expr

-- ** @NullTable@
, NullTable
Expand Down Expand Up @@ -396,8 +388,6 @@ import Rel8.Expr.Bool
import Rel8.Expr.Default
import Rel8.Expr.Eq
import Rel8.Expr.Function
import Rel8.Expr.List
import Rel8.Expr.NonEmpty
import Rel8.Expr.Null
import Rel8.Expr.Opaleye (unsafeCastExpr, unsafeLiteral)
import Rel8.Expr.Ord
Expand Down
26 changes: 26 additions & 0 deletions src/Rel8/Array.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
module Rel8.Array
(
-- ** @ListTable@
ListTable
, head, headExpr
, index, indexExpr
, last, lastExpr
, length, lengthExpr

-- ** @NonEmptyTable@
, NonEmptyTable
, head1, head1Expr
, index1, index1Expr
, last1, last1Expr
, length1, length1Expr
)
where

-- base
import Prelude hiding (head, last, length)

-- rel8
import Rel8.Expr.List
import Rel8.Expr.NonEmpty
import Rel8.Table.List
import Rel8.Table.NonEmpty
1 change: 0 additions & 1 deletion src/Rel8/Statement/OnConflict.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
{-# language GADTs #-}
{-# language LambdaCase #-}
{-# language NamedFieldPuns #-}
{-# language NoFieldSelectors #-}
{-# language OverloadedStrings #-}
{-# language RecordWildCards #-}
{-# language StandaloneKindSignatures #-}
Expand Down

0 comments on commit bfb437f

Please sign in to comment.