From ae4a23890914ccccd8dc1420868409a03ab6714a Mon Sep 17 00:00:00 2001 From: Eitan Chatav Date: Fri, 1 Sep 2023 14:11:28 -0700 Subject: [PATCH] 0.9.1.3 --- squeal-postgresql/squeal-postgresql.cabal | 2 +- squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs | 3 ++- .../src/Squeal/PostgreSQL/Definition/Comment.hs | 3 ++- .../src/Squeal/PostgreSQL/Definition/Constraint.hs | 3 ++- .../src/Squeal/PostgreSQL/Definition/Function.hs | 3 ++- .../src/Squeal/PostgreSQL/Definition/Index.hs | 3 ++- .../src/Squeal/PostgreSQL/Definition/Procedure.hs | 3 ++- .../src/Squeal/PostgreSQL/Definition/Schema.hs | 3 ++- .../src/Squeal/PostgreSQL/Definition/Table.hs | 3 ++- .../src/Squeal/PostgreSQL/Definition/Type.hs | 3 ++- .../src/Squeal/PostgreSQL/Definition/View.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs | 3 ++- .../src/Squeal/PostgreSQL/Expression/Comparison.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Manipulation.hs | 3 ++- .../src/Squeal/PostgreSQL/Manipulation/Call.hs | 3 ++- .../src/Squeal/PostgreSQL/Manipulation/Delete.hs | 3 ++- .../src/Squeal/PostgreSQL/Manipulation/Insert.hs | 3 ++- .../src/Squeal/PostgreSQL/Manipulation/Update.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Query.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Query/From.hs | 3 ++- .../src/Squeal/PostgreSQL/Query/From/Join.hs | 3 ++- .../src/Squeal/PostgreSQL/Query/From/Set.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Query/Select.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Query/Table.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Query/Values.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Query/With.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Session.hs | 9 ++++++--- squeal-postgresql/src/Squeal/PostgreSQL/Session/Pool.hs | 3 ++- .../src/Squeal/PostgreSQL/Session/Transaction/Unsafe.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Type.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Type/Alias.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Type/PG.hs | 3 ++- squeal-postgresql/src/Squeal/PostgreSQL/Type/Schema.hs | 5 +++-- squeal-postgresql/test/Spec.hs | 3 ++- stack-ghc9_6.yaml | 7 +++++++ 35 files changed, 79 insertions(+), 37 deletions(-) create mode 100644 stack-ghc9_6.yaml diff --git a/squeal-postgresql/squeal-postgresql.cabal b/squeal-postgresql/squeal-postgresql.cabal index ca67a83c..8fa67808 100644 --- 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 index 8bf94edd..e42f0e29 100644 --- 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 index 18a616bb..f36bc721 100644 --- 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 index 173cd5ca..9af92e25 100644 --- 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 index 90b4f80f..c2968bd7 100644 --- 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 index 68d80545..13c04a85 100644 --- 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 index a1d12bb0..d3148728 100644 --- 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 index b04ff422..0bf21850 100644 --- 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 index f18fd1a9..2377ab68 100644 --- 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 index ee29254d..99098e84 100644 --- 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 index 668b27cd..da7c4ba5 100644 --- 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 index ff37e690..67176c19 100644 --- 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 index 41c016a9..8563733c 100644 --- 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 index fbf9f5da..18fb0c86 100644 --- 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 index e3bcc828..1a4cb69b 100644 --- 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 index 13f9dd44..9565093d 100644 --- 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 index fc7eb881..0acfada8 100644 --- 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 index af6b3351..7682b2c7 100644 --- 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 index 1dfc5aa7..3b4e7e90 100644 --- 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 index 860380de..8cb3da0a 100644 --- 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 index af651693..06030f6f 100644 --- 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 index a0697de5..c5430996 100644 --- 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 index d4c64de6..e3a4c867 100644 --- 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 index 95803b76..4c9b2bbc 100644 --- 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 index 2d81fd03..79e3f175 100644 --- 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 index 7e7ade72..dacab3db 100644 --- 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 index 201dae09..9adf2324 100644 --- 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 index 030346c7..2069c71b 100644 --- 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 index c84dcf30..104afdd1 100644 --- 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 index a9ec0ea8..12556c76 100644 --- 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 index d006e955..a7c1ce01 100644 --- 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 index af29cac3..c7ecef25 100644 --- 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 index bdfe36ff..4eff6e55 100644 --- 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 index a9d52292..dadc0b9a 100644 --- 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 new file mode 100644 index 00000000..895dc347 --- /dev/null +++ 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