From a7403fecc233c055e7e348253bf25ee8cee7fbe0 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 2 Nov 2020 13:31:52 +0100 Subject: [PATCH] refactor: split InsertSpec into InsertSpec and UpdateSpec --- postgrest.cabal | 1 + test/Feature/InsertSpec.hs | 330 ---------------------------------- test/Feature/UpdateSpec.hs | 350 +++++++++++++++++++++++++++++++++++++ test/Main.hs | 2 + 4 files changed, 353 insertions(+), 330 deletions(-) create mode 100644 test/Feature/UpdateSpec.hs diff --git a/postgrest.cabal b/postgrest.cabal index f5a22143d..9559b7aff 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -168,6 +168,7 @@ test-suite spec Feature.SingularSpec Feature.StructureSpec Feature.UnicodeSpec + Feature.UpdateSpec Feature.UpsertSpec Feature.RawOutputTypesSpec Feature.HtmlRawOutputSpec diff --git a/test/Feature/InsertSpec.hs b/test/Feature/InsertSpec.hs index 53f7c8dc1..2b21ebb31 100644 --- a/test/Feature/InsertSpec.hs +++ b/test/Feature/InsertSpec.hs @@ -422,262 +422,6 @@ spec actualPgVersion = do r <- get (location <> "&select=extra,k") liftIO $ simpleBody r `shouldBe` "["<>payload<>"]" - describe "Patching record" $ do - context "to unknown uri" $ - it "indicates no table found by returning 404" $ - request methodPatch "/fake" [] - [json| { "real": false } |] - `shouldRespondWith` 404 - - context "on an empty table" $ - it "indicates no records found to update by returning 404" $ - request methodPatch "/empty_table" [] - [json| { "extra":20 } |] - `shouldRespondWith` "" - { matchStatus = 404, - matchHeaders = [] - } - - context "with invalid json payload" $ - it "fails with 400 and error" $ - request methodPatch "/simple_pk" [] "}{ x = 2" - `shouldRespondWith` - [json|{"message":"Error in $: Failed reading: not a valid json value at '}{x=2'"}|] - { matchStatus = 400, - matchHeaders = [matchContentTypeJson] - } - - context "with no payload" $ - it "fails with 400 and error" $ - request methodPatch "/items" [] "" - `shouldRespondWith` - [json|{"message":"Error in $: not enough input"}|] - { matchStatus = 400, - matchHeaders = [matchContentTypeJson] - } - - context "in a nonempty table" $ do - it "can update a single item" $ do - g <- get "/items?id=eq.42" - liftIO $ simpleHeaders g - `shouldSatisfy` matchHeader "Content-Range" "\\*/\\*" - p <- request methodPatch "/items?id=eq.2" [] [json| { "id":42 } |] - pure p `shouldRespondWith` "" - { matchStatus = 204, - matchHeaders = ["Content-Range" <:> "0-0/*"] - } - liftIO $ lookup hContentType (simpleHeaders p) `shouldBe` Nothing - - -- check it really got updated - g' <- get "/items?id=eq.42" - liftIO $ simpleHeaders g' - `shouldSatisfy` matchHeader "Content-Range" "0-0/\\*" - -- put value back for other tests - void $ request methodPatch "/items?id=eq.42" [] [json| { "id":2 } |] - - it "returns empty array when no rows updated and return=rep" $ - request methodPatch "/items?id=eq.999999" - [("Prefer", "return=representation")] [json| { "id":999999 } |] - `shouldRespondWith` "[]" - { - matchStatus = 404, - matchHeaders = [] - } - - it "gives a 404 when no rows updated" $ - request methodPatch "/items?id=eq.99999999" [] - [json| { "id": 42 } |] - `shouldRespondWith` 404 - - it "returns updated object as array when return=rep" $ - request methodPatch "/items?id=eq.2" - [("Prefer", "return=representation")] [json| { "id":2 } |] - `shouldRespondWith` [str|[{"id":2}]|] - { matchStatus = 200, - matchHeaders = ["Content-Range" <:> "0-0/*"] - } - - it "can update multiple items" $ do - replicateM_ 10 $ post "/auto_incrementing_pk" - [json| { non_nullable_string: "a" } |] - replicateM_ 10 $ post "/auto_incrementing_pk" - [json| { non_nullable_string: "b" } |] - _ <- request methodPatch - "/auto_incrementing_pk?non_nullable_string=eq.a" [] - [json| { non_nullable_string: "c" } |] - g <- get "/auto_incrementing_pk?non_nullable_string=eq.c" - liftIO $ simpleHeaders g - `shouldSatisfy` matchHeader "Content-Range" "0-9/\\*" - - it "can set a column to NULL" $ do - _ <- post "/no_pk" [json| { a: "keepme", b: "nullme" } |] - _ <- request methodPatch "/no_pk?b=eq.nullme" [] [json| { b: null } |] - get "/no_pk?a=eq.keepme" `shouldRespondWith` - [json| [{ a: "keepme", b: null }] |] - { matchHeaders = [matchContentTypeJson] } - - context "filtering by a computed column" $ do - it "is successful" $ - request methodPatch - "/items?is_first=eq.true" - [("Prefer", "return=representation")] - [json| { id: 100 } |] - `shouldRespondWith` [json| [{ id: 100 }] |] - { matchStatus = 200, - matchHeaders = [matchContentTypeJson, "Content-Range" <:> "0-0/*"] - } - - it "indicates no records updated by returning 404" $ - request methodPatch - "/items?always_true=eq.false" - [("Prefer", "return=representation")] - [json| { id: 100 } |] - `shouldRespondWith` "[]" - { matchStatus = 404, - matchHeaders = [] - } - - context "with representation requested" $ do - it "can provide a representation" $ do - _ <- post "/items" - [json| { id: 1 } |] - request methodPatch - "/items?id=eq.1" - [("Prefer", "return=representation")] - [json| { id: 99 } |] - `shouldRespondWith` [json| [{id:99}] |] - { matchHeaders = [matchContentTypeJson] } - -- put value back for other tests - void $ request methodPatch "/items?id=eq.99" [] [json| { "id":1 } |] - - it "can return computed columns" $ - request methodPatch - "/items?id=eq.1&select=id,always_true" - [("Prefer", "return=representation")] - [json| { id: 1 } |] - `shouldRespondWith` [json| [{ id: 1, always_true: true }] |] - { matchHeaders = [matchContentTypeJson] } - - it "can select overloaded computed columns" $ do - request methodPatch - "/items?id=eq.1&select=id,computed_overload" - [("Prefer", "return=representation")] - [json| { id: 1 } |] - `shouldRespondWith` [json| [{ id: 1, computed_overload: true }] |] - { matchHeaders = [matchContentTypeJson] } - request methodPatch - "/items2?id=eq.1&select=id,computed_overload" - [("Prefer", "return=representation")] - [json| { id: 1 } |] - `shouldRespondWith` [json| [{ id: 1, computed_overload: true }] |] - { matchHeaders = [matchContentTypeJson] } - - it "ignores ?select= when return not set or return=minimal" $ do - request methodPatch "/items?id=eq.1&select=id" [] [json| { id:1 } |] - `shouldRespondWith` "" - { - matchStatus = 204, - matchHeaders = ["Content-Range" <:> "0-0/*"] - } - request methodPatch "/items?id=eq.1&select=id" [("Prefer", "return=minimal")] [json| { id:1 } |] - `shouldRespondWith` "" - { - matchStatus = 204, - matchHeaders = ["Content-Range" <:> "0-0/*"] - } - - context "when patching with an empty body" $ do - it "makes no updates and returns 204 without return= and without ?select=" $ do - request methodPatch "/items" [] [json| {} |] - `shouldRespondWith` "" - { - matchStatus = 204, - matchHeaders = ["Content-Range" <:> "*/*"] - } - - request methodPatch "/items" [] [json| [] |] - `shouldRespondWith` "" - { - matchStatus = 204, - matchHeaders = ["Content-Range" <:> "*/*"] - } - - request methodPatch "/items" [] [json| [{}] |] - `shouldRespondWith` "" - { - matchStatus = 204, - matchHeaders = ["Content-Range" <:> "*/*"] - } - - it "makes no updates and returns 204 without return= and with ?select=" $ do - request methodPatch "/items?select=id" [] [json| {} |] - `shouldRespondWith` "" - { - matchStatus = 204, - matchHeaders = ["Content-Range" <:> "*/*"] - } - - request methodPatch "/items?select=id" [] [json| [] |] - `shouldRespondWith` "" - { - matchStatus = 204, - matchHeaders = ["Content-Range" <:> "*/*"] - } - - request methodPatch "/items?select=id" [] [json| [{}] |] - `shouldRespondWith` "" - { - matchStatus = 204, - matchHeaders = ["Content-Range" <:> "*/*"] - } - - it "makes no updates and returns 200 with return=rep and without ?select=" $ - request methodPatch "/items" [("Prefer", "return=representation")] [json| {} |] - `shouldRespondWith` "[]" - { - matchStatus = 200, - matchHeaders = ["Content-Range" <:> "*/*"] - } - - it "makes no updates and returns 200 with return=rep and with ?select=" $ - request methodPatch "/items?select=id" [("Prefer", "return=representation")] [json| {} |] - `shouldRespondWith` "[]" - { - matchStatus = 200, - matchHeaders = ["Content-Range" <:> "*/*"] - } - - it "makes no updates and returns 200 with return=rep and with ?select= for overloaded computed columns" $ - request methodPatch "/items?select=id,computed_overload" [("Prefer", "return=representation")] [json| {} |] - `shouldRespondWith` "[]" - { - matchStatus = 200, - matchHeaders = ["Content-Range" <:> "*/*"] - } - - context "with unicode values" $ - it "succeeds and returns values intact" $ do - void $ request methodPost "/no_pk" [] - [json| { "a":"patchme", "b":"patchme" } |] - let payload = [json| { "a":"圍棋", "b":"￥" } |] - p <- request methodPatch "/no_pk?a=eq.patchme&b=eq.patchme" - [("Prefer", "return=representation")] payload - liftIO $ do - simpleBody p `shouldBe` "["<>payload<>"]" - simpleStatus p `shouldBe` ok200 - - context "PATCH with ?columns parameter" $ do - it "ignores json keys not included in ?columns" $ - request methodPatch "/articles?id=eq.200&columns=body" [("Prefer", "return=representation")] - [json| {"body": "Some real content", "smth": "here", "other": "stuff", "fake_id": 13} |] `shouldRespondWith` - [json|[{"id": 200, "body": "Some real content", "owner": "postgrest_test_anonymous"}]|] - { matchStatus = 200 - , matchHeaders = [] } - - it "ignores json keys and gives 404 if no record updated" $ - request methodPatch "/articles?id=eq.2001&columns=body" [("Prefer", "return=representation")] - [json| {"body": "Some real content", "smth": "here", "other": "stuff", "fake_id": 13} |] `shouldRespondWith` 404 - describe "Row level permission" $ it "set user_id when inserting rows" $ do let auth = authHeaderJWT "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoicG9zdGdyZXN0X3Rlc3RfYXV0aG9yIiwiaWQiOiJqZG9lIn0.B-lReuGNDwAlU1GOC476MlO0vAt9JNoHIlxg2vwMaO0" @@ -710,71 +454,6 @@ spec actualPgVersion = do , matchHeaders = [ matchContentTypeJson , "Location" <:> "/web_content?id=eq.6" ] } - it "embeds children after update" $ - request methodPatch "/web_content?id=eq.0&select=id,name,web_content(name)" - [("Prefer", "return=representation")] - [json|{"name": "tardis-patched"}|] - `shouldRespondWith` - [json| - [ { "id": 0, "name": "tardis-patched", "web_content": [ { "name": "fezz" }, { "name": "foo" }, { "name": "bar" } ]} ] - |] - { matchStatus = 200, - matchHeaders = [matchContentTypeJson] - } - - it "embeds parent, children and grandchildren after update" $ - request methodPatch "/web_content?id=eq.0&select=id,name,web_content(name,web_content(name)),parent_content:p_web_id(name)" - [("Prefer", "return=representation")] - [json|{"name": "tardis-patched-2"}|] - `shouldRespondWith` - [json| [ - { - "id": 0, - "name": "tardis-patched-2", - "parent_content": { "name": "wat" }, - "web_content": [ - { "name": "fezz", "web_content": [ { "name": "wut" } ] }, - { "name": "foo", "web_content": [] }, - { "name": "bar", "web_content": [] } - ] - } - ] |] - { matchStatus = 200, - matchHeaders = [matchContentTypeJson] - } - - it "embeds children after update without explicitly including the id in the ?select" $ - request methodPatch "/web_content?id=eq.0&select=name,web_content(name)" - [("Prefer", "return=representation")] - [json|{"name": "tardis-patched"}|] - `shouldRespondWith` - [json| - [ { "name": "tardis-patched", "web_content": [ { "name": "fezz" }, { "name": "foo" }, { "name": "bar" } ]} ] - |] - { matchStatus = 200, - matchHeaders = [matchContentTypeJson] - } - - it "embeds an M2M relationship plus parent after update" $ - request methodPatch "/users?id=eq.1&select=name,tasks(name,project:projects(name))" - [("Prefer", "return=representation")] - [json|{"name": "Kevin Malone"}|] - `shouldRespondWith` - [json|[ - { - "name": "Kevin Malone", - "tasks": [ - { "name": "Design w7", "project": { "name": "Windows 7" } }, - { "name": "Code w7", "project": { "name": "Windows 7" } }, - { "name": "Design w10", "project": { "name": "Windows 10" } }, - { "name": "Code w10", "project": { "name": "Windows 10" } } - ] - } - ]|] - { matchStatus = 200, - matchHeaders = [matchContentTypeJson] - } - context "table with limited privileges" $ do it "succeeds inserting if correct select is applied" $ request methodPost "/limited_article_stars?select=article_id,user_id" [("Prefer", "return=representation")] @@ -815,12 +494,3 @@ spec actualPgVersion = do simpleBody p `shouldBe` "" simpleStatus p `shouldBe` created201 - it "succeeds updating row and gives a 204 when using return=minimal" $ - request methodPatch "/app_users?id=eq.1" [("Prefer", "return=minimal")] - [json| { "password": "passxyz" } |] - `shouldRespondWith` 204 - - it "can update without return=minimal and no explicit select" $ - request methodPatch "/app_users?id=eq.1" [] - [json| { "password": "passabc" } |] - `shouldRespondWith` 204 diff --git a/test/Feature/UpdateSpec.hs b/test/Feature/UpdateSpec.hs new file mode 100644 index 000000000..c1044e494 --- /dev/null +++ b/test/Feature/UpdateSpec.hs @@ -0,0 +1,350 @@ +module Feature.UpdateSpec where + +import Data.List (lookup) +import Network.Wai (Application) +import Network.Wai.Test (SResponse (simpleBody, simpleHeaders, simpleStatus)) +import Test.Hspec hiding (pendingWith) + +import Network.HTTP.Types +import Test.Hspec.Wai +import Test.Hspec.Wai.JSON +import Text.Heredoc + +import Protolude hiding (get) +import SpecHelper + +spec :: SpecWith ((), Application) +spec = do + describe "Patching record" $ do + context "to unknown uri" $ + it "indicates no table found by returning 404" $ + request methodPatch "/fake" [] + [json| { "real": false } |] + `shouldRespondWith` 404 + + context "on an empty table" $ + it "indicates no records found to update by returning 404" $ + request methodPatch "/empty_table" [] + [json| { "extra":20 } |] + `shouldRespondWith` "" + { matchStatus = 404, + matchHeaders = [] + } + + context "with invalid json payload" $ + it "fails with 400 and error" $ + request methodPatch "/simple_pk" [] "}{ x = 2" + `shouldRespondWith` + [json|{"message":"Error in $: Failed reading: not a valid json value at '}{x=2'"}|] + { matchStatus = 400, + matchHeaders = [matchContentTypeJson] + } + + context "with no payload" $ + it "fails with 400 and error" $ + request methodPatch "/items" [] "" + `shouldRespondWith` + [json|{"message":"Error in $: not enough input"}|] + { matchStatus = 400, + matchHeaders = [matchContentTypeJson] + } + + context "in a nonempty table" $ do + it "can update a single item" $ do + g <- get "/items?id=eq.42" + liftIO $ simpleHeaders g + `shouldSatisfy` matchHeader "Content-Range" "\\*/\\*" + p <- request methodPatch "/items?id=eq.2" [] [json| { "id":42 } |] + pure p `shouldRespondWith` "" + { matchStatus = 204, + matchHeaders = ["Content-Range" <:> "0-0/*"] + } + liftIO $ lookup hContentType (simpleHeaders p) `shouldBe` Nothing + + -- check it really got updated + g' <- get "/items?id=eq.42" + liftIO $ simpleHeaders g' + `shouldSatisfy` matchHeader "Content-Range" "0-0/\\*" + -- put value back for other tests + void $ request methodPatch "/items?id=eq.42" [] [json| { "id":2 } |] + + it "returns empty array when no rows updated and return=rep" $ + request methodPatch "/items?id=eq.999999" + [("Prefer", "return=representation")] [json| { "id":999999 } |] + `shouldRespondWith` "[]" + { + matchStatus = 404, + matchHeaders = [] + } + + it "gives a 404 when no rows updated" $ + request methodPatch "/items?id=eq.99999999" [] + [json| { "id": 42 } |] + `shouldRespondWith` 404 + + it "returns updated object as array when return=rep" $ + request methodPatch "/items?id=eq.2" + [("Prefer", "return=representation")] [json| { "id":2 } |] + `shouldRespondWith` [str|[{"id":2}]|] + { matchStatus = 200, + matchHeaders = ["Content-Range" <:> "0-0/*"] + } + + it "can update multiple items" $ do + replicateM_ 10 $ post "/auto_incrementing_pk" + [json| { non_nullable_string: "a" } |] + replicateM_ 10 $ post "/auto_incrementing_pk" + [json| { non_nullable_string: "b" } |] + _ <- request methodPatch + "/auto_incrementing_pk?non_nullable_string=eq.a" [] + [json| { non_nullable_string: "c" } |] + g <- get "/auto_incrementing_pk?non_nullable_string=eq.c" + liftIO $ simpleHeaders g + `shouldSatisfy` matchHeader "Content-Range" "0-9/\\*" + + it "can set a column to NULL" $ do + _ <- post "/no_pk" [json| { a: "keepme", b: "nullme" } |] + _ <- request methodPatch "/no_pk?b=eq.nullme" [] [json| { b: null } |] + get "/no_pk?a=eq.keepme" `shouldRespondWith` + [json| [{ a: "keepme", b: null }] |] + { matchHeaders = [matchContentTypeJson] } + + context "filtering by a computed column" $ do + it "is successful" $ + request methodPatch + "/items?is_first=eq.true" + [("Prefer", "return=representation")] + [json| { id: 100 } |] + `shouldRespondWith` [json| [{ id: 100 }] |] + { matchStatus = 200, + matchHeaders = [matchContentTypeJson, "Content-Range" <:> "0-0/*"] + } + + it "indicates no records updated by returning 404" $ + request methodPatch + "/items?always_true=eq.false" + [("Prefer", "return=representation")] + [json| { id: 100 } |] + `shouldRespondWith` "[]" + { matchStatus = 404, + matchHeaders = [] + } + + context "with representation requested" $ do + it "can provide a representation" $ do + _ <- post "/items" + [json| { id: 1 } |] + request methodPatch + "/items?id=eq.1" + [("Prefer", "return=representation")] + [json| { id: 99 } |] + `shouldRespondWith` [json| [{id:99}] |] + { matchHeaders = [matchContentTypeJson] } + -- put value back for other tests + void $ request methodPatch "/items?id=eq.99" [] [json| { "id":1 } |] + + it "can return computed columns" $ + request methodPatch + "/items?id=eq.1&select=id,always_true" + [("Prefer", "return=representation")] + [json| { id: 1 } |] + `shouldRespondWith` [json| [{ id: 1, always_true: true }] |] + { matchHeaders = [matchContentTypeJson] } + + it "can select overloaded computed columns" $ do + request methodPatch + "/items?id=eq.1&select=id,computed_overload" + [("Prefer", "return=representation")] + [json| { id: 1 } |] + `shouldRespondWith` [json| [{ id: 1, computed_overload: true }] |] + { matchHeaders = [matchContentTypeJson] } + request methodPatch + "/items2?id=eq.1&select=id,computed_overload" + [("Prefer", "return=representation")] + [json| { id: 1 } |] + `shouldRespondWith` [json| [{ id: 1, computed_overload: true }] |] + { matchHeaders = [matchContentTypeJson] } + + it "ignores ?select= when return not set or return=minimal" $ do + request methodPatch "/items?id=eq.1&select=id" [] [json| { id:1 } |] + `shouldRespondWith` "" + { + matchStatus = 204, + matchHeaders = ["Content-Range" <:> "0-0/*"] + } + request methodPatch "/items?id=eq.1&select=id" [("Prefer", "return=minimal")] [json| { id:1 } |] + `shouldRespondWith` "" + { + matchStatus = 204, + matchHeaders = ["Content-Range" <:> "0-0/*"] + } + + context "when patching with an empty body" $ do + it "makes no updates and returns 204 without return= and without ?select=" $ do + request methodPatch "/items" [] [json| {} |] + `shouldRespondWith` "" + { + matchStatus = 204, + matchHeaders = ["Content-Range" <:> "*/*"] + } + + request methodPatch "/items" [] [json| [] |] + `shouldRespondWith` "" + { + matchStatus = 204, + matchHeaders = ["Content-Range" <:> "*/*"] + } + + request methodPatch "/items" [] [json| [{}] |] + `shouldRespondWith` "" + { + matchStatus = 204, + matchHeaders = ["Content-Range" <:> "*/*"] + } + + it "makes no updates and returns 204 without return= and with ?select=" $ do + request methodPatch "/items?select=id" [] [json| {} |] + `shouldRespondWith` "" + { + matchStatus = 204, + matchHeaders = ["Content-Range" <:> "*/*"] + } + + request methodPatch "/items?select=id" [] [json| [] |] + `shouldRespondWith` "" + { + matchStatus = 204, + matchHeaders = ["Content-Range" <:> "*/*"] + } + + request methodPatch "/items?select=id" [] [json| [{}] |] + `shouldRespondWith` "" + { + matchStatus = 204, + matchHeaders = ["Content-Range" <:> "*/*"] + } + + it "makes no updates and returns 200 with return=rep and without ?select=" $ + request methodPatch "/items" [("Prefer", "return=representation")] [json| {} |] + `shouldRespondWith` "[]" + { + matchStatus = 200, + matchHeaders = ["Content-Range" <:> "*/*"] + } + + it "makes no updates and returns 200 with return=rep and with ?select=" $ + request methodPatch "/items?select=id" [("Prefer", "return=representation")] [json| {} |] + `shouldRespondWith` "[]" + { + matchStatus = 200, + matchHeaders = ["Content-Range" <:> "*/*"] + } + + it "makes no updates and returns 200 with return=rep and with ?select= for overloaded computed columns" $ + request methodPatch "/items?select=id,computed_overload" [("Prefer", "return=representation")] [json| {} |] + `shouldRespondWith` "[]" + { + matchStatus = 200, + matchHeaders = ["Content-Range" <:> "*/*"] + } + + context "with unicode values" $ + it "succeeds and returns values intact" $ do + void $ request methodPost "/no_pk" [] + [json| { "a":"patchme", "b":"patchme" } |] + let payload = [json| { "a":"圍棋", "b":"￥" } |] + p <- request methodPatch "/no_pk?a=eq.patchme&b=eq.patchme" + [("Prefer", "return=representation")] payload + liftIO $ do + simpleBody p `shouldBe` "["<>payload<>"]" + simpleStatus p `shouldBe` ok200 + + context "PATCH with ?columns parameter" $ do + it "ignores json keys not included in ?columns" $ do + post "/articles?columns=id,body" [json| {"id": 200} |] + request methodPatch "/articles?id=eq.200&columns=body" [("Prefer", "return=representation")] + [json| {"body": "Some real content", "smth": "here", "other": "stuff", "fake_id": 13} |] `shouldRespondWith` + [json|[{"id": 200, "body": "Some real content", "owner": "postgrest_test_anonymous"}]|] + { matchStatus = 200 + , matchHeaders = [] } + + it "ignores json keys and gives 404 if no record updated" $ + request methodPatch "/articles?id=eq.2001&columns=body" [("Prefer", "return=representation")] + [json| {"body": "Some real content", "smth": "here", "other": "stuff", "fake_id": 13} |] `shouldRespondWith` 404 + + context "tables with self reference foreign keys" $ do + it "embeds children after update" $ + request methodPatch "/web_content?id=eq.0&select=id,name,web_content(name)" + [("Prefer", "return=representation")] + [json|{"name": "tardis-patched"}|] + `shouldRespondWith` + [json| + [ { "id": 0, "name": "tardis-patched", "web_content": [ { "name": "fezz" }, { "name": "foo" }, { "name": "bar" } ]} ] + |] + { matchStatus = 200, + matchHeaders = [matchContentTypeJson] + } + + it "embeds parent, children and grandchildren after update" $ + request methodPatch "/web_content?id=eq.0&select=id,name,web_content(name,web_content(name)),parent_content:p_web_id(name)" + [("Prefer", "return=representation")] + [json|{"name": "tardis-patched-2"}|] + `shouldRespondWith` + [json| [ + { + "id": 0, + "name": "tardis-patched-2", + "parent_content": { "name": "wat" }, + "web_content": [ + { "name": "fezz", "web_content": [ { "name": "wut" } ] }, + { "name": "foo", "web_content": [] }, + { "name": "bar", "web_content": [] } + ] + } + ] |] + { matchStatus = 200, + matchHeaders = [matchContentTypeJson] + } + + it "embeds children after update without explicitly including the id in the ?select" $ + request methodPatch "/web_content?id=eq.0&select=name,web_content(name)" + [("Prefer", "return=representation")] + [json|{"name": "tardis-patched"}|] + `shouldRespondWith` + [json| + [ { "name": "tardis-patched", "web_content": [ { "name": "fezz" }, { "name": "foo" }, { "name": "bar" } ]} ] + |] + { matchStatus = 200, + matchHeaders = [matchContentTypeJson] + } + + it "embeds an M2M relationship plus parent after update" $ + request methodPatch "/users?id=eq.1&select=name,tasks(name,project:projects(name))" + [("Prefer", "return=representation")] + [json|{"name": "Kevin Malone"}|] + `shouldRespondWith` + [json|[ + { + "name": "Kevin Malone", + "tasks": [ + { "name": "Design w7", "project": { "name": "Windows 7" } }, + { "name": "Code w7", "project": { "name": "Windows 7" } }, + { "name": "Design w10", "project": { "name": "Windows 10" } }, + { "name": "Code w10", "project": { "name": "Windows 10" } } + ] + } + ]|] + { matchStatus = 200, + matchHeaders = [matchContentTypeJson] + } + + context "table with limited privileges" $ do + it "succeeds updating row and gives a 204 when using return=minimal" $ + request methodPatch "/app_users?id=eq.1" [("Prefer", "return=minimal")] + [json| { "password": "passxyz" } |] + `shouldRespondWith` 204 + + it "can update without return=minimal and no explicit select" $ + request methodPatch "/app_users?id=eq.1" [] + [json| { "password": "passabc" } |] + `shouldRespondWith` 204 diff --git a/test/Main.hs b/test/Main.hs index 2d0150745..612976e46 100644 --- a/test/Main.hs +++ b/test/Main.hs @@ -47,6 +47,7 @@ import qualified Feature.RpcSpec import qualified Feature.SingularSpec import qualified Feature.StructureSpec import qualified Feature.UnicodeSpec +import qualified Feature.UpdateSpec import qualified Feature.UpsertSpec @@ -115,6 +116,7 @@ main = do ("Feature.DeleteSpec" , Feature.DeleteSpec.spec) , ("Feature.InsertSpec" , Feature.InsertSpec.spec actualPgVersion) , ("Feature.SingularSpec" , Feature.SingularSpec.spec) + , ("Feature.UpdateSpec" , Feature.UpdateSpec.spec) ] hspec $ do