Merge catalog/pg_foo_fn.h headers back into pg_foo.h headers.

Traditionally, include/catalog/pg_foo.h contains extern declarations
for functions in backend/catalog/pg_foo.c, in addition to its function
as the authoritative definition of the pg_foo catalog's rowtype.
In some cases, we'd been forced to split out those extern declarations
into separate pg_foo_fn.h headers so that the catalog definitions
could be #include'd by frontend code.  That problem is gone as of
commit 9c0a0de4c, so let's undo the splits to make things less
confusing.

Discussion: https://postgr.es/m/23690.1523031777@sss.pgh.pa.us

diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c
index c1fa320eb4bbe4bc202bb901844f777475ed0f89..9bdbd7b60f57ee900eab3d26b1774a78da238768 100644 (file)
--- a/contrib/sepgsql/dml.c
+++ b/contrib/sepgsql/dml.c
@@ -18,7 +18,7 @@
 #include "catalog/dependency.h"
 #include "catalog/pg_attribute.h"
 #include "catalog/pg_class.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "commands/seclabel.h"
 #include "commands/tablecmds.h"
 #include "executor/executor.h"

diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index b7e39af7a243eee9c6cab31d9907fc82dc09d0ac..c23cfdaf6be27f8f766258347b1ba3a19fac3036 100644 (file)
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -27,11 +27,8 @@
 #include "catalog/pg_authid.h"
 #include "catalog/pg_cast.h"
 #include "catalog/pg_collation.h"
-#include "catalog/pg_collation_fn.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_constraint_fn.h"
 #include "catalog/pg_conversion.h"
-#include "catalog/pg_conversion_fn.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_default_acl.h"
 #include "catalog/pg_depend.h"

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index faa12e061516a4a6f98822eafdc1acc2e6d92002..8f329a6299b2e33b33f6f1f4a41f168f8e8c1ec0 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -45,7 +45,6 @@
 #include "catalog/pg_attrdef.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_constraint_fn.h"
 #include "catalog/pg_foreign_table.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_namespace.h"
@@ -55,7 +54,6 @@
 #include "catalog/pg_subscription_rel.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_type_fn.h"
 #include "catalog/storage.h"
 #include "catalog/storage_xlog.h"
 #include "commands/tablecmds.h"

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 0966aec25f26b77ee0b4f90826df0c366be51762..5d73e92901f1dc473873d21c0856442e7bf04ed3 100644 (file)
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -41,9 +41,8 @@
 #include "catalog/pg_am.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_constraint_fn.h"
 #include "catalog/pg_depend.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_tablespace.h"

diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index d69b015c6980089a2d37b51bfc7bd6665cddb768..0f67a122ededddc76d29c8cab7219ac37198182b 100644 (file)
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -28,7 +28,6 @@
 #include "catalog/pg_authid.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_conversion.h"
-#include "catalog/pg_conversion_fn.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_operator.h"

diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index 119297b33a00c6d7cbc156bf6468567b072d4089..3cbee108c38c002ad755649d7efe95d179931979 100644 (file)
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -30,7 +30,6 @@
 #include "catalog/pg_event_trigger.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_constraint_fn.h"
 #include "catalog/pg_conversion.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_extension.h"

diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index 4b31ff0ead4dd8bd62b44450c5694c6b4216aaba..0f5932feeef700515d9eb5dd41114ecabdce34d9 100644 (file)
--- a/src/backend/catalog/partition.c
+++ b/src/backend/catalog/partition.c
@@ -26,7 +26,6 @@
 #include "catalog/partition.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_inherits.h"
-#include "catalog/pg_inherits_fn.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_partitioned_table.h"
 #include "catalog/pg_type.h"

diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index 50d8d81f2ccce64d3b7cb41b328d7534a61cc9bf..66b4af93bdb1c72b47fdab0c5d754c17f148153d 100644 (file)
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -19,11 +19,9 @@
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_aggregate.h"
-#include "catalog/pg_aggregate_fn.h"
 #include "catalog/pg_language.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_proc_fn.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
 #include "parser/parse_coerce.h"

diff --git a/src/backend/catalog/pg_collation.c b/src/backend/catalog/pg_collation.c
index d280869bafcb3de187453e53af4d7a0f1e2219ad..ce7e5fb5cc18f03fe99965c48ac648a3629fe788 100644 (file)
--- a/src/backend/catalog/pg_collation.c
+++ b/src/backend/catalog/pg_collation.c
@@ -22,7 +22,6 @@
 #include "catalog/indexing.h"
 #include "catalog/objectaccess.h"
 #include "catalog/pg_collation.h"
-#include "catalog/pg_collation_fn.h"
 #include "catalog/pg_namespace.h"
 #include "mb/pg_wchar.h"
 #include "utils/builtins.h"

diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c
index 485fd370803d11586ce0b141e351dd2668c74133..8ba9890ca687a360d4052b59e2ca1c2afbbaf27a 100644 (file)
--- a/src/backend/catalog/pg_constraint.c
+++ b/src/backend/catalog/pg_constraint.c
@@ -22,7 +22,6 @@
 #include "catalog/indexing.h"
 #include "catalog/objectaccess.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_constraint_fn.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"

diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c
index 76fcd8fd9ce82bee0d75fe5a1e78f23937950307..fd5c18426bfc80119eb4925d40178074fda0d5a5 100644 (file)
--- a/src/backend/catalog/pg_conversion.c
+++ b/src/backend/catalog/pg_conversion.c
@@ -21,7 +21,6 @@
 #include "catalog/indexing.h"
 #include "catalog/objectaccess.h"
 #include "catalog/pg_conversion.h"
-#include "catalog/pg_conversion_fn.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_proc.h"
 #include "mb/pg_wchar.h"

diff --git a/src/backend/catalog/pg_inherits.c b/src/backend/catalog/pg_inherits.c
index 5a5beb9273efeec4b8dbc973afb3fc1fe9610d33..6160804ef8ec7ddfe812c91f2d214a1188af2a3c 100644 (file)
--- a/src/backend/catalog/pg_inherits.c
+++ b/src/backend/catalog/pg_inherits.c
@@ -24,7 +24,6 @@
 #include "access/htup_details.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_inherits.h"
-#include "catalog/pg_inherits_fn.h"
 #include "parser/parse_type.h"
 #include "storage/lmgr.h"
 #include "utils/builtins.h"

diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 051602d820c1e9164d057c81872d675f62ceb505..6dde75ed2520f8e0422418eeb54fb6527aac758d 100644 (file)
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -26,7 +26,6 @@
 #include "catalog/objectaccess.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_operator.h"
-#include "catalog/pg_operator_fn.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"

diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 466ff038e7a43e18997cd92cf2af86724290e279..d78335291194d7fad7432ca8bf285d85b2a245b9 100644 (file)
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -22,7 +22,6 @@
 #include "catalog/pg_language.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_proc_fn.h"
 #include "catalog/pg_transform.h"
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
@@ -60,7 +59,7 @@ static bool match_prosrc_to_literal(const char *prosrc, const char *literal,
  *
  * Note: allParameterTypes, parameterModes, parameterNames, trftypes, and proconfig
  * are either arrays of the proper types or NULL.  We declare them Datum,
- * not "ArrayType *", to avoid importing array.h into pg_proc_fn.h.
+ * not "ArrayType *", to avoid importing array.h into pg_proc.h.
  * ----------------------------------------------------------------
  */
 ObjectAddress

diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 660ac5b7c9f3441c65ede7e87a0ecf448930f9fe..2ddd46d48edc5ac2f89bf175f1fa29bae50ca897 100644 (file)
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -25,7 +25,6 @@
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_type_fn.h"
 #include "commands/typecmds.h"
 #include "miscadmin.h"
 #include "parser/scansup.h"

diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c
index a48c3ac5727a50c28f3c9d434b561d80a70f47a8..a1fd871d317ce3c2c078b37303c48fc92e6a452a 100644 (file)
--- a/src/backend/commands/aggregatecmds.c
+++ b/src/backend/commands/aggregatecmds.c
@@ -26,7 +26,6 @@
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_aggregate.h"
-#include "catalog/pg_aggregate_fn.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "commands/alter.h"

diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 378784a93ca6b23f5af592996558e50e1f9ff667..d471541097d784763df1b3d30f3250f8aef7aa6a 100644 (file)
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -27,7 +27,7 @@
 #include "catalog/index.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_collation.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_statistic_ext.h"
 #include "commands/dbcommands.h"

diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
index d0b5cdb69a2c613dc3a95fc66174cc0b5bd13fd9..8fb51e8c3d178377a6852d399b0d608854c4cac8 100644 (file)
--- a/src/backend/commands/collationcmds.c
+++ b/src/backend/commands/collationcmds.c
@@ -22,7 +22,6 @@
 #include "catalog/namespace.h"
 #include "catalog/objectaccess.h"
 #include "catalog/pg_collation.h"
-#include "catalog/pg_collation_fn.h"
 #include "commands/alter.h"
 #include "commands/collationcmds.h"
 #include "commands/comment.h"

diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c
index 01a02484a24b4ab2a8e26001015604adadd06cca..e36fc23dd85d64c445a2bbc0bf962c25574bff48 100644 (file)
--- a/src/backend/commands/conversioncmds.c
+++ b/src/backend/commands/conversioncmds.c
@@ -18,7 +18,6 @@
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_conversion.h"
-#include "catalog/pg_conversion_fn.h"
 #include "catalog/pg_type.h"
 #include "commands/alter.h"
 #include "commands/conversioncmds.h"

diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index c46493dd88bfc7c974981eea1831bf0ac84feb23..80cbbf94b47c0f97354a81bd4d570ee65d544b51 100644 (file)
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -44,10 +44,8 @@
 #include "catalog/pg_language.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_proc_fn.h"
 #include "catalog/pg_transform.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_type_fn.h"
 #include "commands/alter.h"
 #include "commands/defrem.h"
 #include "commands/proclang.h"

diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 10f01bf5b70a259dcf890be7b9c6b5df046e41a4..3fb2344198a77bd8436330bdeb9147816fde1eaf 100644 (file)
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -25,9 +25,8 @@
 #include "catalog/indexing.h"
 #include "catalog/partition.h"
 #include "catalog/pg_am.h"
-#include "catalog/pg_constraint_fn.h"
+#include "catalog/pg_constraint.h"
 #include "catalog/pg_inherits.h"
-#include "catalog/pg_inherits_fn.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_opfamily.h"
 #include "catalog/pg_tablespace.h"

diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index b247c0fe2e16345754de2baa92c199e5ad75df90..6daf8e9b453a70cafeca29c529fd0c0eefd73718 100644 (file)
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -15,7 +15,7 @@
 #include "postgres.h"
 
 #include "catalog/namespace.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "commands/lockcmds.h"
 #include "miscadmin.h"
 #include "parser/parse_clause.h"

diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c
index 585382d7587906b83b7a85226635ae87702cbc84..f0da4c5279231a557f3fb6126bd757e7728ce01c 100644 (file)
--- a/src/backend/commands/operatorcmds.c
+++ b/src/backend/commands/operatorcmds.c
@@ -40,7 +40,6 @@
 #include "catalog/indexing.h"
 #include "catalog/objectaccess.h"
 #include "catalog/pg_operator.h"
-#include "catalog/pg_operator_fn.h"
 #include "catalog/pg_type.h"
 #include "commands/alter.h"
 #include "commands/defrem.h"

diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 447bd49f894e573db50ca0916949a620a3f47821..c900ad9431a5a10ca898cd547690176d851bd5f6 100644 (file)
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -24,7 +24,6 @@
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_pltemplate.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_proc_fn.h"
 #include "catalog/pg_type.h"
 #include "commands/dbcommands.h"
 #include "commands/defrem.h"

diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index 29992d4a0e2fedf9086e68843bdd7351dfa3bb07..6f7762a906caa32c7fffd472f50083f30a5ce609 100644 (file)
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -28,7 +28,7 @@
 #include "catalog/namespace.h"
 #include "catalog/objectaccess.h"
 #include "catalog/objectaddress.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_publication.h"
 #include "catalog/pg_publication_rel.h"

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 846811d1b8e2e3778921a2fd08aa1c49d668117a..43b2fce2c51ca98010f3c2324fe76c6c431f3bc5 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -35,17 +35,14 @@
 #include "catalog/pg_am.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_constraint_fn.h"
 #include "catalog/pg_depend.h"
 #include "catalog/pg_foreign_table.h"
 #include "catalog/pg_inherits.h"
-#include "catalog/pg_inherits_fn.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_trigger.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_type_fn.h"
 #include "catalog/storage.h"
 #include "catalog/storage_xlog.h"
 #include "catalog/toasting.h"

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 5c276b51dc2dd82b25da4234de425171fb854ebd..0d57d4674845a57d6eb44aa44bc8f2b7c630d654 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -24,8 +24,7 @@
 #include "catalog/indexing.h"
 #include "catalog/objectaccess.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_constraint_fn.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_trigger.h"
 #include "catalog/pg_type.h"

diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 04b8b907b55b639e2ea77738d9e37d1190007ba9..7746d1825894b102a1056c498cbefcece1c6986a 100644 (file)
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -41,16 +41,13 @@
 #include "catalog/pg_authid.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_constraint_fn.h"
 #include "catalog/pg_depend.h"
 #include "catalog/pg_enum.h"
 #include "catalog/pg_language.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_proc_fn.h"
 #include "catalog/pg_range.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_type_fn.h"
 #include "commands/defrem.h"
 #include "commands/tablecmds.h"
 #include "commands/typecmds.h"

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index a1782c28742ccad6602fdec1048f484009d86514..d90cb9a9022d0f967b3cdb3a5d95af9330e39099 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -32,7 +32,7 @@
 #include "access/xact.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_database.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/pg_namespace.h"
 #include "commands/cluster.h"
 #include "commands/vacuum.h"

diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c
index 57a24d487830f615d06bf4854817677e178d2c47..50bea2c2ceb2da6cbca6a7506d4fc06f1b02d6f9 100644 (file)
--- a/src/backend/executor/execPartition.c
+++ b/src/backend/executor/execPartition.c
@@ -14,7 +14,7 @@
 
 #include "postgres.h"
 
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/pg_type.h"
 #include "executor/execPartition.h"
 #include "executor/executor.h"

diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 421dc79cc4e678f314a91402b7229e6dd22d3715..20f49e5d432090d1a7d3e0ab534703b60a5dbd10 100644 (file)
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -22,7 +22,7 @@
 #include "access/parallel.h"
 #include "access/sysattr.h"
 #include "access/xact.h"
-#include "catalog/pg_constraint_fn.h"
+#include "catalog/pg_constraint.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "executor/executor.h"

diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 2ce4d4496dc69a77b314a100d4bbc3cf2607ce87..8d86e98adc118c2d7c6715ded8ba5d64a7c90017 100644 (file)
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -34,7 +34,7 @@
 #include "access/htup_details.h"
 #include "access/sysattr.h"
 #include "catalog/partition.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"

diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 544e7300b89c7a0653c0050889bbf91646bf3e26..0307738946a2f97c82abaa9eba7df284835052d9 100644 (file)
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -15,7 +15,7 @@
 #include "postgres.h"
 
 #include "catalog/pg_aggregate.h"
-#include "catalog/pg_constraint_fn.h"
+#include "catalog/pg_constraint.h"
 #include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"

diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index a00c2b46e62dfdfdd94dfe0d273815ec18523dc7..c73d06b3917e4dd9b6828aa413b1b466fd14b741 100644 (file)
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -26,7 +26,7 @@
 #include "catalog/pg_am.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_collation.h"
-#include "catalog/pg_constraint_fn.h"
+#include "catalog/pg_constraint.h"
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
 #include "nodes/makefuncs.h"

diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 665d3327a02a651c9443eb4ac348d6ea5a1c7dde..c31a5630b2fce7723ccfbb8be53fb5da06bbfa90 100644 (file)
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -17,7 +17,7 @@
 #include "access/htup_details.h"
 #include "catalog/pg_cast.h"
 #include "catalog/pg_class.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"

diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index bbbb1a8c1fe86c4b54fdc227ead5fa5f55d30c01..f9f9904bad80763a9ed401cb80f0496bd004d27c 100644 (file)
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -36,7 +36,6 @@
 #include "catalog/pg_am.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_constraint_fn.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_statistic_ext.h"

diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c
index 6e85886e646f3c7262f8026644a629971fc73a39..57e52b4f9883fa948969f2804046f1d98104f42b 100644 (file)
--- a/src/backend/rewrite/rowsecurity.c
+++ b/src/backend/rewrite/rowsecurity.c
@@ -38,7 +38,7 @@
 #include "access/htup_details.h"
 #include "access/sysattr.h"
 #include "catalog/pg_class.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/pg_policy.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"

diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 84f2591736866bf77f53ba49fdb52ad5d740353e..4effadcb300b952836833418f370cb87784fb173 100644 (file)
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -23,7 +23,7 @@
 #include "access/xlog.h"
 #include "catalog/catalog.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_inherits_fn.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/toasting.h"
 #include "commands/alter.h"
 #include "commands/async.h"

diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index 79f9ce0c146e4dfccd7379b5f4cb216705f41c63..8eb5f63f56ef6255ba1c3e7d3e2f8eb725859ad7 100644 (file)
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -21,6 +21,9 @@
 #include "catalog/genbki.h"
 #include "catalog/pg_aggregate_d.h"
 
+#include "catalog/objectaddress.h"
+#include "nodes/pg_list.h"
+
 /* ----------------------------------------------------------------
  *     pg_aggregate definition.
  *     cpp turns this into typedef struct FormData_pg_aggregate
@@ -136,4 +139,37 @@ typedef FormData_pg_aggregate *Form_pg_aggregate;
 
 #endif                         /* EXPOSE_TO_CLIENT_CODE */
 
+
+extern ObjectAddress AggregateCreate(const char *aggName,
+               Oid aggNamespace,
+               char aggKind,
+               int numArgs,
+               int numDirectArgs,
+               oidvector *parameterTypes,
+               Datum allParameterTypes,
+               Datum parameterModes,
+               Datum parameterNames,
+               List *parameterDefaults,
+               Oid variadicArgType,
+               List *aggtransfnName,
+               List *aggfinalfnName,
+               List *aggcombinefnName,
+               List *aggserialfnName,
+               List *aggdeserialfnName,
+               List *aggmtransfnName,
+               List *aggminvtransfnName,
+               List *aggmfinalfnName,
+               bool finalfnExtraArgs,
+               bool mfinalfnExtraArgs,
+               char finalfnModify,
+               char mfinalfnModify,
+               List *aggsortopName,
+               Oid aggTransType,
+               int32 aggTransSpace,
+               Oid aggmTransType,
+               int32 aggmTransSpace,
+               const char *agginitval,
+               const char *aggminitval,
+               char proparallel);
+
 #endif                         /* PG_AGGREGATE_H */

diff --git a/src/include/catalog/pg_aggregate_fn.h b/src/include/catalog/pg_aggregate_fn.h
deleted file mode 100644 (file)
index 00f533a..0000000
--- a/src/include/catalog/pg_aggregate_fn.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_aggregate_fn.h
- *   prototypes for functions in catalog/pg_aggregate.c
- *
- *
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/catalog/pg_aggregate_fn.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_AGGREGATE_FN_H
-#define PG_AGGREGATE_FN_H
-
-#include "catalog/objectaddress.h"
-#include "nodes/pg_list.h"
-
-extern ObjectAddress AggregateCreate(const char *aggName,
-               Oid aggNamespace,
-               char aggKind,
-               int numArgs,
-               int numDirectArgs,
-               oidvector *parameterTypes,
-               Datum allParameterTypes,
-               Datum parameterModes,
-               Datum parameterNames,
-               List *parameterDefaults,
-               Oid variadicArgType,
-               List *aggtransfnName,
-               List *aggfinalfnName,
-               List *aggcombinefnName,
-               List *aggserialfnName,
-               List *aggdeserialfnName,
-               List *aggmtransfnName,
-               List *aggminvtransfnName,
-               List *aggmfinalfnName,
-               bool finalfnExtraArgs,
-               bool mfinalfnExtraArgs,
-               char finalfnModify,
-               char mfinalfnModify,
-               List *aggsortopName,
-               Oid aggTransType,
-               int32 aggTransSpace,
-               Oid aggmTransType,
-               int32 aggmTransSpace,
-               const char *agginitval,
-               const char *aggminitval,
-               char proparallel);
-
-#endif                         /* PG_AGGREGATE_FN_H */

diff --git a/src/include/catalog/pg_collation.h b/src/include/catalog/pg_collation.h
index d932a42ce0d459a0da750a7cc42aadbf2efd676e..5c73bbf94f4ad5ff4a7784cc522f726059c56893 100644 (file)
--- a/src/include/catalog/pg_collation.h
+++ b/src/include/catalog/pg_collation.h
@@ -57,4 +57,15 @@ typedef FormData_pg_collation *Form_pg_collation;
 
 #endif                         /* EXPOSE_TO_CLIENT_CODE */
 
+
+extern Oid CollationCreate(const char *collname, Oid collnamespace,
+               Oid collowner,
+               char collprovider,
+               int32 collencoding,
+               const char *collcollate, const char *collctype,
+               const char *collversion,
+               bool if_not_exists,
+               bool quiet);
+extern void RemoveCollationById(Oid collationOid);
+
 #endif                         /* PG_COLLATION_H */

diff --git a/src/include/catalog/pg_collation_fn.h b/src/include/catalog/pg_collation_fn.h
deleted file mode 100644 (file)
index f01f2ae..0000000
--- a/src/include/catalog/pg_collation_fn.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_collation_fn.h
- *  prototypes for functions in catalog/pg_collation.c
- *
- *
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/catalog/pg_collation_fn.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_COLLATION_FN_H
-#define PG_COLLATION_FN_H
-
-extern Oid CollationCreate(const char *collname, Oid collnamespace,
-               Oid collowner,
-               char collprovider,
-               int32 collencoding,
-               const char *collcollate, const char *collctype,
-               const char *collversion,
-               bool if_not_exists,
-               bool quiet);
-extern void RemoveCollationById(Oid collationOid);
-
-#endif                         /* PG_COLLATION_FN_H */

diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
index 5164092231562e343ce60ad0b96e062a21fefddb..017e4de4aba6f6bcd0d391cc5a5a66b214db5036 100644 (file)
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -21,6 +21,9 @@
 #include "catalog/genbki.h"
 #include "catalog/pg_constraint_d.h"
 
+#include "catalog/dependency.h"
+#include "nodes/pg_list.h"
+
 /* ----------------
  *     pg_constraint definition.  cpp turns this into
  *     typedef struct FormData_pg_constraint
@@ -174,4 +177,89 @@ typedef FormData_pg_constraint *Form_pg_constraint;
 
 #endif                         /* EXPOSE_TO_CLIENT_CODE */
 
+/*
+ * Identify constraint type for lookup purposes
+ */
+typedef enum ConstraintCategory
+{
+   CONSTRAINT_RELATION,
+   CONSTRAINT_DOMAIN,
+   CONSTRAINT_ASSERTION        /* for future expansion */
+} ConstraintCategory;
+
+/*
+ * Used when cloning a foreign key constraint to a partition, so that the
+ * caller can optionally set up a verification pass for it.
+ */
+typedef struct ClonedConstraint
+{
+   Oid         relid;
+   Oid         refrelid;
+   Oid         conindid;
+   Oid         conid;
+   Constraint *constraint;
+} ClonedConstraint;
+
+
+extern Oid CreateConstraintEntry(const char *constraintName,
+                     Oid constraintNamespace,
+                     char constraintType,
+                     bool isDeferrable,
+                     bool isDeferred,
+                     bool isValidated,
+                     Oid parentConstrId,
+                     Oid relId,
+                     const int16 *constraintKey,
+                     int constraintNKeys,
+                     int constraintNTotalKeys,
+                     Oid domainId,
+                     Oid indexRelId,
+                     Oid foreignRelId,
+                     const int16 *foreignKey,
+                     const Oid *pfEqOp,
+                     const Oid *ppEqOp,
+                     const Oid *ffEqOp,
+                     int foreignNKeys,
+                     char foreignUpdateType,
+                     char foreignDeleteType,
+                     char foreignMatchType,
+                     const Oid *exclOp,
+                     Node *conExpr,
+                     const char *conBin,
+                     const char *conSrc,
+                     bool conIsLocal,
+                     int conInhCount,
+                     bool conNoInherit,
+                     bool is_internal);
+
+extern void CloneForeignKeyConstraints(Oid parentId, Oid relationId,
+                          List **cloned);
+
+extern void RemoveConstraintById(Oid conId);
+extern void RenameConstraintById(Oid conId, const char *newname);
+
+extern bool ConstraintNameIsUsed(ConstraintCategory conCat, Oid objId,
+                    Oid objNamespace, const char *conname);
+extern char *ChooseConstraintName(const char *name1, const char *name2,
+                    const char *label, Oid namespaceid,
+                    List *others);
+
+extern void AlterConstraintNamespaces(Oid ownerId, Oid oldNspId,
+                         Oid newNspId, bool isType, ObjectAddresses *objsMoved);
+extern void ConstraintSetParentConstraint(Oid childConstrId,
+                             Oid parentConstrId);
+extern Oid get_relation_constraint_oid(Oid relid, const char *conname, bool missing_ok);
+extern Bitmapset *get_relation_constraint_attnos(Oid relid, const char *conname,
+                              bool missing_ok, Oid *constraintOid);
+extern Oid get_domain_constraint_oid(Oid typid, const char *conname, bool missing_ok);
+extern Oid get_relation_idx_constraint_oid(Oid relationId, Oid indexId);
+
+extern Bitmapset *get_primary_key_attnos(Oid relid, bool deferrableOk,
+                      Oid *constraintOid);
+
+extern bool check_functional_grouping(Oid relid,
+                         Index varno, Index varlevelsup,
+                         List *grouping_columns,
+                         List **constraintDeps);
+
 #endif                         /* PG_CONSTRAINT_H */

diff --git a/src/include/catalog/pg_constraint_fn.h b/src/include/catalog/pg_constraint_fn.h
deleted file mode 100644 (file)
index 5f64409..0000000
--- a/src/include/catalog/pg_constraint_fn.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_constraint_fn.h
- *  prototypes for functions in catalog/pg_constraint.c
- *
- *
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/catalog/pg_constraint_fn.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_CONSTRAINT_FN_H
-#define PG_CONSTRAINT_FN_H
-
-#include "catalog/dependency.h"
-#include "nodes/pg_list.h"
-
-/*
- * Identify constraint type for lookup purposes
- */
-typedef enum ConstraintCategory
-{
-   CONSTRAINT_RELATION,
-   CONSTRAINT_DOMAIN,
-   CONSTRAINT_ASSERTION        /* for future expansion */
-} ConstraintCategory;
-
-/*
- * Used when cloning a foreign key constraint to a partition, so that the
- * caller can optionally set up a verification pass for it.
- */
-typedef struct ClonedConstraint
-{
-   Oid     relid;
-   Oid     refrelid;
-   Oid     conindid;
-   Oid     conid;
-   Constraint *constraint;
-} ClonedConstraint;
-
-extern Oid CreateConstraintEntry(const char *constraintName,
-                     Oid constraintNamespace,
-                     char constraintType,
-                     bool isDeferrable,
-                     bool isDeferred,
-                     bool isValidated,
-                     Oid parentConstrId,
-                     Oid relId,
-                     const int16 *constraintKey,
-                     int constraintNKeys,
-                     int constraintNTotalKeys,
-                     Oid domainId,
-                     Oid indexRelId,
-                     Oid foreignRelId,
-                     const int16 *foreignKey,
-                     const Oid *pfEqOp,
-                     const Oid *ppEqOp,
-                     const Oid *ffEqOp,
-                     int foreignNKeys,
-                     char foreignUpdateType,
-                     char foreignDeleteType,
-                     char foreignMatchType,
-                     const Oid *exclOp,
-                     Node *conExpr,
-                     const char *conBin,
-                     const char *conSrc,
-                     bool conIsLocal,
-                     int conInhCount,
-                     bool conNoInherit,
-                     bool is_internal);
-
-extern void CloneForeignKeyConstraints(Oid parentId, Oid relationId,
-                          List **cloned);
-
-extern void RemoveConstraintById(Oid conId);
-extern void RenameConstraintById(Oid conId, const char *newname);
-
-extern bool ConstraintNameIsUsed(ConstraintCategory conCat, Oid objId,
-                    Oid objNamespace, const char *conname);
-extern char *ChooseConstraintName(const char *name1, const char *name2,
-                    const char *label, Oid namespaceid,
-                    List *others);
-
-extern void AlterConstraintNamespaces(Oid ownerId, Oid oldNspId,
-                         Oid newNspId, bool isType, ObjectAddresses *objsMoved);
-extern void ConstraintSetParentConstraint(Oid childConstrId,
-                             Oid parentConstrId);
-extern Oid get_relation_constraint_oid(Oid relid, const char *conname, bool missing_ok);
-extern Bitmapset *get_relation_constraint_attnos(Oid relid, const char *conname,
-                              bool missing_ok, Oid *constraintOid);
-extern Oid get_domain_constraint_oid(Oid typid, const char *conname, bool missing_ok);
-extern Oid get_relation_idx_constraint_oid(Oid relationId, Oid indexId);
-
-extern Bitmapset *get_primary_key_attnos(Oid relid, bool deferrableOk,
-                      Oid *constraintOid);
-
-extern bool check_functional_grouping(Oid relid,
-                         Index varno, Index varlevelsup,
-                         List *grouping_columns,
-                         List **constraintDeps);
-
-#endif                         /* PG_CONSTRAINT_FN_H */

diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h
index 2a38d71b4820db5ffe3e33444b8216d064869180..7ca54e84306e800759b7996ee391b25180ff1dac 100644 (file)
--- a/src/include/catalog/pg_conversion.h
+++ b/src/include/catalog/pg_conversion.h
@@ -21,6 +21,8 @@
 #include "catalog/genbki.h"
 #include "catalog/pg_conversion_d.h"
 
+#include "catalog/objectaddress.h"
+
 /* ----------------------------------------------------------------
  *     pg_conversion definition.
  *
@@ -53,4 +55,13 @@ CATALOG(pg_conversion,2607,ConversionRelationId)
  */
 typedef FormData_pg_conversion *Form_pg_conversion;
 
+
+extern ObjectAddress ConversionCreate(const char *conname, Oid connamespace,
+                Oid conowner,
+                int32 conforencoding, int32 contoencoding,
+                Oid conproc, bool def);
+extern void RemoveConversionById(Oid conversionOid);
+extern Oid FindDefaultConversion(Oid connamespace, int32 for_encoding,
+                     int32 to_encoding);
+
 #endif                         /* PG_CONVERSION_H */

diff --git a/src/include/catalog/pg_conversion_fn.h b/src/include/catalog/pg_conversion_fn.h
deleted file mode 100644 (file)
index f8f8a78..0000000
--- a/src/include/catalog/pg_conversion_fn.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_conversion_fn.h
- *  prototypes for functions in catalog/pg_conversion.c
- *
- *
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/catalog/pg_conversion_fn.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_CONVERSION_FN_H
-#define PG_CONVERSION_FN_H
-
-
-#include "catalog/objectaddress.h"
-
-extern ObjectAddress ConversionCreate(const char *conname, Oid connamespace,
-                Oid conowner,
-                int32 conforencoding, int32 contoencoding,
-                Oid conproc, bool def);
-extern void RemoveConversionById(Oid conversionOid);
-extern Oid FindDefaultConversion(Oid connamespace, int32 for_encoding, int32 to_encoding);
-
-#endif                         /* PG_CONVERSION_FN_H */

diff --git a/src/include/catalog/pg_db_role_setting.h b/src/include/catalog/pg_db_role_setting.h
index 896c410a17346780346cef9bc4000e8b7cbee49e..f6ae97121932e59011dadc58c4ce6d7963477301 100644 (file)
--- a/src/include/catalog/pg_db_role_setting.h
+++ b/src/include/catalog/pg_db_role_setting.h
@@ -20,6 +20,7 @@
 
 #include "catalog/genbki.h"
 #include "catalog/pg_db_role_setting_d.h"
+
 #include "utils/guc.h"
 #include "utils/relcache.h"
 #include "utils/snapshot.h"

diff --git a/src/include/catalog/pg_enum.h b/src/include/catalog/pg_enum.h
index a0922be49ba710b14c88f63b43f95f234c994a30..52ec55debd176aedd69f351786c2091356c9f62d 100644 (file)
--- a/src/include/catalog/pg_enum.h
+++ b/src/include/catalog/pg_enum.h
@@ -19,6 +19,7 @@
 
 #include "catalog/genbki.h"
 #include "catalog/pg_enum_d.h"
+
 #include "nodes/pg_list.h"
 
 /* ----------------

diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h
index 3b2e03c4bfdb23941899b21fb3a33283693dd81e..3303a9c29736c4e168442bc97f3dc88716e9ac03 100644 (file)
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -21,6 +21,9 @@
 #include "catalog/genbki.h"
 #include "catalog/pg_inherits_d.h"
 
+#include "nodes/pg_list.h"
+#include "storage/lock.h"
+
 /* ----------------
  *     pg_inherits definition.  cpp turns this into
  *     typedef struct FormData_pg_inherits
@@ -40,4 +43,15 @@ CATALOG(pg_inherits,2611,InheritsRelationId) BKI_WITHOUT_OIDS
  */
 typedef FormData_pg_inherits *Form_pg_inherits;
 
+
+extern List *find_inheritance_children(Oid parentrelId, LOCKMODE lockmode);
+extern List *find_all_inheritors(Oid parentrelId, LOCKMODE lockmode,
+                   List **parents);
+extern bool has_subclass(Oid relationId);
+extern bool has_superclass(Oid relationId);
+extern bool typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId);
+extern void StoreSingleInheritance(Oid relationId, Oid parentOid,
+                      int32 seqNumber);
+extern bool DeleteInheritsTuple(Oid inhrelid, Oid inhparent);
+
 #endif                         /* PG_INHERITS_H */

