Skip to content

Commit 9c0a0de

Browse files
tglsfdctglsfdc
committed
Switch client-side code to include catalog/pg_foo_d.h not pg_foo.h.
Everything of use to frontend code should now appear in the _d.h files, and making this change frees us from needing to worry about whether the catalog header files proper are frontend-safe. Remove src/interfaces/ecpg/ecpglib/pg_type.h entirely, as the previous commit reduced it to a confusingly-named wrapper around pg_type_d.h. In passing, make test_rls_hooks.c follow project convention of including our own files with #include "" not <>. Discussion: https://postgr.es/m/23690.1523031777@sss.pgh.pa.us
1 parent 372728b commit 9c0a0de

File tree

27 files changed

+51
-67
lines changed

27 files changed

+51
-67
lines changed

‎contrib/oid2name/oid2name.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
#include "postgres_fe.h"
1111

12-
#include "catalog/pg_class.h"
12+
#include "catalog/pg_class_d.h"
1313

1414
#include "fe_utils/connect.h"
1515
#include "libpq-fe.h"

‎contrib/vacuumlo/vacuumlo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <termios.h>
2222
#endif
2323

24-
#include "catalog/pg_class.h"
24+
#include "catalog/pg_class_d.h"
2525

2626
#include "fe_utils/connect.h"
2727
#include "libpq-fe.h"

‎src/bin/initdb/initdb.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@
6161

6262
#include "access/xlog_internal.h"
6363
#include "catalog/catalog.h"
64-
#include "catalog/pg_authid.h"
65-
#include "catalog/pg_class.h"
66-
#include "catalog/pg_collation.h"
64+
#include "catalog/pg_authid_d.h"
65+
#include "catalog/pg_collation_d.h"
6766
#include "common/file_perm.h"
6867
#include "common/file_utils.h"
6968
#include "common/restricted_token.h"

‎src/bin/pg_dump/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <ctype.h>
2323

24-
#include "catalog/pg_class.h"
24+
#include "catalog/pg_class_d.h"
2525
#include "fe_utils/string_utils.h"
2626

2727

‎src/bin/pg_dump/pg_dump.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@
4242
#include "access/attnum.h"
4343
#include "access/sysattr.h"
4444
#include "access/transam.h"
45-
#include "catalog/pg_aggregate.h"
46-
#include "catalog/pg_am.h"
47-
#include "catalog/pg_attribute.h"
48-
#include "catalog/pg_cast.h"
49-
#include "catalog/pg_class.h"
50-
#include "catalog/pg_default_acl.h"
51-
#include "catalog/pg_largeobject.h"
52-
#include "catalog/pg_largeobject_metadata.h"
53-
#include "catalog/pg_proc.h"
54-
#include "catalog/pg_trigger.h"
55-
#include "catalog/pg_type.h"
45+
#include "catalog/pg_aggregate_d.h"
46+
#include "catalog/pg_am_d.h"
47+
#include "catalog/pg_attribute_d.h"
48+
#include "catalog/pg_cast_d.h"
49+
#include "catalog/pg_class_d.h"
50+
#include "catalog/pg_default_acl_d.h"
51+
#include "catalog/pg_largeobject_d.h"
52+
#include "catalog/pg_largeobject_metadata_d.h"
53+
#include "catalog/pg_proc_d.h"
54+
#include "catalog/pg_trigger_d.h"
55+
#include "catalog/pg_type_d.h"
5656
#include "libpq/libpq-fs.h"
5757

5858
#include "dumputils.h"

‎src/bin/pg_dump/pg_dump_sort.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "pg_backup_utils.h"
2020
#include "pg_dump.h"
2121

22-
#include "catalog/pg_class.h"
22+
#include "catalog/pg_class_d.h"
2323

2424
/* translator: this is a module name */
2525
static const char *modulename = gettext_noop("sorter");

‎src/bin/pg_rewind/filemap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "common/string.h"
2222
#include "catalog/catalog.h"
23-
#include "catalog/pg_tablespace.h"
23+
#include "catalog/pg_tablespace_d.h"
2424
#include "storage/fd.h"
2525

2626
filemap_t *filemap = NULL;

‎src/bin/pg_rewind/libpq_fetch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "libpq-fe.h"
2525
#include "catalog/catalog.h"
26-
#include "catalog/pg_type.h"
26+
#include "catalog/pg_type_d.h"
2727
#include "fe_utils/connect.h"
2828
#include "port/pg_bswap.h"
2929

‎src/bin/pg_upgrade/check.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "postgres_fe.h"
1111

12-
#include "catalog/pg_authid.h"
12+
#include "catalog/pg_authid_d.h"
1313
#include "fe_utils/string_utils.h"
1414
#include "mb/pg_wchar.h"
1515
#include "pg_upgrade.h"

‎src/bin/pg_upgrade/function.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "pg_upgrade.h"
1313

1414
#include "access/transam.h"
15-
#include "catalog/pg_language.h"
15+
#include "catalog/pg_language_d.h"
1616

1717

