这是indexloc提供的服务，不要输入任何密码
Skip to content

fix mutation returning when relationships are present (fix #1576) #1703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 7, 2019
Merged

fix mutation returning when relationships are present (fix #1576) #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27dbcc4
fix mutation returning relationship data, fix #1576
rakeshkky Mar 6, 2019
5f8f2b6
Merge branch 'master' into issue-1576-mut-return-bug
rakeshkky Mar 6, 2019
6c31e3d
add test case for insert mutation
rakeshkky Mar 6, 2019
7fa7260
remove unwanted comments
rakeshkky Mar 6, 2019
8f17d2e
Merge branch 'master' into issue-1576-mut-return-bug
0x777 Mar 6, 2019
3cca30e
Merge branch 'master' into issue-1576-mut-return-bug
0x777 Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/graphql-engine.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ library
, Hasura.RQL.DML.Delete
, Hasura.RQL.DML.Internal
, Hasura.RQL.DML.Insert
, Hasura.RQL.DML.Mutation
, Hasura.RQL.DML.Returning
, Hasura.RQL.DML.Select.Internal
, Hasura.RQL.DML.Select.Types
Expand Down
8 changes: 5 additions & 3 deletions server/src-lib/Hasura/GraphQL/Context.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,15 @@ data UpdOpCtx
, _uocHeaders :: ![T.Text]
, _uocFilter :: !AnnBoolExpSQL
, _uocPresetCols :: !PreSetCols
, _uocUniqCols :: !(Maybe [PGColInfo])
} deriving (Show, Eq)

data DelOpCtx
= DelOpCtx
{ _docTable :: !QualifiedTable
, _docHeaders :: ![T.Text]
, _docFilter :: !AnnBoolExpSQL
{ _docTable :: !QualifiedTable
, _docHeaders :: ![T.Text]
, _docFilter :: !AnnBoolExpSQL
, _docUniqCols :: !(Maybe [PGColInfo])
} deriving (Show, Eq)

data OpCtx
Expand Down
2 changes: 0 additions & 2 deletions server/src-lib/Hasura/GraphQL/Explain.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import Hasura.Prelude
import Hasura.RQL.DML.Internal
import Hasura.RQL.Types
import Hasura.SQL.Types
import Hasura.SQL.Value

import qualified Hasura.GraphQL.Resolve.Select as RS
import qualified Hasura.GraphQL.Transport.HTTP as TH
Expand Down Expand Up @@ -96,7 +95,6 @@ explainField userInfo gCtx sqlGenCtx fld =
return $ FieldPlan fName (Just txtSQL) $ Just planLines
where
fName = _fName fld
txtConverter = return . uncurry toTxtValue

opCtxMap = _gOpCtxMap gCtx
fldMap = _gFields gCtx
Expand Down
4 changes: 4 additions & 0 deletions server/src-lib/Hasura/GraphQL/Resolve/Context.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module Hasura.GraphQL.Resolve.Context
, Convert
, runConvert
, prepare
, txtConverter
, module Hasura.GraphQL.Utils
) where

Expand Down Expand Up @@ -139,6 +140,9 @@ prepare (colTy, colVal) = do
put (preparedArgs Seq.|> binEncoder colVal)
return $ toPrepParam (Seq.length preparedArgs + 1) colTy

txtConverter :: Monad m => PrepFn m
txtConverter = return . uncurry toTxtValue

runConvert
:: (MonadError QErr m)
=> (FieldMap, OrdByCtx, InsCtxMap, SQLGenCtx)
Expand Down
1 change: 1 addition & 0 deletions server/src-lib/Hasura/GraphQL/Resolve/ContextTypes.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ data InsCtx
, icSet :: !PreSetCols
, icRelations :: !RelationInfoMap
, icUpdPerm :: !(Maybe UpdPermForIns)
, icUniqCols :: !(Maybe [PGColInfo])
} deriving (Show, Eq)

type InsCtxMap = Map.HashMap QualifiedTable InsCtx
Expand Down
Loading