Allow setting database name in @GdlGraph

Co-Authored-By: Paul Horn <paul.horn@neotechnology.com>
Co-Authored-By: Jacob Sznajdman <breakanalysis@gmail.com>

Author: 3 people

test-utils/src/main/java/org/neo4j/gds/extension/BaseGdlSupportExtension.java

@@ -52,7 +52,8 @@
 
 public abstract class BaseGdlSupportExtension {
 
-    public static final DatabaseId DATABASE_ID = DatabaseId.of("GDL");
+    static final String DATABASE_NAME = "GDL";
+    public static final DatabaseId DATABASE_ID = DatabaseId.of(DATABASE_NAME);
 
     void beforeAction(ExtensionContext context) {
         Class<?> requiredTestClass = context.getRequiredTestClass();
@@ -113,6 +114,7 @@ private static Stream<GdlGraphSetup> gdlGraphsForField(Field field) {
                 .indexInverse(annotation.indexInverse())
                 .idOffset(annotation.idOffset())
                 .addToCatalog(annotation.addToCatalog())
+                .databaseId(DatabaseId.of(annotation.databaseName()))
                 .build()
             );
     }
@@ -137,7 +139,7 @@ private static void injectGraphStore(GdlGraphSetup gdlGraphSetup, ExtensionConte
             .builder()
             .nodeIdFunction(nodeIdFunction)
             .graphProjectConfig(graphProjectConfig)
-            .databaseId(DATABASE_ID)
+            .databaseId(gdlGraphSetup.databaseId())
             .build();
 
         GraphDimensions dimensions = gdlFactory.dimensions();
@@ -198,5 +200,8 @@ interface GdlGraphSetup {
         default boolean addToCatalog() {
             return false;
         }
+
+        @Value.Auxiliary
+        DatabaseId databaseId();
     }
 }

test-utils/src/main/java/org/neo4j/gds/extension/GdlGraph.java

@@ -62,4 +62,9 @@
      * {@code 'graph'} if no prefix is set.
      */
     boolean addToCatalog() default false;
+
+    /**
+     * If set, the graph will be created using the specified database.
+     */
+    String databaseName() default BaseGdlSupportExtension.DATABASE_NAME;
 }

test-utils/src/test/java/org/neo4j/gds/extension/GdlSupportPerMethodExtensionTest.java

@@ -20,6 +20,7 @@
 package org.neo4j.gds.extension;
 
 import org.junit.jupiter.api.Test;
+import org.neo4j.gds.api.GraphStore;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -33,6 +34,7 @@ class GdlSupportPerMethodExtensionTest {
     @Inject
     private IdFunction idOffsetIdFunction;
 
+
     @Test
     void testIdOffset() {
         assertThat(idOffsetGraph.nodeCount()).isEqualTo(2L);
@@ -42,4 +44,24 @@ void testIdOffset() {
         assertThat(idOffsetGraph.toMappedNodeId(42L)).isEqualTo(0L);
         assertThat(idOffsetGraph.toMappedNodeId(43L)).isEqualTo(1L);
     }
+
+    @GdlGraph(graphNamePrefix = "withoutDatabase")
+    public static final String WITHOUT_DATABASE_GRAPH = "(a)-[:REL]->(b)";
+    @Inject
+    private GraphStore withoutDatabaseGraphStore;
+
+    @Test
+    void withoutDatabaseName() {
+        assertThat(withoutDatabaseGraphStore.databaseInfo().databaseId().databaseName()).isEqualTo("gdl");
+    }
+
+    @GdlGraph(graphNamePrefix = "withDatabase", databaseName = "foobar")
+    public static final String WITH_DATABASE_GRAPH = "(a)-[:REL]->(b)";
+    @Inject
+    private GraphStore withDatabaseGraphStore;
+
+    @Test
+    void withDatabaseName() {
+        assertThat(withDatabaseGraphStore.databaseInfo().databaseId().databaseName()).isEqualTo("foobar");
+    }
 }