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

Accurate range response headers

Browse Source
This commit is contained in:
Joe Nelson
2014-08-04 22:30:38 -07:00
parent 351b44ed52
commit 81929dd513
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Main.hs
+4 -2
View File
@@ -91,8 +91,10 @@ respondWithRangedResult rr =
responseLBS status206 [ responseLBS status206 [
json, json,
("Content-Range", ("Content-Range",
"0-" <> (BS.pack . show . rrTo) rr <> "/" (BS.pack . show . rrFrom ) rr <> "-"
<> (BS.pack . show . rrTotal) rr) <> (BS.pack . show . rrTo ) rr <> "/"
<> (BS.pack . show . rrTotal) rr
)
] (rrBody rr) ] (rrBody rr)
where where
PgQuery.hs
+5 -1
View File
@@ -41,9 +41,13 @@ getRows schema table qq range conn = do
return $ case r of return $ case r of
[[total, limited_total, json]] -> [[total, limited_total, json]] ->
RangedResult 0 (fromSql limited_total) (fromSql total) (fromSql json) RangedResult offset (offset + fromSql limited_total - 1)
(fromSql total) (fromSql json)
_ -> RangedResult 0 0 0 "" _ -> RangedResult 0 0 0 ""
where
offset = fromMaybe 0 $ R.offset <$> range
whereClause :: Net.Query -> QuotedSql whereClause :: Net.Query -> QuotedSql
whereClause qs = whereClause qs =
if null qs then ("", []) else (" where ", []) <> conjunction if null qs then ("", []) else (" where ", []) <> conjunction