Merge remote-tracking branch 'begriffs/v3' into v3

This commit is contained in:
Ruslan Talpa
2015-10-24 21:25:01 +03:00
5 changed files with 35 additions and 25 deletions
+1 -1
View File
@@ -399,7 +399,7 @@ convertJson v = (,) <$> (header <$> normalized) <*> (vals <$> normalized)
normalized = groupByKey =<< normalizeValue v
vals :: [(Text, [Value])] -> [[Value]]
vals a = transpose $ map snd a
vals = transpose . map snd
header :: [(Text, [Value])] -> [Text]
header = map fst
+1 -4
View File
@@ -12,15 +12,12 @@ In the test suite there is an example of simple login function that can be used
very simple authentication system inside the PostgreSQL database.
-}
module PostgREST.Auth (
setRole
setRole
, claimsToSQL
, jwtClaims
, tokenJWT
) where
--line needed for ghc 7.8
--import Data.Functor ((<$>))
import Data.Aeson (Value (..), Object)
import Data.Aeson.Types (emptyObject, emptyArray)
import Data.Vector as V (null, head)
-3
View File
@@ -3,9 +3,6 @@
module PostgREST.Middleware where
-- needed for ghc 7.8
-- import Data.Functor ((<$>))
import Data.Maybe (fromMaybe, isNothing)
import Data.Monoid
import Data.Text
+3 -7
View File
@@ -4,13 +4,9 @@ module PostgREST.Parsers
where
import Control.Applicative hiding ((<$>))
--lines needed for ghc 7.8
-- import Data.Functor ((<$>))
-- import Data.Traversable (traverse)
--import Control.Monad (join)
--import Data.List (delete, find)
--import Data.Maybe
import Control.Monad (join)
import Data.List (delete, find)
import Data.Maybe
import Data.Monoid
import Data.String.Conversions (cs)
import Data.Text (Text)