Skip to content

Commit 23ce511

Browse files
rafsun42rafsun42
committed
Update after rebase
* Regression tests * Comments * Minor overlook during rebasing
1 parent c025fdf commit 23ce511

File tree

11 files changed

+182
-149
lines changed

11 files changed

+182
-149
lines changed

‎regress/expected/age_load.out‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ NOTICE: graph "agload_test_graph" has been created
2828
(1 row)
2929

3030
SELECT * FROM cypher('agload_test_graph', $$CREATE (n:Country {__id__:1}) RETURN n$$) as (n agtype);
31-
n
32-
----------------------------------------------------------------------------------
33-
{"id": 844424930131969, "label": "Country", "properties": {"__id__": 1}}::vertex
31+
n
32+
------------------------------------------------------------------------------------
33+
{"id": 844424930131969, "label": ["Country"], "properties": {"__id__": 1}}::vertex
3434
(1 row)
3535

3636
--

‎regress/expected/cypher.out‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,16 @@ CREATE TABLE my_detailed_paths AS
173173
SELECT * FROM my_vertices;
174174
u
175175
----------------------------------------------------------------
176-
{"id": 281474976710657, "label": "", "properties": {}}::vertex
177-
{"id": 281474976710658, "label": "", "properties": {}}::vertex
178-
{"id": 281474976710659, "label": "", "properties": {}}::vertex
179-
{"id": 281474976710660, "label": "", "properties": {}}::vertex
180-
{"id": 281474976710661, "label": "", "properties": {}}::vertex
181-
{"id": 281474976710662, "label": "", "properties": {}}::vertex
182-
{"id": 281474976710663, "label": "", "properties": {}}::vertex
183-
{"id": 281474976710664, "label": "", "properties": {}}::vertex
184-
{"id": 281474976710665, "label": "", "properties": {}}::vertex
185-
{"id": 281474976710666, "label": "", "properties": {}}::vertex
176+
{"id": 281474976710657, "label": [], "properties": {}}::vertex
177+
{"id": 281474976710658, "label": [], "properties": {}}::vertex
178+
{"id": 281474976710659, "label": [], "properties": {}}::vertex
179+
{"id": 281474976710660, "label": [], "properties": {}}::vertex
180+
{"id": 281474976710661, "label": [], "properties": {}}::vertex
181+
{"id": 281474976710662, "label": [], "properties": {}}::vertex
182+
{"id": 281474976710663, "label": [], "properties": {}}::vertex
183+
{"id": 281474976710664, "label": [], "properties": {}}::vertex
184+
{"id": 281474976710665, "label": [], "properties": {}}::vertex
185+
{"id": 281474976710666, "label": [], "properties": {}}::vertex
186186
(10 rows)
187187

