This is an automated email from the ASF dual-hosted git repository.
dehowef pushed a commit to branch PG11
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG11 by this push:
new 0584de0d Fix unsorted output of some queries in the cypher_match test
(#1507) (#1605)
0584de0d is described below
commit 0584de0d23c17c57304c13e5fe2dc3704471a5f2
Author: John Gemignani <[email protected]>
AuthorDate: Tue Feb 13 21:52:25 2024 -0800
Fix unsorted output of some queries in the cypher_match test (#1507) (#1605)
Fix unsorted output of some queries in the cypher_match test
Co-authored-by: Egor Chindyaskin <[email protected]>
---
regress/expected/cypher_match.out | 12 ++++++------
regress/sql/cypher_match.sql | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/regress/expected/cypher_match.out
b/regress/expected/cypher_match.out
index ace66fd1..caa8ace0 100644
--- a/regress/expected/cypher_match.out
+++ b/regress/expected/cypher_match.out
@@ -1998,13 +1998,13 @@ SELECT * FROM cypher('cypher_match', $$
(0 rows)
SELECT * FROM cypher('cypher_match', $$
- MATCH (a)-[r]-(b) RETURN r $$) as (r agtype);
+ MATCH (a)-[r]-(b) RETURN r ORDER BY r DESC $$) as (r agtype);
r
-----------------------------------------------------------------------------------------------------------------------------------------------------------------
- {"id": 4785074604081153, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710661, "properties": {"years": 3, "relationship":
"friends"}}::edge
- {"id": 4785074604081153, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710661, "properties": {"years": 3, "relationship":
"friends"}}::edge
{"id": 4785074604081154, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710659, "properties": {"years": 4, "relationship":
"enemies"}}::edge
{"id": 4785074604081154, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710659, "properties": {"years": 4, "relationship":
"enemies"}}::edge
+ {"id": 4785074604081153, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710661, "properties": {"years": 3, "relationship":
"friends"}}::edge
+ {"id": 4785074604081153, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710661, "properties": {"years": 3, "relationship":
"friends"}}::edge
{"id": 1407374883553283, "label": "e1", "end_id": 281474976710661,
"start_id": 281474976710660, "properties": {}}::edge
{"id": 1407374883553283, "label": "e1", "end_id": 281474976710661,
"start_id": 281474976710660, "properties": {}}::edge
(6 rows)
@@ -2091,13 +2091,13 @@ SELECT * FROM cypher('cypher_match', $$
-- check reuse of 'r' clause-to-clause - edges
SELECT * FROM cypher('cypher_match', $$
- MATCH ()-[r]-() RETURN r $$) as (r agtype);
+ MATCH ()-[r]-() RETURN r ORDER BY r DESC $$) as (r agtype);
r
-----------------------------------------------------------------------------------------------------------------------------------------------------------------
- {"id": 4785074604081153, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710661, "properties": {"years": 3, "relationship":
"friends"}}::edge
- {"id": 4785074604081153, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710661, "properties": {"years": 3, "relationship":
"friends"}}::edge
{"id": 4785074604081154, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710659, "properties": {"years": 4, "relationship":
"enemies"}}::edge
{"id": 4785074604081154, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710659, "properties": {"years": 4, "relationship":
"enemies"}}::edge
+ {"id": 4785074604081153, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710661, "properties": {"years": 3, "relationship":
"friends"}}::edge
+ {"id": 4785074604081153, "label": "knows", "end_id": 281474976710666,
"start_id": 281474976710661, "properties": {"years": 3, "relationship":
"friends"}}::edge
{"id": 1407374883553283, "label": "e1", "end_id": 281474976710661,
"start_id": 281474976710660, "properties": {}}::edge
{"id": 1407374883553283, "label": "e1", "end_id": 281474976710661,
"start_id": 281474976710660, "properties": {}}::edge
(6 rows)
diff --git a/regress/sql/cypher_match.sql b/regress/sql/cypher_match.sql
index 4c513a79..facbf3e8 100644
--- a/regress/sql/cypher_match.sql
+++ b/regress/sql/cypher_match.sql
@@ -965,7 +965,7 @@ SELECT * FROM cypher('cypher_match', $$
MATCH (a),(b) WHERE a.age = 4 AND a.name = "orphan" AND b.age = 6 CREATE
(a)-[:knows {relationship: "enemies", years: 4}]->(b) $$) as (r agtype);
SELECT * FROM cypher('cypher_match', $$
- MATCH (a)-[r]-(b) RETURN r $$) as (r agtype);
+ MATCH (a)-[r]-(b) RETURN r ORDER BY r DESC $$) as (r agtype);
-- check reuse of 'a' clause-to-clause - vertices
SELECT * FROM cypher('cypher_match', $$
@@ -996,7 +996,7 @@ SELECT * FROM cypher('cypher_match', $$
-- check reuse of 'r' clause-to-clause - edges
SELECT * FROM cypher('cypher_match', $$
- MATCH ()-[r]-() RETURN r $$) as (r agtype);
+ MATCH ()-[r]-() RETURN r ORDER BY r DESC $$) as (r agtype);
SELECT * FROM cypher('cypher_match', $$
MATCH ()-[r]-() MATCH ()-[r {relationship: "friends"}]-() RETURN r $$)
as (r agtype);
SELECT * FROM cypher('cypher_match', $$
