Fix #7087: Procedures yielding collection of nodes are treated as sin…

…gle node
neo4j · May 12, 2016 · 67dd909 · 67dd909
1 parent 31e7272
commit 67dd909
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/...-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProcedureCallPipe.scala b/...-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProcedureCallPipe.scala
@@ -104,10 +104,14 @@ case class ProcedureCallPipe(source: Pipe,
     ), variables)
   }
 
-  override def symbols = resultSymbols.foldLeft(source.symbols) {
+  override def symbols = {
+    val sourceSymbols = source.symbols
+    val outputSymbols = resultSymbols.foldLeft(sourceSymbols) {
       case (symbols, (symbolName, symbolType)) =>
-        symbols.add(symbolName, symbolType.legacyIteratedType)
+        symbols.add(symbolName, symbolType)
     }
+    outputSymbols
+  }
 
   override def localEffects = AllEffects
 

diff --git a/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java b/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java
@@ -644,6 +644,19 @@ private String createCsvFile( String... lines ) throws IOException
         return file.toURI().toURL().toString();
     }
 
+
+    @Test
+    public void shouldReturnNodeListTypedAsNodeList()
+    {
+        // When
+        Result res = db.execute( "CALL org.neo4j.procedure.nodeList() YIELD nodes RETURN extract( x IN nodes | id(x) ) as ids" );
+
+        // Then
+        assertTrue( res.hasNext() );
+        assertThat( ((List<?>) res.next().get( "ids" ) ).size(), equalTo( 2 ) );
+        assertFalse( res.hasNext() );
+    }
+
     @Before
     public void setUp() throws IOException
     {
@@ -729,6 +742,16 @@ public PathOutputRecord( Path path )
         }
     }
 
+    public static class NodeListRecord
+    {
+        public List<Node> nodes;
+
+        public NodeListRecord( List<Node> nodes )
+        {
+            this.nodes = nodes;
+        }
+    }
+
     public static class ClassWithProcedures
     {
         @Context
@@ -921,8 +944,6 @@ public void delegatingSideEffect( @Name( "value" ) String value )
             db.execute( "CALL org.neo4j.procedure.sideEffect", map( "value", value ) );
         }
 
-        private static final ScheduledExecutorService jobs = Executors.newScheduledThreadPool( 5 );
-
         @Procedure
         @PerformsWrites
         public void unsupportedProcedure()
@@ -948,5 +969,18 @@ public Stream<PathOutputRecord> nodePaths( @Name( "node" ) Node node )
                 .stream()
                 .map( record -> new PathOutputRecord( (Path) record.getOrDefault( "p", null ) ) );
         }
+
+        @Procedure
+        @PerformsWrites
+        public Stream<NodeListRecord> nodeList()
+        {
+            List<Node> nodesList = new ArrayList<>();
+            nodesList.add( db.createNode() );
+            nodesList.add( db.createNode() );
+
+            return Stream.of( new NodeListRecord( nodesList ) );
+        }
     }
+
+    private static final ScheduledExecutorService jobs = Executors.newScheduledThreadPool( 5 );
 }