refactor: reorder PgVersion(95/96)Spec tests

* move json ops tests to JsonOperatorSpec * move phfts operator tests to QuerySpec and RpcSpec * add custom spec for pre-request header guc tests
PostgREST · Sep 14, 2020 · 61a78ab · 61a78ab
1 parent 7af54c5
commit 61a78ab
Show file tree

Hide file tree

Showing 9 changed files with 328 additions and 288 deletions.
diff --git a/postgrest.cabal b/postgrest.cabal
@@ -156,13 +156,12 @@ test-suite spec
                       Feature.JsonOperatorSpec
                       Feature.NoJwtSpec
                       Feature.NonexistentSchemaSpec
-                      Feature.PgVersion95Spec
-                      Feature.PgVersion96Spec
                       Feature.ProxySpec
                       Feature.QueryLimitedSpec
                       Feature.QuerySpec
                       Feature.RangeSpec
                       Feature.RootSpec
+                      Feature.RpcPreRequestGucsSpec
                       Feature.RpcSpec
                       Feature.SingularSpec
                       Feature.StructureSpec

diff --git a/test/Feature/JsonOperatorSpec.hs b/test/Feature/JsonOperatorSpec.hs
@@ -7,7 +7,7 @@ import Test.Hspec
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 
-import PostgREST.Types (PgVersion, pgVersion112, pgVersion121)
+import PostgREST.Types (PgVersion, pgVersion112, pgVersion121, pgVersion95)
 import Protolude       hiding (get)
 import SpecHelper
 
@@ -207,3 +207,47 @@ spec actualPgVersion = describe "json and jsonb operators" $ do
                    [json| { "data": { "escaped":" \"bar" } } |]
         `shouldRespondWith` [json| [{ "data": { "escaped":" \"bar" } }] |]
         { matchStatus  = 200 , matchHeaders = [] }
+
+  when (actualPgVersion >= pgVersion95) $
+    context "json array negative index" $ do
+      it "can select with negative indexes" $ do
+        get "/json_arr?select=data->>-1::int&id=in.(1,2)" `shouldRespondWith`
+          [json| [{"data":3}, {"data":6}] |]
+          { matchHeaders = [matchContentTypeJson] }
+        get "/json_arr?select=data->0->>-2::int&id=in.(3,4)" `shouldRespondWith`
+          [json| [{"data":8}, {"data":7}] |]
+          { matchHeaders = [matchContentTypeJson] }
+        get "/json_arr?select=data->-2->>a&id=in.(5,6)" `shouldRespondWith`
+          [json| [{"a":"A"}, {"a":"[1,2,3]"}] |]
+          { matchHeaders = [matchContentTypeJson] }
+
+      it "can filter with negative indexes" $ do
+        get "/json_arr?select=data&data->>-3=eq.1" `shouldRespondWith`
+          [json| [{"data":[1, 2, 3]}] |]
+          { matchHeaders = [matchContentTypeJson] }
+        get "/json_arr?select=data&data->-1->>-3=eq.11" `shouldRespondWith`
+          [json| [{"data":[[9, 8, 7], [11, 12, 13]]}] |]
+          { matchHeaders = [matchContentTypeJson] }
+        get "/json_arr?select=data&data->-1->>b=eq.B" `shouldRespondWith`
+          [json| [{"data":[{"a": "A"}, {"b": "B"}]}] |]
+          { matchHeaders = [matchContentTypeJson] }
+        get "/json_arr?select=data&data->-1->b->>-1=eq.5" `shouldRespondWith`
+          [json| [{"data":[{"a": [1,2,3]}, {"b": [4,5]}]}] |]
+          { matchHeaders = [matchContentTypeJson] }
+
+      it "should fail on badly formed negatives" $ do
+        get "/json_arr?select=data->>-78xy" `shouldRespondWith`
+          [json|
+            {"details": "unexpected 'x' expecting digit, \"->\", \"::\" or end of input",
+             "message": "\"failed to parse select parameter (data->>-78xy)\" (line 1, column 11)"} |]
+          { matchStatus = 400, matchHeaders = [matchContentTypeJson] }
+        get "/json_arr?select=data->>--34" `shouldRespondWith`
+          [json|
+            {"details": "unexpected \"-\" expecting digit",
+             "message": "\"failed to parse select parameter (data->>--34)\" (line 1, column 9)"} |]
+          { matchStatus = 400, matchHeaders = [matchContentTypeJson] }
+        get "/json_arr?select=data->>-xy-4" `shouldRespondWith`
+          [json|
+            {"details":"unexpected \"x\" expecting digit",
+             "message":"\"failed to parse select parameter (data->>-xy-4)\" (line 1, column 9)"} |]
+          { matchStatus = 400, matchHeaders = [matchContentTypeJson] }
diff --git a/test/Feature/PgVersion95Spec.hs b/test/Feature/PgVersion95Spec.hs
diff --git a/test/Feature/PgVersion96Spec.hs b/test/Feature/PgVersion96Spec.hs
diff --git a/test/Feature/QuerySpec.hs b/test/Feature/QuerySpec.hs
@@ -10,7 +10,7 @@ import Test.Hspec.Wai.JSON
 
 import Text.Heredoc
 
