- test for indexes on a domain

- don't fail type-sanity checks if a domain exists

Rod Taylor

diff --git a/src/test/regress/sql/domain.sql b/src/test/regress/sql/domain.sql
index 77dccb2aaca430888010c763b9c9dfc9452e3223..4c2e7e31aca3590223f4c281a6358dbd12f9afad 100644 (file)
--- a/src/test/regress/sql/domain.sql
+++ b/src/test/regress/sql/domain.sql
@@ -111,11 +111,11 @@ create table defaulttest
             ( col1 ddef1
             , col2 ddef2
             , col3 ddef3
-            , col4 ddef4
+            , col4 ddef4 PRIMARY KEY
             , col5 ddef1 NOT NULL DEFAULT NULL
             , col6 ddef2 DEFAULT '88'
             , col7 ddef4 DEFAULT 8000
-       , col8 ddef5
+            , col8 ddef5
             );
 insert into defaulttest default values;
 insert into defaulttest default values;

diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 58019a15d25aa4d382b9707a28128fbfd1855e46..5003ae6b165dc9c831eaa120b3623943f3b81a90 100644 (file)
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -19,7 +19,7 @@
 SELECT p1.oid, p1.typname
 FROM pg_type as p1
 WHERE (p1.typlen <= 0 AND p1.typlen != -1) OR
-    (p1.typtype != 'b' AND p1.typtype != 'c' AND p1.typtype != 'p') OR
+    p1.typtype not in('b', 'c', 'd', 'p') OR
     NOT p1.typisdefined OR
     (p1.typalign != 'c' AND p1.typalign != 's' AND
      p1.typalign != 'i' AND p1.typalign != 'd') OR
@@ -55,7 +55,7 @@ WHERE (p1.typtype = 'c' AND p1.typrelid = 0) OR
 
 SELECT p1.oid, p1.typname
 FROM pg_type as p1
-WHERE p1.typtype = 'b' AND p1.typname NOT LIKE '\\_%' AND NOT EXISTS
+WHERE p1.typtype in ('b','d') AND p1.typname NOT LIKE '\\_%' AND NOT EXISTS
     (SELECT 1 FROM pg_type as p2
      WHERE p2.typname = ('_' || p1.typname)::name AND
            p2.typelem = p1.oid);