Skip to content

Commit 150d8f8

Browse files
Final Expressions (#1243)
This PR does the following: - Removes the old Expressions overview page (outdated). - Creates 2 new pages from its obliteration (values-and-types/numeric-string-boolean.adoc and values-and-types/graph-references) - Redirects any remaining links to the old Syntax/operators page (gone) and Expressions overview page
1 parent 86c25c0 commit 150d8f8

27 files changed

+176
-160
lines changed

modules/ROOT/content-nav.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,18 @@
5555
** xref:patterns/reference.adoc[]
5656
5757
* xref:values-and-types/index.adoc[]
58-
** xref:values-and-types/property-structural-constructed.adoc[]
59-
** xref:values-and-types/temporal.adoc[]
60-
** xref:values-and-types/spatial.adoc[]
61-
** xref:values-and-types/working-with-null.adoc[]
62-
** xref:values-and-types/lists.adoc[]
63-
** xref:values-and-types/maps.adoc[]
64-
** xref:values-and-types/casting-data.adoc[]
58+
** xref::values-and-types/property-structural-constructed.adoc[]
59+
** xref:values-and-types/boolean-numeric-string.adoc[]
60+
** xref::values-and-types/temporal.adoc[]
61+
** xref::values-and-types/spatial.adoc[]
62+
** xref::values-and-types/lists.adoc[]
63+
** xref::values-and-types/maps.adoc[]
64+
** xref:values-and-types/graph-references.adoc[]
65+
** xref::values-and-types/working-with-null.adoc[]
66+
** xref::values-and-types/casting-data.adoc[]
6567
** xref:values-and-types/ordering-equality-comparison.adoc[]
6668
6769
* xref:expressions/index.adoc[]
68-
** xref:expressions/expressions-overview.adoc[]
6970
** xref:expressions/predicates/index.adoc[]
7071
*** xref:expressions/predicates/boolean-operators.adoc[]
7172
*** xref:expressions/predicates/comparison-operators.adoc[]
@@ -135,7 +136,6 @@
135136
** xref:syntax/variables.adoc[]
136137
** xref:syntax/keywords.adoc[]
137138
** xref:syntax/parameters.adoc[]
138-
** xref:syntax/operators.adoc[]
139139
** xref:syntax/comments.adoc[]
140140
141141
* xref:deprecations-additions-removals-compatibility.adoc[]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ GQL supports `GRAPH TYPES` as a way of constraining a graph schema, but does not
620620
| Cypher feature
621621
| Description
622622

623-
| xref:syntax/operators.adoc#query-operator-comparison-string-specific[`STARTS WITH`, `CONTAINS`, `ENDS WITH`, and regular expressions].
623+
| xref:expressions/predicates/string-operators.adoc[`STARTS WITH`, `CONTAINS`, `ENDS WITH`, and regular expressions].
624624
| `STRING` comparison operators.
625625

626626
| xref:expressions/predicates/list-operators.adoc[`IN`]

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ The only way to guarantee row order in Neo4j is to use xref:clauses/order-by.ado
132132

133133
| 19.3
134134
| <comparison predicate>
135-
| xref:syntax/operators.adoc##query-operators-comparison[Comparison operators]
135+
| xref:expressions/predicates/comparison-operators.adoc[Comparison operators]
136136
|
137137

138138
| 19.4
@@ -152,12 +152,12 @@ The only way to guarantee row order in Neo4j is to use xref:clauses/order-by.ado
152152

153153
| 19.7
154154
| <normalized predicate>
155-
| xref:syntax/operators.adoc#match-string-is-normalized[`IS NORMALIZED`], xref:syntax/operators.adoc#match-string-is-not-normalized[`IS NOT NORMALIZED`]
155+
| xref:expressions/predicates/string-operators.adoc#string-normalization-operators[`IS NORMALIZED`,`IS NOT NORMALIZED`]
156156
|
157157

158158
| 20.2
159159
| <value expression primary>
160-
| xref:expressions/expressions-overview.adoc[]
160+
| xref:expressions/index.adoc[]
161161
|
162162

163163
| 20.3
@@ -194,7 +194,7 @@ For example, `RETURN sum(<expr>)` on an empty table returns `NULL` in GQL, but i
194194

195195
| 20.23
196196
| <string value expression>
197-
| xref:syntax/operators.adoc#syntax-concatenating-two-strings-doublebar[`STRING` concatenation operator (`\|\|`)]
197+
| xref:expressions/string-operators.adoc[`STRING` concatenation operator (`\|\|`)]
198198
|
199199

200200
| 20.24

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Cypher only supports xref:functions/mathematical-numeric.adoc#functions-ceil[`ce
128128
| Note the following exceptions:
129129

130130
* Cypher uses the xref:functions/mathematical-logarithmic.adoc#functions-log[`log()`] function instead of GQL's `LN()` function.
131-
* Cypher uses the xref:syntax/operators.adoc#syntax-using-the-exponentiation-operator[exponentiation operator (`^`)] instead of GQL's `POWER()` function.
131+
* Cypher uses the xref:expressions/mathematical-operators.adoc[exponentiation operator (`^`)] instead of GQL's `POWER()` function.
132132

133133
| GF05
134134
| Multi-character trim functions

modules/ROOT/pages/clauses/match.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ RETURN p.name AS actor, r.role AS role
387387
----
388388

389389
[NOTE]
390-
The above query uses the xref:syntax/operators.adoc#query-operator-comparison-string-specific[`CONTAINS` operator].
390+
The above query uses the xref:expressions/predicates/string-operators.adoc[`CONTAINS` operator].
391391

392392
.Result
393393
[role="queryresult",options="header,footer",cols="2*<m"]

modules/ROOT/pages/clauses/order-by.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
`ORDER BY` specifies how the output of a clause should be sorted.
77
It be used as a sub-clause following `RETURN` or `WITH`.
88

9-
`ORDER BY` relies on comparisons to sort the output, see xref::syntax/operators.adoc#cypher-ordering[Ordering and comparison of values].
9+
`ORDER BY` relies on comparisons to sort the output, see xref:values-and-types/ordering-equality-comparison.adoc[Ordering and comparison of values].
1010
You can sort on many different values, e.g. node/relationship properties, the node/relationship ids, or on most expressions.
1111

1212
[NOTE]

modules/ROOT/pages/clauses/use.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ When connected to a composite database, a graph reference may additionally be pa
2525

2626
* The graph function xref:functions/graph.adoc#functions-graph-byname[`graph.byName()`], which allows the graph reference to be resolved dynamically: `USE graph.byName(<string-expression>)`.
2727

28-
A more detailed description of how and when a graph references needs to be quoted and/or escaped is defined xref::expressions/expressions-overview.adoc#graphreferences[here].
28+
A more detailed description of how and when a graph references needs to be quoted and/or escaped is defined xref::values-and-types/graph-references.adoc#rules[here].
2929

3030
== USE clause when connected to a standard or system database
3131

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ USE graph.byName('tom`s-database')
178178
179179
USE graph.propertiesByName('database.with.dot')
180180
----
181-
| xref::expressions/expressions-overview.adoc#graphreferences[Graph references] in arguments of the functions xref:functions/graph.adoc#functions-graph-byname[`graph.byName`] and xref:functions/graph.adoc#functions-graph-propertiesByName[`graph.propertiesByName`] in Cypher 25 are parsed as `<symbolic-name>` or `<symbolic-name>.<symbolic-name>` and now support escaping names.
181+
| xref::values-and-types/graph-references.adoc[Graph references] in arguments of the functions xref:functions/graph.adoc#functions-graph-byname[`graph.byName`] and xref:functions/graph.adoc#functions-graph-propertiesByName[`graph.propertiesByName`] in Cypher 25 are parsed as `<symbolic-name>` or `<symbolic-name>.<symbolic-name>` and now support escaping names.
182182
For more information, see xref:syntax/expressions.adoc#graph-references[Cypher expressions -> Graph references].
183183
Graph name parts that contain unsupported characters for unescaped symbolic names now require backtick quoting.
184184
Graph name parts with special characters may require additional escaping of those characters:
@@ -1167,7 +1167,7 @@ RETURN "Hello" \|\| " " \|\| "World";
11671167
11681168
RETURN [1, 2] \|\| [3, 4, 5];
11691169
----
1170-
| Added a new `STRING` and `LIST` xref:syntax/operators.adoc[concatenation operator].
1170+
| Added a new `STRING` and `LIST` xref:expressions/string-operators.adoc[concatenation operator].
11711171

11721172
a|
11731173
label:functionality[]
@@ -1368,7 +1368,7 @@ IS [NOT] [NFC \| NFD \| NFKC \| NFKD] NORMALIZED
13681368
RETURN "string" IS NORMALIZED
13691369
----
13701370

1371-
| Introduction of an xref::syntax/operators.adoc#match-string-is-normalized[IS NORMALIZED] operator.
1371+
| Introduction of an xref::expressions/predicates/string-operators.adoc#string-normalization-operator[IS NORMALIZED] operator.
13721372
The operator can be used to check if a `STRING` is normalized according to the specified normalization form, which can be of type `NFC`, `NFD`, `NFKC`, or `NFKD`.
13731373

13741374
a|

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,12 @@ implied equals (`=`) comparator.
106106

107107
The supported comparators are:
108108

109-
* xref::syntax/operators.adoc#query-operators-comparison[Regular Comparison Operators]: `+=+`, `+<>+`, `+<+`, `+>+`, `+<=+`, `+>=+`
110-
* xref:values-and-types/working-with-null.adoc#is-null-is-not-null[`IS NULL` Operator]: `IS [NOT] NULL`
111-
* xref:expressions/predicates/type-predicate-expressions.adoc[Type Predicate Expression]: `IS [NOT] TYPED <TYPE>` (Note that the form `IS [NOT] :: <TYPE>` is not accepted)
112-
* xref::syntax/operators.adoc#match-string-is-normalized[Normalization Predicate Expression]: `IS [NOT] NORMALIZED`
113-
* xref::syntax/operators.adoc#query-operator-comparison-string-specific[String Comparison Operators]: `STARTS WITH`, `ENDS WITH`, `=~` (regex matching)
109+
* xref:expressions/predicates/comparison-operators.adoc[Regular Comparison Operators]: `+=+`, `+<>+`, `+<+`, `+>+`, `+<=+`, `+>=+`
110+
* xref:expressions/predicates/comparison-operators.adoc[`IS [NOT] NULL`]
111+
* xref:expressions/predicates/type-predicate-expressions.adoc[Type predicate expressions]: `IS [NOT] TYPED <TYPE>` (Note that the form `IS [NOT] :: <TYPE>` is not accepted)
112+
* xref:expressions/predicates/string-operators.adoc[Normalization Predicate Expression]: `IS [NOT] NORMALIZED`
113+
* xref:expressions/predicates/string-operators.adoc[String Comparison Operators]: `STARTS WITH`, `ENDS WITH`, `=~` (regex matching)
114+
114115

115116
=== Syntax
116117

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

Lines changed: 0 additions & 108 deletions
This file was deleted.

0 commit comments

Comments
 (0)