Skip to content

Commit 13695ea

Browse files
authored
Merge branch 'dev' into dev_add_coll_functions
2 parents 7c8bc62 + f67ba8e commit 13695ea

File tree

12 files changed

+60
-65
lines changed

12 files changed

+60
-65
lines changed

antora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ nav:
77
- modules/ROOT/content-nav.adoc
88
asciidoc:
99
attributes:
10-
neo4j-version: '2025.10'
10+
neo4j-version: '2025.11'

modules/ROOT/pages/appendix/gql-conformance/analogous-cypher.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ These codes order the features in the table below.
3131
| * GQL's `PERCENTILE_CONT()` function is equivalent to Cypher's xref:functions/aggregating.adoc#functions-percentilecont[`percentileCont()`] function.
3232
* GQL's `PERCENTILE_DISC()` function is equivalent to Cypher's xref:functions/aggregating.adoc#functions-percentiledisc[`percentileDisc()`] function.
3333

34-
| GQ09
35-
| `LET` statement
36-
| Adds columns to the current working table.
37-
Cypher uses xref:clauses/with.adoc[`WITH`] instead.
38-
3934
| GQ10, GQ11, GQ23, GQ24
4035
| `FOR` statement: list value support, binding table support, `WITH ORDINALITY`, `WITH OFFSET`
4136
| Unnests a list or a binding table by expanding the current working table.

modules/ROOT/pages/clauses/use.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Targeting multiple databases is not allowed, unless connected to a composite dat
3636
When connected to a non-composite database, the `USE` clause can only appear as the prefix of schema commands, or as the first clause of queries. There may be multiple `USE` clauses as long as they target the same database.
3737

3838
== USE clause when connected to a composite database
39-
When executing queries against a link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/concepts/[composite database], the `USE` clause must only refer to graphs that are part of the current composite database. The constituents can be listed either with `RETURN graph.names()` when connected to the composite database or `SHOW DATABASES YIELD name, constituents RETURN *`.
39+
When executing queries against a link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[composite database], the `USE` clause must only refer to graphs that are part of the current composite database. The constituents can be listed either with `RETURN graph.names()` when connected to the composite database or `SHOW DATABASES YIELD name, constituents RETURN *`.
4040

4141
=== Position of use clauses
4242
When running queries against a composite database, the `USE` clause can appear as the first clause of:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ If not specified, the default language for the database is set to the default la
627627
For more information, see the following sections in the Operations Manual:
628628

629629
* 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].
630-
* 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].
630+
* link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/create-composite-databases/#composite-databases-default-language[Set the default Cypher version for a composite database].
631631

632632
a|
633633
label:functionality[]
@@ -1392,7 +1392,7 @@ DROP [COMPOSITE] DATABASE ... [RESTRICT \| CASCADE ALIAS[ES]]
13921392

13931393
| Added the ability to drop database aliases while deleting a database.
13941394
This will affect local database aliases targeting the database and constituent database aliases belonging to the composite database.
1395-
For more information, see link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/standard-databases/delete-databases/#delete-databases-with-aliases[Delete a database with local database aliases targeting it] and link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/delete-composite-databases/#composite-databases-delete-with-aliases[Delete a composite database with constituent database aliases].
1395+
For more information, see link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/standard-databases/delete-databases/#delete-databases-with-aliases[Delete a database with local database aliases targeting it] and link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/delete-composite-databases/#composite-databases-delete-with-aliases[Delete a composite database with constituent database aliases].
13961396

13971397
a|
13981398
label:functionality[]

modules/ROOT/pages/expressions/list-expressions.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ RETURN list[0] + [2] + list[1..] AS newList
301301
[[list-concatenation]]
302302
== List concatenation
303303

304-
Cypher contains two list concatenation operators: `||` and `+`.
304+
Cypher contains two list concatenation operators: `||` and `\+`.
305305
`||` is xref:appendix/gql-conformance/index.adoc[GQL conformant], while `+` is not.
306306

307307
.List concatenation using `||` and `+`

modules/ROOT/pages/functions/graph.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
.Considerations
1818
|===
19-
| `graph.names()` is only supported on link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/concepts/[composite databases].
19+
| `graph.names()` is only supported on link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[composite databases].
2020
|===
2121

2222
.+graph.names()+
@@ -71,7 +71,7 @@ The names of all graphs on the current composite database are returned.
7171

7272
.Considerations
7373
|===
74-
| `graph.propertiesByName()` is only supported on link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/concepts/[composite databases].
74+
| `graph.propertiesByName()` is only supported on link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[composite databases].
7575
| The properties in the returned `MAP` are set on the link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/aliases/manage-aliases-standard-databases/[alias]that adds the graph as a constituent of a composite database.
7676
|===
7777

modules/ROOT/pages/functions/scalar.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ It is therefore recommended to use application-generated IDs instead.
383383

384384
[NOTE]
385385
====
386-
On a link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/concepts/[composite database], the `id()` function should be used with caution.
387-
It is recommended to use xref:functions/scalar.adoc#functions-elementid[`elementId()`] instead.
386+
On a link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[composite database], the `id()` function should be used with caution.
387+
It is recommended to use xref:functions/scalar.adoc#functions-elementid[`elementId()`] instead.
388388
389389
When called in database-specific subqueries, the resulting ID value for a node or relationship is local to that database.
390390
The local ID for nodes or relationships from different databases may be the same.

modules/ROOT/pages/introduction/cypher-neo4j.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Normally there is only one graph within each database, and many administrative c
7474
Cypher queries executed in a session may declare which graph they apply to, or use a default, given by the session.
7575
Composite databases can contain multiple graphs, by means of aliases to other databases.
7676
Queries submitted to composite databases may refer to multiple graphs within the same query.
77-
For more information, see link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/concepts/[Operations manual -> Composite databases].
77+
For more information, see link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[Operations manual -> Composite databases].
7878

7979
*Database*:: A database is a storage and retrieval mechanism for collecting data in a defined space on disk and in memory.
8080

0 commit comments

Comments
 (0)