diff --git a/main/Main.hs b/main/Main.hs index 902195e5f..98869060b 100644 --- a/main/Main.hs +++ b/main/Main.hs @@ -11,7 +11,7 @@ import PostgREST.DbStructure (getDbStructure) import PostgREST.Error (encodeError) import PostgREST.OpenAPI (isMalformedProxyUri) import PostgREST.Types (DbStructure, Schema) -import Protolude +import Protolude hiding (replace, hPutStrLn) import Control.Retry (RetryStatus, capDelay, exponentialBackoff, diff --git a/postgrest.cabal b/postgrest.cabal index e72711619..ce97ff230 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -72,7 +72,7 @@ library , network-uri , optparse-applicative >= 0.13 && < 0.14 , parsec - , protolude + , protolude >= 0.2 , Ranged-sets == 0.3.0 , regex-tdfa , safe diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs index 9c7bd5df1..d7dd68038 100644 --- a/src/PostgREST/Config.hs +++ b/src/PostgREST/Config.hs @@ -45,7 +45,7 @@ import System.IO (hPrint) import Text.Heredoc import Text.PrettyPrint.ANSI.Leijen hiding ((<>), (<$>)) import qualified Text.PrettyPrint.ANSI.Leijen as L -import Protolude hiding (intercalate, (<>)) +import Protolude hiding (intercalate, (<>), hPutStrLn) -- | Config file settings for the server data AppConfig = AppConfig { diff --git a/src/PostgREST/Parsers.hs b/src/PostgREST/Parsers.hs index e71abf514..016860385 100644 --- a/src/PostgREST/Parsers.hs +++ b/src/PostgREST/Parsers.hs @@ -1,6 +1,6 @@ module PostgREST.Parsers where -import Protolude hiding (try, intercalate) +import Protolude hiding (try, intercalate, replace) import Control.Monad ((>>)) import Data.Foldable (foldl1) import qualified Data.HashMap.Strict as M @@ -114,7 +114,7 @@ pRelationSelect = lexeme $ try ( do alias <- optionMaybe ( try(pFieldName <* aliasSeparator) ) fld <- pField relationDetail <- optionMaybe ( try( char '.' *> pFieldName ) ) - + return (fld, Nothing, alias, relationDetail) ) @@ -184,7 +184,7 @@ pLogicTree = Stmnt <$> try pLogicFilter pLogicFilter :: Parser Filter pLogicFilter = Filter <$> pField <* pDelimiter <*> pOperation pLogicVText pLogicVTextL pNot :: Parser Bool - pNot = try (string "not" *> pDelimiter *> pure True) + pNot = try (string "not" *> pDelimiter *> pure True) <|> pure False "negation operator (not)" pLogicOp :: Parser LogicOperator diff --git a/src/PostgREST/QueryBuilder.hs b/src/PostgREST/QueryBuilder.hs index 4533b68d1..05dbe0df4 100644 --- a/src/PostgREST/QueryBuilder.hs +++ b/src/PostgREST/QueryBuilder.hs @@ -47,7 +47,7 @@ import Data.Scientific ( FPFormat (..) , formatScientific , isInteger ) -import Protolude hiding (from, intercalate, ord, cast) +import Protolude hiding (from, intercalate, ord, cast, replace) import PostgREST.ApiRequest (PreferRepresentation (..)) {-| The generic query result format used by API responses. The location header diff --git a/stack.yaml b/stack.yaml index 77effbaa5..3665baf1e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -7,6 +7,7 @@ extra-deps: - hjsonschema-1.5.0.1 - jose-0.5.0.3 - Ranged-sets-0.3.0 + - protolude-0.2 ghc-options: postgrest: -O2 -Werror -Wall -fwarn-identities -fno-warn-redundant-constraints nix: