[Refactor] CreateGraphV2 (#357)

Author: jwierzbo

database_graphs.go

@@ -42,7 +42,12 @@ type DatabaseGraphs interface {
 
 	// CreateGraph creates a new graph with given name and options, and opens a connection to it.
 	// If a graph with given name already exists within the database, a DuplicateError is returned.
+	// @deprecated since ArangoDB 3.9 - please use CreateGraphV2 instead
 	CreateGraph(ctx context.Context, name string, options *CreateGraphOptions) (Graph, error)
+
+	// CreateGraphV2 creates a new graph with given name and options, and opens a connection to it.
+	// If a graph with given name already exists within the database, a DuplicateError is returned.
+	CreateGraphV2(ctx context.Context, name string, options *CreateGraphOptions) (Graph, error)
 }
 
 // CreateGraphOptions contains options that customize the creating of a graph.

database_graphs_impl.go

@@ -172,8 +172,60 @@ type createGraphAdditionalOptions struct {
 
 // CreateGraph creates a new graph with given name and options, and opens a connection to it.
 // If a graph with given name already exists within the database, a DuplicateError is returned.
-// todo test
 func (d *database) CreateGraph(ctx context.Context, name string, options *CreateGraphOptions) (Graph, error) {
+	input := createGraphOptions{
+		Name: name,
+	}
+	if options != nil {
+		input.OrphanVertexCollections = options.OrphanVertexCollections
+		input.EdgeDefinitions = options.EdgeDefinitions
+		input.IsSmart = options.IsSmart
+		if options.ReplicationFactor == SatelliteGraph {
+			input.Options = &createGraphAdditionalOptions{
+				SmartGraphAttribute: options.SmartGraphAttribute,
+				ReplicationFactor:   graphReplicationFactor(options.ReplicationFactor),
+				IsDisjoint:          options.IsDisjoint,
+				Satellites:          options.Satellites,
+			}
+		} else if options.SmartGraphAttribute != "" || options.NumberOfShards != 0 {
+			input.Options = &createGraphAdditionalOptions{
+				SmartGraphAttribute: options.SmartGraphAttribute,
+				NumberOfShards:      options.NumberOfShards,
+				ReplicationFactor:   graphReplicationFactor(options.ReplicationFactor),
+				WriteConcern:        options.WriteConcern,
+				IsDisjoint:          options.IsDisjoint,
+				Satellites:          options.Satellites,
+			}
+		}
+	}
+	req, err := d.conn.NewRequest("POST", path.Join(d.relPath(), "_api/gharial"))
+	if err != nil {
+		return nil, WithStack(err)
+	}
+	if _, err := req.SetBody(input); err != nil {
+		return nil, WithStack(err)
+	}
+	resp, err := d.conn.Do(ctx, req)
+	if err != nil {
+		return nil, WithStack(err)
+	}
+	if err := resp.CheckStatus(201, 202); err != nil {
+		return nil, WithStack(err)
+	}
+	var data getGraphResponse
+	if err := resp.ParseBody("", &data); err != nil {
+		return nil, WithStack(err)
+	}
+	g, err := newGraph(data.Graph, d)
+	if err != nil {
+		return nil, WithStack(err)
+	}
+	return g, nil
+}
+
+// CreateGraphV2 creates a new graph with given name and options, and opens a connection to it.
+// If a graph with given name already exists within the database, a DuplicateError is returned.
+func (d *database) CreateGraphV2(ctx context.Context, name string, options *CreateGraphOptions) (Graph, error) {
 	input := createGraphOptions{
 		Name: name,
 	}

example_graph_test.go

@@ -77,7 +77,7 @@ func Example_createGraph() {
 	options.EdgeDefinitions = []driver.EdgeDefinition{edgeDefinition}
 
 	// now it's possible to create a graph
-	graph, err := db.CreateGraph(nil, "myGraph", &options)
+	graph, err := db.CreateGraphV2(nil, "myGraph", &options)
 	if err != nil {
 		log.Fatalf("Failed to create graph: %v", err)
 	}

test/edge_collection_test.go

@@ -50,7 +50,7 @@ func TestCreateEdgeCollection(t *testing.T) {
 	c := createClientFromEnv(t, true)
 	db := ensureDatabase(nil, c, "edge_collection_test", nil, t)
 	name := "test_create_edge_collection"
-	g, err := db.CreateGraph(nil, name, nil)
+	g, err := db.CreateGraphV2(nil, name, nil)
 	if err != nil {
 		t.Fatalf("Failed to create graph '%s': %s", name, describe(err))
 	}
@@ -123,7 +123,7 @@ func TestCreateSatelliteEdgeCollection(t *testing.T) {
 		IsSmart:             true,
 		SmartGraphAttribute: "test",
 	}
-	g, err := db.CreateGraph(ctx, name, &options)
+	g, err := db.CreateGraphV2(ctx, name, &options)
 	if err != nil {
 		t.Fatalf("Failed to create graph '%s': %s", name, describe(err))
 	}
@@ -188,7 +188,7 @@ func TestRemoveEdgeCollection(t *testing.T) {
 	c := createClientFromEnv(t, true)
 	db := ensureDatabase(nil, c, "edge_collection_test", nil, t)
 	name := "test_remove_edge_collection"
-	g, err := db.CreateGraph(nil, name, nil)
+	g, err := db.CreateGraphV2(nil, name, nil)
 	if err != nil {
 		t.Fatalf("Failed to create graph '%s': %s", name, describe(err))
 	}
@@ -230,7 +230,7 @@ func TestSetVertexConstraints(t *testing.T) {
 	c := createClientFromEnv(t, true)
 	db := ensureDatabase(nil, c, "edge_collection_test", nil, t)
 	name := "set_vertex_constraints"
-	g, err := db.CreateGraph(nil, name, nil)
+	g, err := db.CreateGraphV2(nil, name, nil)
 	if err != nil {
 		t.Fatalf("Failed to create graph '%s': %s", name, describe(err))
 	}