Fix(GraphQL): Add extra checks for deleting UpdateTypeInput#7595
Merged
vmrajas merged 2 commits intorelease/v21.03from Mar 17, 2021
Merged
Fix(GraphQL): Add extra checks for deleting UpdateTypeInput#7595vmrajas merged 2 commits intorelease/v21.03from
vmrajas merged 2 commits intorelease/v21.03from
Conversation
minhaj-shakeel
approved these changes
Mar 17, 2021
abhimanyusinghgaur
approved these changes
Mar 17, 2021
Contributor
abhimanyusinghgaur
left a comment
There was a problem hiding this comment.
Reviewed 3 of 3 files at r1.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @pawanrawal and @vmrajas)
graphql/schema/gqlschema.go, line 1073 at r1 (raw file):
if strings.HasPrefix(def.Name, "Update") && len(def.Fields) == 1 { if def.Fields[0].Name == "filter" {
we can make the condition exactly match what we generate, like this:
if strings.HasPrefix(def.Name, "Update") && strings.HasSuffix(def.Name, "Input") && len(def.Fields) == 1 {
typeDef := sch.Types[def.Name[6:len(def.Name)-5]]
if typeDef != nil && typeDef.Directives.ForName(remoteDir) == nil && (typeDef.Kind == ast.Object || typeDef.Kind == ast.Interface) {
// this ensures that it was us who generated the `UpdateTInput`
// and allows users to still be able to define a type `UpdateT1Input` with a field named `filter` in that input type and not get cleaned up.
}
}
b5e06e3 to
753390a
Compare
vmrajas
added a commit
that referenced
this pull request
Mar 17, 2021
* Add extra checks for deleting UpdateTypeInput * Address Abhimanyu's comment (cherry picked from commit ce9f4f5)
vmrajas
added a commit
that referenced
this pull request
Mar 17, 2021
aman-bansal
pushed a commit
that referenced
this pull request
Mar 25, 2021
* Add extra checks for deleting UpdateTypeInput * Address Abhimanyu's comment
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation:
A user had reported panic on schema update. The reason was that
cleanupInputfunction cleared any input types which had name of the form,UpdateTInputand contained exactly one field. This PR adds extra conditions to ensure that the input type is removed only when its generated by dgraph and contains a field by name,filter.Testing:
Added unit test in graphql/schema/testdata/schemagen
Fixes GRAPHQL-1102
This change is