postgres.git / summary / log / commit / refs

commit    df44405a0c5c725706317c1faa6e8a0760f17dcc
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Mon Aug 28 14:14:20 2017 +0000

    Fix over-aggressive sanity check in misc_sanity.sql.
    
    Fix thinko in commit 8be8510cf: it's okay to have dbid == 0 in normal
    (non-pin) entries in pg_shdepend, because global objects such as
    databases are entered that way.  The test would pass so long as it
    was run in a cluster containing no databases/tablespaces owned by,
    or granted to, roles other than the bootstrap superuser.  That's the
    expected situation for "make check", but for "make installcheck", not
    so much.
    
    Reported by Ryan Murphy.
    
    Discussion: https://postgr.es/m/CAHeEsBc6EQe0mxGBKDXAwJbntgfvoAd5MQC-5362SmC3Tng_6g@mail.gmail.com


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

diff --git a/src/test/regress/expected/misc_sanity.out b/src/test/regress/expected/misc_sanity.out
index f02689660bd..5aaae6c39fc 100644
--- a/src/test/regress/expected/misc_sanity.out
+++ b/src/test/regress/expected/misc_sanity.out
@@ -29,7 +29,7 @@ SELECT *
 FROM pg_shdepend as d1
 WHERE refclassid = 0 OR refobjid = 0 OR
       deptype NOT IN ('a', 'o', 'p', 'r') OR
-      (deptype != 'p' AND (dbid = 0 OR classid = 0 OR objid = 0)) OR
+      (deptype != 'p' AND (classid = 0 OR objid = 0)) OR
       (deptype = 'p' AND (dbid != 0 OR classid != 0 OR objid != 0 OR objsubid != 0));
  dbid | classid | objid | objsubid | refclassid | refobjid | deptype 
 ------+---------+-------+----------+------------+----------+---------
diff --git a/src/test/regress/sql/misc_sanity.sql b/src/test/regress/sql/misc_sanity.sql
index 5130a4ab794..b921117fa52 100644
--- a/src/test/regress/sql/misc_sanity.sql
+++ b/src/test/regress/sql/misc_sanity.sql
@@ -32,7 +32,7 @@ SELECT *
 FROM pg_shdepend as d1
 WHERE refclassid = 0 OR refobjid = 0 OR
       deptype NOT IN ('a', 'o', 'p', 'r') OR
-      (deptype != 'p' AND (dbid = 0 OR classid = 0 OR objid = 0)) OR
+      (deptype != 'p' AND (classid = 0 OR objid = 0)) OR
       (deptype = 'p' AND (dbid != 0 OR classid != 0 OR objid != 0 OR objsubid != 0));
 
 


[parent: 5ecd7ccbe672]