1818
/*

‎src/bin/pg_upgrade/info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "pg_upgrade.h"
1313

1414
#include "access/transam.h"
15-
#include "catalog/pg_class.h"
15+
#include "catalog/pg_class_d.h"
1616

1717

1818
static void create_rel_filename_map(const char *old_data, const char *new_data,

‎src/bin/pg_upgrade/pg_upgrade.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "postgres_fe.h"
3838

3939
#include "pg_upgrade.h"
40-
#include "catalog/pg_class.h"
40+
#include "catalog/pg_class_d.h"
4141
#include "common/file_perm.h"
4242
#include "common/restricted_token.h"
4343
#include "fe_utils/string_utils.h"

‎src/bin/pg_upgrade/relfilenode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "pg_upgrade.h"
1313

1414
#include <sys/stat.h>
15-
#include "catalog/pg_class.h"
15+
#include "catalog/pg_class_d.h"
1616
#include "access/transam.h"
1717

1818

‎src/bin/pg_upgrade/version.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "pg_upgrade.h"
1313

14-
#include "catalog/pg_class.h"
14+
#include "catalog/pg_class_d.h"
1515
#include "fe_utils/string_utils.h"
1616

1717

‎src/bin/psql/command.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <sys/stat.h> /* for stat() */
2424
#endif
2525

26-
#include "catalog/pg_class.h"
26+
#include "catalog/pg_class_d.h"
2727
#include "portability/instr_time.h"
2828

2929
#include "libpq-fe.h"

‎src/bin/psql/describe.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
#include <ctype.h>
1616

17-
#include "catalog/pg_attribute.h"
18-
#include "catalog/pg_class.h"
19-
#include "catalog/pg_default_acl.h"
17+
#include "catalog/pg_attribute_d.h"
18+
#include "catalog/pg_class_d.h"
19+
#include "catalog/pg_default_acl_d.h"
2020
#include "fe_utils/string_utils.h"
2121

2222
#include "common.h"

‎src/bin/psql/tab-complete.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
#include <ctype.h>
4343

44-
#include "catalog/pg_class.h"
44+
#include "catalog/pg_class_d.h"
4545

4646
#include "libpq-fe.h"
4747
#include "pqexpbuffer.h"

‎src/bin/scripts/vacuumdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <sys/select.h>
1717
#endif
1818

19-
#include "catalog/pg_class.h"
19+
#include "catalog/pg_class_d.h"
2020

2121
#include "common.h"
2222
#include "fe_utils/simple_list.h"

‎src/common/relpath.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#endif
2020

2121
#include "catalog/catalog.h"
22-
#include "catalog/pg_tablespace.h"
22+
#include "catalog/pg_tablespace_d.h"
2323
#include "common/relpath.h"
2424
#include "storage/backendid.h"
2525

‎src/fe_utils/print.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#include "fe_utils/print.h"
3434

35-
#include "catalog/pg_type.h"
35+
#include "catalog/pg_type_d.h"
3636
#include "fe_utils/mbprint.h"
3737

3838

‎src/interfaces/ecpg/ecpglib/descriptor.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
#define POSTGRES_ECPG_INTERNAL
77
#include "postgres_fe.h"
8-
#include "pg_type.h"
8+
9+
#include "catalog/pg_type_d.h"
910

1011
#include "ecpg-pthread-win32.h"
1112
#include "ecpgtype.h"

‎src/interfaces/ecpg/ecpglib/execute.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <float.h>
2020
#include <math.h>
2121

22-
#include "pg_type.h"
22+
#include "catalog/pg_type_d.h"
2323

2424
#include "ecpgtype.h"
2525
#include "ecpglib.h"

‎src/interfaces/ecpg/ecpglib/pg_type.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/interfaces/ecpg/ecpglib/sqlda.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
#define POSTGRES_ECPG_INTERNAL
1010
#include "postgres_fe.h"
11-
#include "pg_type.h"
11+
12+
#include "catalog/pg_type_d.h"
1213

1314
#include "ecpg-pthread-win32.h"
1415
#include "decimal.h"

‎src/interfaces/ecpg/ecpglib/typename.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
#define POSTGRES_ECPG_INTERNAL
44
#include "postgres_fe.h"
55

6+
#include "catalog/pg_type_d.h"
7+
68
#include "ecpgtype.h"
79
#include "ecpglib.h"
810
#include "extern.h"
911
#include "sqltypes.h"
1012
#include "sql3types.h"
11-
#include "pg_type.h"
1213

1314
/*
1415
* This function is used to generate the correct type names.

‎src/test/modules/test_rls_hooks/test_rls_hooks.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818

1919
#include "test_rls_hooks.h"
2020

21-
#include <catalog/pg_type.h>
22-
#include <nodes/makefuncs.h>
23-
#include <nodes/makefuncs.h>
24-
#include <parser/parse_clause.h>
25-
#include <parser/parse_node.h>
26-
#include <parser/parse_relation.h>
27-
#include <rewrite/rowsecurity.h>
28-
#include <utils/acl.h>
29-
#include <utils/rel.h>
30-
#include <utils/relcache.h>
21+
#include "catalog/pg_type.h"
22+
#include "nodes/makefuncs.h"
23+
#include "nodes/makefuncs.h"
24+
#include "parser/parse_clause.h"
25+
#include "parser/parse_node.h"
26+
#include "parser/parse_relation.h"
27+
#include "rewrite/rowsecurity.h"
28+
#include "utils/acl.h"
29+
#include "utils/rel.h"
30+
#include "utils/relcache.h"
3131

3232
PG_MODULE_MAGIC;
3333

‎src/tools/findoidjoins/findoidjoins.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
#include "postgres_fe.h"
99

10-
#include "catalog/pg_class.h"
10+
#include "catalog/pg_class_d.h"
1111

1212
#include "fe_utils/connect.h"
1313
#include "libpq-fe.h"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy