@@ -97,24 +97,25 @@ BEGIN
9797 RETURN QUERY
9898 SELECT set_eq(q, expected);
9999
100- q = format($d$ SELECT * FROM pgr_contraction(
100+ q = format($d$ SELECT type, id, unnest(contracted_vertices) FROM pgr_contraction(
101101 $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
102102 ARRAY[1 ]::integer [], 1 , ARRAY[]::BIGINT [], ' %1$s' ::BOOLEAN )$d$, directed);
103103
104104 expected = format($d$
105- SELECT type, id, contracted_vertices, source, target, cost
105+ SELECT type, id, unnest
106106 FROM (VALUES
107- (' v' ::CHAR , %1 $s::BIGINT , ' %2$s' ::BIGINT [], - 1 ::BIGINT , - 1 ::BIGINT , - 1 ::FLOAT),
108- (' v' , %3 $s, ' %4$s' ::BIGINT [], - 1 , - 1 , - 1 ),
109- (' v' , %5 $s, ' %6$s' ::BIGINT [], - 1 , - 1 , - 1 ),
110- (' v' , %7 $s, ' %8$s' ::BIGINT [], - 1 , - 1 , - 1 ),
111- (' v' , %9 $s, ' %10$s' ::BIGINT [], - 1 , - 1 , - 1 )
112- ) AS t(type, id, contracted_vertices, source, target, cost )$d$,
113- vids[4 ], ARRAY[vids[2 ]],
114- vids[6 ], ARRAY[vids[5 ]],
115- vids[7 ], ARRAY[vids[1 ], vids[3 ]],
116- vids[8 ], ARRAY[vids[9 ]],
117- vids[14 ], ARRAY[vids[13 ]]);
107+ (' v' ::CHAR , %1 $s::BIGINT , %2 $s),
108+ (' v' , %3 $s, %4 $s),
109+ (' v' , %5 $s, %6 $s),
110+ (' v' , %5 $s, %7 $s),
111+ (' v' , %8 $s, %9 $s),
112+ (' v' , %10 $s, %11 $s)
113+ ) AS t(type, id, unnest)$d$,
114+ vids[4 ], vids[2 ],
115+ vids[6 ], vids[5 ],
116+ vids[7 ], vids[1 ], vids[3 ],
117+ vids[8 ], vids[9 ],
118+ vids[14 ], vids[13 ]);
118119
119120 RETURN QUERY
120121 SELECT set_eq(q, expected);
0 commit comments