diff --git a/src/include/catalog/pg_inherits_fn.h b/src/include/catalog/pg_inherits_fn.h
deleted file mode 100644 (file)
index eebee97..0000000
--- a/src/include/catalog/pg_inherits_fn.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_inherits_fn.h
- *   prototypes for functions in catalog/pg_inherits.c
- *
- *
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/catalog/pg_inherits_fn.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_INHERITS_FN_H
-#define PG_INHERITS_FN_H
-
-#include "nodes/pg_list.h"
-#include "storage/lock.h"
-
-extern List *find_inheritance_children(Oid parentrelId, LOCKMODE lockmode);
-extern List *find_all_inheritors(Oid parentrelId, LOCKMODE lockmode,
-                   List **parents);
-extern bool has_subclass(Oid relationId);
-extern bool has_superclass(Oid relationId);
-extern bool typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId);
-extern void StoreSingleInheritance(Oid relationId, Oid parentOid,
-                      int32 seqNumber);
-extern bool DeleteInheritsTuple(Oid inhrelid, Oid inhparent);
-
-#endif                         /* PG_INHERITS_FN_H */

diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 4950d28f1a9707c1289c5f685ce120a23c7b0989..bbf330320e7692ced236b4065a2bf38b780d66af 100644 (file)
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -21,6 +21,9 @@
 #include "catalog/genbki.h"
 #include "catalog/pg_operator_d.h"
 
