summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2010-02-02 18:16:10 +0000
committerTom Lane2010-02-02 18:16:10 +0000
commit21f862e487f5e0f8fc954622ed49c6d9d3cd7280 (patch)
treea1e9d662fc1682a7bb5b59b887eccfb744bff278
parentcedae130173c8a023cbc2bad39e2301b24aeb027 (diff)
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.
-rw-r--r--src/test/regress/expected/inherit.out2
-rw-r--r--src/test/regress/sql/inherit.sql2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index 98c8a79a7e2..6030cba1df0 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 192b3e73340..435b1cd3b42 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;