summaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/misc.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2012-04-10 21:42:46 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2012-04-10 21:43:14 -0400
commit3769fa5fc64298143cf535c8a06921793598e458 (patch)
tree64a553eb9f2a760275e1a54a96c17663ecb7cc4b /src/backend/utils/adt/misc.c
parent38458e45736efeb0d82739305c77c529c9cf0e1e (diff)
Make pg_tablespace_location(0) return the database's default tablespace.
This definition is convenient when applying the function to the reltablespace column of pg_class, since that's what zero means there; and it doesn't interfere with any other plausible use of the function. Per gripe from Bruce Momjian.
Diffstat (limited to 'src/backend/utils/adt/misc.c')
-rw-r--r--src/backend/utils/adt/misc.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 6a1b4771472..6bd7d531bbc 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -335,7 +335,15 @@ pg_tablespace_location(PG_FUNCTION_ARGS)
int rllen;
/*
- * Return empty string for our default tablespaces
+ * It's useful to apply this function to pg_class.reltablespace, wherein
+ * zero means "the database's default tablespace". So, rather than
+ * throwing an error for zero, we choose to assume that's what is meant.
+ */
+ if (tablespaceOid == InvalidOid)
+ tablespaceOid = MyDatabaseTableSpace;
+
+ /*
+ * Return empty string for the cluster's default tablespaces
*/
if (tablespaceOid == DEFAULTTABLESPACE_OID ||
tablespaceOid == GLOBALTABLESPACE_OID)