From 3f828358b8dd5181b8acbe05618ef4235406cd2e Mon Sep 17 00:00:00 2001
From: Marc Cousin <marc.cousin@people-doc.com>
Date: Fri, 23 Mar 2018 11:25:32 +0100
Subject: [PATCH] Fix partition checking

Now return string of partitions_are are sorted with a reproducible order
(collate C)
---
 compat/install-9.6.patch | 8 ++++----
 sql/pgtap.sql.in         | 8 ++++----
 test/sql/partitions.sql  | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/compat/install-9.6.patch b/compat/install-9.6.patch
index 3472d11c0..99ccf5568 100644
--- a/compat/install-9.6.patch
+++ b/compat/install-9.6.patch
@@ -100,8 +100,8 @@
 -RETURNS TEXT AS $$
 -    SELECT _are(
 -        'partitions',
--        ARRAY(SELECT _parts($1, $2) EXCEPT SELECT unnest($3)),
--        ARRAY(SELECT unnest($3) EXCEPT SELECT _parts($1, $2)),
+-        ARRAY((SELECT _parts($1, $2)::text collate "C" EXCEPT SELECT unnest($3)) ORDER BY 1),
+-        ARRAY((SELECT unnest($3)::text collate "C" EXCEPT SELECT _parts($1, $2)) ORDER BY 1),
 -        $4
 -    );
 -$$ LANGUAGE SQL;
@@ -120,8 +120,8 @@
 -RETURNS TEXT AS $$
 -    SELECT _are(
 -        'partitions',
--        ARRAY(SELECT _parts($1) EXCEPT SELECT unnest($2)),
--        ARRAY(SELECT unnest($2) EXCEPT SELECT _parts($1)),
+-        ARRAY((SELECT _parts($1)::text collate "C" EXCEPT SELECT unnest($2)) ORDER BY 1),
+-        ARRAY((SELECT unnest($2)::text collate "C" EXCEPT SELECT _parts($1)) ORDER BY 1),
 -        $3
 -    );
 -$$ LANGUAGE SQL;
diff --git a/sql/pgtap.sql.in b/sql/pgtap.sql.in
index 784a44c5b..d0b52111a 100644
--- a/sql/pgtap.sql.in
+++ b/sql/pgtap.sql.in
@@ -9986,8 +9986,8 @@ CREATE OR REPLACE FUNCTION partitions_are( NAME, NAME, NAME[], TEXT )
 RETURNS TEXT AS $$
     SELECT _are(
         'partitions',
-        ARRAY(SELECT _parts($1, $2) EXCEPT SELECT unnest($3)),
-        ARRAY(SELECT unnest($3) EXCEPT SELECT _parts($1, $2)),
+        ARRAY((SELECT _parts($1, $2)::text collate "C" EXCEPT SELECT unnest($3)) ORDER BY 1),
+        ARRAY((SELECT unnest($3)::text collate "C" EXCEPT SELECT _parts($1, $2)) ORDER BY 1),
         $4
     );
 $$ LANGUAGE SQL;
@@ -10006,8 +10006,8 @@ CREATE OR REPLACE FUNCTION partitions_are( NAME, NAME[], TEXT )
 RETURNS TEXT AS $$
     SELECT _are(
         'partitions',
-        ARRAY(SELECT _parts($1) EXCEPT SELECT unnest($2)),
-        ARRAY(SELECT unnest($2) EXCEPT SELECT _parts($1)),
+        ARRAY((SELECT _parts($1)::text collate "C" EXCEPT SELECT unnest($2)) ORDER BY 1),
+        ARRAY((SELECT unnest($2)::text collate "C" EXCEPT SELECT _parts($1)) ORDER BY 1),
         $3
     );
 $$ LANGUAGE SQL;
diff --git a/test/sql/partitions.sql b/test/sql/partitions.sql
index 237733efa..54c704bed 100644
--- a/test/sql/partitions.sql
+++ b/test/sql/partitions.sql
@@ -300,9 +300,9 @@ SELECT * FROM check_test(
     'partitions_are( hidden tab, parts, desc )',
     'hi',
     '    Missing partitions:
-        not_hidden_part3
+        "hide.hidden_part1"
         "hide.hidden_part2"
-        "hide.hidden_part1"'
+        not_hidden_part3'
 );
 
 -- Should not work for unpartitioned but inherited table