conflict fix

Author: JPryce-Aklundh

antora.yml

@@ -7,5 +7,5 @@ nav:
 asciidoc:
   attributes:
     neo4j-version: '5'
-    neo4j-version-minor: '5.25'
-    neo4j-version-exact: '5.25.0'
+    neo4j-version-minor: '5.26'
+    neo4j-version-exact: '5.26.0'

modules/ROOT/pages/appendix/tutorials/advanced-query-tuning.adoc

@@ -15,7 +15,7 @@ Let's explain how to use these features with a more advanced query tuning exampl
 
 [NOTE]
 ====
-If you are upgrading an existing store to {neo4j-version-exact}, it may be necessary to drop and re-create existing indexes.
+If you are upgrading an existing store, it may be necessary to drop and re-create existing indexes.
 For information on native index support and upgrade considerations regarding indexes, see link:{neo4j-docs-base-uri}/operations-manual/{page-version}/performance/index-configuration[Operations Manual -> Performance -> Index configuration].
 ====
 
@@ -936,10 +936,10 @@ Predicates that will not work:
 
 [NOTE]
 ====
-If there is an existence constraint on the property, no predicate is required to trigger the optimization.
+If there is a xref:constraints/managing-constraints.adoc#create-property-existence-constraints[property existence constraint] on the property, no predicate is required to trigger the optimization.
 For example, `CREATE CONSTRAINT constraint_name FOR (p:Person) REQUIRE p.name IS NOT NULL`
 
-As of Neo4j {neo4j-version-exact}, predicates with parameters, such as `WHERE n.prop > $param`, can trigger _index-backed ORDER BY_.
+Predicates with parameters, such as `WHERE n.prop > $param`, can trigger _index-backed ORDER BY_.
 The only exception are queries with parameters of type `POINT`.
 ====
 

modules/ROOT/pages/clauses/match.adoc

@@ -158,14 +158,13 @@ RETURN n AS connectedNodes
 |===
 | connectedNodes
 | (:Movie {title: "Wall Street"})
-
 1+d| Rows: 1
 |===
 
 [[directed-relationship-patterns]]
 === Directed relationship patterns
 
-The direction of a relationship in a pattern is indicated by arrows: `-->` or `<--`.
+The direction of a relationship in a pattern is indicated by arrows: `+-->+` or `+<--+`.
 
 .Find all nodes connected to `Oliver Stone` by an outgoing relationship.
 [source, cypher]

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

@@ -100,6 +100,50 @@ To continue using variables with this name, use backticks to escape the variable
 * `CASE x ... WHEN ++`in`++[1] THEN ... END` 
 * `CASE x ... WHEN ++`in`++["abc"] THEN ... END`
 
+
+a|
+label:functionality[]
+label:deprecated[]
+[source, cypher, role="noheader"]
+----
+CALL db.schema.nodeTypeProperties() YIELD propertyTypes RETURN propertyTypes;
+CALL db.schema.relTypeProperties() YIELD propertyTypes RETURN propertyTypes;
+----
+a|
+The column `propertyTypes` currently returned by the procedures link:{neo4j-docs-base-uri}/operations-manual/{page-version}/procedures/#procedure_db_schema_nodetypeproperties[`db.schema.nodeTypeProperties()`] and link:{neo4j-docs-base-uri}/operations-manual/{page-version}/procedures/#procedure_db_schema_reltypeproperties[`db.schema.relTypeProperties()`] produces a list of strings representing the potential Java types for a given property.
+In an upcoming major release of Neo4j, this will be updated to represent the possible Cypher types for that property instead.
+For all available Cypher types, see the section on xref::values-and-types/property-structural-constructed.adoc#types-synonyms[types and their synonyms].
+|===
+
+
+=== Updated features
+
+[cols="2", options="header"]
+|===
+| Feature
+| Details
+
+a|
+label:functionality[]
+label:updated[]
+[source, cypher, role="noheader"]
+----
+CREATE DATABASE foo TOPOLOGY $p PRIMARIES $s SECONDARIES
+----
+[source, cypher, role="noheader"]
+----
+ALTER DATABASE foo SET TOPOLOGY $p PRIMARIES $s SECONDARIES
+----
+| The link:{neo4j-docs-base-uri}/operations-manual/{page-version}/database-administration/standard-databases/create-databases/[`CREATE DATABASE`] and link:{neo4j-docs-base-uri}/operations-manual/{page-version}/database-administration/standard-databases/alter-databases/[`ALTER DATABASE`] commands now accept parameters for `TOPOLOGY` configuration.
+
+a|
+label:functionality[]
+label:updated[]
+[source, cypher, role="noheader"]
+----
+GRANT READ {*} ON GRAPH * FOR (n) WHERE n.createdAt > date('2024-10-25') TO regularUsers
+----
+| link:{neo4j-docs-base-uri}/operations-manual/{page-version}/authentication-authorization/property-based-access-control/[Property-based access control] now supports xref:values-and-types/spatial.adoc[spatial] and xref:values-and-types/temporal.adoc[temporal] values.
 |===
 
 

