Merge branch cypher-25 into dev

Author: NataliaIvakina

.github/workflows/docs-pr-checks.yml

@@ -8,6 +8,7 @@ on:
       - 'main'
       - '5.x'
       - '4.4'
+      - 'cypher-25'
 
 jobs:
 

models/hospital/access-control-old.adoc

@@ -5,7 +5,11 @@
 
 When creating a database, administrators may want to establish which users have the ability to access certain information.
 
+<<<<<<< HEAD
 As described in xref:authentication-authorization/built-in-roles.adoc[Built-in roles], Neo4j already offers preset roles configured to specific permissions (i.e. read, edit, or write).
+=======
+As described in xref:authentication-authorization/built-in-roles/auth-built-in-roles[Built-in roles], Neo4j already offers preset roles configured to specific permissions (i.e. read, edit, or write).
+>>>>>>> cypher-25
 While these built-in roles cover many common daily scenarios, it is also possible to create custom roles for specific needs.
 
 This page contains an example that illustrates various aspects of security and fine-grained access control.

modules/ROOT/pages/authentication-authorization/database-administration.adoc

@@ -179,7 +179,7 @@ Use `REVOKE` if you want to remove a privilege.
 ====
 
 Common errors, such as misspellings or attempts to revoke privileges that have not been granted or denied, will lead to notifications.
-Some of these notifications may be replaced with errors in a future major version of Neo4j.
+In Cypher 25, notifications for impossible `REVOKE` commands, where a user, a role, or a database does not exist, have been replaced with errors.
 See link:{neo4j-docs-base-uri}/status-codes/{page-version}/notifications/all-notifications[Status Codes for Errors & Notifications -> Server notifications] for details on notifications.
 
 The hierarchy between the different database privileges is shown in the image below.

modules/ROOT/pages/authentication-authorization/manage-privileges.adoc

@@ -197,7 +197,7 @@ Use `REVOKE` if you want to remove a privilege.
 ====
 
 Common errors, such as misspellings or attempts to revoke privileges that have not been granted or denied, will result in notifications.
-Some of these notifications may be replaced with errors in a future major version of Neo4j.
+In Cypher 25, notifications for impossible `REVOKE` commands, where a user, a role, or a database does not exist, have been replaced with errors.
 See link:{neo4j-docs-base-uri}/status-codes/{page-version}/notifications/all-notifications[Status Codes -> Notification codes] for details on notifications.
 
 The general `GRANT` and `DENY` syntaxes are illustrated in the following image:

modules/ROOT/pages/authentication-authorization/manage-roles.adoc

@@ -814,7 +814,7 @@ REVOKE ROLES role1, role2 FROM user1, user2, user3
 ----
 
 Common errors, such as misspellings or attempts to revoke roles from users who have not been granted those roles, will lead to notifications.
-Some of these notifications may be replaced with errors in a future major version of Neo4j.
+In Cypher 25, notifications for impossible `REVOKE` commands, where a user, a role, or a database does not exist, have been replaced with errors.
 See link:{neo4j-docs-base-uri}/status-codes/{page-version}/notifications/all-notifications[Status Codes -> Notification codes] for details on notifications.
 
 [[access-control-drop-roles]]

modules/ROOT/pages/backup-restore/online-backup.adoc

@@ -465,14 +465,14 @@ bin/neo4j-admin database backup --to-path=azb://myStorageAccount/myContainer/myD
 [[diff-backup-as-parent]]
 === Perform a differential backup using the `--prefer-diff-as-parent` option
 
-By default, a differential backup (`--type=DIFF`) uses the *most recent non-empty* backup -- whether full or differential -- in the directory as its parent.
+By default, a differential backup (`--type=DIFF`) uses the *most recent non-empty* backup -- whether full or differential -- in the directory as its parent.
 
-The `--prefer-diff-as-parent` option changes this behavior and forces the backup job to use the *latest differential* backup as the parent, even if a newer full backup exists.
+The `--prefer-diff-as-parent` option changes this behavior and forces the backup job to use the *latest differential* backup as the parent, even if a newer full backup exists.
 
 This approach allows you to maintain a chain of differential backups for all transactions and restore to any point in time.
 Without this option, the transactions between the last full backup and a previous differential backup cannot be backed up as individual transactions.
 
-To use the `--prefer-diff-as-parent` option, set it to `true`.
+To use the `--prefer-diff-as-parent` option, set it to `true`.
 
 The following examples cover different scenarios for using the `--prefer-diff-as-parent` option.
 

modules/ROOT/pages/backup-restore/restore-backup.adoc

