Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cefa387

Browse files
tglsfdctglsfdc
committed
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 9c0a0de, so let's undo the splits to make things less confusing. Discussion: https://postgr.es/m/[email protected]
1 parent 9c0a0de commit cefa387

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+304
-464
lines changed

‎contrib/sepgsql/dml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "catalog/dependency.h"
1919
#include "catalog/pg_attribute.h"
2020
#include "catalog/pg_class.h"
21-
#include "catalog/pg_inherits_fn.h"
21+
#include "catalog/pg_inherits.h"
2222
#include "commands/seclabel.h"
2323
#include "commands/tablecmds.h"
2424
#include "executor/executor.h"

‎src/backend/catalog/dependency.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,8 @@
2727
#include "catalog/pg_authid.h"
2828
#include "catalog/pg_cast.h"
2929
#include "catalog/pg_collation.h"
30-
#include "catalog/pg_collation_fn.h"
3130
#include "catalog/pg_constraint.h"
32-
#include "catalog/pg_constraint_fn.h"
3331
#include "catalog/pg_conversion.h"
34-
#include "catalog/pg_conversion_fn.h"
3532
#include "catalog/pg_database.h"
3633
#include "catalog/pg_default_acl.h"
3734
#include "catalog/pg_depend.h"

‎src/backend/catalog/heap.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include "catalog/pg_attrdef.h"
4646
#include "catalog/pg_collation.h"
4747
#include "catalog/pg_constraint.h"
48-
#include "catalog/pg_constraint_fn.h"
4948
#include "catalog/pg_foreign_table.h"
5049
#include "catalog/pg_inherits.h"
5150
#include "catalog/pg_namespace.h"
@@ -55,7 +54,6 @@
5554
#include "catalog/pg_subscription_rel.h"
5655
#include "catalog/pg_tablespace.h"
5756
#include "catalog/pg_type.h"
58-
#include "catalog/pg_type_fn.h"
5957
#include "catalog/storage.h"
6058
#include "catalog/storage_xlog.h"
6159
#include "commands/tablecmds.h"

‎src/backend/catalog/index.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@
4141
#include "catalog/pg_am.h"
4242
#include "catalog/pg_collation.h"
4343
#include "catalog/pg_constraint.h"
44-
#include "catalog/pg_constraint_fn.h"
4544
#include "catalog/pg_depend.h"
46-
#include "catalog/pg_inherits_fn.h"
45+
#include "catalog/pg_inherits.h"
4746
#include "catalog/pg_operator.h"
4847
#include "catalog/pg_opclass.h"
4948
#include "catalog/pg_tablespace.h"

‎src/backend/catalog/namespace.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "catalog/pg_authid.h"
2929
#include "catalog/pg_collation.h"
3030
#include "catalog/pg_conversion.h"
31-
#include "catalog/pg_conversion_fn.h"
3231
#include "catalog/pg_namespace.h"
3332
#include "catalog/pg_opclass.h"
3433
#include "catalog/pg_operator.h"

‎src/backend/catalog/objectaddress.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "catalog/pg_event_trigger.h"
3131
#include "catalog/pg_collation.h"
3232
#include "catalog/pg_constraint.h"
33-
#include "catalog/pg_constraint_fn.h"
3433
#include "catalog/pg_conversion.h"
3534
#include "catalog/pg_database.h"
3635
#include "catalog/pg_extension.h"

‎src/backend/catalog/partition.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "catalog/partition.h"
2727
#include "catalog/pg_collation.h"
2828
#include "catalog/pg_inherits.h"
29-
#include "catalog/pg_inherits_fn.h"
3029
#include "catalog/pg_opclass.h"
3130
#include "catalog/pg_partitioned_table.h"
3231
#include "catalog/pg_type.h"

‎src/backend/catalog/pg_aggregate.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
#include "catalog/dependency.h"
2020
#include "catalog/indexing.h"
2121
#include "catalog/pg_aggregate.h"
22-
#include "catalog/pg_aggregate_fn.h"
2322
#include "catalog/pg_language.h"
2423
#include "catalog/pg_operator.h"
2524
#include "catalog/pg_proc.h"
26-
#include "catalog/pg_proc_fn.h"
2725
#include "catalog/pg_type.h"
2826
#include "miscadmin.h"
2927
#include "parser/parse_coerce.h"

‎src/backend/catalog/pg_collation.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "catalog/indexing.h"
2323
#include "catalog/objectaccess.h"
2424
#include "catalog/pg_collation.h"
25-
#include "catalog/pg_collation_fn.h"
2625
#include "catalog/pg_namespace.h"
2726
#include "mb/pg_wchar.h"
2827
#include "utils/builtins.h"

‎src/backend/catalog/pg_constraint.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "catalog/indexing.h"
2323
#include "catalog/objectaccess.h"
2424
#include "catalog/pg_constraint.h"
25-
#include "catalog/pg_constraint_fn.h"
2625
#include "catalog/pg_operator.h"
2726
#include "catalog/pg_type.h"
2827
#include "commands/defrem.h"

0 commit comments

Comments
 (0)