From 0a3057e92d3a4697a595508abe60b647c35e7fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Crist=C3=B3v=C3=A3o?= Date: Wed, 11 Feb 2015 19:49:31 +0000 Subject: [PATCH 1/2] Update PgQuery.hs I'm a bit baffled nobody noticed this before :P Anyhow, without it order does not work. Thanks, Cheers --- src/PgQuery.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PgQuery.hs b/src/PgQuery.hs index 663053770..d43b4694c 100644 --- a/src/PgQuery.hs +++ b/src/PgQuery.hs @@ -162,7 +162,7 @@ orderParse q = orderParseTerm :: Text -> Maybe OrderTerm orderParseTerm s = case split (=='.') s of - [d,c] -> + [c,d] -> if d `elem` ["asc", "desc"] then Just $ OrderTerm c $ if d == "asc" then "asc" else "desc" From 9cb1ced010ff7f177c4aae87730587f5fba6a9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Crist=C3=B3v=C3=A3o?= Date: Thu, 12 Feb 2015 09:44:49 +0000 Subject: [PATCH 2/2] Change order test to match docs --- test/Feature/QuerySpec.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Feature/QuerySpec.hs b/test/Feature/QuerySpec.hs index 6efaceca6..37eb234d9 100644 --- a/test/Feature/QuerySpec.hs +++ b/test/Feature/QuerySpec.hs @@ -25,14 +25,14 @@ spec = beforeAll (clearTable "items" >> createItems 15) describe "ordering response" $ do it "by a column asc" $ - get "/items?id=lte.2&order=asc.id" + get "/items?id=lte.2&order=id.asc" `shouldRespondWith` ResponseMatcher { matchBody = Just "[{\"id\":1},{\"id\":2}]" , matchStatus = 200 , matchHeaders = ["Content-Range" <:> "0-1/2"] } it "by a column desc" $ - get "/items?id=lte.2&order=desc.id" + get "/items?id=lte.2&order=id.desc" `shouldRespondWith` ResponseMatcher { matchBody = Just "[{\"id\":2},{\"id\":1}]" , matchStatus = 200