Standardizing output columns pgr_bipartite to (node,color)

Author: cvvergara

docqueries/coloring/bipartite.pg

@@ -3,7 +3,7 @@
 /* --q1 */
 SELECT * FROM pgr_bipartite(
     $$SELECT id, source, target, cost, reverse_cost FROM edges$$
-) ORDER BY vertex_id;
+) ORDER BY node;
 /* --q2 */
 INSERT INTO edges (source, target, cost, reverse_cost) VALUES
 (5, 1, 1, 1);

docqueries/coloring/bipartite.result

@@ -5,26 +5,26 @@ SET
 /* --q1 */
 SELECT * FROM pgr_bipartite(
     $$SELECT id, source, target, cost, reverse_cost FROM edges$$
-) ORDER BY vertex_id;
- vertex_id | color_id
------------+----------
-         1 |        0
-         2 |        0
-         3 |        1
-         4 |        1
-         5 |        0
-         6 |        1
-         7 |        0
-         8 |        1
-         9 |        0
-        10 |        0
-        11 |        1
-        12 |        0
-        13 |        0
-        14 |        1
-        15 |        1
-        16 |        0
-        17 |        1
+) ORDER BY node;
+ node | color
+------+-------
+    1 |     0
+    2 |     0
+    3 |     1
+    4 |     1
+    5 |     0
+    6 |     1
+    7 |     0
+    8 |     1
+    9 |     0
+   10 |     0
+   11 |     1
+   12 |     0
+   13 |     0
+   14 |     1
+   15 |     1
+   16 |     0
+   17 |     1
 (17 rows)
 
 /* --q2 */
@@ -35,8 +35,8 @@ INSERT 0 1
 SELECT * FROM pgr_bipartite(
     $$SELECT id, source, target, cost, reverse_cost FROM edges$$
 );
- vertex_id | color_id
------------+----------
+ node | color
+------+-------
 (0 rows)
 
 /* --q4 */

pgtap/coloring/bipartite/types_check.pg

@@ -43,10 +43,9 @@ BEGIN
 
   RETURN QUERY
   SELECT function_types_eq('pgr_bipartite',
-    $$VALUES
-    ('{text,int8,int8}'::TEXT[])
-    $$
+    $$SELECT '{text,int8,int8}'::TEXT[] $$
   );
+
 END;
 $BODY$
 LANGUAGE plpgsql;

sql/coloring/bipartite.sql

@@ -26,25 +26,19 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  ********************************************************************PGR-GNU*/
----------------
--- pgr_bipartite
----------------
 
 --v3.2
 CREATE FUNCTION pgr_bipartite(
     TEXT, -- edges_sql (required)
 
-    OUT vertex_id BIGINT,
-    OUT color_id BIGINT)
+    OUT node BIGINT,
+    OUT color BIGINT)
 RETURNS SETOF RECORD AS
 $BODY$
-BEGIN
-    RETURN QUERY
     SELECT node, color
     FROM _pgr_bipartite(_pgr_get_statement($1));
-END;
 $BODY$
-LANGUAGE plpgsql VOLATILE STRICT;
+LANGUAGE SQL VOLATILE STRICT;
 
 -- COMMENTS
 

sql/scripts/build-extension-update-files.pl

@@ -277,6 +277,7 @@ sub generate_upgrade_script {
                 # Out parameters changed names on v4.0.0
                 # Experimental functions
                 push @commands, drop_special_case_function("pgr_dagshortestpath(text,text)");
+                push @commands, drop_special_case_function("pgr_bipartite(text)");
             }
 
             if ($old_minor >= "3.3") {