From 21f862e487f5e0f8fc954622ed49c6d9d3cd7280 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 2 Feb 2010 18:16:10 +0000 Subject: [PATCH] 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. --- src/test/regress/expected/inherit.out | 2 +- src/test/regress/sql/inherit.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out index 98c8a79a7e..6030cba1df 100644 --- 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 192b3e7334..435b1cd3b4 100644 --- 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;