diff --git a/circle.yml b/circle.yml index e2475e026..532d44050 100644 --- a/circle.yml +++ b/circle.yml @@ -3,8 +3,9 @@ dependencies: - "~/.stack" - ".stack-work" pre: - - curl -L https://github.com/commercialhaskell/stack/releases/download/v1.0.2/stack-1.0.2-linux-x86_64.tar.gz | tar zx -C /tmp - - sudo mv /tmp/stack-1.0.2-linux-x86_64/stack /usr/bin + - curl -L https://github.com/commercialhaskell/stack/releases/download/v1.1.2/stack-1.1.2-linux-x86_64.tar.gz | tar zx -C /tmp + - sudo mv /tmp/stack-1.1.2-linux-x86_64/stack /usr/bin + - sudo apt-get update; sudo apt-get install --only-upgrade binutils - createuser --superuser --no-password postgrest_test - createdb -O postgrest_test -U ubuntu postgrest_test override: diff --git a/postgrest.cabal b/postgrest.cabal index 698d1e9cb..fb12d086a 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -30,8 +30,9 @@ executable postgrest "-with-rtsopts=-N -I2" default-language: Haskell2010 build-depends: aeson (>= 0.8 && < 0.10) || (>= 0.11 && < 0.12) - , base >= 4.8 && < 5 + , base >= 4.8 && < 6 , bytestring + , bytestring-tree-builder == 0.2.7 , case-insensitive , cassava , containers @@ -39,7 +40,7 @@ executable postgrest , errors , hasql == 0.19.12 , hasql-pool == 0.4.1 - , hasql-transaction == 0.4.4.1 + , hasql-transaction == 0.4.5 , http-types , interpolatedstring-perl6 , jwt @@ -48,6 +49,7 @@ executable postgrest , mtl , optparse-applicative >= 0.11 && < 0.13 , parsec + , postgresql-binary == 0.9.0.1 , postgrest , regex-tdfa , safe >= 0.3 && < 0.4 @@ -74,7 +76,7 @@ library default-language: Haskell2010 default-extensions: OverloadedStrings, ScopedTypeVariables, QuasiQuotes build-depends: aeson - , base >=4.6 && <5 + , base , bytestring , case-insensitive , cassava @@ -155,7 +157,7 @@ Test-Suite spec , hasql-pool , hasql-transaction , heredoc - , hspec == 2.2.* + , hspec , hspec-wai , hspec-wai-json , http-types diff --git a/src/PostgREST/Parsers.hs b/src/PostgREST/Parsers.hs index cae5479b5..d563c1385 100644 --- a/src/PostgREST/Parsers.hs +++ b/src/PostgREST/Parsers.hs @@ -96,6 +96,7 @@ pJsonPath = (++) <$> many pJsonPathStep <*> ( (:[]) <$> (string "->>" *> pFieldN pField :: Parser Field pField = lexeme $ (,) <$> pFieldName <*> optionMaybe pJsonPath +aliasSeparator :: Parser () aliasSeparator = char ':' >> notFollowedBy (char ':') pSimpleSelect :: Parser SelectItem diff --git a/stack.yaml b/stack.yaml index a4141fed9..cfe320b1b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,15 +1,24 @@ -resolver: lts-5.17 +resolver: lts-6.2 extra-deps: - Ranged-sets-0.3.0 - - bytestring-tree-builder-0.2.6 + - bytestring-tree-builder-0.2.7 - hasql-0.19.12 - hasql-pool-0.4.1 - - hasql-transaction-0.4.4.1 - - packdeps-0.4.2.1 + - hasql-transaction-0.4.5 + - jwt-0.7.2 + - postgresql-binary-0.9.0.1 + - binary-parser-0.5.2 + - contravariant-extras-0.3.2 + - placeholders-0.1 - postgresql-error-codes-1 - - postgresql-binary-0.9 + - success-0.2.6 + - tuple-th-0.2.5 + - wai-cors-0.2.5 + - cryptohash-sha256-0.11.100.0 + - hackage-security-0.5.2.1 + ghc-options: - postgrest: -O2 -Werror -Wall -fwarn-monomorphism-restriction -fwarn-missing-exported-sigs -fwarn-identities + postgrest: -O2 -Werror -Wall -fwarn-identities packages: -- '.' +- .