small cleanup suggested by @begriffs
This commit is contained in:
+1
-2
@@ -61,8 +61,7 @@ library
|
|||||||
if flag(ci)
|
if flag(ci)
|
||||||
ghc-options: -Wall -W -Werror
|
ghc-options: -Wall -W -Werror
|
||||||
else
|
else
|
||||||
-- ghc-options: -Wall -W -O2
|
ghc-options: -Wall -W -O2
|
||||||
ghc-options: -Wall -W
|
|
||||||
|
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
default-extensions: OverloadedStrings, ScopedTypeVariables, QuasiQuotes
|
default-extensions: OverloadedStrings, ScopedTypeVariables, QuasiQuotes
|
||||||
|
|||||||
+45
-43
@@ -1,4 +1,5 @@
|
|||||||
{-# LANGUAGE FlexibleContexts #-}
|
{-# LANGUAGE FlexibleContexts #-}
|
||||||
|
{-# LANGUAGE ScopedTypeVariables #-}
|
||||||
module PostgREST.App (
|
module PostgREST.App (
|
||||||
app
|
app
|
||||||
, sqlError
|
, sqlError
|
||||||
@@ -10,51 +11,52 @@ module PostgREST.App (
|
|||||||
) where
|
) where
|
||||||
|
|
||||||
|
|
||||||
import Control.Monad (join)
|
import qualified Blaze.ByteString.Builder as BB
|
||||||
import Control.Arrow ((***), second)
|
import Control.Applicative
|
||||||
import Control.Applicative
|
import Control.Arrow (second, (***))
|
||||||
import Data.Bifunctor (first)
|
import Control.Monad (join)
|
||||||
import Data.Text (Text, pack)
|
import Data.Bifunctor (first)
|
||||||
import Data.Maybe (fromMaybe, mapMaybe, isJust, isNothing)
|
import qualified Data.ByteString.Char8 as BS
|
||||||
import Text.Regex.TDFA ((=~))
|
import qualified Data.ByteString.Lazy as BL
|
||||||
import Data.Ord (comparing)
|
import Data.CaseInsensitive (original)
|
||||||
import Data.Ranged.Ranges (emptyRange)
|
import qualified Data.Csv as CSV
|
||||||
import qualified Data.HashMap.Strict as M
|
import Data.Functor.Identity
|
||||||
import Data.String.Conversions (cs)
|
import qualified Data.HashMap.Strict as M
|
||||||
import Data.CaseInsensitive (original)
|
import Data.List (find, sortBy)
|
||||||
import Data.List (sortBy, find)
|
import Data.Maybe (fromMaybe, isJust, isNothing,
|
||||||
import Data.Functor.Identity
|
mapMaybe)
|
||||||
import qualified Data.Set as S
|
import Data.Ord (comparing)
|
||||||
import qualified Data.ByteString.Lazy as BL
|
import Data.Ranged.Ranges (emptyRange)
|
||||||
import qualified Data.ByteString.Char8 as BS
|
import qualified Data.Set as S
|
||||||
import qualified Blaze.ByteString.Builder as BB
|
import Data.String.Conversions (cs)
|
||||||
import qualified Data.Csv as CSV
|
import Data.Text (Text, pack)
|
||||||
|
import Text.Regex.TDFA ((=~))
|
||||||
|
|
||||||
import Network.HTTP.Types.Status
|
import Network.HTTP.Base (urlEncodeVars)
|
||||||
import Network.HTTP.Types.Header
|
import Network.HTTP.Types.Header
|
||||||
import Network.HTTP.Types.URI (parseSimpleQuery)
|
import Network.HTTP.Types.Status
|
||||||
import Network.HTTP.Base (urlEncodeVars)
|
import Network.HTTP.Types.URI (parseSimpleQuery)
|
||||||
import Network.Wai
|
import Network.Wai
|
||||||
import Network.Wai.Parse (parseHttpAccept)
|
import Network.Wai.Internal (Response (..))
|
||||||
import Network.Wai.Internal (Response(..))
|
import Network.Wai.Parse (parseHttpAccept)
|
||||||
|
|
||||||
import Data.Aeson
|
import Data.Aeson
|
||||||
import Data.Monoid
|
import Data.Monoid
|
||||||
import qualified Data.Vector as V
|
import qualified Data.Vector as V
|
||||||
import qualified Hasql as H
|
import qualified Hasql as H
|
||||||
import qualified Hasql.Backend as B
|
import qualified Hasql.Backend as B
|
||||||
import qualified Hasql.Postgres as P
|
import qualified Hasql.Postgres as P
|
||||||
|
|
||||||
import PostgREST.Types
|
import PostgREST.Auth
|
||||||
import PostgREST.Config (AppConfig(..))
|
import PostgREST.Config (AppConfig (..))
|
||||||
import PostgREST.Auth
|
import PostgREST.Parsers
|
||||||
import PostgREST.PgQuery
|
import PostgREST.PgQuery
|
||||||
import PostgREST.RangeQuery
|
import PostgREST.PgStructure
|
||||||
import PostgREST.PgStructure
|
import PostgREST.QueryBuilder
|
||||||
import PostgREST.Parsers
|
import PostgREST.RangeQuery
|
||||||
import PostgREST.QueryBuilder
|
import PostgREST.Types
|
||||||
|
|
||||||
import Prelude
|
import Prelude
|
||||||
|
|
||||||
app :: DbStructure -> AppConfig -> BL.ByteString -> DbRole -> Request -> H.Tx P.Postgres s Response
|
app :: DbStructure -> AppConfig -> BL.ByteString -> DbRole -> Request -> H.Tx P.Postgres s Response
|
||||||
app dbstructure conf reqBody dbrole req =
|
app dbstructure conf reqBody dbrole req =
|
||||||
@@ -402,7 +404,7 @@ multipart s rs =
|
|||||||
|
|
||||||
data TableOptions = TableOptions {
|
data TableOptions = TableOptions {
|
||||||
tblOptcolumns :: [Column]
|
tblOptcolumns :: [Column]
|
||||||
, tblOptpkey :: [Text]
|
, tblOptpkey :: [Text]
|
||||||
}
|
}
|
||||||
|
|
||||||
instance ToJSON TableOptions where
|
instance ToJSON TableOptions where
|
||||||
|
|||||||
Reference in New Issue
Block a user