array set_eq polishing and tests

Author: dmfay

sql/pgtap--1.2.0--1.2.1.sql

@@ -168,16 +168,26 @@ RETURNS TEXT AS $$
         AND contype = 'x';
 $$ LANGUAGE sql;
 
+-- _relcomp array-to-array
+CREATE OR REPLACE FUNCTION _relcomp( anyarray, anyarray, TEXT, TEXT )
+RETURNS TEXT AS $$
+    SELECT _docomp(
+        _temptable( $1, '__taphave__' ),
+        _temptable( $2, '__tapwant__' ),
+        $3, $4
+    );
+$$ LANGUAGE sql;
+
 -- set_eq( array, array, description )
 CREATE OR REPLACE FUNCTION set_eq(anyarray, anyarray, TEXT)
 RETURNS TEXT AS $$
-    SELECT ok($1 @> $2 AND $2 @> $1, $3);
+    SELECT _relcomp($1, $2, $3);
 $$ LANGUAGE sql;
 
 -- set_eq( array, array )
 CREATE OR REPLACE FUNCTION set_eq(anyarray, anyarray)
 RETURNS TEXT AS $$
-    SELECT set_eq($1, $2, 'arrays have identical contents')
+    SELECT _relcomp($1, $2, '')
 $$ LANGUAGE sql;
 
 -- table_comment_has(schema, table, comment, description)

sql/pgtap.sql.in

@@ -6852,6 +6852,15 @@ RETURNS TEXT AS $$
     );
 $$ LANGUAGE sql;
 
+CREATE OR REPLACE FUNCTION _relcomp( anyarray, anyarray, TEXT, TEXT )
+RETURNS TEXT AS $$
+    SELECT _docomp(
+        _temptable( $1, '__taphave__' ),
+        _temptable( $2, '__tapwant__' ),
+        $3, $4
+    );
+$$ LANGUAGE sql;
+
 -- set_eq( sql, sql, description )
 CREATE OR REPLACE FUNCTION set_eq( TEXT, TEXT, TEXT )
 RETURNS TEXT AS $$
@@ -6879,13 +6888,13 @@ $$ LANGUAGE sql;
 -- set_eq( array, array, description )
 CREATE OR REPLACE FUNCTION set_eq(anyarray, anyarray, TEXT)
 RETURNS TEXT AS $$
-    SELECT ok($1 @> $2 AND $2 @> $1, $3);
+    SELECT _relcomp( $1, $2, $3, '' );
 $$ LANGUAGE sql;
 
 -- set_eq( array, array )
 CREATE OR REPLACE FUNCTION set_eq(anyarray, anyarray)
 RETURNS TEXT AS $$
-    SELECT set_eq($1, $2, 'arrays have identical contents')
+    SELECT _relcomp( $1, $2, NULL::text, '' )
 $$ LANGUAGE sql;
 
 -- bag_eq( sql, sql, description )

test/sql/resultset.sql

@@ -1,7 +1,7 @@
 \unset ECHO
 \i test/setup.sql
 
-SELECT plan(545);
+SELECT plan(560);
 --SELECT * FROM no_plan();
 
 -- This will be rolled back. :-)
@@ -1672,6 +1672,68 @@ SELECT * FROM check_test(
         want: (text)'
 );
 
+/****************************************************************************/
+-- Test set_eq() with dual arrays.
+SELECT * FROM check_test(
+    set_eq(
+        ARRAY['Angel', 'Andrea', 'Angelina', 'Antonio', 'Anthony', 'Anna', 'Andrew' ],
+        ARRAY['Andrew', 'Anna', 'Anthony', 'Antonio', 'Angelina', 'Andrea', 'Angel' ],
+        'whatever'
+    ),
+    true,
+    'set_eq(array, array, desc)',
+    'whatever',
+    ''
+);
+
+SELECT * FROM check_test(
+    set_eq(
+        ARRAY['Angel', 'Andrea', 'Angelina', 'Antonio', 'Anthony', 'Anna', 'Andrew' ],
+        ARRAY['Andrew', 'Anna', 'Anthony', 'Antonio', 'Angelina', 'Andrea', 'Angel' ]
+    ),
+    true,
+    'set_eq(array, array)',
+    '',
+    ''
+);
+
+SELECT * FROM check_test(
+    set_eq(
+        ARRAY['Angel', 'Andrea', 'Angelina', 'Antonio', 'Anthony', 'Anna', 'Andrew' ],
+        ARRAY['Andrew', 'Anna', 'Anthony', 'Antonio', 'Angelina', 'Andrea', 'Angel', 'Andrew', 'Anna' ]
+    ),
+    true,
+    'set_eq(array, dupe array)',
+    '',
+    ''
+);
+
+-- Fail with an extra record.
+SELECT * FROM check_test(
+    set_eq(
+        ARRAY['Angel', 'Andrea', 'Angelina', 'Antonio', 'Anthony', 'Anna', 'Andrew' ],
+        ARRAY['Andrew', 'Anna', 'Antonio', 'Angelina', 'Andrea', 'Angel' ]
+    ),
+    false,
+    'set_eq(array, array) extra record',
+    '',
+    '    Extra records:
+        (Anthony)'
+);
+
+-- Fail with a missing record.
+SELECT * FROM check_test(
+    set_eq(
+        ARRAY['Angel', 'Andrea', 'Angelina', 'Antonio', 'Anthony', 'Anna', 'Andrew' ],
+        ARRAY['Andrew', 'Anna', 'Anthony', 'Alan', 'Antonio', 'Angelina', 'Andrea', 'Angel' ]
+    ),
+    false,
+    'set_eq(array, array) missing record',
+    '',
+    '    Missing records:
+        (Alan)'
+);
+
 /****************************************************************************/
 -- Test bag_eq() with an array argument.
 SELECT * FROM check_test(