Simplify type definitions.

dgraph/cmd/alpha/run_test.go

@@ -1226,15 +1226,15 @@ func TestListTypeSchemaChange(t *testing.T) {
 func TestDeleteAllSP2(t *testing.T) {
 	s := `
 	type Node12345 {
-		nodeType: string
-		name: string
-		date: dateTime
-		weight: float
-		weightUnit: string
-		lifeLoad: int
-		stressLevel: int
-		plan: string
-		postMortem: string
+		nodeType
+		name
+		date
+		weight
+		weightUnit
+		lifeLoad
+		stressLevel
+		plan
+		postMortem
 	}
 	`
 	require.NoError(t, dropAll())

dgraph/cmd/live/load-json/family.schema

@@ -1,11 +1,11 @@
 type FamilyMember {
-    name: string
-    age: int
-    role: string
-    aka: string
-    carries: string
-    parent_to: [FamilyMember]
-    sibling_of: [FamilyMember]
+    name
+    age
+    role
+    aka
+    carries
+    parent_to
+    sibling_of
 }
 
 name:string @index(term) .

dgraph/cmd/live/load-uids/family.schema

@@ -1,11 +1,11 @@
 type FamilyMember {
-    name: string
-    age: int
-    role: string
-    aka: string
-    carries: string
-    parent_to: [FamilyMember]
-    sibling_of: [FamilyMember]
+    name
+    age
+    role
+    aka
+    carries
+    parent_to
+    sibling_of
 }
 
 name:string @index(term) .

query/common_test.go

@@ -192,38 +192,38 @@ func addGeoMultiPolygonToCluster(uid uint64, polygons [][][][]float64) {
 
 const testSchema = `
 type Person {
-	name: string
-	pet: Animal
+	name
+	pet
 }
 
 type Animal {
-	name: string
+	name
 }
 
 type CarModel {
-	make: string
-	model: string
-	year: int
-	previous_model: CarModel
+	make
+	model
+	year
+	previous_model
 }
 
 type SchoolInfo {
-	name: string
-	abbr: string
-	school: [uid]
-	district: [uid]
-	state: [uid]
-	county: [uid]
+	name
+	abbr
+	school
+	district
+	state
+	county
 }
 
 type User {
-	name: string
-	password: password
+	name
+	password
 }
 
 type Node {
-	node: uid
-	name: string
+	node
+	name
 }
 
 name                           : string @index(term, exact, trigram) @count @lang .

query/query3_test.go

@@ -2119,19 +2119,21 @@ func TestQueryUnknownType(t *testing.T) {
 	require.JSONEq(t, `{"data": {}}`, js)
 }
 
+// TODO(martinmr): Change type query representation since the type of a field is no longer
+// relevant.
 func TestQuerySingleType(t *testing.T) {
 	query := `schema(type: Person) {}`
 	js := processQueryNoErr(t, query)
 	require.JSONEq(t, `{"data": {"types":[{"name":"Person",
-		"fields":[{"name":"name", "type":"string"}, {"name":"pet", "type":"Animal"}]}]}}`,
+		"fields":[{"name":"name", "type":"default"}, {"name":"pet", "type":"default"}]}]}}`,
 		js)
 }
 
 func TestQueryMultipleTypes(t *testing.T) {
 	query := `schema(type: [Person, Animal]) {}`
 	js := processQueryNoErr(t, query)
 	require.JSONEq(t, `{"data": {"types":[{"name":"Animal",
-		"fields":[{"name":"name", "type":"string"}]},
-	{"name":"Person", "fields":[{"name":"name", "type": "string"},
-		{"name":"pet", "type":"Animal"}]}]}}`, js)
+		"fields":[{"name":"name", "type":"default"}]},
+	{"name":"Person", "fields":[{"name":"name", "type": "default"},
+		{"name":"pet", "type":"default"}]}]}}`, js)
 }

schema/parse.go

@@ -24,6 +24,7 @@ import (
 	"github.com/dgraph-io/dgraph/tok"
 	"github.com/dgraph-io/dgraph/types"
 	"github.com/dgraph-io/dgraph/x"
+	"github.com/golang/glog"
 	"github.com/pkg/errors"
 )
 
@@ -335,7 +336,7 @@ func parseTypeDeclaration(it *lex.ItemIterator) (*pb.TypeUpdate, error) {
 			typeUpdate.Fields = fields
 			return typeUpdate, nil
 		case itemText:
-			field, err := parseTypeField(it)
+			field, err := parseTypeField(it, typeUpdate.TypeName)
 			if err != nil {
 				return nil, err
 			}
@@ -349,11 +350,19 @@ func parseTypeDeclaration(it *lex.ItemIterator) (*pb.TypeUpdate, error) {
 	return nil, errors.Errorf("Shouldn't reach here.")
 }
 
-func parseTypeField(it *lex.ItemIterator) (*pb.SchemaUpdate, error) {
+func parseTypeField(it *lex.ItemIterator, typeName string) (*pb.SchemaUpdate, error) {
 	field := &pb.SchemaUpdate{Predicate: it.Item().Val}
 	var list bool
-
 	it.Next()
+
+	// Simplified type definitions only require the field name. If a new line is found,
+	// proceed to the next field in the type.
+	if it.Item().Typ == itemNewLine {
+		return field, nil
+	}
+
+	// For the sake of backwards-compatibility, process type definitions in the old format,
+	// but ignore the information after the colon.
 	if it.Item().Typ != itemColon {
 		return nil, it.Item().Errorf("Missing colon in type declaration. Got %v", it.Item().Val)
 	}
@@ -368,34 +377,30 @@ func parseTypeField(it *lex.ItemIterator) (*pb.SchemaUpdate, error) {
 		return nil, it.Item().Errorf("Missing field type in type declaration. Got %v",
 			it.Item().Val)
 	}
-	field.ValueType = getType(it.Item().Val)
-	if field.ValueType == pb.Posting_OBJECT {
-		field.ObjectTypeName = it.Item().Val
-	}
 
 	it.Next()
 	if it.Item().Typ == itemExclamationMark {
-		field.NonNullable = true
 		it.Next()
 	}
 
 	if list {
 		if it.Item().Typ != itemRightSquare {
 			return nil, it.Item().Errorf("Expected matching square bracket. Got %v", it.Item().Val)
 		}
-		field.List = true
 		it.Next()
 
 		if it.Item().Typ == itemExclamationMark {
-			field.NonNullableList = true
 			it.Next()
 		}
 	}
 
 	if it.Item().Typ != itemNewLine {
-		return nil, it.Item().Errorf("Expected new line after field declaration. Got %v", it.Item().Val)
+		return nil, it.Item().Errorf("Expected new line after field declaration. Got %v",
+			it.Item().Val)
 	}
 
+	glog.Warningf("Type declaration for type %s includes deprecated information about field type "+
+		"for field %s which will be ignored.", typeName, field.Predicate)
 	return field, nil
 }