5.8 dev reconciliation

README.adoc

@@ -1,6 +1,6 @@
 = Neo4j Cypher Manual
 
-== Build
+== Building locally
 
 === Prereqs
 
@@ -27,14 +27,14 @@ npm run build
 
 To view the built site, launch a local server:
 
-1. `npm start`
-2. In a browser tab, go to `localhost:8000`
+. `npm start`
+. In a browser tab, go to `localhost:8000`
 
 === Live preview
 
 When you run `npm start`, the project is monitored for updates to asciidoc files.
 
-If a change to an asciidoc file is detected the site is automatically rebuilt.
+If a change to an asciidoc file is detected, the site is automatically rebuilt.
 
 
 === Errors

modules/ROOT/pages/administration/access-control/built-in-roles.adoc

@@ -453,8 +453,7 @@ To restore the role to its original capabilities two steps are needed.
 First, execute `DROP ROLE admin`.
 Secondly, run these queries:
 
-// we cannot test this right now cause we would delete the role the test user is logged with
-
+// cannot test as it would require deleting the role the test user is logged with
 [source, cypher, role=noplay test-skip]
 ----
 CREATE ROLE admin

modules/ROOT/pages/administration/access-control/manage-users.adoc

@@ -817,6 +817,7 @@ Users can change their password using `ALTER CURRENT USER SET PASSWORD`.
 The old password is required in addition to the new one, and either or both can be a string value or a string parameter.
 When a user executes this command it will change their password as well as set the `CHANGE NOT REQUIRED` flag.
 
+// can't test, don't want to hardcode test user password
 [source, cypher, role=test-skip]
 ----
 ALTER CURRENT USER

modules/ROOT/pages/administration/aliases.adoc

@@ -575,6 +575,7 @@ SHOW ALIAS `northwind` FOR DATABASE
 ======
 
 Local database aliases can also be given properties.
+These properties can then be used in queries with the xref::functions/graph.adoc#functions-graph-propertiesByName[`graph.propertiesByName()` function].
 
 .Query
 [source, cypher]
@@ -761,6 +762,7 @@ SHOW ALIAS `remote-with-driver-settings` FOR DATABASE YIELD *
 .+Setting properties for remote database aliases+
 ======
 Just as the local database aliases, the remote database aliases can be given properties.
+These properties can then be used in queries with the xref::functions/graph.adoc#functions-graph-propertiesByName[`graph.propertiesByName()` function].
 
 .Query
 [source, cypher]
@@ -1083,6 +1085,8 @@ ALTER ALIAS `movie scripts` SET DATABASE PROPERTIES { nameContainsSpace: true }
 System updates: 1
 Rows: 0
 ----
+
+The updated properties can then be used in queries with the xref::functions/graph.adoc#functions-graph-propertiesByName[`graph.propertiesByName()` function].
 ======
 
 .+Altering local and remote aliases in composite databases+
@@ -1113,6 +1117,8 @@ System updates: 1
 Rows: 0
 ----
 
+The updated properties can then be used in queries with the xref::functions/graph.adoc#functions-graph-propertiesByName[`graph.propertiesByName()` function].
+
 ======
 
 The changes for all database aliases will show up in the `SHOW ALIASES FOR DATABASE` command.

modules/ROOT/pages/administration/databases.adoc

@@ -611,15 +611,6 @@ CREATE COMPOSITE DATABASE inventory
 [role="statsonlyqueryresult"]
 0 rows, System updates: 1
 
-[NOTE]
-====
-Composite database names are subject to the same rules as standard databases.
-One difference is however that the deprecated syntax using dots without enclosing the name in backticks is not available.
-Both dots and dashes needs to be enclosed within backticks when using composite databases.
-
-
-====
-
 When a composite database has been created, it will show up in the listing provided by the command `SHOW DATABASES`.
 
 

modules/ROOT/pages/clauses/listing-settings.adoc

@@ -24,36 +24,44 @@ The `SHOW SETTINGS` command will produce a table with the following columns:
 
 
 .Show settings output
-[options="header", cols="4,6"]
+[options="header", cols="4,6,2"]
 |===
-| Column | Description
+| Column | Description | Type
 
 m| name
 a| The name of the setting. label:default-output[]
+m| STRING
 
 m| value
 a| The current value of the setting. label:default-output[]
+m| STRING
 
 m| isDynamic
 a|
 Whether the value of the setting can be updated dynamically, without restarting the server.
 For dynamically updating a setting value, see link:{neo4j-docs-base-uri}/operations-manual/{page-version}/configuration/dynamic-settings/[Update dynamic settings].
 label:default-output[]
+m| BOOLEAN
 
 m| defaultValue
 a| The default value of the setting. label:default-output[]
+m| STRING
 
 m| description
 a| The setting description. label:default-output[]
+m| STRING
 
 m| startupValue
 a| The value of the setting at last startup.
+m| STRING
 
 m| isExplicitlySet
 a| Whether the value of the setting is explicitly set by the user, either through configuration or dynamically.
+m| BOOLEAN
 
 m| validValues
 a| A description of valid values for the setting.
+m| STRING
 
 |===
 

modules/ROOT/pages/clauses/match.adoc

@@ -510,7 +510,7 @@ The following query adds two new paths between `Charlie Sheen` and his father `M
 The query makes evident that both actors had a leading role in the movie `No Code of Conduct`, but only `Martin Sheen` had a leading role in the movie `Free Money`.
 
 .Query
-[source, cypher, indent=0]
+[source, cypher]
 ----
 MATCH
   (charlie:Person {name: 'Charlie Sheen'}),

modules/ROOT/pages/clauses/merge.adoc

@@ -7,7 +7,7 @@
 == Introduction
 
 The `MERGE` clause either matches existing node patterns in the graph and binds them or, if not present, creates new data and binds that.
-In this way, it acts as a combination of `MATCH` and `CREATE` that allows for specific actions depending on whether the specified data was matched or created. 
+In this way, it acts as a combination of `MATCH` and `CREATE` that allows for specific actions depending on whether the specified data was matched or created.
 
 For example, `MERGE` can be used to specify that a graph must contain a node with a `Person` label and a specific `name` property.
 If there isn't a node with the specific `name` property, a new node will be created with that `name` property.
@@ -80,7 +80,7 @@ RETURN robert, labels(robert)
 A new node is created because there are no nodes labeled `Critic` in the database:
 
 .Result
-[role="queryresult",options="header,footer",cols="2*<m"]
+[role="queryresult",options="header",cols="2*<m"]
 |===
 | +robert+ | +labels(robert)+
 | +{}+ | +["Critic"]+
@@ -90,7 +90,7 @@ A new node is created because there are no nodes labeled `Critic` in the databas
 [[merge-merge-single-node-with-properties]]
 === Merge single node with properties
 
-Merging a node with properties that differ from the properties on existing nodes in the graph will create a new node: 
+Merging a node with properties that differ from the properties on existing nodes in the graph will create a new node:
 
 .Query
 [source, cypher]
@@ -102,7 +102,7 @@ RETURN charlie
 A new node with the name `'Charlie Sheen'` is created since not all properties matched those set to the pre-existing `'Charlie Sheen'` node:
 
 .Result
-[role="queryresult",options="header,footer",cols="1*<m"]
+[role="queryresult",options="header",cols="1*<m"]
 |===
 | +charlie+
 | +{"name":"Charlie Sheen","age":10}+
@@ -124,7 +124,7 @@ RETURN michael.name, michael.bornIn
 `'Michael Douglas'` is matched and the `name` and `bornIn` properties are returned:
 
 .Result
-[role="queryresult",options="header,footer",cols="2*<m"]
+[role="queryresult",options="header",cols="2*<m"]
 |===
 | +michael.name+ | +michael.bornIn+
 | +"Michael Douglas"+ | +"New Jersey"+
@@ -149,7 +149,7 @@ As the `'New York'` node is not matched for the first bound node, it is created.
 However, the newly-created `'New York'` node is matched and bound for the second and third bound nodes.
 
 .Result
-[role="queryresult",options="header,footer",cols="3*<m"]
+[role="queryresult",options="header",cols="3*<m"]
 |===
 | +person.name+ | +person.bornIn+ | +location+
 | +"Charlie Sheen"+ | +"New York"+ | +{name:"New York"}+
@@ -181,7 +181,7 @@ The query creates the `Person` node named `Keanu Reeves`, with a `bornIn` proper
 It also sets a timestamp for the `created` property.
 
 .Result
-[role="queryresult",options="header,footer",cols="2*<m"]
+[role="queryresult",options="header",cols="2*<m"]
 |===
 | +keanu.name+ | +keanu.created+
 | +"Keanu Reeves"+ | +1655200898563+
@@ -205,7 +205,7 @@ RETURN person.name, person.found
 The query finds all the `Person` nodes, sets a property on them, and returns them:
 
 .Result
-[role="queryresult",options="header,footer",cols="2*<m"]
+[role="queryresult",options="header",cols="2*<m"]
 |===
 | +person.name+ | +person.found+
 | +"Charlie Sheen"+ | +true+
@@ -235,7 +235,7 @@ Because the `Person` node named `Keanu Reeves` already exists, this query does n
 Instead, it adds a timestamp on the `lastSeen` property.
 
 .Result
-[role="queryresult",options="header,footer",cols="3*<m"]
+[role="queryresult",options="header",cols="3*<m"]
 |===
 | +keanu.name+ | +keanu.created+ | +keanu.lastSeen+
 | +"Keanu Reeves"+ | +1655200902354+ | +1674655352124+
@@ -259,7 +259,7 @@ RETURN person.name, person.found, person.lastAccessed
 ----
 
 .Result
-[role="queryresult",options="header,footer",cols="3*<m"]
+[role="queryresult",options="header",cols="3*<m"]
 |===
 | +person.name+ | +person.found+ | +person.lastAccessed+
 | +"Charlie Sheen"+ | +true+ | +1655200903558+
@@ -293,7 +293,7 @@ RETURN charlie.name, type(r), wallStreet.title
 Note that in order to match or create a relationship when using `MERGE`, at least one bound node must be specified, which is done via the `MATCH` clause in the above example.
 
 .Result
-[role="queryresult",options="header,footer",cols="3*<m"]
+[role="queryresult",options="header",cols="3*<m"]
 |===
 | +charlie.name+ | +type(r)+ | +wallStreet.title+
 | +"Charlie Sheen"+ | +"ACTED_IN"+ | +"Wall Street"+
@@ -318,7 +318,7 @@ When trying to `MERGE` a `Movie` node between them, Neo4j will not use any of th
 Instead, a new `Movie` node is created.
 
 .Result
-[role="queryresult",options="header,footer",cols="1*<m"]
+[role="queryresult",options="header",cols="1*<m"]
 |===
 | +movie+
 | +{}+
@@ -345,7 +345,7 @@ As `'Charlie Sheen'` and `'Oliver Stone'` do not know each other in the example
 The direction of the created relationship is arbitrary.
 
 .Result
-[role="queryresult",options="header,footer",cols="1*<m"]
+[role="queryresult",options="header",cols="1*<m"]
 |===
 | +r+
 | +{}+
@@ -371,7 +371,7 @@ The second `MERGE` creates a `BORN_IN` relationship between each person and a lo
 `'Charlie Sheen'`, `'Rob Reiner',` and `'Oliver Stone'` all have a `BORN_IN` relationship to the _same_ `Location` node (`'New York'`).
 
 .Result
-[role="queryresult",options="header,footer",cols="3*<m"]
+[role="queryresult",options="header",cols="3*<m"]
 |===
 | +person.name+ | +person.bornIn+ | +location+
 | +"Charlie Sheen"+ | +"New York"+ | +{name:"New York"}+
@@ -402,7 +402,7 @@ As `'Charlie Sheen'` and `'Michael Douglas'` both have a chauffeur with the same
 This is in contrast to the example shown above in xref::clauses/merge.adoc#merge-merge-on-a-relationship-between-two-existing-nodes[Merge on a relationship between two existing nodes], where the first `MERGE` was used to bind the `Location` nodes and to prevent them from being recreated (and thus duplicated) on the second `MERGE`.
 
 .Result
-[role="queryresult",options="header,footer",cols="3*<m"]
+[role="queryresult",options="header",cols="3*<m"]
 |===
 | +person.name+ | +person.chauffeurName+ | +chauffeur+
 | +"Charlie Sheen"+ | +"John Brown"+ | +{name:"John Brown"}+
@@ -446,7 +446,7 @@ RETURN laurence.name
 ----
 
 .Result
-[role="queryresult",options="header,footer",cols="1*<m"]
+[role="queryresult",options="header",cols="1*<m"]
 |===
 | +laurence.name+
 | +"Laurence Fishburne"+
@@ -466,7 +466,7 @@ RETURN oliver.name, oliver.bornIn
 ----
 
 .Result
-[role="queryresult",options="header,footer",cols="2*<m"]
+[role="queryresult",options="header",cols="2*<m"]
 |===
 | +oliver.name+ | +oliver.bornIn+
 | +"Oliver Stone"+ | +"New York"+
@@ -565,27 +565,28 @@ To use map parameters with `MERGE`, it is necessary to explicitly use the expect
 For more information on parameters, see xref::syntax/parameters.adoc[].
 
 .Parameters
-[source,javascript, indent=0]
+[source, javascript]
 ----
 {
   "param": {
     "name": "Keanu Reeves",
-    "role": "Neo"
+    "bornIn": "Beirut",
+    "chauffeurName": "Eric Brown"
   }
 }
 ----
 
 .Query
-[source, cypher, role=test-skip]
+[source, cypher]
 ----
-MERGE (person:Person {name: $param.name, role: $param.role})
-RETURN person.name, person.role
+MERGE (person:Person {name: $param.name, bornIn: $param.bornIn, chauffeurName: $param.chauffeurName})
+RETURN person.name, person.bornIn, person.chauffeurName
 ----
 
 .Result
-[role="queryresult",options="header,footer",cols="2*<m"]
+[role="queryresult",options="header",cols="3*<m"]
 |===
-| +person.name+ | +person.role+
-| +"Keanu Reeves"+ | +"Neo"+
+| person.name | person.bornIn | person.chauffeurName
+| "Keanu Reeves" | "Beirut" | "Eric Brown"
 |===
 

modules/ROOT/pages/clauses/use.adoc

@@ -55,12 +55,14 @@ When executing queries against a composite database, the `USE` clause must only
 [[query-use-examples]]
 == Examples
 
-To create the database `myDatabase`, run the following query in a Neo4j database: 
+////
 [source, cypher, role=test-setup]
 ----
 CREATE DATABASE myDatabase;
+CREATE COMPOSITE DATABASE `myComposite`;
+CREATE ALIAS `myComposite`.`myConstituent` FOR DATABASE `myDatabase`;
 ----
-
+////
 
 [[query-use-examples-query-graph]]
 === Query a graph
@@ -80,7 +82,7 @@ MATCH (n) RETURN n
 In this example it is assumed that the DBMS contains a composite database named `myComposite`, which includes an alias named `myConstituent`:
 
 .Query
-[source, cypher, role="test-skip"]
+[source, cypher]
 ----
 USE myComposite.myConstituent
 MATCH (n) RETURN n
@@ -95,14 +97,15 @@ The built-in function `graph.byName()` can be used in the `USE` clause to resolv
 This example uses a composite database named `myComposite` that includes an alias named `myConstituent`:
 
 .Query
-[source, cypher, role="test-skip"]
+[source, cypher]
 ----
 USE graph.byName('myComposite.myConstituent')
 MATCH (n) RETURN n
 ----
 
 The argument can be any expression that evaluates to the name of a constituent graph - for example a parameter:
-// this can only run under composite databases
+
+// can't run this through drivers, we need a value when initializing a session
 .Query
 [source, cypher, role=test-skip]
 ----