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

graphql: make updateGQLSchema always return the new schema #5540

Merged
merged 4 commits into from
May 29, 2020
Merged

graphql: make updateGQLSchema always return the new schema #5540

merged 4 commits into from
May 29, 2020

Conversation

abhimanyusinghgaur
Copy link
Contributor

@abhimanyusinghgaur abhimanyusinghgaur commented May 28, 2020 •
edited by dgraph-bot
Loading

This PR makes the updateGQLSchema mutation return the updated schema always, instead of relying on badger update.

Fixes #DGRAPH-1606.

This change is Reviewable

Docs Preview: Dgraph Preview

@github-actions github-actions bot added the area/graphql Issues related to GraphQL support on Dgraph. label May 28, 2020
MichaelJCompton
MichaelJCompton suggested changes May 29, 2020
View reviewed changes
Copy link
Contributor

@MichaelJCompton MichaelJCompton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 1 files reviewed, 1 unresolved discussion (waiting on @abhimanyusinghgaur, @MichaelJCompton, and @pawanrawal)

graphql/e2e/common/common.go, line 755 at r1 (raw file):

	}

	if addResult.Data.UpdateGQLSchema.GQLSchema.Schema == "" {

Hang on, the result of a schema update can be empty?

Why can that happen?

Isn't that a bug in the updateGQLSchema mutation?

@abhimanyusinghgaur abhimanyusinghgaur changed the title graphql: fix test schema addition in BootstrapServer graphql: make updateGQLSchema always return the new schema May 29, 2020
abhimanyusinghgaur
abhimanyusinghgaur commented May 29, 2020
View reviewed changes
Copy link
Contributor Author

@abhimanyusinghgaur abhimanyusinghgaur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 2 files reviewed, 1 unresolved discussion (waiting on @MichaelJCompton and @pawanrawal)

graphql/e2e/common/common.go, line 755 at r1 (raw file):

Previously, MichaelJCompton (Michael Compton) wrote…

Hang on, the result of a schema update can be empty?

Why can that happen?

Isn't that a bug in the updateGQLSchema mutation?

Done.

pawanrawal
pawanrawal approved these changes May 29, 2020
View reviewed changes
Copy link
Contributor

@pawanrawal pawanrawal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 2 of 2 files at r2.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @MichaelJCompton)

@abhimanyusinghgaur abhimanyusinghgaur merged commit 265086f into master May 29, 2020
@abhimanyusinghgaur abhimanyusinghgaur deleted the abhimanyu/test-fix branch May 29, 2020 17:04
abhimanyusinghgaur added a commit that referenced this pull request Jun 5, 2020
@abhimanyusinghgaur
graphql: make updateGQLSchema always return the new schema (#5540)
35dc57a 
This PR makes the updateGQLSchema mutation return the updated schema always, instead of relying on async badger update.

Fixes #GRAPHQL-497.

(cherry-picked from commit 265086f)

# Conflicts:
#	graphql/admin/schema.go
abhimanyusinghgaur added a commit that referenced this pull request Jun 5, 2020
@abhimanyusinghgaur
graphql: make updateGQLSchema always return the new schema (#5540) (#…
ef43846 
…5582)

This PR makes the updateGQLSchema mutation return the updated schema always, instead of relying on async badger update.

Fixes #GRAPHQL-497.

(cherry-picked from commit 265086f)

# Conflicts:
#	graphql/admin/schema.go
dna2github pushed a commit to dna2fork/dgraph that referenced this pull request Jul 18, 2020
@abhimanyusinghgaur @dna2github
graphql: make updateGQLSchema always return the new schema (hypermode…
8f5eaf0 
…inc#5540)

This PR makes the updateGQLSchema mutation return the updated schema always, instead of relying on async badger update.

Fixes #DGRAPH-1606.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pawanrawal pawanrawal pawanrawal approved these changes

@MichaelJCompton MichaelJCompton Awaiting requested review from MichaelJCompton

Assignees
No one assigned
Labels
area/graphql Issues related to GraphQL support on Dgraph.
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@abhimanyusinghgaur @pawanrawal @MichaelJCompton