Merge branch 'dev'

Author: echatav

squeal-postgresql-ltree/squeal-postgresql-ltree.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name: squeal-postgresql-ltree
-version: 0.1.0.1
+version: 0.1.0.2
 synopsis: LTree extension for Squeal
 description: LTree extension for Squeal
 homepage: https://github.com/morphismtech/squeal/ltree

squeal-postgresql-ltree/src/Squeal/PostgreSQL/LTree.hs

@@ -45,7 +45,8 @@ module Squeal.PostgreSQL.LTree
   ) where
 
 import Control.Exception hiding (TypeError)
-import Control.Monad.Reader
+import Control.Monad (when)
+import Control.Monad.Reader (ReaderT(ReaderT))
 import Data.String
 import Data.Text
 import GHC.Generics

squeal-postgresql/squeal-postgresql.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name: squeal-postgresql
-version: 0.9.1.1
+version: 0.9.1.2
 synopsis: Squeal PostgreSQL Library
 description: Squeal is a type-safe embedding of PostgreSQL in Haskell
 homepage: https://github.com/morphismtech/squeal

squeal-postgresql/src/Squeal/PostgreSQL/Session/Oid.hs

@@ -34,8 +34,9 @@ module Squeal.PostgreSQL.Session.Oid
   , OidOfField (..)
   ) where
 
-import Control.Monad.Catch
-import Control.Monad.Reader
+import Control.Monad (when)
+import Control.Monad.Catch (throwM)
+import Control.Monad.Reader (ReaderT(ReaderT))
 import Data.String
 import GHC.TypeLits
 import PostgreSQL.Binary.Decoding (valueParser, int)