Update version bounds and fix compilation errors

Author: creichert

esqueleto-textsearch.cabal

@@ -18,9 +18,9 @@ library
                      , Database.Esqueleto.TextSearch.Language
                      , Database.Esqueleto.TextSearch.Types
   build-depends:       base                  >=4.7   && <5
-                     , esqueleto             >=2.1   && <2.5
-                     , persistent            >=2.1   && <2.5
-                     , persistent-postgresql >=2.1.4 && <2.5
+                     , esqueleto             >=2.1   && <2.7
+                     , persistent            >=2.1   && <2.9
+                     , persistent-postgresql >=2.1.4 && <2.9
                      , text                  >= 1.2  && <1.3
                      , parsec
                      , data-default
@@ -33,6 +33,7 @@ test-suite spec
   ghc-options:         -Wall -fwarn-incomplete-uni-patterns
   hs-source-dirs:      test
   main-is:             Spec.hs
+  other-modules:       Database.Esqueleto.TextSearchSpec
   build-depends:       base
                      , esqueleto
                      , esqueleto-textsearch

test/Database/Esqueleto/TextSearchSpec.hs

@@ -18,8 +18,9 @@ import Data.Text (Text, pack)
 
 import Control.Monad.IO.Class (MonadIO(liftIO))
 import Control.Monad.Logger (MonadLogger(..), runStderrLoggingT)
+import Control.Monad.Trans.Control (MonadBaseControl)
 import Control.Monad.Trans.Resource (
-  MonadBaseControl, MonadThrow, ResourceT, runResourceT)
+  MonadThrow, ResourceT, runResourceT)
 import Database.Esqueleto (
     SqlExpr, Value(..), unValue, update, select, set, val, from, where_
   , (=.), (^.))
@@ -279,8 +280,8 @@ spec = do
         isEqual ((toRight . fromPersistValue . toPersistValue) q) q
           `shouldBe` True
 
-instance Arbitrary ([NormalizationOption]) where
-  arbitrary = (:[]) <$> elements [minBound..maxBound]
+instance {-# OVERLAPPING #-} Arbitrary [NormalizationOption] where
+    arbitrary = (:[]) <$> elements [minBound..maxBound]
 
 instance a ~ Lexemes => Arbitrary (TsQuery a) where
   arbitrary = query 0