add many new reexport modules

freckle · Jan 10, 2025 · 23af746 · 23af746
1 parent b040e75
commit 23af746
Show file tree

Hide file tree

Showing 32 changed files with 526 additions and 2 deletions.
diff --git a/persistent-sql-lifted/CHANGELOG.md b/persistent-sql-lifted/CHANGELOG.md
@@ -1,4 +1,38 @@
-## [_Unreleased_](https://github.com/freckle/persistent-sql-lifted/compare/persistent-sql-lifted-v0.1.1.0...main)
+## [_Unreleased_](https://github.com/freckle/persistent-sql-lifted/compare/persistent-sql-lifted-v0.2.0.0...main)
+
+## [v0.2.0.0](https://github.com/freckle/persistent-sql-lifted/compare/persistent-sql-lifted-v0.1.1.0...persistent-sql-lifted-v0.2.0.0)
+
+New modules:
+
+- `Database.Persist.Sql.Lifted.Expression`
+- `Database.Persist.Sql.Lifted.Expression.Bool`
+- `Database.Persist.Sql.Lifted.Expression.Case`
+- `Database.Persist.Sql.Lifted.Expression.Comparison`
+- `Database.Persist.Sql.Lifted.Expression.Constant`
+- `Database.Persist.Sql.Lifted.Expression.Count`
+- `Database.Persist.Sql.Lifted.Expression.Exists`
+- `Database.Persist.Sql.Lifted.Expression.Insert`
+- `Database.Persist.Sql.Lifted.Expression.Key`
+- `Database.Persist.Sql.Lifted.Expression.List`
+- `Database.Persist.Sql.Lifted.Expression.Maybe`
+- `Database.Persist.Sql.Lifted.Expression.Number`
+- `Database.Persist.Sql.Lifted.Expression.OrderBy`
+- `Database.Persist.Sql.Lifted.Expression.Projection`
+- `Database.Persist.Sql.Lifted.Expression.String`
+- `Database.Persist.Sql.Lifted.Expression.SubSelect`
+- `Database.Persist.Sql.Lifted.Expression.Table`
+- `Database.Persist.Sql.Lifted.Expression.Type`
+- `Database.Persist.Sql.Lifted.Expression.Update`
+- `Database.Persist.Sql.Lifted.Filter`
+- `Database.Persist.Sql.Lifted.From`
+- `Database.Persist.Sql.Lifted.Query`
+- `Database.Persist.Sql.Lifted.Query.Aggregate`
+- `Database.Persist.Sql.Lifted.Query.CommonTableExpressions`
+- `Database.Persist.Sql.Lifted.Query.Core`
+- `Database.Persist.Sql.Lifted.Query.Locking`
+- `Database.Persist.Sql.Lifted.Query.SetOperations`
+- `Database.Persist.Sql.Lifted.Query.Update`
+- `Database.Persist.Sql.Lifted.Update`
 
 ## [v0.1.1.0](https://github.com/freckle/persistent-sql-lifted/compare/persistent-sql-lifted-v0.1.0.0...persistent-sql-lifted-v0.1.1.0)
 

diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression.hs
@@ -0,0 +1,138 @@
+module Database.Persist.Sql.Lifted.Expression
+  ( -- * Type
+    SqlExpr
+
+    -- * Constant
+  , val
+
+    -- * Bool
+  , not_
+  , (&&.)
+  , (||.)
+
+    -- * Case
+  , case_
+  , when_
+  , then_
+  , else_
+
+    -- * Comparison
+  , (==.)
+  , (!=.)
+  , (>=.)
+  , (>.)
+  , (<=.)
+  , (<.)
+  , between
+
+    -- * Count
+  , count
+  , countRows
+  , countDistinct
+
+    -- * Exists
+  , exists
+  , notExists
+
+    -- * Insert
+  , (<#)
+  , (<&>)
+
+    -- * Key
+  , toBaseId
+  , ToBaseId (..)
+
+    -- * List
+  , in_
+  , notIn
+  , subList_select
+  , valList
+  , justList
+
+    -- * Maybe
+  , isNothing
+  , isNothing_
+  , just
+  , nothing
+  , joinV
+  , coalesce
+  , coalesceDefault
+
+    -- * Number
+  , (+.)
+  , (-.)
+  , (/.)
+  , (*.)
+  , round_
+  , ceiling_
+  , floor_
+  , min_
+  , max_
+  , sum_
+  , avg_
+  , castNum
+  , castNumM
+
+    -- * OrderBy
+  , asc
+  , desc
+  , rand
+
+    -- * Projection
+  , (^.)
+  , (?.)
+
+    -- * String
+  , lower_
+  , upper_
+  , trim_
+  , ltrim_
+  , rtrim_
+  , length_
+  , left_
+  , right_
+  , like
+  , ilike
+  , (%)
+  , concat_
+  , (++.)
+  , castString
+
+    -- * SubSelect
+  , subSelect
+  , subSelectMaybe
+  , subSelectCount
+  , subSelectForeign
+  , subSelectList
+  , subSelectUnsafe
+
+    -- * Table
+  , getTable
+  , getTableMaybe
+
+    -- * Update
+  , (=.)
+  , (+=.)
+  , (-=.)
+  , (*=.)
+  , (/=.)
+  ) where
+
+import Database.Persist.Sql.Lifted.Expression.Bool
+import Database.Persist.Sql.Lifted.Expression.Case
+import Database.Persist.Sql.Lifted.Expression.Comparison
+import Database.Persist.Sql.Lifted.Expression.Constant
+import Database.Persist.Sql.Lifted.Expression.Count
+import Database.Persist.Sql.Lifted.Expression.Exists
+import Database.Persist.Sql.Lifted.Expression.Insert
+import Database.Persist.Sql.Lifted.Expression.Key
+import Database.Persist.Sql.Lifted.Expression.List
+import Database.Persist.Sql.Lifted.Expression.Maybe
+import Database.Persist.Sql.Lifted.Expression.Number
+import Database.Persist.Sql.Lifted.Expression.OrderBy
+import Database.Persist.Sql.Lifted.Expression.Projection
+import Database.Persist.Sql.Lifted.Expression.String
+import Database.Persist.Sql.Lifted.Expression.SubSelect
+import Database.Persist.Sql.Lifted.Expression.Table
+import Database.Persist.Sql.Lifted.Expression.Type
+import Database.Persist.Sql.Lifted.Expression.Update
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Bool.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Bool.hs
@@ -0,0 +1,7 @@
+module Database.Persist.Sql.Lifted.Expression.Bool
+  ( not_
+  , (&&.)
+  , (||.)
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Case.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Case.hs
@@ -0,0 +1,8 @@
+module Database.Persist.Sql.Lifted.Expression.Case
+  ( case_
+  , when_
+  , then_
+  , else_
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Comparison.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Comparison.hs
@@ -0,0 +1,14 @@
+module Database.Persist.Sql.Lifted.Expression.Comparison
+  ( -- * Equality
+    (==.)
+  , (!=.)
+
+    -- * Less & greater
+  , (>=.)
+  , (>.)
+  , (<=.)
+  , (<.)
+  , between
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Constant.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Constant.hs
@@ -0,0 +1,5 @@
+module Database.Persist.Sql.Lifted.Expression.Constant
+  ( val
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Count.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Count.hs
@@ -0,0 +1,7 @@
+module Database.Persist.Sql.Lifted.Expression.Count
+  ( count
+  , countRows
+  , countDistinct
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Exists.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Exists.hs
@@ -0,0 +1,6 @@
+module Database.Persist.Sql.Lifted.Expression.Exists
+  ( exists
+  , notExists
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Insert.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Insert.hs
@@ -0,0 +1,6 @@
+module Database.Persist.Sql.Lifted.Expression.Insert
+  ( (<#)
+  , (<&>)
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Key.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Key.hs
@@ -0,0 +1,6 @@
+module Database.Persist.Sql.Lifted.Expression.Key
+  ( toBaseId
+  , ToBaseId (..)
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/List.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/List.hs
@@ -0,0 +1,9 @@
+module Database.Persist.Sql.Lifted.Expression.List
+  ( in_
+  , notIn
+  , subList_select
+  , valList
+  , justList
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Maybe.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Maybe.hs
@@ -0,0 +1,11 @@
+module Database.Persist.Sql.Lifted.Expression.Maybe
+  ( isNothing
+  , isNothing_
+  , just
+  , nothing
+  , joinV
+  , coalesce
+  , coalesceDefault
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Number.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Number.hs
@@ -0,0 +1,17 @@
+module Database.Persist.Sql.Lifted.Expression.Number
+  ( (+.)
+  , (-.)
+  , (/.)
+  , (*.)
+  , round_
+  , ceiling_
+  , floor_
+  , min_
+  , max_
+  , sum_
+  , avg_
+  , castNum
+  , castNumM
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/OrderBy.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/OrderBy.hs
@@ -0,0 +1,7 @@
+module Database.Persist.Sql.Lifted.Expression.OrderBy
+  ( asc
+  , desc
+  , rand
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Projection.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Projection.hs
@@ -0,0 +1,6 @@
+module Database.Persist.Sql.Lifted.Expression.Projection
+  ( (^.)
+  , (?.)
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/String.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/String.hs
@@ -0,0 +1,18 @@
+module Database.Persist.Sql.Lifted.Expression.String
+  ( lower_
+  , upper_
+  , trim_
+  , ltrim_
+  , rtrim_
+  , length_
+  , left_
+  , right_
+  , like
+  , ilike
+  , (%)
+  , concat_
+  , (++.)
+  , castString
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/SubSelect.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/SubSelect.hs
@@ -0,0 +1,10 @@
+module Database.Persist.Sql.Lifted.Expression.SubSelect
+  ( subSelect
+  , subSelectMaybe
+  , subSelectCount
+  , subSelectForeign
+  , subSelectList
+  , subSelectUnsafe
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Table.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Table.hs
@@ -0,0 +1,6 @@
+module Database.Persist.Sql.Lifted.Expression.Table
+  ( getTable
+  , getTableMaybe
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Type.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Type.hs
@@ -0,0 +1,5 @@
+module Database.Persist.Sql.Lifted.Expression.Type
+  ( SqlExpr
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Update.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression/Update.hs
@@ -0,0 +1,9 @@
+module Database.Persist.Sql.Lifted.Expression.Update
+  ( (=.)
+  , (+=.)
+  , (-=.)
+  , (*=.)
+  , (/=.)
+  ) where
+
+import Database.Esqueleto.Experimental
diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Filter.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Filter.hs
@@ -0,0 +1,23 @@
+module Database.Persist.Sql.Lifted.Filter
+  ( -- * Type
+    Filter
+
+    -- * Equality
+  , (==.)
+  , (!=.)
+
+    -- * Less & greater
+  , (<.)
+  , (>.)
+  , (<=.)
+  , (>=.)
+
+    -- * Lists
+  , (<-.)
+  , (/<-.)
+
+    -- * Disjunction
+  , (||.)
+  ) where
+
+import Database.Persist