Revert "fix(GraphQL): This PR add schema cleaning in GraphQL. (#6523)" (

#6559)

This reverts commit 812a6f0.

# Conflicts:
#	graphql/schema/testdata/schemagen/output/filter-cleanSchema-all-empty.graphql
#	graphql/schema/testdata/schemagen/output/filter-cleanSchema-circular.graphql
#	graphql/schema/testdata/schemagen/output/filter-cleanSchema-custom-mutation.graphql
#	graphql/schema/testdata/schemagen/output/filter-cleanSchema-directLink.graphql

graphql/admin/schema.go

@@ -20,8 +20,8 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	dgoapi "github.com/dgraph-io/dgo/v200/protos/api"
 
+	dgoapi "github.com/dgraph-io/dgo/v200/protos/api"
 	"github.com/dgraph-io/dgraph/edgraph"
 	"github.com/dgraph-io/dgraph/gql"
 	"github.com/dgraph-io/dgraph/graphql/resolve"

graphql/schema/gqlschema.go

@@ -554,88 +554,11 @@ func completeSchema(sch *ast.Schema, definitions []string) {
 	}
 }
 
-func cleanupInput(sch *ast.Schema, def *ast.Definition, seen map[string]bool) {
-	// seen helps us avoid cycles
-	if def == nil || seen[def.Name] {
-		return
-	}
-
-	i := 0
-	// recursively walk over fields for an input type and delete those which are themselves empty.
-	for _, f := range def.Fields {
-		nt := f.Type.Name()
-		enum := sch.Types[nt] != nil && sch.Types[nt].Kind == "ENUM"
-		// Lets skip scalar types and enums.
-		if _, ok := scalarToDgraph[nt]; ok || enum {
-			def.Fields[i] = f
-			i++
-			continue
-		}
-
-		seen[def.Name] = true
-		cleanupInput(sch, sch.Types[nt], seen)
-		seen[def.Name] = false
-
-		// If after calling cleanup on an input type, it got deleted then it doesn't need to be
-		// in the fields for this type anymore.
-		if sch.Types[nt] == nil {
-			continue
-		}
-		def.Fields[i] = f
-		i++
-	}
-	def.Fields = def.Fields[:i]
-
-	if len(def.Fields) == 0 {
-		delete(sch.Types, def.Name)
-	}
-}
-
-func cleanSchema(sch *ast.Schema) {
-	// Let's go over inputs of the type TRef, TPatch and AddTInput and delete the ones which
-	// don't have field inside them.
-	for k := range sch.Types {
-		if strings.HasSuffix(k, "Ref") || strings.HasSuffix(k, "Patch") ||
-			(strings.HasPrefix(k, "Add") && strings.HasSuffix(k, "Input")) {
-			cleanupInput(sch, sch.Types[k], map[string]bool{})
-		}
-	}
-
-	// Let's go over mutations and cleanup those which don't have AddTInput defined in the schema
-	// anymore.
-	i := 0 // helps us overwrite the array with valid entries.
-	for _, field := range sch.Mutation.Fields {
-		custom := field.Directives.ForName("custom")
-		// We would only modify add type queries.
-		if custom != nil || !strings.HasPrefix(field.Name, "add") {
-			sch.Mutation.Fields[i] = field
-			i++
-			continue
-		}
-
-		// addT type mutations have an input which is AddTInput so if that doesn't exist anymore,
-		// we can delete the AddTPayload and also skip this mutation.
-		typ := field.Name[3:]
-		input := sch.Types["Add"+typ+"Input"]
-		if input == nil {
-			delete(sch.Types, "Add"+typ+"Payload")
-			continue
-		}
-		sch.Mutation.Fields[i] = field
-		i++
-
-	}
-	sch.Mutation.Fields = sch.Mutation.Fields[:i]
-}
-
 func addInputType(schema *ast.Schema, defn *ast.Definition) {
-	field := getFieldsWithoutIDType(schema, defn)
-	if len(field) != 0 {
-		schema.Types["Add"+defn.Name+"Input"] = &ast.Definition{
-			Kind:   ast.InputObject,
-			Name:   "Add" + defn.Name + "Input",
-			Fields: field,
-		}
+	schema.Types["Add"+defn.Name+"Input"] = &ast.Definition{
+		Kind:   ast.InputObject,
+		Name:   "Add" + defn.Name + "Input",
+		Fields: getFieldsWithoutIDType(schema, defn),
 	}
 }
 
@@ -658,12 +581,10 @@ func addReferenceType(schema *ast.Schema, defn *ast.Definition) {
 		}
 	}
 
