diff options
63 files changed, 304 insertions, 464 deletions
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c index c1fa320eb4b..9bdbd7b60f5 100644 --- 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 b7e39af7a24..c23cfdaf6be 100644 --- 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 faa12e06151..8f329a6299b 100644 --- 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 0966aec25f2..5d73e92901f 100644 --- 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 d69b015c698..0f67a122ede 100644 --- 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 119297b33a0..3cbee108c38 100644 --- 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 4b31ff0ead4..0f5932feeef 100644 --- 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 50d8d81f2cc..66b4af93bdb 100644 --- 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 d280869bafc..ce7e5fb5cc1 100644 --- 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 485fd370803..8ba9890ca68 100644 --- 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 76fcd8fd9ce..fd5c18426bf 100644 --- 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 5a5beb9273e..6160804ef8e 100644 --- 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 051602d820c..6dde75ed252 100644 --- 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 466ff038e7a..d7833529119 100644 --- 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 660ac5b7c9f..2ddd46d48ed 100644 --- 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 a48c3ac5727..a1fd871d317 100644 --- 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 378784a93ca..d471541097d 100644 --- 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 d0b5cdb69a2..8fb51e8c3d1 100644 --- 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 01a02484a24..e36fc23dd85 100644 --- 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 c46493dd88b..80cbbf94b47 100644 --- 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 10f01bf5b70..3fb2344198a 100644 --- 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 b247c0fe2e1..6daf8e9b453 100644 --- 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 585382d7587..f0da4c52792 100644 --- 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 447bd49f894..c900ad9431a 100644 --- 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 29992d4a0e2..6f7762a906c 100644 --- 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 846811d1b8e..43b2fce2c51 100644 --- 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 5c276b51dc2..0d57d467484 100644 --- 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 04b8b907b55..7746d182589 100644 --- 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 a1782c28742..d90cb9a9022 100644 --- 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 57a24d48783..50bea2c2ceb 100644 --- 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 421dc79cc4e..20f49e5d432 100644 --- 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 2ce4d4496dc..8d86e98adc1 100644 --- 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 544e7300b89..0307738946a 100644 --- 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 a00c2b46e62..c73d06b3917 100644 --- 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 665d3327a02..c31a5630b2f 100644 --- 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 bbbb1a8c1fe..f9f9904bad8 100644 --- 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 6e85886e646..57e52b4f988 100644 --- 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 84f25917368..4effadcb300 100644 --- 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 79f9ce0c146..8eb5f63f56e 100644 --- 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 index 00f533ae48b..00000000000 --- 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 d932a42ce0d..5c73bbf94f4 100644 --- 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 index f01f2ae65ee..00000000000 --- 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 51640922315..017e4de4aba 100644 --- 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 index 5f64409f3d5..00000000000 --- 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 2a38d71b482..7ca54e84306 100644 --- 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 index f8f8a78b7d3..00000000000 --- 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 896c410a173..f6ae9712193 100644 --- 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 a0922be49ba..52ec55debd1 100644 --- 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 3b2e03c4bfd..3303a9c2973 100644 --- 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 index eebee977a55..00000000000 --- 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 4950d28f1a9..bbf330320e7 100644 --- 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 index 6a2b39c2e7e..00000000000 --- 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 0b5203a68a2..821bc60f01f 100644 --- 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 index b66871bc469..00000000000 --- 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 9652d345281..e81d62dac34 100644 --- 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 1adc3f729ac..eacdd39b83b 100644 --- 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 93b249fc1d0..7fc1c29603a 100644 --- 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 0543c0eee63..8971b679cdd 100644 --- 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 cf068dc7d5e..ade771ddd37 100644 --- 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 index 0ea0e9029ac..00000000000 --- 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 a7dd8367bb7..4342c02b272 100644 --- 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 96c1622d66c..2f41071dd3f 100644 --- 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 16f1278b372..50b07cad820 100644 --- 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" |