188188
SELECT * FROM my_edges;
@@ -198,11 +198,11 @@ SELECT * FROM my_edges;
198198
SELECT * FROM my_detailed_paths;
199199
u | e | v | p
200200
----------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
201-
{"id": 281474976710657, "label": "", "properties": {}}::vertex | {"id": 844424930131969, "label": "knows", "end_id": 281474976710658, "start_id": 281474976710657, "properties": {}}::edge | {"id": 281474976710658, "label": "", "properties": {}}::vertex | [{"id": 281474976710657, "label": "", "properties": {}}::vertex, {"id": 844424930131969, "label": "knows", "end_id": 281474976710658, "start_id": 281474976710657, "properties": {}}::edge, {"id": 281474976710658, "label": "", "properties": {}}::vertex]::path
202-
{"id": 281474976710659, "label": "", "properties": {}}::vertex | {"id": 844424930131970, "label": "knows", "end_id": 281474976710660, "start_id": 281474976710659, "properties": {}}::edge | {"id": 281474976710660, "label": "", "properties": {}}::vertex | [{"id": 281474976710659, "label": "", "properties": {}}::vertex, {"id": 844424930131970, "label": "knows", "end_id": 281474976710660, "start_id": 281474976710659, "properties": {}}::edge, {"id": 281474976710660, "label": "", "properties": {}}::vertex]::path
203-
{"id": 281474976710661, "label": "", "properties": {}}::vertex | {"id": 844424930131971, "label": "knows", "end_id": 281474976710662, "start_id": 281474976710661, "properties": {}}::edge | {"id": 281474976710662, "label": "", "properties": {}}::vertex | [{"id": 281474976710661, "label": "", "properties": {}}::vertex, {"id": 844424930131971, "label": "knows", "end_id": 281474976710662, "start_id": 281474976710661, "properties": {}}::edge, {"id": 281474976710662, "label": "", "properties": {}}::vertex]::path
204-
{"id": 281474976710663, "label": "", "properties": {}}::vertex | {"id": 844424930131972, "label": "knows", "end_id": 281474976710664, "start_id": 281474976710663, "properties": {}}::edge | {"id": 281474976710664, "label": "", "properties": {}}::vertex | [{"id": 281474976710663, "label": "", "properties": {}}::vertex, {"id": 844424930131972, "label": "knows", "end_id": 281474976710664, "start_id": 281474976710663, "properties": {}}::edge, {"id": 281474976710664, "label": "", "properties": {}}::vertex]::path
205-
{"id": 281474976710665, "label": "", "properties": {}}::vertex | {"id": 844424930131973, "label": "knows", "end_id": 281474976710666, "start_id": 281474976710665, "properties": {}}::edge | {"id": 281474976710666, "label": "", "properties": {}}::vertex | [{"id": 281474976710665, "label": "", "properties": {}}::vertex, {"id": 844424930131973, "label": "knows", "end_id": 281474976710666, "start_id": 281474976710665, "properties": {}}::edge, {"id": 281474976710666, "label": "", "properties": {}}::vertex]::path
201+
{"id": 281474976710657, "label": [], "properties": {}}::vertex | {"id": 844424930131969, "label": "knows", "end_id": 281474976710658, "start_id": 281474976710657, "properties": {}}::edge | {"id": 281474976710658, "label": [], "properties": {}}::vertex | [{"id": 281474976710657, "label": [], "properties": {}}::vertex, {"id": 844424930131969, "label": "knows", "end_id": 281474976710658, "start_id": 281474976710657, "properties": {}}::edge, {"id": 281474976710658, "label": [], "properties": {}}::vertex]::path
202+
{"id": 281474976710659, "label": [], "properties": {}}::vertex | {"id": 844424930131970, "label": "knows", "end_id": 281474976710660, "start_id": 281474976710659, "properties": {}}::edge | {"id": 281474976710660, "label": [], "properties": {}}::vertex | [{"id": 281474976710659, "label": [], "properties": {}}::vertex, {"id": 844424930131970, "label": "knows", "end_id": 281474976710660, "start_id": 281474976710659, "properties": {}}::edge, {"id": 281474976710660, "label": [], "properties": {}}::vertex]::path
203+
{"id": 281474976710661, "label": [], "properties": {}}::vertex | {"id": 844424930131971, "label": "knows", "end_id": 281474976710662, "start_id": 281474976710661, "properties": {}}::edge | {"id": 281474976710662, "label": [], "properties": {}}::vertex | [{"id": 281474976710661, "label": [], "properties": {}}::vertex, {"id": 844424930131971, "label": "knows", "end_id": 281474976710662, "start_id": 281474976710661, "properties": {}}::edge, {"id": 281474976710662, "label": [], "properties": {}}::vertex]::path
204+
{"id": 281474976710663, "label": [], "properties": {}}::vertex | {"id": 844424930131972, "label": "knows", "end_id": 281474976710664, "start_id": 281474976710663, "properties": {}}::edge | {"id": 281474976710664, "label": [], "properties": {}}::vertex | [{"id": 281474976710663, "label": [], "properties": {}}::vertex, {"id": 844424930131972, "label": "knows", "end_id": 281474976710664, "start_id": 281474976710663, "properties": {}}::edge, {"id": 281474976710664, "label": [], "properties": {}}::vertex]::path
205+
{"id": 281474976710665, "label": [], "properties": {}}::vertex | {"id": 844424930131973, "label": "knows", "end_id": 281474976710666, "start_id": 281474976710665, "properties": {}}::edge | {"id": 281474976710666, "label": [], "properties": {}}::vertex | [{"id": 281474976710665, "label": [], "properties": {}}::vertex, {"id": 844424930131973, "label": "knows", "end_id": 281474976710666, "start_id": 281474976710665, "properties": {}}::edge, {"id": 281474976710666, "label": [], "properties": {}}::vertex]::path
206206
(5 rows)
207207

208208
-- cleanup

‎regress/expected/cypher_match.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ $$) AS (i agtype);
15561556
SELECT * FROM cypher('cypher_match', $$
15571557
MATCH p=(:duplicate)-[]-(:other_v)
15581558
RETURN DISTINCT p
1559-
$$) AS (i agtype);
1559+
$$) AS (i agtype) ORDER BY i;
15601560
i
15611561
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
15621562
[{"id": 3377699720527873, "label": ["duplicate"], "properties": {}}::vertex, {"id": 3659174697238529, "label": "dup_edge", "end_id": 3940649673949185, "start_id": 3377699720527873, "properties": {"id": 1}}::edge, {"id": 3940649673949185, "label": ["other_v"], "properties": {}}::vertex]::path

‎regress/expected/cypher_merge.out‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,16 +1662,16 @@ NOTICE: graph "issue_1907" has been created
16621662

16631663
SELECT * from cypher('issue_1907', $$ CREATE (n:Testnode {name: 'Test Node A'})
16641664
RETURN n $$) as (n agtype);
1665-
n
1666-
---------------------------------------------------------------------------------------------
1667-
{"id": 844424930131969, "label": "Testnode", "properties": {"name": "Test Node A"}}::vertex
1665+
n
1666+
-----------------------------------------------------------------------------------------------
1667+
{"id": 844424930131969, "label": ["Testnode"], "properties": {"name": "Test Node A"}}::vertex
16681668
(1 row)
16691669

16701670
SELECT * from cypher('issue_1907', $$ CREATE (n:Testnode {name: 'Test Node B'})
16711671
RETURN n $$) as (n agtype);
1672-
n
1673-
---------------------------------------------------------------------------------------------
1674-
{"id": 844424930131970, "label": "Testnode", "properties": {"name": "Test Node B"}}::vertex
1672+
n
1673+
-----------------------------------------------------------------------------------------------
1674+
{"id": 844424930131970, "label": ["Testnode"], "properties": {"name": "Test Node B"}}::vertex
16751675
(1 row)
16761676

16771677
SELECT * FROM cypher('issue_1907', $$ MATCH ()-[r]->() RETURN r $$) AS (r agtype);

0 commit comments

Comments
 (0)