Fix fatal error on postgres unsupported version, also fix #577 format of supported version

This commit is contained in:
SteveBash
2016-10-29 13:38:19 -05:00
parent d78ef56314
commit 4064a7b984
3 changed files with 15 additions and 6 deletions
+5 -4
View File
@@ -5,6 +5,7 @@ module Main where
import Protolude
import PostgREST.App
import PostgREST.Config (AppConfig (..),
PgVersion (..),
minimumPgVersion,
prettyVersion,
readOptions)
@@ -34,11 +35,11 @@ import System.Posix.Signals
isServerVersionSupported :: H.Session Bool
isServerVersionSupported = do
ver <- H.query () pgVersion
return $ toInteger ver >= minimumPgVersion
return $ ver >= pgvNum minimumPgVersion
where
pgVersion =
H.statement "SHOW server_version_num"
HE.unit (HD.singleRow $ HD.value HD.int4) True
H.statement "SELECT current_setting('server_version_num')::integer"
HE.unit (HD.singleRow $ HD.value HD.int4) False
main :: IO ()
main = do
@@ -67,7 +68,7 @@ main = do
supported <- isServerVersionSupported
unless supported $ panic (
"Cannot run in this PostgreSQL version, PostgREST needs at least "
<> show minimumPgVersion)
<> pgvName minimumPgVersion)
getDbStructure (toS $ configSchema conf)
forM_ (lefts [result]) $ \e -> do