Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move some ListTable operations to Rel8.Array to avoid name clashes #286

Merged
merged 1 commit into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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