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

Reword error message for BinaryFieldError (#1372)

Browse Source
This commit is contained in:
Dan Amoroso
2019-08-08 14:20:06 -05:00
committed by Steve Chávez
parent d5758523f3
commit c80c9ef726
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/Error.hs
+1 -1
View File
@@ -224,7 +224,7 @@ instance JSON.ToJSON SimpleError where
toJSON GucHeadersError = JSON.object [ toJSON GucHeadersError = JSON.object [
"message" .= ("response.headers guc must be a JSON array composed of objects with a single key and a string value" :: Text)] "message" .= ("response.headers guc must be a JSON array composed of objects with a single key and a string value" :: Text)]
toJSON (BinaryFieldError ct) = JSON.object [ toJSON (BinaryFieldError ct) = JSON.object [
"message" .= ((toS (toMime ct) <> " requested but a single column was not selected") :: Text)] "message" .= ((toS (toMime ct) <> " requested but more than one column was selected") :: Text)]
toJSON ConnectionLostError = JSON.object [ toJSON ConnectionLostError = JSON.object [
"message" .= ("Database connection lost, retrying the connection." :: Text)] "message" .= ("Database connection lost, retrying the connection." :: Text)]
test/Feature/QuerySpec.hs
+1 -1
View File
@@ -950,7 +950,7 @@ spec actualPgVersion = do
it "fails if a single column is not selected" $ do it "fails if a single column is not selected" $ do
request methodGet "/images?select=img,name&name=eq.A.png" (acceptHdrs "application/octet-stream") "" request methodGet "/images?select=img,name&name=eq.A.png" (acceptHdrs "application/octet-stream") ""
`shouldRespondWith` `shouldRespondWith`
[json| {"message":"application/octet-stream requested but a single column was not selected"} |] [json| {"message":"application/octet-stream requested but more than one column was selected"} |]
{ matchStatus = 406 { matchStatus = 406
, matchHeaders = [matchContentTypeJson] , matchHeaders = [matchContentTypeJson]
} }
test/Feature/RpcSpec.hs
+1 -1
View File
@@ -482,7 +482,7 @@ spec actualPgVersion =
it "fails if a single column is not selected" $ it "fails if a single column is not selected" $
request methodPost "/rpc/ret_rows_with_base64_bin" (acceptHdrs "application/octet-stream") "" request methodPost "/rpc/ret_rows_with_base64_bin" (acceptHdrs "application/octet-stream") ""
`shouldRespondWith` `shouldRespondWith`
[json| {"message":"application/octet-stream requested but a single column was not selected"} |] [json| {"message":"application/octet-stream requested but more than one column was selected"} |]
{ matchStatus = 406 { matchStatus = 406
, matchHeaders = [matchContentTypeJson] , matchHeaders = [matchContentTypeJson]
} }