postgrest 0.2.5.2 → 0.2.5.3

raw patch · 3 files changed

+27/−20 lines, 3 filesdep +hlintdep +packdepsdep ~bcryptdep ~hasqldep ~hasql-postgres

Dependencies added: hlint, packdeps

Dependency ranges changed: bcrypt, hasql, hasql-postgres, network, network-uri, optparse-applicative, wai, wai-middleware-static, warp

Files

• postgrest.cabal +10/−9
• src/Config.hs +9/−9
• src/Main.hs +8/−2

@@ -2,7 +2,7 @@ description:           Reads the schema of a PostgreSQL database and creates RESTful routes                        for the tables and views, supporting all HTTP verbs that security                        permits.-version:               0.2.5.2+version:               0.2.5.3 synopsis:              REST API for any Postgres database license:               MIT license-file:          LICENSE@@ -32,12 +32,12 @@                      , bytestring, text, split, string-conversions                      , stringsearch                      , containers, unordered-containers-                     , optparse-applicative >= 0.9.1 && < 0.10+                     , optparse-applicative == 0.11.*                      , regex-base, regex-tdfa                      , regex-tdfa-text                      , Ranged-sets                      , transformers, MissingH-                     , bcrypt, base64-string+                     , bcrypt >= 0.0.6, base64-string                      , network-uri >= 2.6                      , resource-pool                      , blaze-builder@@ -75,15 +75,16 @@                      , SpecHelper   Build-Depends:       base, hspec >= 2.1.2, QuickCheck                      , hspec-wai >= 0.5.0, hspec-wai-json-                     , hasql == 0.7.*, hasql-backend-                     , hasql-postgres == 0.10.*-                     , warp >= 3.0.2, wai >= 3.0.1+                     , hasql, hasql-backend+                     , hasql-postgres+                     , warp, wai+                     , packdeps, hlint                      , HTTP, convertible                      , case-insensitive                      , wai-extra, wai-cors, containers-                     , wai-middleware-static >= 0.6.0+                     , wai-middleware-static                      , http-types, scientific, time-                     , bytestring, aeson, network >= 2.6+                     , bytestring, aeson, network                      , text, optparse-applicative                      , stringsearch                      , unordered-containers@@ -94,7 +95,7 @@                      , Ranged-sets                      , transformers, MissingH, split                      , bcrypt, base64-string-                     , network-uri >= 2.6+                     , network-uri                      , resource-pool                      , blaze-builder                      , vector

@@ -24,16 +24,16 @@  argParser :: Parser AppConfig argParser = AppConfig-  <$> strOption (long "db-name" <> short 'd'                     <> help "name of database")-  <*> option    (long "db-port" <> short 'P' <> value 5432        <> help "postgres server port")-  <*> strOption (long "db-user" <> short 'U'                     <> help "postgres authenticator role")-  <*> strOption (long "db-pass"             <> value ""          <> help "password for authenticator role")-  <*> strOption (long "db-host" <> short 'h' <> value "localhost" <> help "postgres server hostname")+  <$> strOption (long "db-name" <> short 'd' <> metavar "NAME" <> help "name of database")+  <*> option auto (long "db-port" <> short 'P' <> metavar "PORT" <> value 5432 <> help "postgres server port" <> showDefault)+  <*> strOption (long "db-user" <> short 'U' <> metavar "ROLE" <> help "postgres authenticator role")+  <*> strOption (long "db-pass" <> metavar "PASS" <> value "" <> help "password for authenticator role")+  <*> strOption (long "db-host" <> metavar "HOST" <> value "localhost" <> help "postgres server hostname" <> showDefault) -  <*> option    (long "port" <> short 'p' <> value 3000 <> help "port number on which to run HTTP server")-  <*> strOption (long "anonymous" <> short 'a' <> help "postgres role to use for non-authenticated requests")-  <*> switch    (long "secure" <> short 's' <> help "Redirect all requests to HTTPS")-  <*> option    (long "db-pool" <> value 10 <> help "Max connections in database pool")+  <*> option auto (long "port" <> short 'p' <> metavar "PORT" <> value 3000 <> help "port number on which to run HTTP server" <> showDefault)+  <*> strOption (long "anonymous" <> short 'a' <> metavar "ROLE" <> help "postgres role to use for non-authenticated requests")+  <*> switch (long "secure" <> short 's' <> help "Redirect all requests to HTTPS")+  <*> option auto (long "db-pool" <> metavar "COUNT" <> value 10 <> help "Max connections in database pool" <> showDefault)  defaultCorsPolicy :: CorsResourcePolicy defaultCorsPolicy =  CorsResourcePolicy Nothing

@@ -24,7 +24,14 @@  main :: IO () main = do-  conf <- execParser (info (helper <*> argParser) describe)+  let opts = info (helper <*> argParser) $+                fullDesc+                <> progDesc (+                    "PostgREST "+                    <> prettyVersion+                    <> " / create a REST API to an existing Postgres database"+                )+  conf <- execParser opts   let port = configPort conf    unless (configSecure conf) $@@ -59,5 +66,4 @@     either (respond . errResponse) respond resOrError    where-    describe = progDesc "create a REST API to an existing Postgres database"     prettyVersion = intercalate "." $ map show $ versionBranch version