Making it so collections can have mixed types neo4j#378

freeeve · Jan 18, 2013 · ca457ac · ca457ac
1 parent f23059b
commit ca457ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/community/cypher/src/main/scala/org/neo4j/cypher/internal/symbols/CypherType.scala b/community/cypher/src/main/scala/org/neo4j/cypher/internal/symbols/CypherType.scala
@@ -29,7 +29,7 @@ trait CypherType {
   def mergeWith(other: CypherType): CypherType = {
     if (this.isAssignableFrom(other)) other
     else if (other.isAssignableFrom(this)) this
-    else throw new CypherTypeException("Failed merging " + this + " with " + other)
+    else AnyType()
   }
 
   def parentType: CypherType

diff --git a/community/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.scala b/community/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.scala
@@ -2355,4 +2355,9 @@ RETURN x0.name?
     assert(result.toList === List())
   }
 
+  @Test def mixed_type_collections_should_be_allowed() {
+    val result = parseAndExecute("START a=node(0) RETURN [1,'hello'] as mixed")
+
+    assert(result.toList.head === Map("mixed" -> List(1,"hello")))
+  }
 }