Update compiler dependencies to 2.3.5

neo4j · Jul 6, 2016 · 2ead72e · 2ead72e
1 parent 3281c2d
commit 2ead72e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/...tance/src/test/scala/org/neo4j/internal/cypher/acceptance/AggregationAcceptanceTest.scala b/...tance/src/test/scala/org/neo4j/internal/cypher/acceptance/AggregationAcceptanceTest.scala
@@ -304,7 +304,7 @@ class AggregationAcceptanceTest extends ExecutionEngineFunSuite with NewPlannerT
                    |WITH user, friendships[toInt(rand() * size(friendships))] AS selectedFriendship
                    |RETURN id(selectedFriendship) AS friendshipId, selectedFriendship.propFive AS propertyValue""".stripMargin
 
-    // TODO: this can be executed with the compatibility mode when we'll depend on the 2.3.4 cypher-compiler
+    // TODO: this can be executed with the compatibility mode when we'll depend on the 2.3.5 cypher-compiler
     val result1 = executeWithCostPlannerOnly(query1).toList
     val result2 = executeWithCostPlannerOnly(query2).toList
 

diff --git a/community/cypher/cypher/pom.xml b/community/cypher/cypher/pom.xml
@@ -185,7 +185,7 @@
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-cypher-compiler-2.3</artifactId>
-      <version>2.3.4</version>
+      <version>2.3.5</version>
       <exclusions>
         <exclusion>
           <groupId>org.neo4j</groupId>

diff --git a/...pher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala b/...pher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala
@@ -361,8 +361,6 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper)
       }
     }
 
-    override def detachDelete(obj: Relationship): Int = ??? // not supported for relationships
-
     override def propertyKeyIds(id: Long): Iterator[Int] = try {
       // use the following when bumping the cypher 2.3.x version
       //JavaConversionSupport.asScalaENFXSafe(statement.readOperations().relationshipGetPropertyKeys(id))
@@ -605,4 +603,13 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper)
   def relationshipCountByCountStore(startLabelId: Int, typeId: Int, endLabelId: Int): Long = {
     tc.statement.readOperations().countsForRelationship(startLabelId, typeId, endLabelId)
   }
+
+  override def detachDeleteNode(node: Node): Int = {
+    try {
+      tc.statement.dataWriteOperations().nodeDetachDelete(node.getId)
+    } catch {
+      case _: exceptions.EntityNotFoundException => // the node has been deleted by another transaction, oh well...
+        0
+    }
+  }
 }