From bd869345f3d113deb19f7d358c6f2d5146bffa0d Mon Sep 17 00:00:00 2001 From: Aman Mangal Date: Thu, 17 Apr 2025 00:18:52 +0530 Subject: [PATCH 1/2] Fix bugs in v25 RunDQL API --- edgraph/query.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/edgraph/query.go b/edgraph/query.go index c9388492e55..a83a16665f9 100644 --- a/edgraph/query.go +++ b/edgraph/query.go @@ -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, 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), From 2e5cab09fb5bb1bb6e232ca9eb12fe921b063985 Mon Sep 17 00:00:00 2001 From: Aman Mangal Date: Thu, 17 Apr 2025 00:28:52 +0530 Subject: [PATCH 2/2] Update edgraph/query.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- edgraph/query.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgraph/query.go b/edgraph/query.go index a83a16665f9..4c519c4b80e 100644 --- a/edgraph/query.go +++ b/edgraph/query.go @@ -36,7 +36,7 @@ func (s *ServerV25) RunDQL(ctx context.Context, req *apiv25.RunDQLRequest) (*api nsID, err := getNamespaceIDFromName(x.AttachJWTNamespace(ctx), req.NsName) if err != nil { - return nil, err + return nil, fmt.Errorf("error retrieving namespace ID: %w", err) } apiReq, err := dql.ParseDQL(req.DqlQuery)