modules/ROOT/pages/functions/aggregating.adoc

@@ -63,11 +63,13 @@ CREATE
 ======
 
 .Query
+// tag::functions_aggregating_avg[]
 [source, cypher]
 ----
 MATCH (p:Person)
 RETURN avg(p.age)
 ----
+// end::functions_aggregating_avg[]
 
 The average of all the values in the property `age` is returned:
 
@@ -87,11 +89,13 @@ The average of all the values in the property `age` is returned:
 ======
 
 .Query
+// tag::functions_aggregating_duration_avg[]
 [source, cypher]
 ----
 UNWIND [duration('P2DT3H'), duration('PT1H45S')] AS dur
 RETURN avg(dur)
 ----
+// end::functions_aggregating_duration_avg[]
 
 The average of the two supplied `DURATION` values is returned:
 
@@ -133,11 +137,13 @@ The average of the two supplied `DURATION` values is returned:
 ======
 
 .Query
+// tag::functions_aggregating_collect[]
 [source, cypher]
 ----
 MATCH (p:Person)
 RETURN collect(p.age)
 ----
+// end::functions_aggregating_collect[]
 
 All the values are collected and returned in a single list:
 
@@ -189,11 +195,13 @@ The function `count(*)` can be used to return the number of nodes; for example,
 ======
 
 .Query
+// tag::functions_aggregating_count[]
 [source, cypher]
 ----
 MATCH (p:Person {name: 'Keanu Reeves'})-->(x)
 RETURN labels(p), p.age, count(*)
 ----
+// end::functions_aggregating_count[]
 
 The labels and `age` property of the start node `Keanu Reeves` and the number of nodes related to it are returned:
 
