diff --git a/squeal-postgresql.cabal b/squeal-postgresql.cabal --- a/squeal-postgresql.cabal +++ b/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/src/Squeal/PostgreSQL/Definition.hs b/src/Squeal/PostgreSQL/Definition.hs --- a/src/Squeal/PostgreSQL/Definition.hs +++ b/src/Squeal/PostgreSQL/Definition.hs @@ -24,7 +24,8 @@ , RankNTypes , ScopedTypeVariables , TypeApplications - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableSuperClasses , UndecidableInstances diff --git a/src/Squeal/PostgreSQL/Definition/Comment.hs b/src/Squeal/PostgreSQL/Definition/Comment.hs --- a/src/Squeal/PostgreSQL/Definition/Comment.hs +++ b/src/Squeal/PostgreSQL/Definition/Comment.hs @@ -24,7 +24,8 @@ , RankNTypes , ScopedTypeVariables , TypeApplications - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableSuperClasses #-} diff --git a/src/Squeal/PostgreSQL/Definition/Constraint.hs b/src/Squeal/PostgreSQL/Definition/Constraint.hs --- a/src/Squeal/PostgreSQL/Definition/Constraint.hs +++ b/src/Squeal/PostgreSQL/Definition/Constraint.hs @@ -24,7 +24,8 @@ , RankNTypes , ScopedTypeVariables , TypeApplications - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableSuperClasses #-} diff --git a/src/Squeal/PostgreSQL/Definition/Function.hs b/src/Squeal/PostgreSQL/Definition/Function.hs --- a/src/Squeal/PostgreSQL/Definition/Function.hs +++ b/src/Squeal/PostgreSQL/Definition/Function.hs @@ -24,7 +24,8 @@ , RankNTypes , ScopedTypeVariables , TypeApplications - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableSuperClasses #-} diff --git a/src/Squeal/PostgreSQL/Definition/Index.hs b/src/Squeal/PostgreSQL/Definition/Index.hs --- a/src/Squeal/PostgreSQL/Definition/Index.hs +++ b/src/Squeal/PostgreSQL/Definition/Index.hs @@ -24,7 +24,8 @@ , RankNTypes , ScopedTypeVariables , TypeApplications - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableSuperClasses #-} diff --git a/src/Squeal/PostgreSQL/Definition/Procedure.hs b/src/Squeal/PostgreSQL/Definition/Procedure.hs --- a/src/Squeal/PostgreSQL/Definition/Procedure.hs +++ b/src/Squeal/PostgreSQL/Definition/Procedure.hs @@ -24,7 +24,8 @@ , RankNTypes , ScopedTypeVariables , TypeApplications - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableSuperClasses #-} diff --git a/src/Squeal/PostgreSQL/Definition/Schema.hs b/src/Squeal/PostgreSQL/Definition/Schema.hs --- a/src/Squeal/PostgreSQL/Definition/Schema.hs +++ b/src/Squeal/PostgreSQL/Definition/Schema.hs @@ -24,7 +24,8 @@ , RankNTypes , ScopedTypeVariables , TypeApplications - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableSuperClasses #-} diff --git a/src/Squeal/PostgreSQL/Definition/Table.hs b/src/Squeal/PostgreSQL/Definition/Table.hs --- a/src/Squeal/PostgreSQL/Definition/Table.hs +++ b/src/Squeal/PostgreSQL/Definition/Table.hs @@ -24,7 +24,8 @@ , RankNTypes , ScopedTypeVariables , TypeApplications - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableSuperClasses #-} diff --git a/src/Squeal/PostgreSQL/Definition/Type.hs b/src/Squeal/PostgreSQL/Definition/Type.hs --- a/src/Squeal/PostgreSQL/Definition/Type.hs +++ b/src/Squeal/PostgreSQL/Definition/Type.hs @@ -24,7 +24,8 @@ , RankNTypes , ScopedTypeVariables , TypeApplications - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableSuperClasses #-} diff --git a/src/Squeal/PostgreSQL/Definition/View.hs b/src/Squeal/PostgreSQL/Definition/View.hs --- a/src/Squeal/PostgreSQL/Definition/View.hs +++ b/src/Squeal/PostgreSQL/Definition/View.hs @@ -24,7 +24,8 @@ , RankNTypes , ScopedTypeVariables , TypeApplications - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableSuperClasses #-} diff --git a/src/Squeal/PostgreSQL/Expression.hs b/src/Squeal/PostgreSQL/Expression.hs --- a/src/Squeal/PostgreSQL/Expression.hs +++ b/src/Squeal/PostgreSQL/Expression.hs @@ -25,7 +25,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances , RankNTypes diff --git a/src/Squeal/PostgreSQL/Expression/Comparison.hs b/src/Squeal/PostgreSQL/Expression/Comparison.hs --- a/src/Squeal/PostgreSQL/Expression/Comparison.hs +++ b/src/Squeal/PostgreSQL/Expression/Comparison.hs @@ -11,7 +11,8 @@ {-# LANGUAGE OverloadedStrings , RankNTypes - , TypeInType + , DataKinds + , PolyKinds , TypeOperators #-} diff --git a/src/Squeal/PostgreSQL/Manipulation.hs b/src/Squeal/PostgreSQL/Manipulation.hs --- a/src/Squeal/PostgreSQL/Manipulation.hs +++ b/src/Squeal/PostgreSQL/Manipulation.hs @@ -24,7 +24,8 @@ , ScopedTypeVariables , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances #-} diff --git a/src/Squeal/PostgreSQL/Manipulation/Call.hs b/src/Squeal/PostgreSQL/Manipulation/Call.hs --- a/src/Squeal/PostgreSQL/Manipulation/Call.hs +++ b/src/Squeal/PostgreSQL/Manipulation/Call.hs @@ -24,7 +24,8 @@ , ScopedTypeVariables , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances #-} diff --git a/src/Squeal/PostgreSQL/Manipulation/Delete.hs b/src/Squeal/PostgreSQL/Manipulation/Delete.hs --- a/src/Squeal/PostgreSQL/Manipulation/Delete.hs +++ b/src/Squeal/PostgreSQL/Manipulation/Delete.hs @@ -24,7 +24,8 @@ , ScopedTypeVariables , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances #-} diff --git a/src/Squeal/PostgreSQL/Manipulation/Insert.hs b/src/Squeal/PostgreSQL/Manipulation/Insert.hs --- a/src/Squeal/PostgreSQL/Manipulation/Insert.hs +++ b/src/Squeal/PostgreSQL/Manipulation/Insert.hs @@ -24,7 +24,8 @@ , ScopedTypeVariables , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances #-} diff --git a/src/Squeal/PostgreSQL/Manipulation/Update.hs b/src/Squeal/PostgreSQL/Manipulation/Update.hs --- a/src/Squeal/PostgreSQL/Manipulation/Update.hs +++ b/src/Squeal/PostgreSQL/Manipulation/Update.hs @@ -24,7 +24,8 @@ , ScopedTypeVariables , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances #-} diff --git a/src/Squeal/PostgreSQL/Query.hs b/src/Squeal/PostgreSQL/Query.hs --- a/src/Squeal/PostgreSQL/Query.hs +++ b/src/Squeal/PostgreSQL/Query.hs @@ -25,7 +25,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , RankNTypes , UndecidableInstances diff --git a/src/Squeal/PostgreSQL/Query/From.hs b/src/Squeal/PostgreSQL/Query/From.hs --- a/src/Squeal/PostgreSQL/Query/From.hs +++ b/src/Squeal/PostgreSQL/Query/From.hs @@ -25,7 +25,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , RankNTypes , UndecidableInstances diff --git a/src/Squeal/PostgreSQL/Query/From/Join.hs b/src/Squeal/PostgreSQL/Query/From/Join.hs --- a/src/Squeal/PostgreSQL/Query/From/Join.hs +++ b/src/Squeal/PostgreSQL/Query/From/Join.hs @@ -25,7 +25,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , RankNTypes , UndecidableInstances diff --git a/src/Squeal/PostgreSQL/Query/From/Set.hs b/src/Squeal/PostgreSQL/Query/From/Set.hs --- a/src/Squeal/PostgreSQL/Query/From/Set.hs +++ b/src/Squeal/PostgreSQL/Query/From/Set.hs @@ -25,7 +25,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , RankNTypes , UndecidableInstances diff --git a/src/Squeal/PostgreSQL/Query/Select.hs b/src/Squeal/PostgreSQL/Query/Select.hs --- a/src/Squeal/PostgreSQL/Query/Select.hs +++ b/src/Squeal/PostgreSQL/Query/Select.hs @@ -25,7 +25,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , RankNTypes , UndecidableInstances diff --git a/src/Squeal/PostgreSQL/Query/Table.hs b/src/Squeal/PostgreSQL/Query/Table.hs --- a/src/Squeal/PostgreSQL/Query/Table.hs +++ b/src/Squeal/PostgreSQL/Query/Table.hs @@ -25,7 +25,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , RankNTypes , UndecidableInstances diff --git a/src/Squeal/PostgreSQL/Query/Values.hs b/src/Squeal/PostgreSQL/Query/Values.hs --- a/src/Squeal/PostgreSQL/Query/Values.hs +++ b/src/Squeal/PostgreSQL/Query/Values.hs @@ -25,7 +25,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , RankNTypes , UndecidableInstances diff --git a/src/Squeal/PostgreSQL/Query/With.hs b/src/Squeal/PostgreSQL/Query/With.hs --- a/src/Squeal/PostgreSQL/Query/With.hs +++ b/src/Squeal/PostgreSQL/Query/With.hs @@ -25,7 +25,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , RankNTypes , UndecidableInstances diff --git a/src/Squeal/PostgreSQL/Session.hs b/src/Squeal/PostgreSQL/Session.hs --- a/src/Squeal/PostgreSQL/Session.hs +++ b/src/Squeal/PostgreSQL/Session.hs @@ -24,7 +24,8 @@ , ScopedTypeVariables , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances #-} @@ -39,11 +40,13 @@ 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/src/Squeal/PostgreSQL/Session/Pool.hs b/src/Squeal/PostgreSQL/Session/Pool.hs --- a/src/Squeal/PostgreSQL/Session/Pool.hs +++ b/src/Squeal/PostgreSQL/Session/Pool.hs @@ -41,7 +41,8 @@ , RankNTypes , ScopedTypeVariables , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , UndecidableInstances #-} diff --git a/src/Squeal/PostgreSQL/Session/Transaction/Unsafe.hs b/src/Squeal/PostgreSQL/Session/Transaction/Unsafe.hs --- a/src/Squeal/PostgreSQL/Session/Transaction/Unsafe.hs +++ b/src/Squeal/PostgreSQL/Session/Transaction/Unsafe.hs @@ -13,7 +13,8 @@ , FlexibleContexts , LambdaCase , OverloadedStrings - , TypeInType + , DataKinds + , PolyKinds #-} module Squeal.PostgreSQL.Session.Transaction.Unsafe diff --git a/src/Squeal/PostgreSQL/Type.hs b/src/Squeal/PostgreSQL/Type.hs --- a/src/Squeal/PostgreSQL/Type.hs +++ b/src/Squeal/PostgreSQL/Type.hs @@ -26,7 +26,8 @@ , ScopedTypeVariables , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances , UndecidableSuperClasses diff --git a/src/Squeal/PostgreSQL/Type/Alias.hs b/src/Squeal/PostgreSQL/Type/Alias.hs --- a/src/Squeal/PostgreSQL/Type/Alias.hs +++ b/src/Squeal/PostgreSQL/Type/Alias.hs @@ -27,7 +27,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilyDependencies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances , UndecidableSuperClasses diff --git a/src/Squeal/PostgreSQL/Type/PG.hs b/src/Squeal/PostgreSQL/Type/PG.hs --- a/src/Squeal/PostgreSQL/Type/PG.hs +++ b/src/Squeal/PostgreSQL/Type/PG.hs @@ -27,7 +27,8 @@ , ScopedTypeVariables , TypeApplications , TypeFamilies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances , UndecidableSuperClasses diff --git a/src/Squeal/PostgreSQL/Type/Schema.hs b/src/Squeal/PostgreSQL/Type/Schema.hs --- a/src/Squeal/PostgreSQL/Type/Schema.hs +++ b/src/Squeal/PostgreSQL/Type/Schema.hs @@ -27,7 +27,8 @@ , StandaloneDeriving , TypeApplications , TypeFamilyDependencies - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances , UndecidableSuperClasses @@ -206,7 +207,7 @@ -- | `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/test/Spec.hs b/test/Spec.hs --- a/test/Spec.hs +++ b/test/Spec.hs @@ -15,7 +15,8 @@ , TypeApplications , TypeFamilies , TypeSynonymInstances - , TypeInType + , DataKinds + , PolyKinds , TypeOperators , UndecidableInstances #-}