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

Adjust total for active filter

Browse Source 
Including total = 0
This commit is contained in:
Joe Nelson
2014-08-05 12:28:40 -07:00
parent 81929dd513
commit 5d5c2393b6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PgQuery.hs
+8 -4
View File
@@ -32,7 +32,7 @@ type QuotedSql = (String, [SqlValue])
getRows :: String -> String -> Net.Query -> Maybe R.NonnegRange -> Connection -> IO RangedResult getRows :: String -> String -> Net.Query -> Maybe R.NonnegRange -> Connection -> IO RangedResult
getRows schema table qq range conn = do getRows schema table qq range conn = do
query <- populateSql conn query <- populateSql conn
$ globalAndLimitedCounts schema table <> $ globalAndLimitedCounts schema table qq <>
jsonArrayRows jsonArrayRows
(selectStarClause schema table (selectStarClause schema table
<> whereClause qq <> whereClause qq
@@ -40,6 +40,7 @@ getRows schema table qq range conn = do
r <- quickQuery conn query [] r <- quickQuery conn query []
return $ case r of return $ case r of
[[_, _, SqlNull]] -> RangedResult 0 0 0 ""
[[total, limited_total, json]] -> [[total, limited_total, json]] ->
RangedResult offset (offset + fromSql limited_total - 1) RangedResult offset (offset + fromSql limited_total - 1)
(fromSql total) (fromSql json) (fromSql total) (fromSql json)
@@ -81,9 +82,12 @@ limitClause range =
limit = fromMaybe "ALL" $ show <$> (R.limit =<< range) limit = fromMaybe "ALL" $ show <$> (R.limit =<< range)
offset = fromMaybe 0 $ R.offset <$> range offset = fromMaybe 0 $ R.offset <$> range
globalAndLimitedCounts :: String -> String -> QuotedSql globalAndLimitedCounts :: String -> String -> Net.Query -> QuotedSql
globalAndLimitedCounts schema table = globalAndLimitedCounts schema table qq =
(" select (select count(1) from %I.%I), count(t), ", map toSql [schema, table]) (" select ", [])
<> ("(select count(1) from %I.%I ", map toSql [schema, table])
<> whereClause qq
<> ("), count(t), ", [])
selectStarClause :: String -> String -> QuotedSql selectStarClause :: String -> String -> QuotedSql
selectStarClause schema table = selectStarClause schema table =