@@ -23,7 +23,8 @@ For more information, see xref:database-administration/standard-databases/create
 [NOTE]
 ====
 If you are using CDC, make sure you create the new database with the same `txLogEnrichment` value and handle the potential loss or corruption of CDC data in your CDC application.
-For more information, see the link:https://neo4j.com/docs/cdc/current/[Change Data Capture (CDC)] documentation.
+
+For more information, see the link:{neo4j-docs-base-uri}/cdc/{page-version}[Change Data Capture (CDC)] documentation.
 ====
 
 [NOTE]

modules/ROOT/pages/changes-deprecations-removals.adoc

@@ -475,7 +475,7 @@ Replaced by: xref:procedures.adoc#procedure_dbms_cluster_secondaryReplicationDis
 | Comment
 
 | xref:configuration/configuration-settings.adoc#config_dbms.routing.load_balancing.plugin[`dbms.routing.load_balancing.plugin`]
-|
+| 
 | {check-mark}
 | label:deprecated[Deprecated in 2025.05]
 

modules/ROOT/pages/database-administration/standard-databases/create-databases.adoc

@@ -19,6 +19,9 @@ For more information, see link:{neo4j-docs-base-uri}/upgrade-migration-guide/upg
 == Create databases
 
 You can create a database using the Cypher command `CREATE DATABASE`.
+The initial contents of the database depend on the state of the server and the options provided to the command.
+When no additional options are provided, `CREATE DATABASE` will attempt to mount any pre-existing store files in place (e.g., as the result of restoring a backup). 
+If no pre-existing store files are available, it will create an empty database.
 
 [NOTE]
 ====
@@ -36,6 +39,11 @@ See xref:database-internals/store-formats.adoc[Store formats], for more details
 
 === Syntax
 
+[options="header", width="100%", cols="1m,5a"]
+[.tabbed-example]
+=====
+[role=include-with-Cypher-5]
+======
 [options="header", width="100%", cols="1m,5a"]
 |===
 | Command | Syntax
@@ -57,13 +65,47 @@ CREATE OR REPLACE DATABASE name
 [OPTIONS "{" option: value[, ...] "}"]
 [WAIT [n [SEC[OND[S]]]]\|NOWAIT]
 ----
+|===
+
+======
 
+[role=include-with-Cypher-25]
+======
+
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
+| CREATE DATABASE
+|
+[source, syntax, role="noheader"]
+----
+CREATE DATABASE name [IF NOT EXISTS]
+[[SET] TOPOLOGY n PRIMAR{Y\|IES} [m SECONDAR{Y\|IES}]]
+[OPTIONS "{" option: value[, ...] "}"]
+[WAIT [n [SEC[OND[S]]]]\|NOWAIT]
+----
+
+[source, syntax, role="noheader"]
+----
+CREATE OR REPLACE DATABASE name
+[[SET] TOPOLOGY n PRIMAR{Y\|IES} [m SECONDAR{Y\|IES}]]
+[OPTIONS "{" option: value[, ...] "}"]
+[WAIT [n [SEC[OND[S]]]]\|NOWAIT]
+----
 |===
 
+======
+=====
+
 
 [[manage-databases-create-database-options]]
 === Options
 
+[.tabbed-example]
+=====
+[.include-with-cypher-5]
+======
+
 The `CREATE DATABASE` command can have a map of options, e.g. `OPTIONS {key: 'value'}`.
 
 [options="header"]
@@ -128,7 +170,70 @@ Starting from Neo4j 2025.01, you can use `existingData`, `seedURI`, `seedConfig`
 The `existingDataSeedInstance` and `existingDataSeedServer` are still not supported with the `CREATE OR REPLACE DATABASE` command.
 More details about seeding options can be found in xref::clustering/databases.adoc#cluster-seed[Seed a cluster].
 ====
+======
+[.include-with-cypher-25]
+======
+The `CREATE DATABASE [OR REPLACE]` command can have a map of options, e.g., `OPTIONS {key: 'value'}`.
 
