Merge branch 'dev' into dev-clauseComposition_WriteReadConflicts

Author: rsill-neo4j

antora.yml

@@ -7,4 +7,4 @@ nav:
 - modules/ROOT/content-nav.adoc
 asciidoc:
   attributes:
-    neo4j-version: '2025.06'
+    neo4j-version: '2025.07'

modules/ROOT/pages/appendix/gql-conformance/supported-optional.adoc

@@ -106,7 +106,7 @@ These codes order the features in the table below.
 
 | GD01
 | Updatable graphs
-| xref:clauses/clause-composition.adoc#writing-clauses[Cypher clauses -> Writing clauses]
+| xref:clauses/index.adoc#writing-clauses[Cypher clauses -> Writing clauses]
 | * Feature GD01 implies compliance with GQL feature GT01, "Explicit transaction commands", which states that conforming languages shall contain the following transaction control commands: `START TRANSACTION`, `ROLLBACK`, and `COMMIT`.
 These are not present in Cypher.
 However, Neo4j offers transaction management through the link:{neo4j-docs-base-uri}/create-applications[driver] transaction API.

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

@@ -341,6 +341,112 @@ a|
 label:functionality[]
 label:new[]
 
+[source, cypher, role="noheader"]
+----
+CREATE [COMPOSITE] DATABASE actors SET DEFAULT LANGUAGE CYPHER 25
+----
+
+a| Set the default Cypher version for a standard or composite database when creating it.
+The available versions are `CYPHER 25` and `CYPHER 5`.
+If not specified, the default language for the database is set to the default language of the DBMS.
+For more information, see the following sections in the Operations Manual:
+
+* link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/standard-databases/create-databases/#_set_a_default_cypher_version_for_a_standard_database[Set a default Cypher version for a standard database].
+* link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/create-composite-databases/#composite-databases-default-language[Set the default Cypher version for a composite database].
+
+a|
+label:functionality[]
+label:new[]
+
+[source, cypher, role="noheader"]
+----
+CREATE ALIAS `remote-with-default-language`
+FOR DATABASE `northwind-graph-2020`
+	AT "neo4j+s://location:7687"
+	USER alice
+	PASSWORD 'example_secret'
+	DEFAULT LANGUAGE CYPHER 25
+----
+
+a| Set the default Cypher version for a remote database alias when creating it.
+The available versions are `CYPHER 5` and `CYPHER 25`.
+Local database aliases and database aliases in composite databases cannot be assigned a default Cypher version.
+Local database aliases always have the Cypher version of their target database and database aliases in composite databases always have the Cypher version of the composite database they belong to.
+For more information, see the link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/aliases/manage-aliases-standard-databases/#_set_a_default_cypher_version_for_remote_database_aliases[Operations Manual -> Set a default Cypher version for remote database aliases].
+
+a|
+label:functionality[]
+label:new[]
+[source, cypher, role="noheader"]
+----
+ALTER DATABASE movies SET DEFAULT LANGUAGE CYPHER 25
+----
+
+a| Alter the default Cypher version of an existing standard or composite database.
+The available versions are `CYPHER 25` and `CYPHER 5`.
+For more information, see the link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/standard-databases/alter-databases/#alter-database-default-language[Operations Manual -> Alter the default Cypher version of an existing database].
+
+a|
+label:functionality[]
+label:new[]
+
+[source, cypher, role="noheader"]
+----
+ALTER ALIAS `remote-with-default-language` SET DATABASE DEFAULT LANGUAGE CYPHER 25
+----
+
+a| Alter the default Cypher version of a remote database alias.
+The available versions are `CYPHER 25` and `CYPHER 5`.
+It is not possible to alter the default Cypher version of a local database alias or an alias belonging to a composite database.
+Local database aliases always have the Cypher version of their target database and aliases belonging to composite databases always have the Cypher version of the composite database.
+For more information, see the link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/aliases/manage-aliases-standard-databases/#alter-default-language-remote-database-alias[Operations Manual -> Alter the default Cypher version of a remote database alias].
+
+a|
+label:functionality[]
+label:new[]
+
+[source, cypher, role="noheader"]
+----
+SHOW DATABASES YIELD name, defaultLanguage
+----
+
+a| The new return column `defaultLanguage` for the `SHOW DATABASE` command returns the default language of a database.
+This column is not returned by default; it can only be returned using `YIELD`.
+For more information, see the link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/standard-databases/listing-databases/#_show_the_default_cypher_version_of_a_database[Operations Manual -> Show the default Cypher version of a database].
+
+a|
+label:functionality[]
+label:new[]
+
+[source, cypher, role="noheader"]
+----
+SHOW ALIAS `remote-with-default-language` FOR DATABASE YIELD name, defaultLanguage
+----
+
+a| The new return column `defaultLanguage` for the `SHOW ALIAS` command returns the default language of a database alias.
+This column is not returned by default; it can only be returned using `YIELD`.
+For more information, see the link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/aliases/manage-aliases-standard-databases/#manage-aliases-list[Operations Manual -> List database aliases].
+
+a|
+label:functionality[]
+label:new[]
+
+[source, cypher, role="noheader"]
+----
+CYPHER 25
+MATCH (n:Person)
+FILTER n.age < 35
+RETURN n.name AS name
+----
+
+a| New query option: `CYPHER 25`.
+Prepending a query with `CYPHER 25` ensures that a query is run with Cypher 25, regardless of the default language of a database.
+(The ability to select `CYPHER 5` was introduced in Neo4j 5.21).
+
+a|
+label:functionality[]
+label:new[]
+
 [source, cypher, role="noheader"]
 ----
 RETURN 1 AS a

modules/ROOT/pages/expressions/predicates/type-predicate-expressions.adoc

@@ -64,8 +64,8 @@ RETURN val, val IS NOT :: STRING AS notString
 |===
 
 
-[[type-predicate-NULL]]
-== Type predicate expressions for NULL
+[[type-predicate-null]]
+== Type predicate expressions for null
 
 All Cypher types includes the `null` value.
 Type predicate expressions can be appended with `NOT NULL`.

modules/ROOT/pages/patterns/match-modes.adoc

@@ -95,7 +95,7 @@ RETURN pathCount,
        [r IN relationships(samplePath) | r.id] AS samplePathBridges
 ----
 
-<1> The xref:functions/list.adoc#functions-collect[`collect()`] function collects all paths and `[0]` takes the first entry as the `samplePath`.
+<1> The xref:functions/aggregating.adoc#functions-collect[`collect()`] function collects all paths and `[0]` takes the first entry as the `samplePath`.
 
 .Result
 [role="queryresult",options="header,footer",cols="3*<m"]

modules/ROOT/pages/queries/index.adoc

@@ -6,7 +6,7 @@ It also explains how to select the version of Cypher in which queries are run, a
 
 * xref:queries/concepts.adoc[]
 * xref:queries/basic.adoc[]
-* xref:queries/select-version.adoc[]
+* xref:queries/select-version.adoc[] label:new[Introduced in Neo4j 2025.06]
 * xref:queries/composed-queries/index.adoc[]
 ** xref:queries/composed-queries/combined-queries.adoc[]
 ** xref:queries/composed-queries/conditional-queries.adoc[] label:new[Introduced in Neo4j 2025.06]

modules/ROOT/pages/queries/select-version.adoc

@@ -1,4 +1,5 @@
 :description: Information about how to select Cypher version for queries or databases.
+:page-role: new-2025.06
 
 = Select Cypher version
 
@@ -98,9 +99,9 @@ ALTER DATABASE actors SET DEFAULT LANGUAGE CYPHER 5
 ======
 =====
 
-Selecting `CYPHER 25` ensures that all queries run on that database will be executed using the language as it exists in the version of Neo4j that the database is currently running, provided it is on Neo4j 2025.06 or later (unless a query is prepended with xref:selection-query-cypher-version[`CYPHER 5`], which overrides this default).
+Selecting `CYPHER 25` ensures that all queries run on that database will be executed using Cypher 25 as it exists in the version of Neo4j that the database is currently running, provided it is on Neo4j 2025.06 or later (unless a query is prepended with xref:selection-query-cypher-version[`CYPHER 5`], which overrides this default).
 
-Selecting `CYPHER 5` as the default database language ensures that all queries run on that database uses the language as it existed at the time of the Neo4j 2025.06 release (unless a query is prepended with xref:selection-query-cypher-version[`CYPHER 25`], which overrides this default).
+Selecting `CYPHER 5` as the default database language ensures that all queries run on that database uses Cypher 5 as it existed at the time of the Neo4j 2025.06 release (unless a query is prepended with xref:selection-query-cypher-version[`CYPHER 25`], which overrides this default).
 Any changes introduced after the 2025.06 release will not affect the semantics of the query.
 
 [[config-database-upgrades]]
@@ -182,32 +183,36 @@ It is, therefore, recommended to set the default language to Cypher 25 and migra
 ======
 
 .Cypher 25 query on a Neo4j 2025.06+ database with Cypher 5 as default language
+// tag::queries_select_version_cypher_25[]
 [source,cypher]
 ----
 CYPHER 25
 MATCH (n:Order)-[r:SHIPPED_TO]->(:Address)
 SET n = properties(r)
 ----
+// end::queries_select_version_cypher_25[]
 
 ======
 
 [.include-with-Cypher-5]
 ======
 
 .Cypher 5 query on a Neo4j 2025.06+ database with Cypher 25 as default language
+// tag::queries_select_version_cypher_5[]
 [source,cypher]
 ----
 CYPHER 5
 MATCH (n:Order)-[r:SHIPPED_TO]->(:Address) 
 SET n = r
 ----
+// end::queries_select_version_cypher_5[]
 
 ======
 =====
 
-Selecting `CYPHER 25` ensures that the query will be executed using the language as it exists in the version of Neo4j that the database is currently running, provided it is on Neo4j 2025.06 or later.
+Selecting `CYPHER 25` ensures that the query will be executed using Cypher 25 as it exists in the version of Neo4j that the database is currently running, provided it is on Neo4j 2025.06 or later.
 
-Selecting `CYPHER 5` ensures that the query will be executed using the language as it existed at the time of the Neo4j 2025.06 release.
+Selecting `CYPHER 5` ensures that the query will be executed using Cypher 5 as it existed at the time of the Neo4j 2025.06 release.
 Any changes introduced after the 2025.06 release will not affect the query.
 
 [[procedures-and-functions]]