Merge branch 'jcristovao-isnull'

CHANGELOG.md

@@ -5,7 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 ### Added
-- Option to specify nulls first or last, eg /people?order=age.desc.nullsfirst
+- Option to specify nulls first or last, eg `/people?order=age.desc.nullsfirst`
+- Filter nulls, `?col=is.null` and `?col=isnot.null`
 
 ## [0.2.7.0] - 2015-03-03
 ### Added

src/PgQuery.hs

@@ -139,13 +139,18 @@ update t cols vals = B.Stmt
   empty True
 
 wherePred :: Net.QueryItem -> PStmt
-wherePred (col, predicate) = B.Stmt
-  (" " <> cs (pgFmtIdent $ cs col) <> " " <> op <> " " <> cs sqlValue)
-  empty True
+wherePred (col, predicate) =
+  B.Stmt (" " <> cs (pgFmtIdent $ cs col) <> " " <> op <> " " <>
+      if opCode `elem` ["is","isnot"] then whiteList value
+                                 else cs sqlValue)
+      empty True
 
   where
     opCode:rest = T.split (=='.') $ cs $ fromMaybe "." predicate
     value = T.intercalate "." rest
+    whiteList val = fromMaybe (cs (pgFmtLit val) <> "::unknown ")
+                              (L.find ((==) . T.toLower $ val)
+                                      ["null","true","false"])
 
     star c = if c == '*' then '%' else c
     unknownLiteral = (<> "::unknown ") . pgFmtLit
@@ -166,6 +171,8 @@ wherePred (col, predicate) = B.Stmt
          "like"-> "like"
          "ilike"-> "ilike"
          "in"  -> "in"
+         "is"    -> "is"
+         "isnot" -> "is not"
          _     -> "="
 
 orderParse :: Net.Query -> [OrderTerm]

test/Feature/QuerySpec.hs

@@ -34,6 +34,10 @@ spec =
         , matchHeaders = ["Content-Range" <:> "0-2/3"]
         }
 
+    it "matches nulls" $
+      get "/no_pk?a=is.null" `shouldRespondWith`
+        [json| [{"a": null, "b": null}] |]
+
     it "matches with like" $ do
       get "/simple_pk?k=like.*yx" `shouldRespondWith`
         "[{\"k\":\"xyyx\",\"extra\":\"u\"}]"