Skip to content

Commit af66356

Browse files
conflicts and cypher 25 removals
1 parent 101e9de commit af66356

23 files changed

+134
-48
lines changed

modules/ROOT/content-nav.adoc

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,18 @@
5151
** xref:patterns/reference.adoc[]
5252
5353
* xref:values-and-types/index.adoc[]
54-
** xref:values-and-types/property-structural-constructed.adoc[]
55-
** xref:values-and-types/temporal.adoc[]
56-
** xref:values-and-types/spatial.adoc[]
57-
** xref:values-and-types/working-with-null.adoc[]
58-
** xref:values-and-types/lists.adoc[]
59-
** xref:values-and-types/maps.adoc[]
60-
** xref:values-and-types/casting-data.adoc[]
54+
** xref::values-and-types/property-structural-constructed.adoc[]
55+
** xref:values-and-types/boolean-numeric-string.adoc[]
56+
** xref::values-and-types/temporal.adoc[]
57+
** xref::values-and-types/spatial.adoc[]
58+
** xref::values-and-types/lists.adoc[]
59+
** xref::values-and-types/maps.adoc[]
60+
** xref:values-and-types/graph-references.adoc[]
61+
** xref::values-and-types/working-with-null.adoc[]
62+
** xref::values-and-types/casting-data.adoc[]
6163
** xref:values-and-types/ordering-equality-comparison.adoc[]
6264
6365
* xref:expressions/index.adoc[]
64-
** xref:expressions/expressions-overview.adoc[]
6566
** xref:expressions/predicates/index.adoc[]
6667
*** xref:expressions/predicates/boolean-operators.adoc[]
6768
*** xref:expressions/predicates/comparison-operators.adoc[]

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

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

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

628628
| 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
@@ -128,7 +128,7 @@ This is currently not available in Cypher.
128128

129129
| 19.3
130130
| <comparison predicate>
131-
| xref:syntax/operators.adoc##query-operators-comparison[Comparison operators]
131+
| xref:expressions/predicates/comparison-operators.adoc[Comparison operators]
132132
|
133133

134134
| 19.4
@@ -148,12 +148,12 @@ This is currently not available in Cypher.
148148

149149
| 19.7
150150
| <normalized predicate>
151-
| xref:syntax/operators.adoc#match-string-is-normalized[`IS NORMALIZED`], xref:syntax/operators.adoc#match-string-is-not-normalized[`IS NOT NORMALIZED`]
151+
| xref:expressions/predicates/string-operators.adoc#string-normalization-operators[`IS NORMALIZED`,`IS NOT NORMALIZED`]
152152
|
153153

154154
| 20.2
155155
| <value expression primary>
156-
| xref:expressions/expressions-overview.adoc[]
156+
| xref:expressions/index.adoc[]
157157
|
158158

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

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

196196
| 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
@@ -116,7 +116,7 @@ Cypher only supports xref:functions/mathematical-numeric.adoc#functions-ceil[`ce
116116
| Note the following exceptions:
117117

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

121121
| GF05
122122
| 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
@@ -7,7 +7,7 @@
77
It be used as a sub-clause following `RETURN` or `WITH`.
88
As of Neo4j 5.24, it can also be used as a standalone clause, either on its own or in combination with `SKIP`/`OFFSET` or `LIMIT`.
99

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

1313
[NOTE]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ RETURN "Hello" \|\| " " \|\| "World";
837837
838838
RETURN [1, 2] \|\| [3, 4, 5];
839839
----
840-
| Added a new `STRING` and `LIST` xref:syntax/operators.adoc[concatenation operator].
840+
| Added a new `STRING` and `LIST` xref:expressions/string-operators.adoc[concatenation operator].
841841

842842
a|
843843
label:functionality[]
@@ -1038,7 +1038,7 @@ IS [NOT] [NFC \| NFD \| NFKC \| NFKD] NORMALIZED
10381038
RETURN "string" IS NORMALIZED
10391039
----
10401040

1041-
| Introduction of an xref::syntax/operators.adoc#match-string-is-normalized[IS NORMALIZED] operator.
1041+
| Introduction of an xref::expressions/predicates/string-operators.adoc#string-normalization-operator[IS NORMALIZED] operator.
10421042
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`.
10431043

10441044
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/index.adoc

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
:description: Information about the expressions available in Cypher.
33
:page-aliases: syntax/operators.adoc
44

5-
65
A Cypher expression is any part of a query that evaluates to a value.
76
For details and examples of specific expressions, see the following sections:
87

9-
* xref:expressions/expressions-overview.adoc[]
108
* xref:expressions/predicates/index.adoc[]
119
** xref:expressions/predicates/boolean-operators.adoc[]: `AND`, `OR`, `XOR`, `NOT`
1210
** xref:expressions/predicates/comparison-operators.adoc[]: `=`, `<>`, `<`, `>`, `\<=`, `>=`, `IS NULL`, `IS NOT NULL`
@@ -21,3 +19,16 @@ For details and examples of specific expressions, see the following sections:
2119
* xref:expressions/list-expressions.adoc[]: information about list concatenation operators (`||`, `+`), list element access, list slicing, and list as well as pattern comprehensions.
2220
* xref:expressions/map-expressions.adoc[]: information about map operators (`.`, `[]`) and map projection.
2321
* xref:expressions/conditional-expressions.adoc[]
22+
23+
The following expressions are documented elsewhere in the Cypher Manual:
24+
25+
* xref:patterns/reference.adoc#label-expressions[Label expressions]
26+
* xref:functions/index.adoc[Function calls]
27+
* Subquery expressions: xref:subqueries/collect.adoc[`COLLECT`], xref:subqueries/count.adoc[`COUNT`], and xref:subqueries/existential.adoc[`EXISTS`]
28+
* Value literals (see xref:values-and-types/index.adoc[])
29+
30+
[NOTE]
31+
Expressions containing unsanitized user input may make your application vulnerable to Cypher injection.
32+
Consider using xref:syntax/parameters.adoc[parameters] instead.
33+
For more information, see link:https://neo4j.com/developer/kb/protecting-against-cypher-injection/[Neo4j Knowledge Base -> Protecting against Cypher Injection].
34+

modules/ROOT/pages/expressions/predicates/path-pattern-expressions.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
:table-caption!:
33
:description: Information about path pattern expressions in Cypher.
44

5-
Similar to xref::subqueries/existential.adoc[existential subqueries], path pattern expressions can be used to assert whether a specified path exists at least once in a graph.
5+
Similar to xref::subqueries/existential.adoc[`EXISTS` subqueries], path pattern expressions can be used to assert whether a specified path exists at least once in a graph.
66
While existential subqueries are more powerful and capable of performing anything achievable with path pattern expressions, path pattern expressions are more concise.
77

88
For more information about graph pattern matching in Cypher, see xref:patterns/index.adoc[].
@@ -20,7 +20,7 @@ In other words, it must contain at least one xref::patterns/reference.adoc#relat
2020
* Path pattern expressions may not declare new variables.
2121
They can only reference existing variables.
2222

23-
* Path pattern expressions may only be used in positions where a xref:expressions/expressions-overview.adoc#boolean[boolean expression] is expected.
23+
* Path pattern expressions may only be used in positions where a xref:expressions/predicates/boolean-operators.adoc[boolean expression] is expected.
2424
The following sections will demonstrate how to use path pattern expressions in a `WHERE` clause.
2525

2626
[[example-graph]]

0 commit comments

Comments
 (0)