mirror of https://github.com/postgres/postgres
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
This commit is contained in:
parent
372728b0d4
commit
9c0a0de4c9
|
@ -9,7 +9,7 @@
|
|||
*/
|
||||
#include "postgres_fe.h"
|
||||
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
|
||||
#include "fe_utils/connect.h"
|
||||
#include "libpq-fe.h"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <termios.h>
|
||||
#endif
|
||||
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
|
||||
#include "fe_utils/connect.h"
|
||||
#include "libpq-fe.h"
|
||||
|
|
|
@ -61,9 +61,8 @@
|
|||
|
||||
#include "access/xlog_internal.h"
|
||||
#include "catalog/catalog.h"
|
||||
#include "catalog/pg_authid.h"
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_collation.h"
|
||||
#include "catalog/pg_authid_d.h"
|
||||
#include "catalog/pg_collation_d.h"
|
||||
#include "common/file_perm.h"
|
||||
#include "common/file_utils.h"
|
||||
#include "common/restricted_token.h"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include <ctype.h>
|
||||
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
#include "fe_utils/string_utils.h"
|
||||
|
||||
|
||||
|
|
|
@ -42,17 +42,17 @@
|
|||
#include "access/attnum.h"
|
||||
#include "access/sysattr.h"
|
||||
#include "access/transam.h"
|
||||
#include "catalog/pg_aggregate.h"
|
||||
#include "catalog/pg_am.h"
|
||||
#include "catalog/pg_attribute.h"
|
||||
#include "catalog/pg_cast.h"
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_default_acl.h"
|
||||
#include "catalog/pg_largeobject.h"
|
||||
#include "catalog/pg_largeobject_metadata.h"
|
||||
#include "catalog/pg_proc.h"
|
||||
#include "catalog/pg_trigger.h"
|
||||
#include "catalog/pg_type.h"
|
||||
#include "catalog/pg_aggregate_d.h"
|
||||
#include "catalog/pg_am_d.h"
|
||||
#include "catalog/pg_attribute_d.h"
|
||||
#include "catalog/pg_cast_d.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
#include "catalog/pg_default_acl_d.h"
|
||||
#include "catalog/pg_largeobject_d.h"
|
||||
#include "catalog/pg_largeobject_metadata_d.h"
|
||||
#include "catalog/pg_proc_d.h"
|
||||
#include "catalog/pg_trigger_d.h"
|
||||
#include "catalog/pg_type_d.h"
|
||||
#include "libpq/libpq-fs.h"
|
||||
|
||||
#include "dumputils.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "pg_backup_utils.h"
|
||||
#include "pg_dump.h"
|
||||
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
|
||||
/* translator: this is a module name */
|
||||
static const char *modulename = gettext_noop("sorter");
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#include "common/string.h"
|
||||
#include "catalog/catalog.h"
|
||||
#include "catalog/pg_tablespace.h"
|
||||
#include "catalog/pg_tablespace_d.h"
|
||||
#include "storage/fd.h"
|
||||
|
||||
filemap_t *filemap = NULL;
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "libpq-fe.h"
|
||||
#include "catalog/catalog.h"
|
||||
#include "catalog/pg_type.h"
|
||||
#include "catalog/pg_type_d.h"
|
||||
#include "fe_utils/connect.h"
|
||||
#include "port/pg_bswap.h"
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "postgres_fe.h"
|
||||
|
||||
#include "catalog/pg_authid.h"
|
||||
#include "catalog/pg_authid_d.h"
|
||||
#include "fe_utils/string_utils.h"
|
||||
#include "mb/pg_wchar.h"
|
||||
#include "pg_upgrade.h"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include "pg_upgrade.h"
|
||||
|
||||
#include "access/transam.h"
|
||||
#include "catalog/pg_language.h"
|
||||
#include "catalog/pg_language_d.h"
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include "pg_upgrade.h"
|
||||
|
||||
#include "access/transam.h"
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
|
||||
|
||||
static void create_rel_filename_map(const char *old_data, const char *new_data,
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include "postgres_fe.h"
|
||||
|
||||
#include "pg_upgrade.h"
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
#include "common/file_perm.h"
|
||||
#include "common/restricted_token.h"
|
||||
#include "fe_utils/string_utils.h"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include "pg_upgrade.h"
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
#include "access/transam.h"
|
||||
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
#include "pg_upgrade.h"
|
||||
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
#include "fe_utils/string_utils.h"
|
||||
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <sys/stat.h> /* for stat() */
|
||||
#endif
|
||||
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
#include "portability/instr_time.h"
|
||||
|
||||
#include "libpq-fe.h"
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
|
||||
#include <ctype.h>
|
||||
|
||||
#include "catalog/pg_attribute.h"
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_default_acl.h"
|
||||
#include "catalog/pg_attribute_d.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
#include "catalog/pg_default_acl_d.h"
|
||||
#include "fe_utils/string_utils.h"
|
||||
|
||||
#include "common.h"
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
#include <ctype.h>
|
||||
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
|
||||
#include "libpq-fe.h"
|
||||
#include "pqexpbuffer.h"
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include <sys/select.h>
|
||||
#endif
|
||||
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
|
||||
#include "common.h"
|
||||
#include "fe_utils/simple_list.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#endif
|
||||
|
||||
#include "catalog/catalog.h"
|
||||
#include "catalog/pg_tablespace.h"
|
||||
#include "catalog/pg_tablespace_d.h"
|
||||
#include "common/relpath.h"
|
||||
#include "storage/backendid.h"
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include "fe_utils/print.h"
|
||||
|
||||
#include "catalog/pg_type.h"
|
||||
#include "catalog/pg_type_d.h"
|
||||
#include "fe_utils/mbprint.h"
|
||||
|
||||
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
|
||||
#define POSTGRES_ECPG_INTERNAL
|
||||
#include "postgres_fe.h"
|
||||
#include "pg_type.h"
|
||||
|
||||
#include "catalog/pg_type_d.h"
|
||||
|
||||
#include "ecpg-pthread-win32.h"
|
||||
#include "ecpgtype.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <float.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "pg_type.h"
|
||||
#include "catalog/pg_type_d.h"
|
||||
|
||||
#include "ecpgtype.h"
|
||||
#include "ecpglib.h"
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
/*-------------------------------------------------------------------------
|
||||
*
|
||||
* pg_type.h
|
||||
* Interface to generated type OID symbols.
|
||||
*
|
||||
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* src/interfaces/ecpg/ecpglib/pg_type.h
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
#ifndef PG_TYPE_H
|
||||
#define PG_TYPE_H
|
||||
|
||||
#include "catalog/pg_type_d.h"
|
||||
|
||||
#endif /* PG_TYPE_H */
|
|
@ -8,7 +8,8 @@
|
|||
|
||||
#define POSTGRES_ECPG_INTERNAL
|
||||
#include "postgres_fe.h"
|
||||
#include "pg_type.h"
|
||||
|
||||
#include "catalog/pg_type_d.h"
|
||||
|
||||
#include "ecpg-pthread-win32.h"
|
||||
#include "decimal.h"
|
||||
|
|
|
@ -3,12 +3,13 @@
|
|||
#define POSTGRES_ECPG_INTERNAL
|
||||
#include "postgres_fe.h"
|
||||
|
||||
#include "catalog/pg_type_d.h"
|
||||
|
||||
#include "ecpgtype.h"
|
||||
#include "ecpglib.h"
|
||||
#include "extern.h"
|
||||
#include "sqltypes.h"
|
||||
#include "sql3types.h"
|
||||
#include "pg_type.h"
|
||||
|
||||
/*
|
||||
* This function is used to generate the correct type names.
|
||||
|
|
|
@ -18,16 +18,16 @@
|
|||
|
||||
#include "test_rls_hooks.h"
|
||||
|
||||
#include <catalog/pg_type.h>
|
||||
#include <nodes/makefuncs.h>
|
||||
#include <nodes/makefuncs.h>
|
||||
#include <parser/parse_clause.h>
|
||||
#include <parser/parse_node.h>
|
||||
#include <parser/parse_relation.h>
|
||||
#include <rewrite/rowsecurity.h>
|
||||
#include <utils/acl.h>
|
||||
#include <utils/rel.h>
|
||||
#include <utils/relcache.h>
|
||||
#include "catalog/pg_type.h"
|
||||
#include "nodes/makefuncs.h"
|
||||
#include "nodes/makefuncs.h"
|
||||
#include "parser/parse_clause.h"
|
||||
#include "parser/parse_node.h"
|
||||
#include "parser/parse_relation.h"
|
||||
#include "rewrite/rowsecurity.h"
|
||||
#include "utils/acl.h"
|
||||
#include "utils/rel.h"
|
||||
#include "utils/relcache.h"
|
||||
|
||||
PG_MODULE_MAGIC;
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
#include "postgres_fe.h"
|
||||
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/pg_class_d.h"
|
||||
|
||||
#include "fe_utils/connect.h"
|
||||
#include "libpq-fe.h"
|
||||
|
|
Loading…
Reference in New Issue