From 2ffc0e88499c38c78203038b7e1f16a7c7d4de2e Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 13 Oct 2007 22:33:38 +0000
Subject: [PATCH] Strengthen type_sanity's check on pg_type.typarray.  It
 failed to complain about types that didn't have typarray set.  Noted while
 working on txid patch.

---
 src/test/regress/expected/type_sanity.out | 2 +-
 src/test/regress/sql/type_sanity.sql      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index 2a551a7d0b8..932353238d7 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -62,7 +62,7 @@ FROM pg_type as p1
 WHERE p1.typtype in ('b','e') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS
     (SELECT 1 FROM pg_type as p2
      WHERE p2.typname = ('_' || p1.typname)::name AND
-           p2.typelem = p1.oid);
+           p2.typelem = p1.oid and p1.typarray = p2.oid);
  oid | typname 
 -----+---------
  210 | smgr
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index d0967e69c92..44a150a3179 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -57,7 +57,7 @@ FROM pg_type as p1
 WHERE p1.typtype in ('b','e') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS
     (SELECT 1 FROM pg_type as p2
      WHERE p2.typname = ('_' || p1.typname)::name AND
-           p2.typelem = p1.oid);
+           p2.typelem = p1.oid and p1.typarray = p2.oid);
 
 -- Make sure typarray points to a varlena array type of our own base
 SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, 
-- 
GitLab