Use a set of Tree FieldName instead of just FieldName for columns

src/PostgREST/ApiRequest.hs

@@ -39,7 +39,7 @@ import Data.Aeson.Types (emptyArray, emptyObject)
 import Data.List (lookup)
 import Data.Ranged.Ranges (emptyRange, rangeIntersection,
  rangeIsEmpty)
-import Data.Tree (flatten)
+import Data.Tree (Tree (..))
 import Network.HTTP.Types.Header (RequestHeaders, hCookie)
 import Network.HTTP.Types.URI (parseSimpleQuery)
 import Network.Wai (Request (..))
@@ -124,7 +124,7 @@ data ApiRequest = ApiRequest {
  , iPayload :: Maybe Payload -- ^ Data sent by client and used for mutation actions
  , iPreferences :: Preferences.Preferences -- ^ Prefer header values
  , iQueryParams :: QueryParams.QueryParams
- , iColumns :: S.Set FieldName  -- ^ parsed colums from &columns parameter and payload
+ , iColumns :: S.Set (Tree FieldName) -- ^ parsed colums from &columns parameter and payload
  , iHeaders :: [(ByteString, ByteString)] -- ^ HTTP request headers
  , iCookies :: [(ByteString, ByteString)] -- ^ Request Cookies
  , iPath :: ByteString -- ^ Raw request path
@@ -242,13 +242,13 @@ getRanges method QueryParams{qsOrder,qsRanges} hdrs
  isInvalidRange = topLevelRange == emptyRange && not (hasLimitZero limitRange)
  topLevelRange = fromMaybe allRange $ HM.lookup "limit" ranges -- if no limit is specified, get all the request rows
 
-getPayload :: RequestBody -> MediaType -> QueryParams.QueryParams -> Action -> PathInfo -> Either ApiRequestError (Maybe Payload, S.Set FieldName)
+getPayload :: RequestBody -> MediaType -> QueryParams.QueryParams -> Action -> PathInfo -> Either ApiRequestError (Maybe Payload, S.Set (Tree FieldName))
 getPayload reqBody contentMediaType QueryParams{qsColumns} action PathInfo{pathIsProc}= do
  checkedPayload <- if shouldParsePayload then payload else Right Nothing
  let cols = case (checkedPayload, columns) of
- (Just ProcessedJSON{payKeys}, _) -> payKeys
- (Just ProcessedUrlEncoded{payKeys}, _) -> payKeys
- (Just RawJSON{}, Just cls) -> S.fromList $ foldl (<>) [] (flatten <$> cls)
+ (Just ProcessedJSON{payKeys}, _) -> S.map (`Node` []) payKeys
+ (Just ProcessedUrlEncoded{payKeys}, _) -> S.map (`Node` []) payKeys
+ (Just RawJSON{}, Just cls) -> S.fromList cls
  _ -> S.empty
  return (checkedPayload, cols)
  where

src/PostgREST/ApiRequest/QueryParams.hs

@@ -863,7 +863,7 @@ pColumnName = lexeme $ do
  fld <- pFieldName
  pEnd
  return fld
- where 
+ where
  pEnd = try (void $ lookAhead (string ")")) <|>
  try (void $ lookAhead (string ",")) <|>
  try eof

src/PostgREST/Plan.hs

@@ -144,7 +144,7 @@ callReadPlan identifier conf sCache apiRequest@ApiRequest{iPreferences=Preferenc
  let paramKeys = case invMethod of
  InvGet -> S.fromList $ fst <$> qsParams'
  InvHead -> S.fromList $ fst <$> qsParams'
- InvPost -> iColumns
+ InvPost -> S.map rootLabel iColumns
  proc@Function{..} <- mapLeft ApiRequestError $
  findProc identifier paramKeys (preferParameters == Just SingleObject) (dbRoutines sCache) iContentMediaType (invMethod == InvPost)
  let relIdentifier = QualifiedIdentifier pdSchema (fromMaybe pdName $ Routine.funcTableName proc) -- done so a set returning function can embed other relations
@@ -914,7 +914,7 @@ mutatePlan mutation qi ApiRequest{iPreferences=Preferences{..}, ..} SchemaCache{
  combinedLogic = foldr (addFilterToLogicForest . resolveFilter ctx) logic qsFiltersRoot
  body = payRaw <$> iPayload -- the body is assumed to be json at this stage(ApiRequest validates)
  applyDefaults = preferMissing == Just ApplyDefaults
- typedColumnsOrError = resolveOrError ctx tbl `traverse` S.toList iColumns
+ typedColumnsOrError = resolveOrError ctx tbl `traverse` S.toList (S.map rootLabel iColumns)
 
 resolveOrError :: ResolverContext -> Maybe Table -> FieldName -> Either ApiRequestError CoercibleField
 resolveOrError _ Nothing _ = Left NotFound