Parser for type declaration.

dgraph/cmd/bulk/loader.go

@@ -139,9 +139,9 @@ func readSchema(filename string) []*pb.SchemaUpdate {
 	buf, err := ioutil.ReadAll(r)
 	x.Check(err)
 
-	initialSchema, err := schema.Parse(string(buf))
+	result, err := schema.Parse(string(buf))
 	x.Check(err)
-	return initialSchema
+	return result.Schemas
 }
 
 func findDataFiles(dir string, ext string) []string {

edgraph/access_ee.go

@@ -462,11 +462,11 @@ func authorizeAlter(ctx context.Context, op *api.Operation) error {
 		return nil
 	}
 
-	updates, err := schema.Parse(op.Schema)
+	result, err := schema.Parse(op.Schema)
 	if err != nil {
 		return err
 	}
-	for _, update := range updates {
+	for _, update := range result.Schemas {
 		if err := authorizePredicate(groupIds, update.Predicate, acl.Modify); err != nil {
 			return status.Error(codes.PermissionDenied,
 				fmt.Sprintf("unauthorized to alter the predicate: %v", err))

edgraph/server.go

@@ -327,13 +327,13 @@ func (s *Server) Alter(ctx context.Context, op *api.Operation) (*api.Payload, er
 		return empty, err
 	}
 
-	updates, err := schema.Parse(op.Schema)
+	result, err := schema.Parse(op.Schema)
 	if err != nil {
 		return empty, err
 	}
-	glog.Infof("Got schema: %+v\n", updates)
+	glog.Infof("Got schema: %+v\n", result.Schemas)
 	// TODO: Maybe add some checks about the schema.
-	m.Schema = updates
+	m.Schema = result.Schemas
 	_, err = query.ApplyMutations(ctx, m)
 	return empty, err
 }

protos/pb.proto

@@ -241,7 +241,7 @@ message Posting {
 		UID = 7;
 		PASSWORD = 8;
 		STRING = 9;
-
+    OBJECT = 10;
 	}
 	ValType val_type = 3;
 	enum PostingType {
@@ -338,11 +338,24 @@ message SchemaUpdate {
 	bool upsert = 8;
 	bool lang = 9;
 
+	// Fields required for type system.
+	bool non_nullable = 10;
+	bool non_nullable_list = 11;
+
+	// If value_type is OBJECT, then this represents an object type with a
+	// custom name. This field stores said name.
+	string object_type_name = 12;
+
 	// Deleted field:
 	reserved 7;
 	reserved "explicit";
 }
 
+message TypeUpdate {
+	string type_name = 1;
+	repeated SchemaUpdate fields = 2;
+}
+
 // Bulk loader proto.
 message MapEntry {
 	bytes key = 1;