code cleanup

src/PostgREST/Main.hs

@@ -1,42 +1,48 @@
-{-# LANGUAGE QuasiQuotes, ScopedTypeVariables #-}
+{-# LANGUAGE QuasiQuotes         #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 module Main where
 
-import Paths_postgrest (version)
+
+import           Paths_postgrest                      (version)
 -- added
-import PostgREST.PgStructure
-import Data.Aeson
-import Data.List (find)
-import Data.Maybe (isJust)
-import PostgREST.Types
-import Network.HTTP.Types.Status
-import Network.HTTP.Types.Header
-import Network.Wai -- (strictRequestBody, pathInfo, requestMethod, requestHeaders)
+import           PostgREST.PgStructure
+--import Data.Aeson
+--import Data.List (find)
+--import Data.Maybe (isJust)
+import           PostgREST.Types
+--import Network.HTTP.Types.Status
+--import Network.HTTP.Types.Header
+import           Network.Wai
 
 
-import PostgREST.App
-import PostgREST.Middleware
-import PostgREST.Error(errResponse)
+import           PostgREST.App
+import           PostgREST.Error                      (errResponse)
+import           PostgREST.Middleware
 
-import Control.Monad (unless)
-import Control.Monad.IO.Class (liftIO)
-import Data.String.Conversions (cs)
-import Network.Wai.Handler.Warp hiding (Connection)
-import Network.Wai.Middleware.RequestLogger (logStdout)
-import Data.List (intercalate)
-import Data.Version (versionBranch)
-import Data.Functor.Identity
-import Data.Text(Text)
-import qualified Hasql as H
-import qualified Hasql.Postgres as P
-import Options.Applicative hiding (columns)
+import           Control.Monad                        (unless)
+import           Control.Monad.IO.Class               (liftIO)
+import           Data.Functor.Identity
+import           Data.List                            (intercalate)
+import           Data.String.Conversions              (cs)
+import           Data.Text                            (Text)
+import           Data.Version                         (versionBranch)
+import qualified Hasql                                as H
+import qualified Hasql.Postgres                       as P
+import           Network.Wai.Handler.Warp             hiding (Connection)
+import           Network.Wai.Middleware.RequestLogger (logStdout)
+import           Options.Applicative                  hiding (columns)
 
-import System.IO (stderr, stdin, stdout, hSetBuffering, BufferMode(..))
+import           System.IO                            (BufferMode (..),
+                                                       hSetBuffering, stderr,
+                                                       stdin, stdout)
 
-import PostgREST.Config (AppConfig(..), argParser)
+import           PostgREST.Config                     (AppConfig (..),
+                                                       argParser)
 
+isServerVersionSupported :: H.Session P.Postgres IO Bool
 isServerVersionSupported = do
   Identity (row :: Text) <- H.tx Nothing $ H.singleEx $ [H.stmt|SHOW server_version_num|]
-  return $ read (cs row) >= 90200
+  return $ read (cs row) >= (90200::Integer)
 
 main :: IO ()
 main = do
@@ -76,12 +82,12 @@ main = do
     H.poolSettings (fromIntegral $ configPool conf) 30
   pool :: H.Pool P.Postgres <- H.acquirePool pgSettings poolSettings
 
-  resOrError <- H.session pool isServerVersionSupported
+  supportedOrError <- H.session pool isServerVersionSupported
   either (fail . show)
     (\supported ->
       unless supported $
         fail "Cannot run in this PostgreSQL version, PostgREST needs at least 9.2.0"
-    ) resOrError
+    ) supportedOrError
 
     -- read the structure of the database
     -- read the structure of the database
@@ -96,7 +102,7 @@ main = do
   colsRes <-  H.session pool $ H.tx txParam $ allcolumns allRelations
   let allColumns = either (fail . show) id colsRes
 
-  pkRes <-  H.session pool $ H.tx txParam $ allprimaryKeys
+  pkRes <-  H.session pool $ H.tx txParam allprimaryKeys
   let allPrimaryKeys = either (fail . show) id pkRes
 
   -- tableAclRes <-  H.session pool $ H.tx txParam $ alltablesAcl