From 479e61be7036f20e678870fc65ab9b4d0f3c6901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Pryce-=C3=85klundh?= <112686610+JPryce-Aklundh@users.noreply.github.com> Date: Thu, 30 Jan 2025 12:11:19 +0100 Subject: [PATCH 1/3] fix problematic tables --- modules/ROOT/pages/clauses/call.adoc | 6 +-- modules/ROOT/pages/clauses/where.adoc | 3 +- modules/ROOT/pages/functions/aggregating.adoc | 2 +- modules/ROOT/pages/syntax/operators.adoc | 51 +++++++++++-------- .../ROOT/pages/values-and-types/temporal.adoc | 10 ++-- 5 files changed, 42 insertions(+), 30 deletions(-) diff --git a/modules/ROOT/pages/clauses/call.adoc b/modules/ROOT/pages/clauses/call.adoc index 283b594d2..c007a50f4 100644 --- a/modules/ROOT/pages/clauses/call.adoc +++ b/modules/ROOT/pages/clauses/call.adoc @@ -86,7 +86,7 @@ CALL dbms.checkConfigValue('server.bolt.enabled', 'true') | "valid" | "message" | true | "requires restart" -2+d|Rows: 2 +2+d|Rows: 1 |=== ==== @@ -118,7 +118,7 @@ CALL dbms.checkConfigValue($setting, $value) | "valid" | "message" | true | "requires restart" -2+d|Rows: 2 +2+d|Rows: 1 |=== [NOTE] @@ -153,7 +153,7 @@ CALL dbms.checkConfigValue($setting, 'true') | "valid" | "message" | true | "requires restart" -2+d|Rows: 2 +2+d|Rows: 1 |=== ==== diff --git a/modules/ROOT/pages/clauses/where.adoc b/modules/ROOT/pages/clauses/where.adoc index 060b49136..9a3bb0c25 100644 --- a/modules/ROOT/pages/clauses/where.adoc +++ b/modules/ROOT/pages/clauses/where.adoc @@ -384,7 +384,8 @@ For more information, see the section about the xref:syntax/operators.adoc#match | 'Andy' | 'Timothy' | 'Peter' -1+|Rows: 3 + +1+d|Rows: 3 |=== Note that the `IS NORMALIZED` operator returns `null` when used on a non-`STRING` value. diff --git a/modules/ROOT/pages/functions/aggregating.adoc b/modules/ROOT/pages/functions/aggregating.adoc index 9bb8d535f..9e57a6d1d 100644 --- a/modules/ROOT/pages/functions/aggregating.adoc +++ b/modules/ROOT/pages/functions/aggregating.adoc @@ -312,8 +312,8 @@ The `Guy Pearce` node will, therefore, get counted twice when not using `DISTINC | friendOfFriend.name | count(friendOfFriend) | count(ALL friendOfFriend) | count(DISTINCT friendOfFriend) | "Guy Pearce" | 2 | 2 | 1 -4+d|Rows: 1 +4+d|Rows: 1 |=== ====== diff --git a/modules/ROOT/pages/syntax/operators.adoc b/modules/ROOT/pages/syntax/operators.adoc index 599ccf677..1da8140a2 100644 --- a/modules/ROOT/pages/syntax/operators.adoc +++ b/modules/ROOT/pages/syntax/operators.adoc @@ -55,10 +55,8 @@ Even though both *'Anne'* and *'Carol'* have blue eyes, *'blue'* is only returne | +p.eyeColor+ | +"blue"+ | +"brown"+ -1+d|Rows: 2 + -Nodes created: 3 + -Properties set: 6 + -Labels added: 3 + +1+d|Rows: 2 |=== `DISTINCT` is commonly used in conjunction with xref::functions/aggregating.adoc[aggregating functions]. @@ -102,10 +100,8 @@ RETURN p.name | +p.name+ | +"Jane"+ | +"Tom"+ -1+d|Rows: 2 + -Nodes created: 2 + -Properties set: 4 + -Labels added: 2 + +1+d|Rows: 2 |=== @@ -131,10 +127,8 @@ RETURN DISTINCT restaurant.name |=== | +restaurant.name+ | +"Hungry Jo"+ -1+d|Rows: 1 + -Nodes created: 4 + -Properties set: 8 + -Labels added: 4 + +1+d|Rows: 1 |=== See xref::clauses/where.adoc#query-where-basic[Basic usage] for more details on dynamic property access. @@ -165,10 +159,8 @@ All the existing properties on the node are replaced by those provided in the ma |=== | +p.name+ | +p.age+ | +p.livesIn+ | +"Ellen"+ | ++ | +"London"+ -3+d|Rows: 1 + -Nodes created: 1 + -Properties set: 5 + -Labels added: 1 + +3+d|Rows: 1 |=== See xref::clauses/set.adoc#set-replace-properties-using-map[Replace all properties using a map and `=`] for more details on using the property replacement operator `=`. @@ -194,10 +186,8 @@ The properties on the node are updated as follows by those provided in the map: |=== | +p.name+ | +p.age+ | +p.livesIn+ | +"Ellen"+ | +20+ | +"London"+ -3+d|Rows: 1 + -Nodes created: 1 + -Properties set: 4 + -Labels added: 1 + +3+d|Rows: 1 |=== See xref::clauses/set.adoc#set-setting-properties-using-map[Mutate specific properties using a map and `+=`] for more details on using the property mutation operator `+=`. @@ -250,6 +240,7 @@ RETURN b - a AS result |=== | +result+ | +7+ + 1+d|Rows: 1 |=== @@ -292,6 +283,7 @@ RETURN one > two AS result |=== | +result+ | +true+ + 1+d|Rows: 1 |=== @@ -317,6 +309,7 @@ RETURN candidate | +candidate+ | +"John"+ | +"Jonathan"+ + 1+d|Rows: 2 |=== @@ -531,6 +524,7 @@ RETURN number | +4+ | +7+ | +9+ + 1+d|Rows: 3 |=== @@ -560,6 +554,7 @@ RETURN 'neo' + '4j' AS result |=== | +result+ | +"neo4j"+ + 1+d|Rows: 1 |=== @@ -605,6 +600,7 @@ RETURN "the \u212B char" IS NORMALIZED AS normalized |=== | normalized | false + 1+|Rows: 1 |=== @@ -632,6 +628,7 @@ RETURN "the \u212B char" IS NOT NORMALIZED AS notNormalized |=== | notNormalized | true + 1+|Rows: 1 |=== @@ -752,6 +749,7 @@ RETURN aDateTime + aDuration, aDateTime - aDuration |=== | +aDateTime + aDuration+ | +aDateTime - aDuration+ | +1996-10-11T12:31:14.000000002+ | +1972-10-11T12:31:13.999999998+ + 2+d|Rows: 1 |=== @@ -791,6 +789,7 @@ RETURN |=== | +date1+ | +date2+ | +2012-02-28+ | +2012-02-29+ + 2+d|Rows: 1 |=== @@ -812,6 +811,7 @@ RETURN duration1, duration2, duration1 + duration2, duration1 - duration2 |=== | +duration1+ | +duration2+ | +duration1 + duration2+ | +duration1 - duration2+ | +P12Y5M14DT16H13M10.000000001S+ | +P1M-14DT15H49M10S+ | +P12Y6MT32H2M20.000000001S+ | +P12Y4M28DT24M0.000000001S+ + 4+d|Rows: 1 |=== @@ -833,6 +833,7 @@ RETURN aDuration, aDuration * 2, aDuration / 3 |=== | +aDuration+ | +aDuration * 2+ | +aDuration / 3+ | +P14DT13M10.000000001S+ | +P28DT26M20.000000002S+ | +P4DT16H4M23.333333333S+ + 3+d|Rows: 1 |=== @@ -867,6 +868,7 @@ RETURN p.person.name |=== | +p.person.name+ | +"Anne"+ + 1+d|Rows: 1 |=== @@ -896,6 +898,7 @@ RETURN a[$myKey] AS result |=== | +result+ | +"Anne"+ + 1+d|Rows: 1 |=== @@ -930,6 +933,7 @@ RETURN [1,2,3,4,5] + [6,7] AS myList |=== | +myList+ | +[1,2,3,4,5,6,7]+ + 1+d|Rows: 1 |=== @@ -948,6 +952,7 @@ RETURN [1,2,3,4,5] || [6,7] AS myList |=== | myList | [1,2,3,4,5,6,7] + 1+d|Rows: 1 |=== @@ -971,6 +976,7 @@ RETURN number | +number+ | +2+ | +3+ + 1+d|Rows: 2 |=== @@ -997,6 +1003,7 @@ If the left-hand operator had been `[1, 2]` instead of `[2, 1]`, the query would |=== | +inList+ | +true+ + 1+d|Rows: 1 |=== @@ -1015,6 +1022,7 @@ However, `IN` evaluates to `false` as the right-hand operand does not contain an |=== | +inList+ | +false+ + 1+d|Rows: 1 |=== @@ -1047,6 +1055,7 @@ The square brackets will extract the elements from the start index `1`, and up t |=== | +result+ | +["John","Bill"]+ + 1+d|Rows: 1 |=== @@ -1076,6 +1085,7 @@ RETURN names[$myIndex] AS result |=== | +result+ | +"John"+ + 1+d|Rows: 1 |=== @@ -1097,6 +1107,7 @@ RETURN 3 IN l[0] AS result |=== | +result+ | +true+ + 1+d|Rows: 1 |=== diff --git a/modules/ROOT/pages/values-and-types/temporal.adoc b/modules/ROOT/pages/values-and-types/temporal.adoc index ddcb589c1..e07da4fd1 100644 --- a/modules/ROOT/pages/values-and-types/temporal.adoc +++ b/modules/ROOT/pages/values-and-types/temporal.adoc @@ -500,15 +500,15 @@ For more information, see the xref::values-and-types/temporal.adoc#cypher-tempor | The number of seconds between `1970-01-01T00:00:00+0000` and the instant.{epochSeconds_foot_note} | `INTEGER` | Positive for instants after and negative for instants before `1970-01-01T00:00:00+0000`. -| +| | {check-mark} -| -| -| - +| +| +| |=== + [[cypher-temporal-specify-instant-examples]] === Examples From c3bb1149228c3d5bb45f4141feb2051c08a739c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Pryce-=C3=85klundh?= <112686610+JPryce-Aklundh@users.noreply.github.com> Date: Thu, 30 Jan 2025 12:12:26 +0100 Subject: [PATCH 2/3] whitespace --- modules/ROOT/pages/values-and-types/temporal.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ROOT/pages/values-and-types/temporal.adoc b/modules/ROOT/pages/values-and-types/temporal.adoc index e07da4fd1..26b008af3 100644 --- a/modules/ROOT/pages/values-and-types/temporal.adoc +++ b/modules/ROOT/pages/values-and-types/temporal.adoc @@ -500,11 +500,11 @@ For more information, see the xref::values-and-types/temporal.adoc#cypher-tempor | The number of seconds between `1970-01-01T00:00:00+0000` and the instant.{epochSeconds_foot_note} | `INTEGER` | Positive for instants after and negative for instants before `1970-01-01T00:00:00+0000`. -| +| | {check-mark} -| -| -| +| +| +| |=== From dbafa4547fd7ba136e0f6b25770069e68fdf32a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Pryce-=C3=85klundh?= <112686610+JPryce-Aklundh@users.noreply.github.com> Date: Thu, 30 Jan 2025 12:13:07 +0100 Subject: [PATCH 3/3] whitespace2 --- modules/ROOT/pages/values-and-types/temporal.adoc | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/ROOT/pages/values-and-types/temporal.adoc b/modules/ROOT/pages/values-and-types/temporal.adoc index 26b008af3..9d7fd4a25 100644 --- a/modules/ROOT/pages/values-and-types/temporal.adoc +++ b/modules/ROOT/pages/values-and-types/temporal.adoc @@ -508,7 +508,6 @@ For more information, see the xref::values-and-types/temporal.adoc#cypher-tempor |=== - [[cypher-temporal-specify-instant-examples]] === Examples