@@ -248,11 +256,13 @@ Instead of simply returning the number of rows with `count(*)`, the function `co
 ======
 
 .Query
+// tag::functions_aggregating_count_as_expression[]
 [source, cypher]
 ----
 MATCH (p:Person)
 RETURN count(p.age)
 ----
+// end::functions_aggregating_count_as_expression[]
 
 The number of nodes with the label `Person` and a property `age` is returned:
 (To calculate the sum, use `sum(n.age)`)
@@ -389,11 +399,13 @@ The highest of all the lists in the set -- in this case, the list `[1, 2]` -- is
 ======
 
 .Query
+// tag::functions_aggregating_max[]
 [source, cypher]
 ----
 MATCH (p:Person)
 RETURN max(p.age)
 ----
+// end::functions_aggregating_max[]
 
 The highest of all the values in the property `age` is returned:
 
@@ -486,11 +498,13 @@ The lowest of all the values in the set -- in this case, the list `['a', 'c', 23
 ======
 
 .Query
+// tag::functions_aggregating_min[]
 [source, cypher]
 ----
 MATCH (p:Person)
 RETURN min(p.age)
 ----
+// end::functions_aggregating_min[]
 
 The lowest of all the values in the property `age` is returned:
 
@@ -532,11 +546,13 @@ The lowest of all the values in the property `age` is returned:
 ======
 
 .Query
+// tag::functions_aggregating_percentile_cont[]
 [source, cypher]
 ----
 MATCH (p:Person)
 RETURN percentileCont(p.age, 0.4)
 ----
+// end::functions_aggregating_percentile_cont[]
 
 The 40th percentile of the values in the property `age` is returned, calculated with a weighted average:
 
@@ -579,11 +595,13 @@ The 40th percentile of the values in the property `age` is returned, calculated
 ======
 
 .Query
+// tag::functions_aggregating_percentile_disc[]
 [source, cypher]
 ----
 MATCH (p:Person)
 RETURN percentileDisc(p.age, 0.5)
 ----
+// end::functions_aggregating_percentile_disc[]
 
 The 50th percentile of the values in the property `age` is returned:
 
@@ -625,12 +643,14 @@ The 50th percentile of the values in the property `age` is returned:
 ======
 
 .Query
+// tag::functions_aggregating_stdev[]
 [source, cypher]
 ----
 MATCH (p:Person)
 WHERE p.name IN ['Keanu Reeves', 'Liam Neeson', 'Carrie Anne Moss']
 RETURN stDev(p.age)
 ----
+// end::functions_aggregating_stdev[]
 
 The standard deviation of the values in the property `age` is returned:
 
@@ -672,12 +692,14 @@ The standard deviation of the values in the property `age` is returned:
 ======
 
 .Query
+// tag::functions_aggregating_stdevp[]
 [source, cypher]
 ----
 MATCH (p:Person)
 WHERE p.name IN ['Keanu Reeves', 'Liam Neeson', 'Carrie Anne Moss']
 RETURN stDevP(p.age)
 ----
+// end::functions_aggregating_stdevp[]
 
 The population standard deviation of the values in the property `age` is returned:
 
@@ -719,11 +741,13 @@ The population standard deviation of the values in the property `age` is returne
 ======
 
 .Query
+// tag::functions_aggregating_sum[]
 [source, cypher]
 ----
 MATCH (p:Person)
 RETURN sum(p.age)
 ----
+// end::functions_aggregating_sum[]
 
 The sum of all the values in the property `age` is returned:
 
@@ -744,11 +768,13 @@ The sum of all the values in the property `age` is returned:
 ======
 
 .Query
+// tag::functions_aggregating_sum_duration[]
 [source, cypher]
 ----
 UNWIND [duration('P2DT3H'), duration('PT1H45S')] AS dur
 RETURN sum(dur)
 ----
+// end::functions_aggregating_sum_duration[]
 
 The sum of the two supplied durations is returned:
 

modules/ROOT/pages/functions/database.adoc

@@ -26,11 +26,13 @@
 ======
 
 .Query
+// tag::functions_database_name_from_element_id[]
 [source, cypher, indent=0]
 ----
 WITH "2:efc7577d-022a-107c-a736-dbcdfc189c03:0" AS eid
 RETURN db.nameFromElementId(eid) AS name
 ----
+// end::functions_database_name_from_element_id[]
 
 Returns the name of the database which the element id belongs to.
 

modules/ROOT/pages/functions/graph.adoc

@@ -34,10 +34,12 @@ CREATE ALIAS composite.third FOR DATABASE dbc;
 ----
 
 .Query
+// tag::functions_graph_names[]
 [source, cypher, indent=0]
 ----
 RETURN graph.names() AS name
 ----
+// end::functions_graph_names[]
 
 The names of all graphs on the current composite database are returned.
 
@@ -91,11 +93,13 @@ CREATE ALIAS composite.third FOR DATABASE dbc
 ----
 
 .Query
+// tag::functions_graph_properties_by_name[]
 [source, cypher, indent=0]
 ----
 UNWIND graph.names() AS name
 RETURN name, graph.propertiesByName(name) AS props
 ----
+// end::functions_graph_properties_by_name[]
 
 Properties for all graphs on the current composite database are returned.
 
@@ -150,7 +154,8 @@ For more information, see xref:subqueries/call-subquery.adoc#import-variables[CA
 ======
 
 .Query
-[source, cypher, indent=0]
+// tag::functions_graph_by_name[]
+[source, cypher, role=noplay]
 ----
 UNWIND graph.names() AS graphName
 CALL () {
@@ -160,6 +165,7 @@ CALL () {
 }
 RETURN n
 ----
+// end::functions_graph_by_name[]
 
 Returns all nodes from all graphs on the current composite database.
 
@@ -194,10 +200,12 @@ For more information, see xref:subqueries/call-subquery.adoc#import-variables[CA
 In this example, it is assumed that the DBMS contains a composite database constituent, which contains the element id `4:c0a65d96-4993-4b0c-b036-e7ebd9174905:0`.
 
 .Query
+// tag::functions_graph_by_element_id[]
 [source, cypher, role=test-skip]
 ----
 USE graph.byElementId("4:c0a65d96-4993-4b0c-b036-e7ebd9174905:0")
 MATCH (n) RETURN n
 ----
+// end::functions_graph_by_element_id[]
 
 ======