Merge remote-tracking branch 'upstream/3.3' into 3.4

neo4j · Apr 23, 2018 · 0b01554 · 0b01554
2 parents b5cbc62 + 269a3a9
commit 0b01554
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/...nity/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CompilerEngineDelegator.scala b/...nity/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CompilerEngineDelegator.scala
@@ -64,7 +64,7 @@ case class PreParsedQuery(statement: String, rawStatement: String, version: Cyph
     }
     val debugFlags = debugOptions.map(flag => s"debug=$flag").mkString(" ")
 
-    s"CYPHER ${version.name} $plannerInfo $runtimeInfo $updateStrategyInfo $debugFlags $statement".replaceAll("\\s+", " ")
+    s"CYPHER ${version.name} $plannerInfo $runtimeInfo $updateStrategyInfo $debugFlags $statement"
   }
 }
 

diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryCachingTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryCachingTest.scala
@@ -69,7 +69,7 @@ class QueryCachingTest extends CypherFunSuite with GraphDatabaseTestSupport with
         graph.execute(firstQuery).resultAsString()
         graph.execute(secondQuery).resultAsString()
 
-        val actual = cacheListener.trace
+        val actual = cacheListener.trace.map(str => str.replaceAll("\\s+", " "))
         val expected = List(
           s"cacheFlushDetected",
           s"cacheMiss: CYPHER 3.4 $query",

diff --git a/...te/src/test/scala/org/neo4j/internal/cypher/acceptance/StringMatchingAcceptanceTest.scala b/...te/src/test/scala/org/neo4j/internal/cypher/acceptance/StringMatchingAcceptanceTest.scala
@@ -87,4 +87,12 @@ class StringMatchingAcceptanceTest extends ExecutionEngineFunSuite with QuerySta
         | RETURN a.name""".stripMargin)
     result.columnAs("a.name").toList should be (List())
   }
+
+  test("should distinguish between one and multiple spaces in strings") {
+    graph.execute("CREATE (:Label{prop:'1 2'})")
+    graph.execute("CREATE (:Label{prop:'1  2'})")
+
+    val result = innerExecuteDeprecated("MATCH (n:Label) RETURN length(n.prop) as l", Map.empty)
+    result.toSet should equal(Set(Map("l" -> 3), Map("l" -> 4)))
+  }
 }