Merge branch 'release/1.3.1' into production

Author: s9gf4ult

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.3.1
+### Changed
+* work with `hset-1.0.0`
+
 ## 1.3.0
 ### Added
 * dependency from `hreader` and `hset`

postgresql-query.cabal

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

src/Database/PostgreSQL/Query/Types.hs

@@ -262,7 +262,7 @@ instance (HasPostgres m, Monoid w) => HasPostgres (WS.WriterT w m) where
             WS.runWriterT (action con)
     {-# INLINABLE withPGConnection #-}
 
-instance (MonadBase IO m, MonadBaseControl IO m, Contains els (Pool Connection))
+instance (MonadBase IO m, MonadBaseControl IO m, HGetable els (Pool Connection))
          => HasPostgres (HReaderT els m) where
     withPGConnection action = do
         pool <- haskM