+#include "catalog/objectaddress.h"
+#include "nodes/pg_list.h"
+
 /* ----------------
  *     pg_operator definition.  cpp turns this into
  *     typedef struct FormData_pg_operator
@@ -78,4 +81,21 @@ CATALOG(pg_operator,2617,OperatorRelationId)
  */
 typedef FormData_pg_operator *Form_pg_operator;
 
+
+extern ObjectAddress OperatorCreate(const char *operatorName,
+              Oid operatorNamespace,
+              Oid leftTypeId,
+              Oid rightTypeId,
+              Oid procedureId,
+              List *commutatorName,
+              List *negatorName,
+              Oid restrictionId,
+              Oid joinId,
+              bool canMerge,
+              bool canHash);
+
+extern ObjectAddress makeOperatorDependencies(HeapTuple tuple, bool isUpdate);
+
+extern void OperatorUpd(Oid baseId, Oid commId, Oid negId, bool isDelete);
+
 #endif                         /* PG_OPERATOR_H */

diff --git a/src/include/catalog/pg_operator_fn.h b/src/include/catalog/pg_operator_fn.h
deleted file mode 100644 (file)
index 6a2b39c..0000000
--- a/src/include/catalog/pg_operator_fn.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_operator_fn.h
-*   prototypes for functions in catalog/pg_operator.c
- *
- *
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/catalog/pg_operator_fn.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_OPERATOR_FN_H
-#define PG_OPERATOR_FN_H
-
-#include "catalog/objectaddress.h"
-#include "nodes/pg_list.h"
-
-extern ObjectAddress OperatorCreate(const char *operatorName,
-              Oid operatorNamespace,
-              Oid leftTypeId,
-              Oid rightTypeId,
-              Oid procedureId,
-              List *commutatorName,
-              List *negatorName,
-              Oid restrictionId,
-              Oid joinId,
-              bool canMerge,
-              bool canHash);
-
-extern ObjectAddress makeOperatorDependencies(HeapTuple tuple, bool isUpdate);
-
-extern void OperatorUpd(Oid baseId, Oid commId, Oid negId, bool isDelete);
-
-#endif                         /* PG_OPERATOR_FN_H */

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 0b5203a68a2b227524fae16344a8cc1b183c65d3..821bc60f01fbce354313f50e75f404727c36550e 100644 (file)
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -20,6 +20,9 @@
 #include "catalog/genbki.h"
 #include "catalog/pg_proc_d.h"
 
