From 717a5c289eda0020d663e81b464fe9c75157c53f Mon Sep 17 00:00:00 2001
From: Egor Chindyaskin <e.chindyaskin@postgrespro.ru>
Date: Tue, 6 Feb 2024 02:35:55 +0700
Subject: [PATCH] Fix unsorted output of some queries in the cypher_match test
 (#1507)

Fix unsorted output of some queries in the cypher_match test
---
 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 1b1fbaa33..461e9243a 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 1ac29419a..d1531be3f 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', $$