fix(GraphQL): correct GraphQL variable propagation to custom-dql (#6433)

Fixes GRAPHQL-680 Fixes [Discuss Issue](https://discuss.dgraph.io/t/int-type-parameter-of-custom-dql-is-wrong/10142)
dgraph-io · Sep 14, 2020 · afeea49 · afeea49
1 parent 75bb4db
commit afeea49
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/graphql/e2e/custom_logic/custom_logic_test.go b/graphql/e2e/custom_logic/custom_logic_test.go
@@ -2748,7 +2748,11 @@ func TestCustomDQL(t *testing.T) {
 
 	params = &common.GraphQLParams{
 		Query: `
-		query {
+		query ($count: Int!) {
+		  queryWithVar: getFirstUserByFollowerCount(count: $count) {
+			screen_name
+			followers
+		  }
 		  getFirstUserByFollowerCount(count: 10) {
 			screen_name
 			followers
@@ -2764,12 +2768,17 @@ func TestCustomDQL(t *testing.T) {
 			tweetCount
 		  }
 		}`,
+		Variables: map[string]interface{}{"count": 5},
 	}
 
 	result = params.ExecuteAsPost(t, alphaURL)
 	common.RequireNoGQLErrors(t, result)
 
 	require.JSONEq(t, `{
+		"queryWithVar": {
+		  "screen_name": "abhimanyu",
+		  "followers": 5
+		},
 		"getFirstUserByFollowerCount": {
 		  "screen_name": "pawan",
 		  "followers": 10

diff --git a/graphql/resolve/query.go b/graphql/resolve/query.go
@@ -188,6 +188,8 @@ func convertScalarToString(val interface{}) (string, error) {
 		str = strconv.FormatInt(v, 10)
 	case float64:
 		str = strconv.FormatFloat(v, 'f', -1, 64)
+	case json.Number:
+		str = v.String()
 	case nil:
 		str = ""
 	default: