diff --git a/modules/ROOT/pages/clauses/use.adoc b/modules/ROOT/pages/clauses/use.adoc index 69d43792d..e549018b4 100644 --- a/modules/ROOT/pages/clauses/use.adoc +++ b/modules/ROOT/pages/clauses/use.adoc @@ -36,7 +36,7 @@ Targeting multiple databases is not allowed, unless connected to a composite dat 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. == USE clause when connected to a composite database -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 *`. +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 *`. === Position of use clauses When running queries against a composite database, the `USE` clause can appear as the first clause of: diff --git a/modules/ROOT/pages/deprecations-additions-removals-compatibility.adoc b/modules/ROOT/pages/deprecations-additions-removals-compatibility.adoc index 7e2276a36..80e6827c3 100644 --- a/modules/ROOT/pages/deprecations-additions-removals-compatibility.adoc +++ b/modules/ROOT/pages/deprecations-additions-removals-compatibility.adoc @@ -598,7 +598,7 @@ If not specified, the default language for the database is set to the default la 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]. +* 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]. a| label:functionality[] @@ -1363,7 +1363,7 @@ DROP [COMPOSITE] DATABASE ... [RESTRICT \| CASCADE ALIAS[ES]] | Added the ability to drop database aliases while deleting a database. This will affect local database aliases targeting the database and constituent database aliases belonging to the composite database. -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]. +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]. a| label:functionality[] diff --git a/modules/ROOT/pages/functions/graph.adoc b/modules/ROOT/pages/functions/graph.adoc index c62c6a785..a47a2ad7a 100644 --- a/modules/ROOT/pages/functions/graph.adoc +++ b/modules/ROOT/pages/functions/graph.adoc @@ -16,7 +16,7 @@ .Considerations |=== -| `graph.names()` is only supported on link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/concepts/[composite databases]. +| `graph.names()` is only supported on link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[composite databases]. |=== .+graph.names()+ @@ -71,7 +71,7 @@ The names of all graphs on the current composite database are returned. .Considerations |=== -| `graph.propertiesByName()` is only supported on link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/concepts/[composite databases]. +| `graph.propertiesByName()` is only supported on link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[composite databases]. | 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. |=== diff --git a/modules/ROOT/pages/functions/scalar.adoc b/modules/ROOT/pages/functions/scalar.adoc index 5ef22862c..9f486d832 100644 --- a/modules/ROOT/pages/functions/scalar.adoc +++ b/modules/ROOT/pages/functions/scalar.adoc @@ -383,8 +383,8 @@ It is therefore recommended to use application-generated IDs instead. [NOTE] ==== -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. -It is recommended to use xref:functions/scalar.adoc#functions-elementid[`elementId()`] instead. +On a link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[composite database], the `id()` function should be used with caution. +It is recommended to use xref:functions/scalar.adoc#functions-elementid[`elementId()`] instead. When called in database-specific subqueries, the resulting ID value for a node or relationship is local to that database. The local ID for nodes or relationships from different databases may be the same. diff --git a/modules/ROOT/pages/introduction/cypher-neo4j.adoc b/modules/ROOT/pages/introduction/cypher-neo4j.adoc index 2edbedf60..b458d2f07 100644 --- a/modules/ROOT/pages/introduction/cypher-neo4j.adoc +++ b/modules/ROOT/pages/introduction/cypher-neo4j.adoc @@ -74,7 +74,7 @@ Normally there is only one graph within each database, and many administrative c Cypher queries executed in a session may declare which graph they apply to, or use a default, given by the session. Composite databases can contain multiple graphs, by means of aliases to other databases. Queries submitted to composite databases may refer to multiple graphs within the same query. -For more information, see link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/concepts/[Operations manual -> Composite databases]. +For more information, see link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[Operations manual -> Composite databases]. *Database*:: A database is a storage and retrieval mechanism for collecting data in a defined space on disk and in memory. diff --git a/modules/ROOT/pages/queries/select-version.adoc b/modules/ROOT/pages/queries/select-version.adoc index 2bdf362a9..8074597d2 100644 --- a/modules/ROOT/pages/queries/select-version.adoc +++ b/modules/ROOT/pages/queries/select-version.adoc @@ -100,10 +100,10 @@ For more information about how to change and view the default language of new an * link:{neo4j-docs-base-uri}/operations-manual/current/configuration/cypher-version-configuration/[Configure the Cypher default version] * 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 a default Cypher version for a composite database] +* link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/create-composite-databases/#composite-databases-default-language[Set a default Cypher version for a composite database] * link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/aliases/manage-aliases-standard-databases/#set-default-language-for-remote-database-aliases[Set a default Cypher version for remote database aliases] * link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/standard-databases/alter-databases/#alter-database-default-language[Alter the default Cypher version of an existing database] -* link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/alter-composite-databases/#alter-default-language-composite-database[Alter the default Cypher version of a composite database] +* link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/alter-composite-databases/#alter-default-language-composite-database[Alter the default Cypher version of a composite database] * link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/aliases/manage-aliases-standard-databases/#alter-default-language-remote-database-alias[Alter the default Cypher version of a remote database alias] * link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/standard-databases/listing-databases/#_show_the_default_cypher_version_of_a_database[Show the default Cypher version of a database] * link:{neo4j-docs-base-uri}/operations-manual/current/authentication-authorization/dbms-administration/#_grant_privilege_to_modify_the_default_language_of_standard_databases[Grant privilege to modify the default language of standard databases] @@ -122,7 +122,7 @@ The following example demonstrates how a query that works in Cypher 5 can be rew .Original Cypher 5 query [source, cypher, role=test-skip] ---- -MATCH (n:Order)-[r:SHIPPED_TO]->(:Address) +MATCH (n:Order)-[r:SHIPPED_TO]->(:Address) SET n = r ---- @@ -170,7 +170,7 @@ SET n = properties(r) [source,cypher] ---- CYPHER 5 -MATCH (n:Order)-[r:SHIPPED_TO]->(:Address) +MATCH (n:Order)-[r:SHIPPED_TO]->(:Address) SET n = r ---- // end::queries_select_version_cypher_5[] diff --git a/modules/ROOT/pages/subqueries/subqueries-in-transactions.adoc b/modules/ROOT/pages/subqueries/subqueries-in-transactions.adoc index a6ade238e..4907a5495 100644 --- a/modules/ROOT/pages/subqueries/subqueries-in-transactions.adoc +++ b/modules/ROOT/pages/subqueries/subqueries-in-transactions.adoc @@ -220,7 +220,7 @@ For larger data sets, you might want to use larger batch sizes, such as `10000 R [[composite-databases]] == Composite databases -`CALL { ... } IN TRANSACTIONS` can be used with link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/concepts/[composite databases]. +`CALL { ... } IN TRANSACTIONS` can be used with link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[composite databases]. Even though composite databases allow accessing multiple graphs in a single query, only one graph can be modified in a single transaction. `CALL { ... } IN TRANSACTIONS` offers a way of constructing queries which modify multiple graphs. @@ -431,7 +431,7 @@ RETURN n.num 1+d|Rows: 4 |=== -In this case, the first inner transaction includes `i = 1` and `i = 0`. +In this case, the first inner transaction includes `i = 1` and `i = 0`. Since `i = 0` causes an error, the entire transaction is rolled back, resulting in `null` for both elements. ===== @@ -519,7 +519,7 @@ RETURN n.num In the following example, `ON ERROR FAIL` is used after the failed inner transaction to prevent the remaining inner transactions from executing and to cause the outer transaction to fail as well. -.Transactions batched in 1 row with `ON ERROR FAIL` +.Transactions batched in 1 row with `ON ERROR FAIL` [source, cypher, role=test-fail] ---- UNWIND [1, 0, 2, 4] AS i diff --git a/modules/ROOT/pages/values-and-types/graph-references.adoc b/modules/ROOT/pages/values-and-types/graph-references.adoc index a679c95f7..4fc57b412 100644 --- a/modules/ROOT/pages/values-and-types/graph-references.adoc +++ b/modules/ROOT/pages/values-and-types/graph-references.adoc @@ -16,7 +16,7 @@ A static graph reference is a direct reference to a graph in a database. These include: * Database and alias names when managing link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/[databases and aliases]: `CREATE DATABASE `. -* Database and alias names when selecting a graph with the `USE` clause: `USE ` or `USE .` (for constituents of a link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/concepts/[composite databases]). +* Database and alias names when selecting a graph with the `USE` clause: `USE ` or `USE .` (for constituents of a link:{neo4j-docs-base-uri}/operations-manual/current/scalability/composite-databases/concepts/[composite databases]). [[dynamic-graph-references]] == Dynamic graph references