Bulk update (#2311)

* refactor: remove EmbedPath type from qsFiltersRoot

* Rename reset items function for reusability

src/PostgREST/Request/DbRequestBuilder.hs

@@ -316,14 +316,14 @@ mutateRequest mutation schema tName ApiRequest{..} pkCols readReq = mapLeft ApiR
   case mutation of
     MutationCreate ->
       Right $ Insert qi iColumns body ((,) <$> iPreferResolution <*> Just confCols) [] returnings
-    MutationUpdate -> Right $ Update qi iColumns body combinedLogic iTopLevelRange rootOrder returnings
+    MutationUpdate -> Right $ Update qi iColumns body combinedLogic pkCols iTopLevelRange rootOrder returnings
     MutationSingleUpsert ->
         if null qsLogic &&
            qsFilterFields == S.fromList pkCols &&
            not (null (S.fromList pkCols)) &&
            all (\case
               Filter _ (OpExpr False (Op OpEqual _)) -> True
-              _                                      -> False) filters
+              _                                      -> False) qsFiltersRoot
           then Right $ Insert qi iColumns body (Just (MergeDuplicates, pkCols)) combinedLogic returnings
         else
           Left InvalidFilters
@@ -336,11 +336,9 @@ mutateRequest mutation schema tName ApiRequest{..} pkCols readReq = mapLeft ApiR
       if iPreferRepresentation == None
         then []
         else returningCols readReq pkCols
-    -- update/delete filters can be only on the root table
-    filters = map snd qsFiltersRoot
     logic = map snd qsLogic
     rootOrder = maybe [] snd $ find (\(x, _) -> null x) qsOrder
-    combinedLogic = foldr addFilterToLogicForest logic filters
+    combinedLogic = foldr addFilterToLogicForest logic qsFiltersRoot
     body = payRaw <$> iPayload -- the body is assumed to be json at this stage(ApiRequest validates)
 
 callRequest :: ProcDescription -> ApiRequest -> ReadRequest -> CallRequest

src/PostgREST/Request/QueryParams.hs

@@ -90,8 +90,8 @@ data QueryParams =
     -- ^ &select parameter used to shape the response
     , qsFilters        :: [(EmbedPath, Filter)]
     -- ^ Filters on the result from e.g. &id=e.10
-    , qsFiltersRoot    :: [(EmbedPath, Filter)]
-    -- ^ Subset of the filters that apply on the root table
+    , qsFiltersRoot    :: [Filter]
+    -- ^ Subset of the filters that apply on the root table. These are used on UPDATE/DELETE.
     , qsFiltersNotRoot :: [(EmbedPath, Filter)]
     -- ^ Subset of the filters that do not apply on the root table
     , qsFilterFields   :: S.Set FieldName
@@ -133,7 +133,7 @@ parse qs =
     <*> pRequestColumns columns
     <*> pRequestSelect select
     <*> pRequestFilter `traverse` filters
-    <*> pRequestFilter `traverse` filtersRoot
+    <*> (fmap snd <$> (pRequestFilter `traverse` filtersRoot))
     <*> pRequestFilter `traverse` filtersNotRoot
     <*> pure (S.fromList (fst <$> filters))
     <*> sequenceA (pRequestOnConflict <$> onConflict)

src/PostgREST/Request/Types.hs

@@ -137,6 +137,7 @@ data MutateQuery
       , updCols   :: S.Set FieldName
       , updBody   :: Maybe LBS.ByteString
       , where_    :: [LogicTree]
+      , pkFilters :: [FieldName]
       , mutRange  :: NonnegRange
       , mutOrder  :: [OrderTerm]
       , returning :: [FieldName]