+#include "catalog/objectaddress.h"
+#include "nodes/pg_list.h"
+
 /* ----------------
  *     pg_proc definition.  cpp turns this into
  *     typedef struct FormData_pg_proc
@@ -172,4 +175,35 @@ typedef FormData_pg_proc *Form_pg_proc;
 
 #endif                         /* EXPOSE_TO_CLIENT_CODE */
 
+
+extern ObjectAddress ProcedureCreate(const char *procedureName,
+               Oid procNamespace,
+               bool replace,
+               bool returnsSet,
+               Oid returnType,
+               Oid proowner,
+               Oid languageObjectId,
+               Oid languageValidator,
+               const char *prosrc,
+               const char *probin,
+               char prokind,
+               bool security_definer,
+               bool isLeakProof,
+               bool isStrict,
+               char volatility,
+               char parallel,
+               oidvector *parameterTypes,
+               Datum allParameterTypes,
+               Datum parameterModes,
+               Datum parameterNames,
+               List *parameterDefaults,
+               Datum trftypes,
+               Datum proconfig,
+               float4 procost,
+               float4 prorows);
+
+extern bool function_parse_error_transpose(const char *prosrc);
+
+extern List *oid_array_to_list(Datum datum);
+
 #endif                         /* PG_PROC_H */

