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

Allow NULL in csv field and unquote the multipart headers

Browse Source
This commit is contained in:
Joe Nelson
2015-04-16 12:43:22 -07:00
parent a87f13f9bb
commit f4c49f03f4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.hs
+5 -5
View File
@@ -12,6 +12,7 @@ import Data.Ord (comparing)
import Data.Ranged.Ranges (emptyRange) import Data.Ranged.Ranges (emptyRange)
import qualified Data.HashMap.Strict as M import qualified Data.HashMap.Strict as M
import Data.String.Conversions (cs) import Data.String.Conversions (cs)
import Data.CaseInsensitive (original)
import Data.List (sortBy) import Data.List (sortBy)
import Data.Functor.Identity import Data.Functor.Identity
import qualified Data.Set as S import qualified Data.Set as S
@@ -245,19 +246,18 @@ handleJsonObj reqBody handler = do
[("message", String "Expecting a JSON object")] [("message", String "Expecting a JSON object")]
parseCsvCell :: BL.ByteString -> Value parseCsvCell :: BL.ByteString -> Value
parseCsvCell s = parseCsvCell s = if s == "NULL" then Null else String $ cs s
either (const $ String "") id (eitherDecode s)
multipart :: Status -> [Response] -> Response multipart :: Status -> [Response] -> Response
multipart _ [] = responseLBS status204 [] "" multipart _ [] = responseLBS status204 [] ""
multipart _ [r] = r multipart _ [r] = r
multipart s rs = multipart s rs =
responseLBS s [(hContentType, "Multipart/mixed; boundary=postgrest_boundary")] $ responseLBS s [(hContentType, "multipart/mixed; boundary=\"postgrest_boundary\"")] $
BL.intercalate "\n\n--postgrest_boundary\n" (map renderResponseBody rs) BL.intercalate "\n--postgrest_boundary\n" (map renderResponseBody rs)
where where
renderHeader :: Header -> BL.ByteString renderHeader :: Header -> BL.ByteString
renderHeader (k, v) = cs (show k) <> ": " <> cs v renderHeader (k, v) = cs (original k) <> ": " <> cs v
renderResponseBody :: Response -> BL.ByteString renderResponseBody :: Response -> BL.ByteString
renderResponseBody (ResponseBuilder _ headers b) = renderResponseBody (ResponseBuilder _ headers b) =