Fix test

PostgREST · Aug 11, 2022 · 506df5a · 506df5a
1 parent 3affe7c
commit 506df5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/PostgREST/Query/QueryBuilder.hs b/src/PostgREST/Query/QueryBuilder.hs
@@ -141,6 +141,7 @@ mutateRequestToQuery (Update mainQi uCols body logicForest pkFlts range ordts re
     pkInCols = S.fromList pkFlts `S.isSubsetOf` uCols
     logicForestF = intercalateSnippet " AND " (pgFmtLogicTree mainQi <$> logicForest)
     pgrstUpdateBodyF = SQL.sql (BS.intercalate " AND " $ (\x -> pgFmtColumn mainQi x <> " = " <> pgFmtColumn (QualifiedIdentifier mempty "pgrst_update_body") x) <$> pkFlts)
+    logicForestAndDelBodyF = intercalateSnippet " AND " ([logicForestF | not (null logicForest)] ++ [pgrstDeleteBodyF | not hasEmptyBody])
     emptyBodyReturnedColumns = if null returnings then "NULL" else BS.intercalate ", " (pgFmtColumn (QualifiedIdentifier mempty $ qiName mainQi) <$> returnings)
     nonRangeCols = BS.intercalate ", " (pgFmtIdent <> const " = pgrst_update_body." <> pgFmtIdent <$> S.toList uCols)
     rangeCols = BS.intercalate ", " ((\col -> pgFmtIdent col <> " = (SELECT " <> pgFmtIdent col <> " FROM pgrst_update_body) ") <$> S.toList uCols)

diff --git a/test/spec/Feature/Query/QueryLimitedSpec.hs b/test/spec/Feature/Query/QueryLimitedSpec.hs
@@ -93,7 +93,7 @@ spec =
               { "id": 8, "name": "HaikuOS" } ]|]
             { matchStatus  = 201 }
 
-      it "doesn't affect updates" $
+      it "doesn't affect updates(2 rows would be modified if it did)" $
         request methodPatch "/employees?select=first_name,last_name,occupation"
             [("Prefer", "return=representation")]
             [json| [{"occupation": "Barista"}] |]