+[options="header"]
+|===
+
+| Key | Value | Description
+
+|`existingDataSeedServer`
+| ID of the cluster server
+|
+Defines which server is used for seeding the data of the created database.
+The server ID can be found in the `serverId` column after running `SHOW SERVERS`.
+
+| `seedURI`
+| URI to a backup, a folder that contains backup artifacts or a dump from an existing database.
+|
+Defines a seed from an external source, which will be used to seed all servers.
+
+| `seedConfig`
+| Comma-separated list of configuration values.
+|
+For more information see xref::clustering/databases.adoc#cluster-seed-uri[Seed from URI].
+
+| `txLogEnrichment`
+| `FULL` \| `DIFF` \| `OFF`
+|
+Defines the level of enrichment applied to transaction logs for Change Data Capture (CDC) purposes.
+
+For details about enrichment mode, see link:{neo4j-docs-base-uri}/cdc/current/get-started/self-managed/#set-enrichment-mode/[Change Data Capture Manual -> Enable CDC on self-managed instances -> Set the enrichment mode].
+
+| `storeFormat`
+| `aligned` \| `standard` \| `high_limit` \| `block`
+|
+Defines the store format if the database created is new.
+`high_limit` and `standard` formats are deprecated from 5.23.
+For more information on store formats, see xref::database-internals/store-formats.adoc[Store formats].
+
+If the store is seeded with `seedURI` or `existingDataSeedServer`, or if the command is used to mount pre-existing store files already present on the disk, they will retain their current store format without any modifications.
+
+| `seedRestoreUntil`
+| Datetime or transaction id. E.g. `datetime("2025-01-01T12:15:00.000+0100")` or `123456`
+| 
+If you are passing a `seedURI` that leads to a backup chain, including differential backups, you can choose to not apply all the transactions in the differential backups.
+To seed up to a specific date, specify a `datetime`.
+This will seed the database with transactions committed before the provided timestamp.
+To seed up to a specific transaction ID, specify a transaction ID.
+This will seed the database with transactions up to, but not including the specified transaction.
+
+| `seedSourceDatabase`
+| A source database name
+|
+If the `seedURI` points to a folder containing backups for multiple databases, you can specify the database name to filter the artifacts.
+
+| `existingData` label:deprecated[Deprecated]
+| `use`
+|
+Included for backward compatibility only, has no effect and will be removed in a future version.
+
+|===
+======
+=====
 
 === Examples
 
@@ -164,7 +269,11 @@ SHOW DATABASES YIELD name
 
 ==== Create a database with xref:database-administration/standard-databases/wait-options.adoc[`WAIT`]
 
-Sub-clause `WAIT` allows you to specify a time limit in which the command must complete and return.
+[.tabbed-example]
+=====
+[.include-with-cypher-5]
+======
+Sub-clause `WAIT` allows you to specify a time limit for the command to complete and return.
 
 [source, cypher]
 ----
@@ -183,7 +292,33 @@ CREATE DATABASE slow WAIT 5 SECONDS
 
 The `success` column provides an aggregate status of whether or not the command is considered successful.
 Thus, every row has the same value, determined on a successful completion without a timeout.
+======
+[.include-with-cypher-25]
+======
+Sub-clause `WAIT` allows you to specify a time limit for the command to complete and return.
+
+[source, cypher]
+----
+CREATE DATABASE slow WAIT 5 SECONDS
+----
+
+.Result
+[role="queryresult"]
+----
+info: Server `ServerId{b55c6551}` at address `server1:7687` has caught up.
+03N85 (Neo.ClientNotification.Cluster.ServerCaughtUp)
+
+info: Server `ServerId{a9e7e8f1}` at address `server2:7687` has caught up.
+03N85 (Neo.ClientNotification.Cluster.ServerCaughtUp)
+
+info: Server `ServerId{0f7cb48e}` at address `server3:7687` has caught up.
+03N85 (Neo.ClientNotification.Cluster.ServerCaughtUp)
+----
 
+The command returns a notification for each server in the cluster to indicate the status of that command on that server.
+In this example, all three cluster members have returned `Neo.ClientNotification.Cluster.ServerCaughtUp`, which indicates that the server has applied the command successfully and is up to date.
+======
+=====
 
 ==== Create databases with `IF NOT EXISTS` or `OR REPLACE`
 

modules/ROOT/pages/database-administration/standard-databases/naming-databases.adoc

@@ -20,9 +20,9 @@ Support for database names starting with a numeric character is available from N
 The `-` (dash) and `.` (dot) characters are not legal in Cypher variables.
 Names containing a `-` or that begin with a numeric character must be enclosed within backticks.
 For example, `CREATE DATABASE ++`main-db`++` is a valid database name.
-Database names are the only identifier for which dots do not need to be quoted.
-For example `main.db` is a valid database name.
-However, this behavior is deprecated due to the difficulty of determining if a dot is part of the database name or a delimiter for a database alias in a composite database.
+In Cypher 25, names that contain a dot (`.`) must be quoted in backticks.
+However, using dots in database names is not recommended, as it makes it difficult to determine if a dot is part of the database name or a delimiter for a database alias in a composite database.
+A future version of Neo4j may entirely disallow database names with dots.
 ====
 
 It is possible to create an alias to refer to an existing database to avoid these restrictions.