The particular table names used in the new inheritance regression test are

prone to sort differently in different locales, as seen in buildfarm results.
Let's cast to name not text to avoid that.

diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index 98c8a79a7e24ffeacb6c22b45764574d4c64740f..6030cba1df0b3128c857529c71119e4f12a1793c 100644 (file)
--- a/src/test/regress/expected/inherit.out
+++ b/src/test/regress/expected/inherit.out
@@ -1124,7 +1124,7 @@ SELECT a.attrelid::regclass, a.attname, a.attinhcount, e.expected
   FROM (SELECT inhrelid, count(*) AS expected FROM pg_inherits
         WHERE inhparent IN (SELECT inhrelid FROM r) GROUP BY inhrelid) e
   JOIN pg_attribute a ON e.inhrelid = a.attrelid WHERE NOT attislocal
-  ORDER BY a.attrelid::regclass::text, a.attnum;
+  ORDER BY a.attrelid::regclass::name, a.attnum;
  attrelid | attname | attinhcount | expected 
 ----------+---------+-------------+----------
  t2       | aaaa    |           1 |        1

diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql
index 192b3e73340db076a77cc0feddbf4356ceed1a16..435b1cd3b421c2602e46b20f0dc868d362298a90 100644 (file)
--- a/src/test/regress/sql/inherit.sql
+++ b/src/test/regress/sql/inherit.sql
@@ -370,6 +370,6 @@ SELECT a.attrelid::regclass, a.attname, a.attinhcount, e.expected
   FROM (SELECT inhrelid, count(*) AS expected FROM pg_inherits
         WHERE inhparent IN (SELECT inhrelid FROM r) GROUP BY inhrelid) e
   JOIN pg_attribute a ON e.inhrelid = a.attrelid WHERE NOT attislocal
-  ORDER BY a.attrelid::regclass::text, a.attnum;
+  ORDER BY a.attrelid::regclass::name, a.attnum;
 
 DROP TABLE t1, s1 CASCADE;