Merge branch 'release/2.1.0' into production

Author: s9gf4ult

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.1.0
+### Changed
+* use hset-2.0 and hreader-1.0
+
 ## 2.0.0
 ### Changed
 * `Entity` typeclass now use `FN` instead of `Text`. This provides an

postgresql-query.cabal

@@ -1,5 +1,5 @@
 name:                postgresql-query
-version:             2.0.0
+version:             2.1.0
 
 synopsis: Sql interpolating quasiquote plus some kind of primitive ORM
           using it
@@ -67,8 +67,8 @@ library
                , exceptions
                , file-embed
                , haskell-src-meta
-               , hreader                       >= 0.1.0   && < 1.0.0
-               , hset                          >= 1.0.0   && < 2.0.0
+               , hreader                       >= 1.0.0   && < 2.0.0
+               , hset                          >= 2.0.0   && < 3.0.0
                , monad-control                 == 0.3.3.1 || > 1.0.0.3
                , monad-logger
                , mtl

src/Database/PostgreSQL/Query/Types.hs

@@ -268,10 +268,10 @@ instance (HasPostgres m, Monoid w) => HasPostgres (WS.WriterT w m) where
             WS.runWriterT (action con)
     {-# INLINABLE withPGConnection #-}
 
-instance (MonadBase IO m, MonadBaseControl IO m, HGetable els (Pool Connection))
+instance (MonadBase IO m, MonadBaseControl IO m, HGettable els (Pool Connection))
          => HasPostgres (HReaderT els m) where
     withPGConnection action = do
-        pool <- haskM
+        pool <- hask
         withResource pool action
 
 -- | Empty typeclass signing monad in which transaction is