Skip to content

Commit 3d636f7

Browse files
Merge branch 'dev' into version_control_additions
2 parents 82c8609 + 6814407 commit 3d636f7

File tree

16 files changed

+1604
-1022
lines changed

16 files changed

+1604
-1022
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ on:
66
branches:
77
- "dev"
88
- "cypher-25"
9-
- "5.x"
10-
- "4.[0-9]"
11-
- "3.5"
12-
9+
- "cypher-5"
1310

1411
jobs:
1512

.github/workflows/docs-teardown.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ on:
66
branches:
77
- "dev"
88
- "cypher-25"
9-
- "5.x"
10-
- "4.[0-9]"
11-
- "3.5"
9+
- "cypher-5"
10+
1211
types:
1312
- closed
1413

antora.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: cypher-manual
22
title: Cypher Manual
33
version: '25'
4+
prerelease: true
45
start_page: ROOT:introduction/index.adoc
56
nav:
67
- modules/ROOT/content-nav.adoc
78
asciidoc:
89
attributes:
9-
neo4j-version: '2025.06'
10+
neo4j-version: '2025.07'

modules/ROOT/content-nav.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* xref:queries/index.adoc[]
77
** xref:queries/concepts.adoc[]
88
** xref:queries/basic.adoc[]
9+
** xref:queries/select-version.adoc[]
910
** xref:queries/composed-queries/index.adoc[]
1011
*** xref:queries/composed-queries/combined-queries.adoc[]
1112
*** xref:queries/composed-queries/conditional-queries.adoc[]

modules/ROOT/images/conditional-query-graph.svg

Lines changed: 27 additions & 0 deletions
Loading

modules/ROOT/images/conditional_query_graph.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

modules/ROOT/pages/appendix/gql-conformance/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:description: Overview of Cypher's conformance to GQL.
22
= GQL conformance
33

4-
*Last updated*: 2 June 2025 +
4+
*Last updated*: 18 June 2025 +
55
*Neo4j version*: 2025.06
66

77
GQL is the new link:https://www.iso.org/home.html[ISO] International Standard query language for graph databases.

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,8 @@ In Cypher, `trim()` removes any whitespace character.
211211
| 21.1
212212
| Names and variables
213213
| xref:syntax/index.adoc[]
214-
| Cypher supports GQL’s lexical elements, with the following caveats:
214+
| Cypher supports GQL’s lexical elements, with the following caveat:
215215

216-
* GQL allows for extended parameter identifiers.
217-
For example: `RETURN $0hello` is allowed in GQL but not Cypher.
218216
* GQL allows identifiers that are not variables to be delimited with both backticks and quotes.
219217
Cypher only allows backticks.
220218
For example: `MATCH (n) RETURN n."a prop"` is allowed in GQL but not Cypher.

0 commit comments

Comments
 (0)