Merge branch 'master' of https://github.com/begriffs/postgrest

2016-03-01 17:54:55 +02:00
parent 7b94fb608d 8af91e262c
commit e43ad54dbf
6 changed files with 77 additions and 73 deletions
@@ -26,7 +26,7 @@ executable postgrest
  default-extensions:  OverloadedStrings, ScopedTypeVariables, QuasiQuotes
  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
  default-language:    Haskell2010
-  build-depends:       aeson >= 0.8 && < 0.10
+  build-depends:       aeson (>= 0.8 && < 0.10) || (>= 0.11 && < 0.12)
                     , base >= 4.8 && < 5
                     , bytestring
                     , case-insensitive
@@ -139,6 +139,7 @@ Test-Suite spec
                     , Feature.DeleteSpec
                     , Feature.InsertSpec
                     , Feature.QuerySpec
+                     , Feature.QueryLimitedSpec
                     , Feature.RangeSpec
                     , Feature.StructureSpec
                     , Paths_postgrest