aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2016-11-10 15:00:58 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2016-11-10 15:00:58 -0500
commit530f8065243b185e56c70ab317a9b40964b4ad00 (patch)
tree265f132e37d91ce5bfc8bb3bcfae95165f4ed09c
parent279c439c7fbc1bcb52173d92dd3b1fbe63e497ab (diff)
downloadpostgresql-530f8065243b185e56c70ab317a9b40964b4ad00.tar.gz
postgresql-530f8065243b185e56c70ab317a9b40964b4ad00.zip
Re-allow user_catalog_table option for materialized views.
The reloptions stuff allows this option to be set on a matview. While it's questionable whether that is useful or was really intended, it does work, and we shouldn't change that in minor releases. Commit e3e66d8a9 disabled the option since I didn't realize that it was possible for it to be set on a matview. Tweak the test to re-allow it. Discussion: <19749.1478711862@sss.pgh.pa.us>
-rw-r--r--src/include/utils/rel.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index c867ebb233d..fa15f28468d 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -270,8 +270,9 @@ typedef struct StdRdOptions
* from the pov of logical decoding. Note multiple eval of argument!
*/
#define RelationIsUsedAsCatalogTable(relation) \
- ((relation)->rd_rel->relkind == RELKIND_RELATION && \
- (relation)->rd_options ? \
+ ((relation)->rd_options && \
+ ((relation)->rd_rel->relkind == RELKIND_RELATION || \
+ (relation)->rd_rel->relkind == RELKIND_MATVIEW) ? \
((StdRdOptions *) (relation)->rd_options)->user_catalog_table : false)
/*