mirror of
https://github.com/postgres/postgres.git
synced 2026-06-14 19:20:08 -04:00
2ed532ee8c
Most error messages about a relkind that was not supported or
appropriate for the command was of the pattern
"relation \"%s\" is not a table, foreign table, or materialized view"
This style can become verbose and tedious to maintain. Moreover, it's
not very helpful: If I'm trying to create a comment on a TOAST table,
which is not supported, then the information that I could have created
a comment on a materialized view is pointless.
Instead, write the primary error message shorter and saying more
directly that what was attempted is not possible. Then, in the detail
message, explain that the operation is not supported for the relkind
the object was. To simplify that, add a new function
errdetail_relkind_not_supported() that does this.
In passing, make use of RELKIND_HAS_STORAGE() where appropriate,
instead of listing out the relkinds individually.
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Reviewed-by: Alvaro Herrera <alvherre@alvh.no-ip.org>
Discussion: https://www.postgresql.org/message-id/flat/dc35a398-37d0-75ce-07ea-1dd71d98f8ec@2ndquadrant.com
143 lines
5.5 KiB
Makefile
143 lines
5.5 KiB
Makefile
#-------------------------------------------------------------------------
|
|
#
|
|
# Makefile for backend/catalog
|
|
#
|
|
# Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
|
|
# Portions Copyright (c) 1994, Regents of the University of California
|
|
#
|
|
# src/backend/catalog/Makefile
|
|
#
|
|
#-------------------------------------------------------------------------
|
|
|
|
subdir = src/backend/catalog
|
|
top_builddir = ../../..
|
|
include $(top_builddir)/src/Makefile.global
|
|
|
|
OBJS = \
|
|
aclchk.o \
|
|
catalog.o \
|
|
dependency.o \
|
|
heap.o \
|
|
index.o \
|
|
indexing.o \
|
|
namespace.o \
|
|
objectaccess.o \
|
|
objectaddress.o \
|
|
partition.o \
|
|
pg_aggregate.o \
|
|
pg_cast.o \
|
|
pg_class.o \
|
|
pg_collation.o \
|
|
pg_constraint.o \
|
|
pg_conversion.o \
|
|
pg_db_role_setting.o \
|
|
pg_depend.o \
|
|
pg_enum.o \
|
|
pg_inherits.o \
|
|
pg_largeobject.o \
|
|
pg_namespace.o \
|
|
pg_operator.o \
|
|
pg_proc.o \
|
|
pg_publication.o \
|
|
pg_range.o \
|
|
pg_shdepend.o \
|
|
pg_subscription.o \
|
|
pg_type.o \
|
|
storage.o \
|
|
toasting.o
|
|
|
|
include $(top_srcdir)/src/backend/common.mk
|
|
|
|
# Note: the order of this list determines the order in which the catalog
|
|
# header files are assembled into postgres.bki. BKI_BOOTSTRAP catalogs
|
|
# must appear first, and pg_statistic before pg_statistic_ext_data, and
|
|
# there are reputedly other, undocumented ordering dependencies.
|
|
CATALOG_HEADERS := \
|
|
pg_proc.h pg_type.h pg_attribute.h pg_class.h \
|
|
pg_attrdef.h pg_constraint.h pg_inherits.h pg_index.h pg_operator.h \
|
|
pg_opfamily.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
|
|
pg_language.h pg_largeobject_metadata.h pg_largeobject.h pg_aggregate.h \
|
|
pg_statistic.h pg_statistic_ext.h pg_statistic_ext_data.h \
|
|
pg_rewrite.h pg_trigger.h pg_event_trigger.h pg_description.h \
|
|
pg_cast.h pg_enum.h pg_namespace.h pg_conversion.h pg_depend.h \
|
|
pg_database.h pg_db_role_setting.h pg_tablespace.h \
|
|
pg_authid.h pg_auth_members.h pg_shdepend.h pg_shdescription.h \
|
|
pg_ts_config.h pg_ts_config_map.h pg_ts_dict.h \
|
|
pg_ts_parser.h pg_ts_template.h pg_extension.h \
|
|
pg_foreign_data_wrapper.h pg_foreign_server.h pg_user_mapping.h \
|
|
pg_foreign_table.h pg_policy.h pg_replication_origin.h \
|
|
pg_default_acl.h pg_init_privs.h pg_seclabel.h pg_shseclabel.h \
|
|
pg_collation.h pg_partitioned_table.h pg_range.h pg_transform.h \
|
|
pg_sequence.h pg_publication.h pg_publication_rel.h pg_subscription.h \
|
|
pg_subscription_rel.h
|
|
|
|
GENERATED_HEADERS := $(CATALOG_HEADERS:%.h=%_d.h) schemapg.h system_fk_info.h
|
|
|
|
POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/, $(CATALOG_HEADERS))
|
|
|
|
# The .dat files we need can just be listed alphabetically.
|
|
POSTGRES_BKI_DATA = $(addprefix $(top_srcdir)/src/include/catalog/,\
|
|
pg_aggregate.dat pg_am.dat pg_amop.dat pg_amproc.dat pg_authid.dat \
|
|
pg_cast.dat pg_class.dat pg_collation.dat pg_conversion.dat \
|
|
pg_database.dat pg_language.dat \
|
|
pg_namespace.dat pg_opclass.dat pg_operator.dat pg_opfamily.dat \
|
|
pg_proc.dat pg_range.dat pg_tablespace.dat \
|
|
pg_ts_config.dat pg_ts_config_map.dat pg_ts_dict.dat pg_ts_parser.dat \
|
|
pg_ts_template.dat pg_type.dat \
|
|
)
|
|
|
|
all: distprep generated-header-symlinks
|
|
|
|
distprep: bki-stamp
|
|
|
|
.PHONY: generated-header-symlinks
|
|
|
|
generated-header-symlinks: $(top_builddir)/src/include/catalog/header-stamp
|
|
|
|
# bki-stamp records the last time we ran genbki.pl. We don't rely on
|
|
# the timestamps of the individual output files, because the Perl script
|
|
# won't update them if they didn't change (to avoid unnecessary recompiles).
|
|
# Technically, this should depend on Makefile.global which supplies
|
|
# $(MAJORVERSION); but then genbki.pl would need to be re-run after every
|
|
# configure run, even in distribution tarballs. So depending on configure.ac
|
|
# instead is cheating a bit, but it will achieve the goal of updating the
|
|
# version number when it changes.
|
|
bki-stamp: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS) $(POSTGRES_BKI_DATA) $(top_srcdir)/configure.ac
|
|
$(PERL) $< --include-path=$(top_srcdir)/src/include/ \
|
|
--set-version=$(MAJORVERSION) $(POSTGRES_BKI_SRCS)
|
|
touch $@
|
|
|
|
# The generated headers must all be symlinked into builddir/src/include/,
|
|
# using absolute links for the reasons explained in src/backend/Makefile.
|
|
# We use header-stamp to record that we've done this because the symlinks
|
|
# themselves may appear older than bki-stamp.
|
|
$(top_builddir)/src/include/catalog/header-stamp: bki-stamp
|
|
prereqdir=`cd '$(dir $<)' >/dev/null && pwd` && \
|
|
cd '$(dir $@)' && for file in $(GENERATED_HEADERS); do \
|
|
rm -f $$file && $(LN_S) "$$prereqdir/$$file" . ; \
|
|
done
|
|
touch $@
|
|
|
|
# Note: installation of generated headers is handled elsewhere
|
|
.PHONY: install-data
|
|
install-data: bki-stamp installdirs
|
|
$(INSTALL_DATA) $(call vpathsearch,postgres.bki) '$(DESTDIR)$(datadir)/postgres.bki'
|
|
$(INSTALL_DATA) $(call vpathsearch,system_constraints.sql) '$(DESTDIR)$(datadir)/system_constraints.sql'
|
|
$(INSTALL_DATA) $(srcdir)/system_functions.sql '$(DESTDIR)$(datadir)/system_functions.sql'
|
|
$(INSTALL_DATA) $(srcdir)/system_views.sql '$(DESTDIR)$(datadir)/system_views.sql'
|
|
$(INSTALL_DATA) $(srcdir)/information_schema.sql '$(DESTDIR)$(datadir)/information_schema.sql'
|
|
$(INSTALL_DATA) $(srcdir)/sql_features.txt '$(DESTDIR)$(datadir)/sql_features.txt'
|
|
|
|
installdirs:
|
|
$(MKDIR_P) '$(DESTDIR)$(datadir)'
|
|
|
|
.PHONY: uninstall-data
|
|
uninstall-data:
|
|
rm -f $(addprefix '$(DESTDIR)$(datadir)'/, postgres.bki system_constraints.sql system_functions.sql system_views.sql information_schema.sql sql_features.txt)
|
|
|
|
# postgres.bki, system_constraints.sql, and the generated headers are
|
|
# in the distribution tarball, so they are not cleaned here.
|
|
clean:
|
|
|
|
maintainer-clean: clean
|
|
rm -f bki-stamp postgres.bki system_constraints.sql $(GENERATED_HEADERS)
|