Skip to content
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

Jump to bottom

refactor nested insert mutation and fix returning (fix #844) #852

Merged
merged 11 commits into from
Nov 2, 2018
Merged

refactor nested insert mutation and fix returning (fix #844) #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
27142a9
improved nested insert execution logic
rakeshkky Oct 24, 2018
9e3ae6b
Merge branch 'master' into nested-insert-refactor
rakeshkky Oct 24, 2018
56b3ecc
integrate error path, improve executing 'withExp' and improve tests
rakeshkky Oct 24, 2018
4f6d186
Merge branch 'master' into issue-844
rakeshkky Oct 26, 2018
ada9451
Merge branch 'master' into issue-844
rakeshkky Oct 29, 2018
3debf8b
Merge branch 'master' into issue-844
rakeshkky Nov 2, 2018
ad411b3
Merge branch 'master' into issue-844
0x777 Nov 2, 2018
3e3a2d5
add more readable types in '/Resolve/Insert.hs'
rakeshkky Nov 2, 2018
790fbfc
Merge branch 'issue-844' of github.com:rakeshkky/graphql-engine into …
rakeshkky Nov 2, 2018
5b99f03
Merge branch 'master' into issue-844
0x777 Nov 2, 2018
db278ef
set conflict context just before executing WITH expression
rakeshkky Nov 2, 2018
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
14 changes: 1 addition & 13 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 @@ -3,11 +3,9 @@
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TemplateHaskell #-}

module Hasura.GraphQL.Resolve.Context
( InsResp(..)
, FieldMap
( FieldMap
, RelationInfoMap
, OrdByCtx
, OrdByItemMap
Expand All @@ -32,9 +30,6 @@ module Hasura.GraphQL.Resolve.Context
import Data.Has
import Hasura.Prelude

import qualified Data.Aeson as J
import qualified Data.Aeson.Casing as J
import qualified Data.Aeson.TH as J
import qualified Data.ByteString.Lazy as BL
import qualified Data.HashMap.Strict as Map
import qualified Data.Sequence as Seq
Expand All @@ -50,13 +45,6 @@ import Hasura.SQL.Value

import qualified Hasura.SQL.DML as S

data InsResp
= InsResp
{ _irAffectedRows :: !Int
, _irResponse :: !(Maybe J.Object)
} deriving (Show, Eq)
$(J.deriveJSON (J.aesonDrop 3 J.snakeCase) ''InsResp)

type FieldMap
= Map.HashMap (G.NamedType, G.Name)
(Either PGColInfo (RelInfo, Bool, S.BoolExp, Maybe Int))
Expand Down
Loading