From 282713a836d5dfe3dcefeaa6a6cedf5f000bdb09 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 5 Jul 2000 23:02:37 +0000
Subject: [PATCH] Make the regression tests safe for TOAST.
---
src/test/regress/expected/sanity_check.out | 5 +++--
src/test/regress/expected/type_sanity.out | 3 +--
src/test/regress/sql/sanity_check.sql | 5 +++--
src/test/regress/sql/type_sanity.sql | 3 +--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index 09262994452..823d9e142db 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -1,11 +1,12 @@
VACUUM;
--
-- sanity check, if we don't have indices the test will take years to
--- complete.
+-- complete. But skip TOAST relations since they will have varying
+-- names depending on the current OID counter.
--
SELECT relname, relhasindex
FROM pg_class
- WHERE relhasindex
+ WHERE relhasindex AND relkind != 't'
ORDER BY relname;
relname | relhasindex
---------------------+-------------
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index 19710312dff..38eaf0b21da 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -111,8 +111,7 @@ WHERE p1.typsend = p2.oid AND p1.typtype = 'b' AND
-- Look for illegal values in pg_class fields
SELECT p1.oid, p1.relname
FROM pg_class as p1
-WHERE (p1.relkind != 'r' AND p1.relkind != 'i' AND
- p1.relkind != 's' AND p1.relkind != 'S');
+WHERE p1.relkind NOT IN ('r', 'i', 's', 'S', 't');
oid | relname
-----+---------
(0 rows)
diff --git a/src/test/regress/sql/sanity_check.sql b/src/test/regress/sql/sanity_check.sql
index e7c337761bf..696a4f425d1 100644
--- a/src/test/regress/sql/sanity_check.sql
+++ b/src/test/regress/sql/sanity_check.sql
@@ -2,10 +2,11 @@
VACUUM;
--
-- sanity check, if we don't have indices the test will take years to
--- complete.
+-- complete. But skip TOAST relations since they will have varying
+-- names depending on the current OID counter.
--
SELECT relname, relhasindex
FROM pg_class
- WHERE relhasindex
+ WHERE relhasindex AND relkind != 't'
ORDER BY relname;
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 312fd2857af..106a86b87c8 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -99,8 +99,7 @@ WHERE p1.typsend = p2.oid AND p1.typtype = 'b' AND
SELECT p1.oid, p1.relname
FROM pg_class as p1
-WHERE (p1.relkind != 'r' AND p1.relkind != 'i' AND
- p1.relkind != 's' AND p1.relkind != 'S');
+WHERE p1.relkind NOT IN ('r', 'i', 's', 'S', 't');
-- Indexes should have an access method, others not.
--
GitLab