Skip to content

Fix bugs in v25 RunDQL API #9388

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
mangalaman93 merged 2 commits into from
Apr 17, 2025
Merged

Fix bugs in v25 RunDQL API #9388

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd86934
Fix bugs in v25 RunDQL API
mangalaman93 Apr 16, 2025
2e5cab0
Update edgraph/query.go
mangalaman93 Apr 16, 2025
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
19 changes: 11 additions & 8 deletions edgraph/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,25 @@ func (s *ServerV25) RunDQL(ctx context.Context, req *apiv25.RunDQLRequest) (*api
"v25.RunDQL can only be called by the guardian of the galaxy. "+s.Message())
}

apiReq, err := dql.ParseDQL(req.DqlQuery)
nsID, err := getNamespaceIDFromName(x.AttachJWTNamespace(ctx), req.NsName)
if err != nil {
return nil, fmt.Errorf("error parsing DQL query: %w", err)
return nil, fmt.Errorf("error retrieving namespace ID: %w", err)
}

nsID, err := getNamespaceIDFromName(x.AttachJWTNamespace(ctx), req.NsName)
apiReq, err := dql.ParseDQL(req.DqlQuery)
if err != nil {
return nil, err
return nil, fmt.Errorf("error parsing DQL query: %w", err)
}

apiReq.Vars = req.Vars
apiReq.ReadOnly = req.ReadOnly
apiReq.BestEffort = req.BestEffort
apiReq.RespFormat = api.Request_JSON
if req.RespFormat == apiv25.RespFormat_RDF {
apiReq.RespFormat = api.Request_RDF
}
if len(apiReq.Mutations) > 0 {
apiReq.CommitNow = true
apiReq.Vars = req.Vars
apiReq.ReadOnly = req.ReadOnly
apiReq.BestEffort = req.BestEffort
apiReq.RespFormat = api.Request_RespFormat(req.RespFormat)
}

apiResp, err := (&Server{}).doQuery(x.AttachNamespace(ctx, nsID),
Expand Down