jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code beautify using stylish-haskell

Browse Source
This commit is contained in:
Ruslan Talpa
2016-02-29 14:53:41 +02:00
parent 77bec52be7
commit 40eec0b2ff
10 changed files with 97 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/App.hs
+37 -37
View File
@@ -1,65 +1,65 @@
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TupleSections #-} {-# LANGUAGE TupleSections #-}
--module PostgREST.App where
module PostgREST.App ( module PostgREST.App (
handleRequest handleRequest
) where ) where
import Control.Applicative import Control.Applicative
import Control.Arrow ((***)) import Control.Arrow ((***))
import Control.Monad (join) import Control.Monad (join)
import Data.Bifunctor (first) import Data.Bifunctor (first)
import Data.List (find, sortBy, delete) import Data.List (delete, find, sortBy)
import Data.Maybe (isJust, fromMaybe, fromJust, mapMaybe) import Data.Maybe (fromJust, fromMaybe,
import Data.Ord (comparing) isJust, mapMaybe)
import Data.Ranged.Ranges (emptyRange) import Data.Ord (comparing)
import Data.String.Conversions (cs) import Data.Ranged.Ranges (emptyRange)
import Data.Text (Text, replace, strip) import Data.String.Conversions (cs)
import Data.Tree import Data.Text (Text, replace, strip)
import Data.Time.Clock.POSIX (getPOSIXTime) import Data.Time.Clock.POSIX (getPOSIXTime)
import Data.Tree
import Text.Parsec.Error import Text.Parsec.Error
import Text.ParserCombinators.Parsec (parse) import Text.ParserCombinators.Parsec (parse)
import Network.HTTP.Base (urlEncodeVars) import Network.HTTP.Base (urlEncodeVars)
import Network.HTTP.Types.Header import Network.HTTP.Types.Header
import Network.HTTP.Types.Status import Network.HTTP.Types.Status
import Network.HTTP.Types.URI (parseSimpleQuery) import Network.HTTP.Types.URI (parseSimpleQuery)
import Network.Wai import Network.Wai
import Network.Wai.Middleware.RequestLogger (logStdout) import Network.Wai.Middleware.RequestLogger (logStdout)
import qualified Hasql.Pool as P import qualified Hasql.Pool as P
import Data.Aeson import Data.Aeson
import Data.Aeson.Types (emptyArray) import Data.Aeson.Types (emptyArray)
import Data.Monoid import Data.Monoid
import qualified Data.Vector as V import qualified Data.Vector as V
import qualified Hasql.Transaction as H import qualified Hasql.Transaction as H
import qualified Hasql.Transaction as HT import qualified Hasql.Transaction as HT
import PostgREST.Error (pgErrResponse, errResponse) import PostgREST.ApiRequest (Action (..),
import PostgREST.Middleware ApiRequest (..),
import PostgREST.Config (AppConfig (..)) ContentType (..), PreferRepresentation (..),
import PostgREST.Parsers Target (..),
userApiRequest)
import PostgREST.Auth (tokenJWT)
import PostgREST.Config (AppConfig (..))
import PostgREST.DbStructure import PostgREST.DbStructure
import PostgREST.Error (errResponse,
pgErrResponse)
import PostgREST.Middleware
import PostgREST.Parsers
import PostgREST.RangeQuery import PostgREST.RangeQuery
import PostgREST.ApiRequest (ApiRequest(..), ContentType(..)
, Action(..), Target(..)
, PreferRepresentation (..)
, userApiRequest)
import PostgREST.Types import PostgREST.Types
import PostgREST.Auth (tokenJWT)
import PostgREST.QueryBuilder ( callProc import PostgREST.QueryBuilder (ResultsWithCount,
, addJoinConditions addJoinConditions,
, sourceCTEName addRelations, callProc,
, requestToQuery createReadStatement,
, requestToCountQuery createWriteStatement,
, addRelations requestToCountQuery,
, createReadStatement requestToQuery,
, createWriteStatement sourceCTEName)
, ResultsWithCount
)
import Prelude import Prelude
src/PostgREST/Auth.hs
+5 -5
View File
@@ -19,18 +19,18 @@ module PostgREST.Auth (
) where ) where
import Control.Monad (join) import Control.Monad (join)
import Data.Aeson (Value (..), Object) import Data.Aeson (Object, Value (..))
import Data.Aeson.Types (emptyObject, emptyArray) import Data.Aeson.Types (emptyArray, emptyObject)
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import Data.Vector as V (null, head) import qualified Data.HashMap.Lazy as H
import Data.Map as M (fromList, toList) import Data.Map as M (fromList, toList)
import Data.Monoid ((<>)) import Data.Monoid ((<>))
import Data.String.Conversions (cs) import Data.String.Conversions (cs)
import Data.Text (Text) import Data.Text (Text)
import Data.Time.Clock (NominalDiffTime) import Data.Time.Clock (NominalDiffTime)
import PostgREST.QueryBuilder (pgFmtLit, pgFmtIdent, unquoted) import Data.Vector as V (head, null)
import PostgREST.QueryBuilder (pgFmtIdent, pgFmtLit, unquoted)
import qualified Web.JWT as JWT import qualified Web.JWT as JWT
import qualified Data.HashMap.Lazy as H
{-| {-|
Receives a map of JWT claims and returns a list Receives a map of JWT claims and returns a list
src/PostgREST/Config.hs
+1 -1
View File
@@ -30,9 +30,9 @@ import Network.Wai
import Network.Wai.Middleware.Cors (CorsResourcePolicy (..)) import Network.Wai.Middleware.Cors (CorsResourcePolicy (..))
import Options.Applicative import Options.Applicative
import Paths_postgrest (version) import Paths_postgrest (version)
import Prelude
import Safe (readMay) import Safe (readMay)
import Web.JWT (Secret, secret) import Web.JWT (Secret, secret)
import Prelude
-- | Data type to store all command line options -- | Data type to store all command line options
data AppConfig = AppConfig { data AppConfig = AppConfig {
src/PostgREST/DbStructure.hs
+14 -12
View File
@@ -10,23 +10,25 @@ module PostgREST.DbStructure (
, doesProcReturnJWT , doesProcReturnJWT
) where ) where
import qualified Hasql.Query as H import qualified Hasql.Decoders as HD
import qualified Hasql.Encoders as HE import qualified Hasql.Encoders as HE
import qualified Hasql.Decoders as HD import qualified Hasql.Query as H
import Control.Applicative import Control.Applicative
import Control.Monad (join, replicateM) import Control.Monad (join, replicateM)
import Data.Functor.Contravariant (contramap) import Data.Functor.Contravariant (contramap)
import Text.InterpolatedString.Perl6 (q) import Data.List (elemIndex, find, sort,
import Data.List (elemIndex, find, subsequences, sort, transpose) subsequences, transpose)
import Data.Maybe (fromMaybe, fromJust, isJust, mapMaybe, listToMaybe) import Data.Maybe (fromJust, fromMaybe, isJust,
listToMaybe, mapMaybe)
import Data.Monoid import Data.Monoid
import Data.Text (Text, split) import Data.Text (Text, split)
import qualified Hasql.Session as H import qualified Hasql.Session as H
import PostgREST.Types import PostgREST.Types
import Text.InterpolatedString.Perl6 (q)
import GHC.Exts (groupWith) import Data.Int (Int32)
import Data.Int (Int32) import GHC.Exts (groupWith)
import Prelude import Prelude
getDbStructure :: Schema -> H.Session DbStructure getDbStructure :: Schema -> H.Session DbStructure
src/PostgREST/Error.hs
+1 -1
View File
@@ -12,8 +12,8 @@ import Data.Monoid ((<>))
import Data.String.Conversions (cs) import Data.String.Conversions (cs)
import Data.Text (Text) import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import qualified Hasql.Session as H
import qualified Hasql.Pool as P import qualified Hasql.Pool as P
import qualified Hasql.Session as H
import Network.HTTP.Types.Header import Network.HTTP.Types.Header
import qualified Network.HTTP.Types.Status as HT import qualified Network.HTTP.Types.Status as HT
import Network.Wai (Response, responseLBS) import Network.Wai (Response, responseLBS)
src/PostgREST/Main.hs
+15 -18
View File
@@ -3,32 +3,29 @@
module Main where module Main where
import PostgREST.App (handleRequest) import PostgREST.App (handleRequest)
import PostgREST.Config (AppConfig (..), import PostgREST.Config (AppConfig (..), minimumPgVersion,
minimumPgVersion, prettyVersion, readOptions)
prettyVersion,
readOptions)
import PostgREST.DbStructure import PostgREST.DbStructure
import Control.Monad import Control.Monad
import Data.Monoid ((<>)) import Data.Monoid ((<>))
import Data.String.Conversions (cs) import Data.String.Conversions (cs)
import qualified Hasql.Query as H import qualified Hasql.Decoders as HD
import qualified Hasql.Session as H import qualified Hasql.Encoders as HE
import qualified Hasql.Decoders as HD import qualified Hasql.Pool as P
import qualified Hasql.Encoders as HE import qualified Hasql.Query as H
import qualified Hasql.Pool as P import qualified Hasql.Session as H
import Network.Wai.Handler.Warp import Network.Wai.Handler.Warp
import System.IO (BufferMode (..), import System.IO (BufferMode (..), hSetBuffering,
hSetBuffering, stderr, stderr, stdin, stdout)
stdin, stdout) import Web.JWT (secret)
import Web.JWT (secret)
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import Control.Concurrent (myThreadId)
import Control.Exception.Base (AsyncException (..), throwTo)
import System.Posix.Signals import System.Posix.Signals
import Control.Concurrent (myThreadId)
import Control.Exception.Base (throwTo, AsyncException(..))
#endif #endif
isServerVersionSupported :: H.Session Bool isServerVersionSupported :: H.Session Bool
src/PostgREST/Middleware.hs
+8 -8
View File
@@ -4,27 +4,27 @@
module PostgREST.Middleware where module PostgREST.Middleware where
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import Data.Text
import Data.String.Conversions (cs) import Data.String.Conversions (cs)
import Data.Text
import Data.Time.Clock (NominalDiffTime) import Data.Time.Clock (NominalDiffTime)
import qualified Hasql.Transaction as H import qualified Hasql.Transaction as H
import Network.HTTP.Types.Header (hAccept, hAuthorization) import Network.HTTP.Types.Header (hAccept, hAuthorization)
import Network.HTTP.Types.Status (status415, status400) import Network.HTTP.Types.Status (status400, status415)
import Network.Wai (Application, Request (..), Response, import Network.Wai (Application, Request (..),
requestHeaders) Response, requestHeaders)
import Network.Wai.Middleware.Cors (cors) import Network.Wai.Middleware.Cors (cors)
import Network.Wai.Middleware.Gzip (def, gzip) import Network.Wai.Middleware.Gzip (def, gzip)
import Network.Wai.Middleware.Static (only, staticPolicy) import Network.Wai.Middleware.Static (only, staticPolicy)
import PostgREST.ApiRequest (pickContentType) import PostgREST.ApiRequest (pickContentType)
import PostgREST.Auth (setRole, jwtClaims, claimsToSQL) import PostgREST.Auth (claimsToSQL, jwtClaims, setRole)
import PostgREST.Config (AppConfig (..), corsPolicy) import PostgREST.Config (AppConfig (..), corsPolicy)
import PostgREST.Error (errResponse) import PostgREST.Error (errResponse)
import Prelude hiding(concat) import Prelude hiding (concat)
import qualified Data.Map.Lazy as M import qualified Data.Map.Lazy as M
runWithClaims :: AppConfig -> NominalDiffTime -> runWithClaims :: AppConfig -> NominalDiffTime ->
(Request -> H.Transaction Response) -> (Request -> H.Transaction Response) ->
src/PostgREST/Parsers.hs
+2 -2
View File
@@ -3,14 +3,14 @@ module PostgREST.Parsers
-- ) -- )
where where
import Control.Applicative hiding ((<$>)) import Control.Applicative hiding ((<$>))
import Data.Monoid import Data.Monoid
import Data.String.Conversions (cs) import Data.String.Conversions (cs)
import Data.Text (Text) import Data.Text (Text)
import Data.Tree import Data.Tree
import PostgREST.QueryBuilder (operators)
import PostgREST.Types import PostgREST.Types
import Text.ParserCombinators.Parsec hiding (many, (<|>)) import Text.ParserCombinators.Parsec hiding (many, (<|>))
import PostgREST.QueryBuilder (operators)
pRequestSelect :: Text -> Parser ReadRequest pRequestSelect :: Text -> Parser ReadRequest
pRequestSelect rootNodeName = do pRequestSelect rootNodeName = do
src/PostgREST/Types.hs
+8 -8
View File
@@ -1,16 +1,16 @@
module PostgREST.Types where module PostgREST.Types where
import Data.Text import Data.Aeson
import Data.Tree
import qualified Data.ByteString.Lazy as BL
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as BL
import Data.Int (Int32)
import Data.Text
import Data.Tree
import qualified Data.Vector as V import qualified Data.Vector as V
import Data.Aeson
import Data.Int (Int32)
data DbStructure = DbStructure { data DbStructure = DbStructure {
dbTables :: [Table] dbTables :: [Table]
, dbColumns :: [Column] , dbColumns :: [Column]
, dbRelations :: [Relation] , dbRelations :: [Relation]
, dbPrimaryKeys :: [PrimaryKey] , dbPrimaryKeys :: [PrimaryKey]
} deriving (Show, Eq) } deriving (Show, Eq)
test/Main.hs
+6 -6
View File
@@ -1,13 +1,13 @@
module Main where module Main where
import Test.Hspec import SpecHelper
import SpecHelper import Test.Hspec
import qualified Hasql.Pool as P import qualified Hasql.Pool as P
import PostgREST.DbStructure (getDbStructure) import Data.String.Conversions (cs)
import PostgREST.App (handleRequest) import PostgREST.App (handleRequest)
import Data.String.Conversions (cs) import PostgREST.DbStructure (getDbStructure)
import qualified Feature.AuthSpec import qualified Feature.AuthSpec
import qualified Feature.ConcurrentSpec import qualified Feature.ConcurrentSpec