From 9a318fac486a81c857ef23064646248028e39147 Mon Sep 17 00:00:00 2001
From: Arijit Das <arijit@dgraph.io>
Date: Mon, 8 Jun 2020 09:42:29 +0530
Subject: [PATCH] =?UTF-8?q?graphql:=20Fix=20mutation=20on=20predicate=20wi?=
 =?UTF-8?q?th=20special=20characters=20having=20dgr=E2=80=A6=20(#5577)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* graphql: Fix mutation on predicate with special characters having dgraph directive. (#5526)

* Fix Dgraph directive for multiple languages.

(cherry picked from commit 92232c05221e34bf0790c62e99447ffdef0e3762)
(cherry picked from commit 829cbb0fb8d16216632f4bc4255d479191e24aff)
---
 graphql/e2e/directives/schema.graphql | 5 +++++
 graphql/resolve/schema.graphql        | 5 +++++
 graphql/schema/gqlschema_test.yml     | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/graphql/e2e/directives/schema.graphql b/graphql/e2e/directives/schema.graphql
index 7a83e6d88f4..65955a55844 100644
--- a/graphql/e2e/directives/schema.graphql
+++ b/graphql/e2e/directives/schema.graphql
@@ -143,3 +143,8 @@ type Message {
     content: String! @dgraph(pred: "post")
     author: String @dgraph(pred: "<职业>")
 }
+
+type Message {
+    content: String! @dgraph(pred: "post")
+    author: String @dgraph(pred: "<职业>")
+}
diff --git a/graphql/resolve/schema.graphql b/graphql/resolve/schema.graphql
index c677d34d9db..ec9e6b5eda2 100644
--- a/graphql/resolve/schema.graphql
+++ b/graphql/resolve/schema.graphql
@@ -229,3 +229,8 @@ type Y implements X @auth(
 ){
   userRole: String @search(by: [hash])
 }
+
+type Message {
+        content: String! @dgraph(pred: "post")
+        author: String @dgraph(pred: "<职业>")
+}
diff --git a/graphql/schema/gqlschema_test.yml b/graphql/schema/gqlschema_test.yml
index b855d109a23..e6ff14e1a3d 100644
--- a/graphql/schema/gqlschema_test.yml
+++ b/graphql/schema/gqlschema_test.yml
@@ -1044,6 +1044,7 @@ invalid_schemas:
   -
     name: "@custom directive with undefined parameter in body"
     input: |
+<<<<<<< HEAD
       type Author {
         id: ID!
         name: String
@@ -2582,4 +2583,4 @@ valid_schemas:
           method: "POST",
           body: "{sid: $id}"
           })
-      }
+      }
\ No newline at end of file