diff --git a/src/include/catalog/pg_proc_fn.h b/src/include/catalog/pg_proc_fn.h
deleted file mode 100644 (file)
index b66871b..0000000
--- a/src/include/catalog/pg_proc_fn.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_proc_fn.h
- *  prototypes for functions in catalog/pg_proc.c
- *
- *
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/catalog/pg_proc_fn.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_PROC_FN_H
-#define PG_PROC_FN_H
-
-#include "catalog/objectaddress.h"
-#include "nodes/pg_list.h"
-
-extern ObjectAddress ProcedureCreate(const char *procedureName,
-               Oid procNamespace,
-               bool replace,
-               bool returnsSet,
-               Oid returnType,
-               Oid proowner,
-               Oid languageObjectId,
-               Oid languageValidator,
-               const char *prosrc,
-               const char *probin,
-               char prokind,
-               bool security_definer,
-               bool isLeakProof,
-               bool isStrict,
-               char volatility,
-               char parallel,
-               oidvector *parameterTypes,
-               Datum allParameterTypes,
-               Datum parameterModes,
-               Datum parameterNames,
-               List *parameterDefaults,
-               Datum trftypes,
-               Datum proconfig,
-               float4 procost,
-               float4 prorows);
-
-extern bool function_parse_error_transpose(const char *prosrc);
-
-extern List *oid_array_to_list(Datum datum);
-
-#endif                         /* PG_PROC_FN_H */

