diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/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/library/Database/Persist/Sql/Lifted/Expression.hs b/library/Database/Persist/Sql/Lifted/Expression.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Bool.hs b/library/Database/Persist/Sql/Lifted/Expression/Bool.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Case.hs b/library/Database/Persist/Sql/Lifted/Expression/Case.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Comparison.hs b/library/Database/Persist/Sql/Lifted/Expression/Comparison.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Constant.hs b/library/Database/Persist/Sql/Lifted/Expression/Constant.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Count.hs b/library/Database/Persist/Sql/Lifted/Expression/Count.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Exists.hs b/library/Database/Persist/Sql/Lifted/Expression/Exists.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Insert.hs b/library/Database/Persist/Sql/Lifted/Expression/Insert.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Key.hs b/library/Database/Persist/Sql/Lifted/Expression/Key.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/List.hs b/library/Database/Persist/Sql/Lifted/Expression/List.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Maybe.hs b/library/Database/Persist/Sql/Lifted/Expression/Maybe.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Number.hs b/library/Database/Persist/Sql/Lifted/Expression/Number.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/OrderBy.hs b/library/Database/Persist/Sql/Lifted/Expression/OrderBy.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Projection.hs b/library/Database/Persist/Sql/Lifted/Expression/Projection.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/String.hs b/library/Database/Persist/Sql/Lifted/Expression/String.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/SubSelect.hs b/library/Database/Persist/Sql/Lifted/Expression/SubSelect.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Table.hs b/library/Database/Persist/Sql/Lifted/Expression/Table.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Type.hs b/library/Database/Persist/Sql/Lifted/Expression/Type.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Expression/Update.hs b/library/Database/Persist/Sql/Lifted/Expression/Update.hs new file mode 100644 --- /dev/null +++ b/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/library/Database/Persist/Sql/Lifted/Filter.hs b/library/Database/Persist/Sql/Lifted/Filter.hs new file mode 100644 --- /dev/null +++ b/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 diff --git a/library/Database/Persist/Sql/Lifted/From.hs b/library/Database/Persist/Sql/Lifted/From.hs new file mode 100644 --- /dev/null +++ b/library/Database/Persist/Sql/Lifted/From.hs @@ -0,0 +1,22 @@ +module Database.Persist.Sql.Lifted.From + ( -- * Type + From + + -- * Table + , from + , table + + -- * Joins + , (:&) (..) + , on + , innerJoin + , innerJoinLateral + , leftJoin + , leftJoinLateral + , rightJoin + , fullOuterJoin + , crossJoin + , crossJoinLateral + ) where + +import Database.Esqueleto.Experimental diff --git a/library/Database/Persist/Sql/Lifted/Query.hs b/library/Database/Persist/Sql/Lifted/Query.hs new file mode 100644 --- /dev/null +++ b/library/Database/Persist/Sql/Lifted/Query.hs @@ -0,0 +1,50 @@ +module Database.Persist.Sql.Lifted.Query + ( -- * Type + SqlQuery + + -- * Where + , where_ + + -- * Aggregate + , groupBy + , groupBy_ + , having + + -- * Limit & offset + , limit + , offset + + -- * Distinct & order by + , distinct + , distinctOn + , orderBy + , don + , distinctOnOrderBy + + -- * Update + , set + + -- * withNonNull + , withNonNull + + -- * Locking + , locking + , LockingKind (..) + + -- * Set operations + , union_ + , unionAll_ + , except_ + , intersect_ + + -- * Common table expressions + , with + , withRecursive + ) where + +import Database.Persist.Sql.Lifted.Query.Aggregate +import Database.Persist.Sql.Lifted.Query.CommonTableExpressions +import Database.Persist.Sql.Lifted.Query.Core +import Database.Persist.Sql.Lifted.Query.Locking +import Database.Persist.Sql.Lifted.Query.SetOperations +import Database.Persist.Sql.Lifted.Query.Update diff --git a/library/Database/Persist/Sql/Lifted/Query/Aggregate.hs b/library/Database/Persist/Sql/Lifted/Query/Aggregate.hs new file mode 100644 --- /dev/null +++ b/library/Database/Persist/Sql/Lifted/Query/Aggregate.hs @@ -0,0 +1,7 @@ +module Database.Persist.Sql.Lifted.Query.Aggregate + ( groupBy + , groupBy_ + , having + ) where + +import Database.Esqueleto.Experimental diff --git a/library/Database/Persist/Sql/Lifted/Query/CommonTableExpressions.hs b/library/Database/Persist/Sql/Lifted/Query/CommonTableExpressions.hs new file mode 100644 --- /dev/null +++ b/library/Database/Persist/Sql/Lifted/Query/CommonTableExpressions.hs @@ -0,0 +1,6 @@ +module Database.Persist.Sql.Lifted.Query.CommonTableExpressions + ( with + , withRecursive + ) where + +import Database.Esqueleto.Experimental diff --git a/library/Database/Persist/Sql/Lifted/Query/Core.hs b/library/Database/Persist/Sql/Lifted/Query/Core.hs new file mode 100644 --- /dev/null +++ b/library/Database/Persist/Sql/Lifted/Query/Core.hs @@ -0,0 +1,23 @@ +module Database.Persist.Sql.Lifted.Query.Core + ( -- * Type + SqlQuery + + -- * Where + , where_ + + -- * Limit & offset + , limit + , offset + + -- * Distinct & order by + , distinct + , distinctOn + , orderBy + , don + , distinctOnOrderBy + + -- * withNonNull + , withNonNull + ) where + +import Database.Esqueleto.Experimental diff --git a/library/Database/Persist/Sql/Lifted/Query/Locking.hs b/library/Database/Persist/Sql/Lifted/Query/Locking.hs new file mode 100644 --- /dev/null +++ b/library/Database/Persist/Sql/Lifted/Query/Locking.hs @@ -0,0 +1,6 @@ +module Database.Persist.Sql.Lifted.Query.Locking + ( locking + , LockingKind (..) + ) where + +import Database.Esqueleto.Experimental diff --git a/library/Database/Persist/Sql/Lifted/Query/SetOperations.hs b/library/Database/Persist/Sql/Lifted/Query/SetOperations.hs new file mode 100644 --- /dev/null +++ b/library/Database/Persist/Sql/Lifted/Query/SetOperations.hs @@ -0,0 +1,9 @@ +module Database.Persist.Sql.Lifted.Query.SetOperations + ( union_ + , unionAll_ + , except_ + , intersect_ + ) +where + +import Database.Esqueleto.Experimental diff --git a/library/Database/Persist/Sql/Lifted/Query/Update.hs b/library/Database/Persist/Sql/Lifted/Query/Update.hs new file mode 100644 --- /dev/null +++ b/library/Database/Persist/Sql/Lifted/Query/Update.hs @@ -0,0 +1,5 @@ +module Database.Persist.Sql.Lifted.Query.Update + ( set + ) where + +import Database.Esqueleto.Experimental diff --git a/library/Database/Persist/Sql/Lifted/Update.hs b/library/Database/Persist/Sql/Lifted/Update.hs new file mode 100644 --- /dev/null +++ b/library/Database/Persist/Sql/Lifted/Update.hs @@ -0,0 +1,15 @@ +module Database.Persist.Sql.Lifted.Update + ( -- * Type + Update + + -- * Basic update + , (=.) + + -- * Arithmetic update + , (+=.) + , (-=.) + , (*=.) + , (/=.) + ) where + +import Database.Persist diff --git a/package.yaml b/package.yaml --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: persistent-sql-lifted -version: 0.1.1.0 +version: 0.2.0.0 maintainer: Freckle Education category: Database diff --git a/persistent-sql-lifted.cabal b/persistent-sql-lifted.cabal --- a/persistent-sql-lifted.cabal +++ b/persistent-sql-lifted.cabal @@ -1,6 +1,6 @@ cabal-version: 1.18 name: persistent-sql-lifted -version: 0.1.1.0 +version: 0.2.0.0 license: MIT license-file: LICENSE maintainer: Freckle Education @@ -35,10 +35,39 @@ Database.Persist.Sql.Lifted Database.Persist.Sql.Lifted.Core Database.Persist.Sql.Lifted.Esqueleto + 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.HasSqlBackend Database.Persist.Sql.Lifted.MonadSqlBackend Database.Persist.Sql.Lifted.MonadSqlTx Database.Persist.Sql.Lifted.Persistent + 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 hs-source-dirs: library other-modules: Paths_persistent_sql_lifted