-	if len(flds) != 0 {
-		schema.Types[defn.Name+"Ref"] = &ast.Definition{
-			Kind:   ast.InputObject,
-			Name:   defn.Name + "Ref",
-			Fields: flds,
-		}
+	schema.Types[defn.Name+"Ref"] = &ast.Definition{
+		Kind:   ast.InputObject,
+		Name:   defn.Name + "Ref",
+		Fields: flds,
 	}
 }
 
@@ -1062,12 +983,11 @@ func addAddPayloadType(schema *ast.Schema, defn *ast.Definition) {
 	addFilterArgument(schema, qry)
 	addOrderArgument(schema, qry)
 	addPaginationArguments(qry)
-	if schema.Types["Add"+defn.Name+"Input"] != nil {
-		schema.Types["Add"+defn.Name+"Payload"] = &ast.Definition{
-			Kind:   ast.Object,
-			Name:   "Add" + defn.Name + "Payload",
-			Fields: []*ast.FieldDefinition{qry, numUids},
-		}
+
+	schema.Types["Add"+defn.Name+"Payload"] = &ast.Definition{
+		Kind:   ast.Object,
+		Name:   "Add" + defn.Name + "Payload",
+		Fields: []*ast.FieldDefinition{qry, numUids},
 	}
 }
 
@@ -1258,7 +1178,6 @@ func addAddMutation(schema *ast.Schema, defn *ast.Definition) {
 		},
 	}
 	schema.Mutation.Fields = append(schema.Mutation.Fields, add)
-
 }
 
 func addUpdateMutation(schema *ast.Schema, defn *ast.Definition) {
@@ -1309,9 +1228,6 @@ func addDeleteMutation(schema *ast.Schema, defn *ast.Definition) {
 }
 
 func addMutations(schema *ast.Schema, defn *ast.Definition) {
-	if schema.Types["Add"+defn.Name+"Input"] == nil {
-		return
-	}
 	addAddMutation(schema, defn)
 	addUpdateMutation(schema, defn)
 	addDeleteMutation(schema, defn)
@@ -1412,6 +1328,7 @@ func getFieldsWithoutIDType(schema *ast.Schema, defn *ast.Definition) ast.FieldL
 			(!hasID(schema.Types[fld.Type.Name()]) && !hasXID(schema.Types[fld.Type.Name()])) {
 			continue
 		}
+
 		fldList = append(fldList, createField(schema, fld))
 	}
 

graphql/schema/schemagen.go

@@ -204,7 +204,6 @@ func NewHandler(input string) (Handler, error) {
 	headers := getAllowedHeaders(sch, defns)
 	dgSchema := genDgSchema(sch, typesToComplete)
 	completeSchema(sch, typesToComplete)
-	cleanSchema(sch)
 
 	if len(sch.Query.Fields) == 0 && len(sch.Mutation.Fields) == 0 {
 		return nil, gqlerror.Errorf("No query or mutation found in the generated schema")

graphql/schema/schemagen_test.go

@@ -87,6 +87,7 @@ func TestSchemaString(t *testing.T) {
 
 			_, err = FromString(newSchemaStr)
 			require.NoError(t, err)
+
 			outputFileName := outputDir + testFile.Name()
 			str2, err := ioutil.ReadFile(outputFileName)
 			require.NoError(t, err)

graphql/schema/testdata/schemagen/input/hasInverse-with-interface-having-directive.graphql

@@ -1,7 +1,7 @@
 type Author {
   id: ID!
   name: String! @search(by: [hash])
-  posts: [Post]
+  posts: [Post] 
 }
 
 interface Post {
@@ -12,7 +12,7 @@ interface Post {
 }
 
 type Question implements Post {
-  answered: Boolean
+  answered: Boolean 
 }
 
 type Answer implements Post {