-import PostgREST.Types (PgVersion, pgVersion112, pgVersion121)
+import PostgREST.Types (PgVersion, pgVersion96, pgVersion112, pgVersion121)
 import Protolude       hiding (get)
 import SpecHelper
 
@@ -183,6 +183,35 @@ spec actualPgVersion = do
                     {"text_search_vector": "'art':4 'spass':5 'unmog':7"}]|]
                   { matchHeaders = [matchContentTypeJson] }
 
+      when (actualPgVersion >= pgVersion96) $
+        context "Use of the phraseto_tsquery function" $ do
+          it "finds matches" $
+            get "/tsearch?text_search_vector=phfts.The%20Fat%20Cats" `shouldRespondWith`
+              [json| [{"text_search_vector": "'ate':3 'cat':2 'fat':1 'rat':4" }] |]
+              { matchHeaders = [matchContentTypeJson] }
+
+          it "finds matches with different dictionaries" $
+            get "/tsearch?text_search_vector=phfts(german).Art%20Spass" `shouldRespondWith`
+              [json| [{"text_search_vector": "'art':4 'spass':5 'unmog':7" }] |]
+              { matchHeaders = [matchContentTypeJson] }
+
+          it "can be negated with not operator" $
+            get "/tsearch?text_search_vector=not.phfts(english).The%20Fat%20Cats" `shouldRespondWith`
+              [json| [
+                {"text_search_vector": "'fun':5 'imposs':9 'kind':3"},
+                {"text_search_vector": "'also':2 'fun':3 'possibl':8"},
+                {"text_search_vector": "'amus':5 'fair':7 'impossibl':9 'peu':4"},
+                {"text_search_vector": "'art':4 'spass':5 'unmog':7"}]|]
+              { matchHeaders = [matchContentTypeJson] }
+
+          it "can be used with or query param" $
+            get "/tsearch?or=(text_search_vector.phfts(german).Art%20Spass, text_search_vector.phfts(french).amusant, text_search_vector.fts(english).impossible)" `shouldRespondWith`
+              [json|[
+                {"text_search_vector": "'fun':5 'imposs':9 'kind':3" },
+                {"text_search_vector": "'amus':5 'fair':7 'impossibl':9 'peu':4" },
+                {"text_search_vector": "'art':4 'spass':5 'unmog':7"}
+              ]|] { matchHeaders = [matchContentTypeJson] }
+
     it "matches with computed column" $
       get "/items?always_true=eq.true&order=id.asc" `shouldRespondWith`
         [json| [{"id":1},{"id":2},{"id":3},{"id":4},{"id":5},{"id":6},{"id":7},{"id":8},{"id":9},{"id":10},{"id":11},{"id":12},{"id":13},{"id":14},{"id":15}] |]