graphql: Return better error message if a type only contains ID field (…

…#5531) Fixes GRAPHQL-449
hypermodeinc · May 29, 2020 · 60882e7 · 60882e7
1 parent 4757813
commit 60882e7
Show file tree

Hide file tree

Showing 4 changed files with 153 additions and 37 deletions.
diff --git a/graphql/e2e/custom_logic/custom_logic_test.go b/graphql/e2e/custom_logic/custom_logic_test.go
@@ -223,7 +223,7 @@ func TestServerShouldAllowForwardHeaders(t *testing.T) {
 		id: ID!
 		name: String!
 	}
-	type Movie @remote {
+	type Movie {
 		id: ID!
 		name: String! @custom(http: {
 			url: "http://mock:8888/movieName",
@@ -235,6 +235,7 @@ func TestServerShouldAllowForwardHeaders(t *testing.T) {
 			method: "POST",
 			forwardHeaders: ["User-Id", "X-App-Token"]
 		})
+		foo: String
 	}
 
 	type Query {
@@ -2098,9 +2099,9 @@ func TestRestCustomLogicInDeepNestedField(t *testing.T) {
 	type SearchTweets {
 		id: ID!
 		text: String!
-		user: User 
+		user: User
 	}
-	
+
 	type User {
 		id: ID!
 		screen_name: String! @id
@@ -2110,12 +2111,12 @@ func TestRestCustomLogicInDeepNestedField(t *testing.T) {
 		})
 		tweets: [SearchTweets] @hasInverse(field: user)
 	}
-	
+
 	type RemoteUser @remote {
 		id: ID!
 		name: String
 	}
-	
+
 	type Followers@remote{
 		users: [RemoteUser]
 	}

diff --git a/graphql/schema/dgraph_schemagen_test.yml b/graphql/schema/dgraph_schemagen_test.yml
@@ -8,14 +8,17 @@ schemas:
       }
       type P {
         id: ID!
+        q: A
       }
     output: |
       type A {
         A.p
       }
       A.p: uid .
       type P {
+        P.q
       }
+      P.q: uid .
 
   -
     name: "Scalar list"
@@ -54,14 +57,17 @@ schemas:
       }
       type P {
         id: ID!
+        name: String
       }
     output: |
       type X {
         X.p
       }
       X.p: [uid] .
       type P {
+        P.name
       }
+      P.name: string .
 
   -
     name: "Scalar types"