post-review update

Author: JPryce-Aklundh

modules/ROOT/pages/clauses/create.adoc

@@ -209,7 +209,7 @@ Properties set: 4
 [[dynamic-create]]
 == CREATE nodes and relationships using dynamic node labels and relationship types
 
-Node labels and relationship types can be referenced dynamically in parameters and variables when creating nodes and relationships.
+Node labels and relationship types can be referenced dynamically in expressions, parameters, and variables when creating nodes and relationships.
 
 .Syntax for creating nodes and relationships dynamically
 [source, syntax]
@@ -219,6 +219,8 @@ CREATE ()-[r:$(<expr>)]->()
 ----
 
 The expression must evaluate to a `STRING NOT NULL | LIST<STRING NOT NULL> NOT NULL` value.
+Using a `LIST<STRING>` with more than one item when creating a relationship using dynamic relationship types will fail.
+This is because a relationship can only have exactly one type.
 
 .Parameters
 [source, parameters]

modules/ROOT/pages/clauses/match.adoc

@@ -17,11 +17,11 @@ To recreate the graph, run the following query against an empty Neo4j database:
 
 [source, cypher, role=test-setup]
 ----
-CREATE (charlie:Person {name: 'Charlie Sheen'}),
-       (martin:Person {name: 'Martin Sheen'}),
-       (michael:Person {name: 'Michael Douglas'}),
-       (oliver:Person {name: 'Oliver Stone'}),
-       (rob:Person {name: 'Rob Reiner'}),
+CREATE (charlie:Person:Actor {name: 'Charlie Sheen'}),
+       (martin:Person:Actor {name: 'Martin Sheen'}),
+       (michael:Person:Actor {name: 'Michael Douglas'}),
+       (oliver:Person:Director {name: 'Oliver Stone'}),
+       (rob:Person:Director {name: 'Rob Reiner'}),
        (wallStreet:Movie {title: 'Wall Street'}),
        (charlie)-[:ACTED_IN {role: 'Bud Fox'}]->(wallStreet),
        (martin)-[:ACTED_IN {role: 'Carl Fox'}]->(wallStreet),
@@ -494,7 +494,7 @@ For more information about how Cypher queries work, see xref:clauses/clause-comp
 [[dynamic-match]]
 == MATCH nodes and relationships using dynamic node labels and relationship types
 
-Node labels and relationship types can be referenced dynamically in parameters and variables when matching nodes and relationships.
+Node labels and relationship types can be referenced dynamically in expressions, parameters, and variables when matching nodes and relationships.
 
 .Syntax for matching node labels dynamically
 [source, syntax]
@@ -504,6 +504,9 @@ MATCH (n:$any(<expr>))
 MATCH (n:$all(<expr>))
 ----
 
+[NOTE]
+`MATCH (n:$all(<expr>))` is functionally equivalent to `MATCH (n:$(<expr>))`.
+
 .Syntax for matching relationship types dynamically
 [source, syntax]
 ----
@@ -513,66 +516,50 @@ MATCH ()-[r:$all(<expr>))]->()
 ----
 
 The expression must evaluate to a `STRING NOT NULL | LIST<STRING NOT NULL> NOT NULL` value.
+If you use a `LIST<STRING>` with more than one item in a relationship pattern with dynamic relationship types, no results will be returned.
+This is because a relationship can only have exactly one type.
 
-.Match labels dynamically using the `all()` function
+.Match labels dynamically
 [source, cypher]
 ----
-WITH "Movie" AS label
-MATCH (movie:$all(label))
-RETURN movie AS movieNodes
+WITH ["Person", "Director"] AS labels
+MATCH (directors:$(labels))
+RETURN directors
 ----
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
 |===
-| movieNodes
+| directors
 
-| (:Movie {title: "Wall Street"})
-| (:Movie {title: "The American President"}) 
+| (:Person:Director {name: "Oliver Stone"})
+| (:Person:Director {name: "Rob Reiner"})
 
 1+d|Rows: 2
 |===
 
-[NOTE]
-The xref:functions/predicate.adoc#functions-all[`all()`] function matches nodes that have all the specified labels.
-
-If passing a `LIST<STRING>` to an `all()` function evaluating a relationship pattern using dynamic relationship types, the list cannot contain more than one element.
-This is because a relationship can only have exactly one type.
-
-.Attempting to match relationship patterns using more than one relationship type will not return any results
-[source, cypher]
-----
-MATCH ()-[r:$all(["ACTED_IN", "DIRECTED"])]->() 
-RETURN r
-----
-
-.Warning
-[source, warning]
-----
-Warning: The query contains a relationship type expression that cannot be satisfied.
-----
-
 .Match nodes dynamically using the `any()` function
 [source, cypher]
 ----
-MATCH (n:$any(["Movie", "Person"]))-[:ACTED_IN|DIRECTED]->(m:Movie)
-RETURN labels(n) AS labels, n.name AS person, collect(m.title) AS movies
+MATCH (n:$any(["Movie", "Actor"]))
+RETURN n as nodes
 ----
 
 [NOTE]
 The xref:functions/predicate.adoc#functions-any[`any()`] function matches nodes that have any of the specified labels.
 
 .Result
-[role="queryresult",options="header,footer",cols="3*<m"]
+[role="queryresult",options="header,footer",cols="1*<m"]
 |===
-| labels | person | movies
-| ["Person"] | Charlie Sheen | ["Wall Street"]
-| ["Person"] | Martin Sheen | ["Wall Street", "The American President"]
-| ["Person"] | Michael Douglas | ["Wall Street", "The American President"]
-| ["Person"] | Oliver Stone | ["Wall Street"]
-| ["Person"] | Rob Reiner | ["The American President"]
+| nodes
+
+| (:Person:Actor {name: "Charlie Sheen"})
+| (:Person:Actor {name: "Martin Sheen"})
+| (:Person:Actor {name: "Michael Douglas"})
+| (:Movie {title: "Wall Street"})
+| (:Movie {title: "The American President"})
 
-3+d|Rows: 5
+1+d|Rows: 5
 |===
 
 
@@ -608,7 +595,7 @@ RETURN movie.title AS movieTitle
 ----
 CALL db.relationshipTypes()
 YIELD relationshipType
-MATCH ()-[r:$(relationshipType)]-()
+MATCH ()-[r:$(relationshipType)]->()
 RETURN relationshipType, count(r) AS relationshipCount
 ----
 

modules/ROOT/pages/clauses/merge.adoc

@@ -688,7 +688,7 @@ RETURN person.name, person.bornIn, person.chauffeurName
 [[dynamic-merge]]
 == MERGE nodes and relationships using dynamic node labels and relationship types
 
-Node labels and relationship types can be referenced dynamically in parameters and variables when merging nodes and relationships.
+Node labels and relationship types can be referenced dynamically in expressions, parameters, and variables when merging nodes and relationships.
 
 .Syntax for merging nodes and relationships dynamically
 [source, syntax]
@@ -698,6 +698,8 @@ MERGE ()-[r:$(<expr>)]->()
 ----
 
 The expression must evaluate to a `STRING NOT NULL | LIST<STRING NOT NULL> NOT NULL` value.
+Using a `LIST<STRING>` with more than one item when merging a relationship using dynamic relationship types will fail.
+This is because a relationship can only have exactly one type.
 
 .Parameters
 [source, parameters]

modules/ROOT/pages/deprecations-additions-removals-compatibility.adoc

@@ -85,17 +85,20 @@ label:functionality[]
 label:new[]
 [source, cypher, role="noheader"]
 ----
-MATCH (movie:$($label))
+MATCH (movie:$($label)),
+      ()-[r:$($type))]->()
 ----
 
 [source, cypher, role="noheader"]
 ----
-CREATE (movie:$($label))
+CREATE (movie:$($label)),
+       ()-[r:$($type)]->()
 ----
 
 [source, cypher, role="noheader"]
 ----
-MERGE (movie:$($label))
+MERGE (movie:$($label)),
+      ()-[r:$($type)]->()
 ----
 
 [source, cypher, role="noheader"]
@@ -104,7 +107,7 @@ LOAD CSV WITH HEADERS FROM 'file:///artists-with-headers.csv' AS line
 CREATE (n:$(line.label) {name: line.Name})
 ----
 
-| Added the ability reference node labels and relationship types in xref:clauses/match.adoc#dynamic-match[`MATCH`], xref:clauses/create.adoc#dynamic-create[`CREATE`], and xref:clauses/merge.adoc#dynamic-merge[`MERGE`] clauses.
+| Added the ability to dynamically reference node labels and relationship types in xref:clauses/match.adoc#dynamic-match[`MATCH`], xref:clauses/create.adoc#dynamic-create[`CREATE`], and xref:clauses/merge.adoc#dynamic-merge[`MERGE`] clauses.
 Also introduced the ability to specify CSV columns dynamically when using xref:clauses/load-csv.adoc#dynamic-load[`LOAD CSV`].
 |===