0.9.1.3

morphismtech · Sep 1, 2023 · ae4a238 · ae4a238
1 parent fa20d37
commit ae4a238
Show file tree

Hide file tree

Showing 35 changed files with 79 additions and 37 deletions.
diff --git a/squeal-postgresql/squeal-postgresql.cabal b/squeal-postgresql/squeal-postgresql.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name: squeal-postgresql
-version: 0.9.1.2
+version: 0.9.1.3
 synopsis: Squeal PostgreSQL Library
 description: Squeal is a type-safe embedding of PostgreSQL in Haskell
 homepage: https://github.com/morphismtech/squeal

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs
@@ -24,7 +24,8 @@ data definition language
   , RankNTypes
   , ScopedTypeVariables
   , TypeApplications
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableSuperClasses
   , UndecidableInstances

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Comment.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Comment.hs
@@ -24,7 +24,8 @@ comments
   , RankNTypes
   , ScopedTypeVariables
   , TypeApplications
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableSuperClasses
   #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Constraint.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Constraint.hs
@@ -24,7 +24,8 @@ constraint expressions
   , RankNTypes
   , ScopedTypeVariables
   , TypeApplications
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableSuperClasses
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Function.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Function.hs
@@ -24,7 +24,8 @@ create and drop functions
   , RankNTypes
   , ScopedTypeVariables
   , TypeApplications
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableSuperClasses
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Index.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Index.hs
@@ -24,7 +24,8 @@ create and drop indexes
   , RankNTypes
   , ScopedTypeVariables
   , TypeApplications
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableSuperClasses
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Procedure.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Procedure.hs
@@ -24,7 +24,8 @@ create and drop procedures
   , RankNTypes
   , ScopedTypeVariables
   , TypeApplications
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableSuperClasses
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Schema.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Schema.hs
@@ -24,7 +24,8 @@ create and drop schemas
   , RankNTypes
   , ScopedTypeVariables
   , TypeApplications
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableSuperClasses
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Table.hs
@@ -24,7 +24,8 @@ create, drop and alter tables
   , RankNTypes
   , ScopedTypeVariables
   , TypeApplications
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableSuperClasses
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Type.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Definition/Type.hs
@@ -24,7 +24,8 @@ create and drop types
   , RankNTypes
   , ScopedTypeVariables
   , TypeApplications
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableSuperClasses
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Definition/View.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Definition/View.hs
@@ -24,7 +24,8 @@ create and drop views
   , RankNTypes
   , ScopedTypeVariables
   , TypeApplications
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableSuperClasses
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs
@@ -25,7 +25,8 @@ Expressions are the atoms used to build statements.
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
   , RankNTypes

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Expression/Comparison.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Expression/Comparison.hs
@@ -11,7 +11,8 @@ comparison functions and operators
 {-# LANGUAGE
     OverloadedStrings
   , RankNTypes
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
 #-}
 

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Manipulation.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Manipulation.hs
@@ -24,7 +24,8 @@ data manipulation language
   , ScopedTypeVariables
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Manipulation/Call.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Manipulation/Call.hs
@@ -24,7 +24,8 @@ call statements
   , ScopedTypeVariables
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Manipulation/Delete.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Manipulation/Delete.hs
@@ -24,7 +24,8 @@ delete statements
   , ScopedTypeVariables
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Manipulation/Insert.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Manipulation/Insert.hs
@@ -24,7 +24,8 @@ insert statements
   , ScopedTypeVariables
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Manipulation/Update.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Manipulation/Update.hs
@@ -24,7 +24,8 @@ update statements
   , ScopedTypeVariables
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
 #-}

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Query.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Query.hs
@@ -25,7 +25,8 @@ structured query language
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , RankNTypes
   , UndecidableInstances

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Query/From.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Query/From.hs
@@ -25,7 +25,8 @@ from clauses
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , RankNTypes
   , UndecidableInstances

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Query/From/Join.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Query/From/Join.hs
@@ -25,7 +25,8 @@ Squeal joins
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , RankNTypes
   , UndecidableInstances

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Query/From/Set.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Query/From/Set.hs
@@ -25,7 +25,8 @@ set returning functions
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , RankNTypes
   , UndecidableInstances

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Query/Select.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Query/Select.hs
@@ -25,7 +25,8 @@ select statements
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , RankNTypes
   , UndecidableInstances

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Query/Table.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Query/Table.hs
@@ -25,7 +25,8 @@ intermediate table expressions
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , RankNTypes
   , UndecidableInstances

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Query/Values.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Query/Values.hs
@@ -25,7 +25,8 @@ values statements
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , RankNTypes
   , UndecidableInstances

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Query/With.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Query/With.hs
@@ -25,7 +25,8 @@ with statements
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , RankNTypes
   , UndecidableInstances

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Session.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Session.hs
@@ -24,7 +24,8 @@ application's monad transformer stack, giving it an instance of `MonadPQ` @DB@.
   , ScopedTypeVariables
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
 #-}
@@ -39,11 +40,13 @@ module Squeal.PostgreSQL.Session
 
 import Control.Applicative
 import Control.Category
+import Control.Monad (MonadPlus(..))
 import Control.Monad.Base (MonadBase(..))
+import Control.Monad.Fix (MonadFix(..))
 import Control.Monad.Catch
-import Control.Monad.Except
+import Control.Monad.IO.Class (MonadIO(..))
 import Control.Monad.Morph
-import Control.Monad.Reader
+import Control.Monad.Reader (ReaderT(..))
 import Control.Monad.Trans.Control (MonadBaseControl(..), MonadTransControl(..))
 import UnliftIO (MonadUnliftIO(..))
 import Data.ByteString (ByteString)

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Session/Pool.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Session/Pool.hs
@@ -41,7 +41,8 @@ a
   , RankNTypes
   , ScopedTypeVariables
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , UndecidableInstances
 #-}
 

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Session/Transaction/Unsafe.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Session/Transaction/Unsafe.hs
@@ -13,7 +13,8 @@ transaction control language permitting arbitrary `IO`
   , FlexibleContexts
   , LambdaCase
   , OverloadedStrings
-  , TypeInType
+  , DataKinds
+  , PolyKinds
 #-}
 
 module Squeal.PostgreSQL.Session.Transaction.Unsafe

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Type.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Type.hs
@@ -26,7 +26,8 @@ storage newtypes
   , ScopedTypeVariables
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
   , UndecidableSuperClasses

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Type/Alias.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Type/Alias.hs
@@ -27,7 +27,8 @@ Squeal can reference aliases by prepending with a @#@.
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilyDependencies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
   , UndecidableSuperClasses

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Type/PG.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Type/PG.hs
@@ -27,7 +27,8 @@ into corresponding Postgres types.
   , ScopedTypeVariables
   , TypeApplications
   , TypeFamilies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
   , UndecidableSuperClasses

diff --git a/squeal-postgresql/src/Squeal/PostgreSQL/Type/Schema.hs b/squeal-postgresql/src/Squeal/PostgreSQL/Type/Schema.hs
@@ -27,7 +27,8 @@ It also defines useful type families to operate on these.
   , StandaloneDeriving
   , TypeApplications
   , TypeFamilyDependencies
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
   , UndecidableSuperClasses
@@ -206,7 +207,7 @@ data Optionality
 -- | `ColumnType` encodes the allowance of @DEFAULT@ and @NULL@ and the
 -- base `PGType` for a column.
 --
--- >>> :set -XTypeFamilies -XTypeInType
+-- >>> :set -XTypeFamilies -XDataKinds -XPolyKinds
 -- >>> import GHC.TypeLits
 -- >>> type family IdColumn :: ColumnType where IdColumn = 'Def :=> 'NotNull 'PGint4
 -- >>> type family EmailColumn :: ColumnType where EmailColumn = 'NoDef :=> 'Null 'PGtext

diff --git a/squeal-postgresql/test/Spec.hs b/squeal-postgresql/test/Spec.hs
@@ -15,7 +15,8 @@
   , TypeApplications
   , TypeFamilies
   , TypeSynonymInstances
-  , TypeInType
+  , DataKinds
+  , PolyKinds
   , TypeOperators
   , UndecidableInstances
 #-}

diff --git a/stack-ghc9_6.yaml b/stack-ghc9_6.yaml
@@ -0,0 +1,7 @@
+resolver: nightly-2023-08-29
+packages:
+- squeal-postgresql
+- squeal-postgresql-ltree
+- squeal-postgresql-uuid-ossp
+extra-deps:
+- records-sop-0.1.1.1