From 7f2c39ef94238ae2387ce8a56e025b9caac3c34d Mon Sep 17 00:00:00 2001 From: Ruslan Talpa Date: Tue, 29 Sep 2015 19:16:25 +0300 Subject: [PATCH] small cleanup suggested by @begriffs --- postgrest.cabal | 3 +- src/PostgREST/App.hs | 88 ++++++++++++++++++++++---------------------- 2 files changed, 46 insertions(+), 45 deletions(-) diff --git a/postgrest.cabal b/postgrest.cabal index e04d4a65e..bfe278c4a 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -61,8 +61,7 @@ library if flag(ci) ghc-options: -Wall -W -Werror else - -- ghc-options: -Wall -W -O2 - ghc-options: -Wall -W + ghc-options: -Wall -W -O2 default-language: Haskell2010 default-extensions: OverloadedStrings, ScopedTypeVariables, QuasiQuotes diff --git a/src/PostgREST/App.hs b/src/PostgREST/App.hs index 487581e17..b93e4bc7b 100644 --- a/src/PostgREST/App.hs +++ b/src/PostgREST/App.hs @@ -1,4 +1,5 @@ -{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE ScopedTypeVariables #-} module PostgREST.App ( app , sqlError @@ -10,51 +11,52 @@ module PostgREST.App ( ) where -import Control.Monad (join) -import Control.Arrow ((***), second) -import Control.Applicative -import Data.Bifunctor (first) -import Data.Text (Text, pack) -import Data.Maybe (fromMaybe, mapMaybe, isJust, isNothing) -import Text.Regex.TDFA ((=~)) -import Data.Ord (comparing) -import Data.Ranged.Ranges (emptyRange) -import qualified Data.HashMap.Strict as M -import Data.String.Conversions (cs) -import Data.CaseInsensitive (original) -import Data.List (sortBy, find) -import Data.Functor.Identity -import qualified Data.Set as S -import qualified Data.ByteString.Lazy as BL -import qualified Data.ByteString.Char8 as BS -import qualified Blaze.ByteString.Builder as BB -import qualified Data.Csv as CSV +import qualified Blaze.ByteString.Builder as BB +import Control.Applicative +import Control.Arrow (second, (***)) +import Control.Monad (join) +import Data.Bifunctor (first) +import qualified Data.ByteString.Char8 as BS +import qualified Data.ByteString.Lazy as BL +import Data.CaseInsensitive (original) +import qualified Data.Csv as CSV +import Data.Functor.Identity +import qualified Data.HashMap.Strict as M +import Data.List (find, sortBy) +import Data.Maybe (fromMaybe, isJust, isNothing, + mapMaybe) +import Data.Ord (comparing) +import Data.Ranged.Ranges (emptyRange) +import qualified Data.Set as S +import Data.String.Conversions (cs) +import Data.Text (Text, pack) +import Text.Regex.TDFA ((=~)) -import Network.HTTP.Types.Status -import Network.HTTP.Types.Header -import Network.HTTP.Types.URI (parseSimpleQuery) -import Network.HTTP.Base (urlEncodeVars) -import Network.Wai -import Network.Wai.Parse (parseHttpAccept) -import Network.Wai.Internal (Response(..)) +import Network.HTTP.Base (urlEncodeVars) +import Network.HTTP.Types.Header +import Network.HTTP.Types.Status +import Network.HTTP.Types.URI (parseSimpleQuery) +import Network.Wai +import Network.Wai.Internal (Response (..)) +import Network.Wai.Parse (parseHttpAccept) -import Data.Aeson -import Data.Monoid -import qualified Data.Vector as V -import qualified Hasql as H -import qualified Hasql.Backend as B -import qualified Hasql.Postgres as P +import Data.Aeson +import Data.Monoid +import qualified Data.Vector as V +import qualified Hasql as H +import qualified Hasql.Backend as B +import qualified Hasql.Postgres as P -import PostgREST.Types -import PostgREST.Config (AppConfig(..)) -import PostgREST.Auth -import PostgREST.PgQuery -import PostgREST.RangeQuery -import PostgREST.PgStructure -import PostgREST.Parsers -import PostgREST.QueryBuilder +import PostgREST.Auth +import PostgREST.Config (AppConfig (..)) +import PostgREST.Parsers +import PostgREST.PgQuery +import PostgREST.PgStructure +import PostgREST.QueryBuilder +import PostgREST.RangeQuery +import PostgREST.Types -import Prelude +import Prelude app :: DbStructure -> AppConfig -> BL.ByteString -> DbRole -> Request -> H.Tx P.Postgres s Response app dbstructure conf reqBody dbrole req = @@ -402,7 +404,7 @@ multipart s rs = data TableOptions = TableOptions { tblOptcolumns :: [Column] -, tblOptpkey :: [Text] +, tblOptpkey :: [Text] } instance ToJSON TableOptions where