diff --git a/src/include/catalog/pg_publication.h b/src/include/catalog/pg_publication.h
index 9652d3452819e64c0d82035b516369167b564eb3..e81d62dac34abc78c89ead6a210679e97501f6e8 100644 (file)
--- a/src/include/catalog/pg_publication.h
+++ b/src/include/catalog/pg_publication.h
@@ -19,6 +19,7 @@
 
 #include "catalog/genbki.h"
 #include "catalog/pg_publication_d.h"
+
 #include "catalog/objectaddress.h"
 
 /* ----------------

diff --git a/src/include/catalog/pg_replication_origin.h b/src/include/catalog/pg_replication_origin.h
index 1adc3f729ac05387f13cc6793f9d9948a9be232c..eacdd39b83be11a41ff326af831acf3f17d72f58 100644 (file)
--- a/src/include/catalog/pg_replication_origin.h
+++ b/src/include/catalog/pg_replication_origin.h
@@ -19,6 +19,7 @@
 
 #include "catalog/genbki.h"
 #include "catalog/pg_replication_origin_d.h"
+
 #include "access/xlogdefs.h"
 
 /* ----------------

diff --git a/src/include/catalog/pg_subscription.h b/src/include/catalog/pg_subscription.h
index 93b249fc1d0263b27eb122b2a50f0e934b4a5803..7fc1c29603a33cae2447d0f120d0622d6533c02a 100644 (file)
--- a/src/include/catalog/pg_subscription.h
+++ b/src/include/catalog/pg_subscription.h
@@ -13,6 +13,7 @@
 
 #include "catalog/genbki.h"
 #include "catalog/pg_subscription_d.h"
+
 #include "nodes/pg_list.h"
 
 /* ----------------

diff --git a/src/include/catalog/pg_subscription_rel.h b/src/include/catalog/pg_subscription_rel.h
index 0543c0eee632060c6b0663c4ab43faeadcc8c5d9..8971b679cdd407704ef9558611cc331d59ffc413 100644 (file)
--- a/src/include/catalog/pg_subscription_rel.h
+++ b/src/include/catalog/pg_subscription_rel.h
@@ -14,6 +14,7 @@
 
 #include "catalog/genbki.h"
 #include "catalog/pg_subscription_rel_d.h"
+
 #include "access/xlogdefs.h"
 #include "nodes/pg_list.h"
 

diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index cf068dc7d5e8e2052a1029ad4faff06aa3cb9603..ade771ddd3798df2374544860c2f878579967419 100644 (file)
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -21,6 +21,9 @@
 #include "catalog/genbki.h"
 #include "catalog/pg_type_d.h"
 
+#include "catalog/objectaddress.h"
+#include "nodes/nodes.h"
+
 /* ----------------
  *     pg_type definition.  cpp turns this into
  *     typedef struct FormData_pg_type
@@ -282,4 +285,68 @@ typedef FormData_pg_type *Form_pg_type;
 
 #endif                         /* EXPOSE_TO_CLIENT_CODE */
 
+
+extern ObjectAddress TypeShellMake(const char *typeName,
+             Oid typeNamespace,
+             Oid ownerId);
+
+extern ObjectAddress TypeCreate(Oid newTypeOid,
+          const char *typeName,
+          Oid typeNamespace,
+          Oid relationOid,
+          char relationKind,
+          Oid ownerId,
+          int16 internalSize,
+          char typeType,
+          char typeCategory,
+          bool typePreferred,
+          char typDelim,
+          Oid inputProcedure,
+          Oid outputProcedure,
+          Oid receiveProcedure,
+          Oid sendProcedure,
+          Oid typmodinProcedure,
+          Oid typmodoutProcedure,
+          Oid analyzeProcedure,
+          Oid elementType,
+          bool isImplicitArray,
+          Oid arrayType,
+          Oid baseType,
+          const char *defaultTypeValue,
+          char *defaultTypeBin,
+          bool passedByValue,
+          char alignment,
+          char storage,
+          int32 typeMod,
+          int32 typNDims,
+          bool typeNotNull,
+          Oid typeCollation);
+
+extern void GenerateTypeDependencies(Oid typeNamespace,
+                        Oid typeObjectId,
+                        Oid relationOid,
+                        char relationKind,
+                        Oid owner,
+                        Oid inputProcedure,
+                        Oid outputProcedure,
+                        Oid receiveProcedure,
+                        Oid sendProcedure,
+                        Oid typmodinProcedure,
+                        Oid typmodoutProcedure,
+                        Oid analyzeProcedure,
+                        Oid elementType,
+                        bool isImplicitArray,
+                        Oid baseType,
+                        Oid typeCollation,
+                        Node *defaultExpr,
+                        bool rebuild);
+
+extern void RenameTypeInternal(Oid typeOid, const char *newTypeName,
+                  Oid typeNamespace);
+
+extern char *makeArrayTypeName(const char *typeName, Oid typeNamespace);
+
+extern bool moveArrayTypeName(Oid typeOid, const char *typeName,
+                 Oid typeNamespace);
+
 #endif                         /* PG_TYPE_H */

diff --git a/src/include/catalog/pg_type_fn.h b/src/include/catalog/pg_type_fn.h
deleted file mode 100644 (file)
index 0ea0e90..0000000
--- a/src/include/catalog/pg_type_fn.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_type_fn.h
- *  prototypes for functions in catalog/pg_type.c
- *
- *
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/catalog/pg_type_fn.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_TYPE_FN_H
-#define PG_TYPE_FN_H
-
-#include "catalog/objectaddress.h"
-#include "nodes/nodes.h"
-
-
-extern ObjectAddress TypeShellMake(const char *typeName,
-             Oid typeNamespace,
-             Oid ownerId);
-
-extern ObjectAddress TypeCreate(Oid newTypeOid,
-          const char *typeName,
-          Oid typeNamespace,
-          Oid relationOid,
-          char relationKind,
-          Oid ownerId,
-          int16 internalSize,
-          char typeType,
-          char typeCategory,
-          bool typePreferred,
-          char typDelim,
-          Oid inputProcedure,
-          Oid outputProcedure,
-          Oid receiveProcedure,
-          Oid sendProcedure,
-          Oid typmodinProcedure,
-          Oid typmodoutProcedure,
-          Oid analyzeProcedure,
-          Oid elementType,
-          bool isImplicitArray,
-          Oid arrayType,
-          Oid baseType,
-          const char *defaultTypeValue,
-          char *defaultTypeBin,
-          bool passedByValue,
-          char alignment,
-          char storage,
-          int32 typeMod,
-          int32 typNDims,
-          bool typeNotNull,
-          Oid typeCollation);
-
-extern void GenerateTypeDependencies(Oid typeNamespace,
-                        Oid typeObjectId,
-                        Oid relationOid,
-                        char relationKind,
-                        Oid owner,
-                        Oid inputProcedure,
-                        Oid outputProcedure,
-                        Oid receiveProcedure,
-                        Oid sendProcedure,
-                        Oid typmodinProcedure,
-                        Oid typmodoutProcedure,
-                        Oid analyzeProcedure,
-                        Oid elementType,
-                        bool isImplicitArray,
-                        Oid baseType,
-                        Oid typeCollation,
-                        Node *defaultExpr,
-                        bool rebuild);
-
-extern void RenameTypeInternal(Oid typeOid, const char *newTypeName,
-                  Oid typeNamespace);
-
-extern char *makeArrayTypeName(const char *typeName, Oid typeNamespace);
-
-extern bool moveArrayTypeName(Oid typeOid, const char *typeName,
-                 Oid typeNamespace);
-
-#endif                         /* PG_TYPE_FN_H */

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index a7dd8367bb7457cc7d9c44ad42a97f7762eb436e..4342c02b272e0dd7f8f8a58a14d387c14fa94dcb 100644 (file)
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -21,7 +21,6 @@
 #include "access/xact.h"
 #include "catalog/pg_language.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_proc_fn.h"
 #include "catalog/pg_type.h"
 #include "commands/event_trigger.h"
 #include "commands/trigger.h"

diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 96c1622d66cc461cd7f7ad672a864276e1b270bf..2f41071dd3fef88dd73023cd289b4ba8edd91498 100644 (file)
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -20,7 +20,6 @@
 #include "access/htup_details.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_proc_fn.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "nodes/makefuncs.h"

diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c
index 16f1278b3729680e870d3cbe92acbf6588224621..50b07cad8207e1e13c841d2875fc93e869873239 100644 (file)
--- a/src/pl/plpython/plpy_procedure.c
+++ b/src/pl/plpython/plpy_procedure.c
@@ -10,7 +10,6 @@
 #include "access/transam.h"
 #include "funcapi.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_proc_fn.h"
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"
 #include "utils/hsearch.h"