Commit 3c173a53 authored by Peter Eisentraut's avatar Peter Eisentraut

Remove utils/acl.h from catalog/objectaddress.h

The need for this was removed by
8b9e9644.

A number of files now need to include utils/acl.h or
parser/parse_node.h explicitly where they previously got it indirectly
somehow.

Since parser/parse_node.h already includes nodes/parsenodes.h, the
latter is then removed where the former was added.  Also, remove
nodes/pg_list.h from objectaddress.h, since that's included via
nodes/parsenodes.h.
Reviewed-by: default avatarTom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: default avatarAlvaro Herrera <alvherre@2ndquadrant.com>
Discussion: https://www.postgresql.org/message-id/flat/7601e258-26b2-8481-36d0-dc9dca6f28f1%402ndquadrant.com
parent 17b9e7f9
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "miscadmin.h" #include "miscadmin.h"
#include "postmaster/syslogger.h" #include "postmaster/syslogger.h"
#include "storage/fd.h" #include "storage/fd.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/datetime.h" #include "utils/datetime.h"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "optimizer/pathnode.h" #include "optimizer/pathnode.h"
#include "optimizer/planmain.h" #include "optimizer/planmain.h"
#include "optimizer/restrictinfo.h" #include "optimizer/restrictinfo.h"
#include "utils/acl.h"
#include "utils/memutils.h" #include "utils/memutils.h"
#include "utils/rel.h" #include "utils/rel.h"
#include "utils/sampling.h" #include "utils/sampling.h"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "postmaster/autovacuum.h" #include "postmaster/autovacuum.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "storage/freespace.h" #include "storage/freespace.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/index_selfuncs.h" #include "utils/index_selfuncs.h"
#include "utils/memutils.h" #include "utils/memutils.h"
......
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
#include "parser/parsetree.h" #include "parser/parsetree.h"
#include "rewrite/rewriteRemove.h" #include "rewrite/rewriteRemove.h"
#include "storage/lmgr.h" #include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/fmgroids.h" #include "utils/fmgroids.h"
#include "utils/guc.h" #include "utils/guc.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
......
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
#include "storage/large_object.h" #include "storage/large_object.h"
#include "storage/lmgr.h" #include "storage/lmgr.h"
#include "storage/sinval.h" #include "storage/sinval.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/fmgroids.h" #include "utils/fmgroids.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "commands/defrem.h" #include "commands/defrem.h"
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/pg_locale.h" #include "utils/pg_locale.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "parser/parse_func.h" #include "parser/parse_func.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/rel.h" #include "utils/rel.h"
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include "rewrite/rewriteHandler.h" #include "rewrite/rewriteHandler.h"
#include "storage/fd.h" #include "storage/fd.h"
#include "tcop/tcopprot.h" #include "tcop/tcopprot.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/memutils.h" #include "utils/memutils.h"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "miscadmin.h" #include "miscadmin.h"
#include "nodes/makefuncs.h" #include "nodes/makefuncs.h"
#include "parser/parse_type.h" #include "parser/parse_type.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/syscache.h" #include "utils/syscache.h"
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "parser/parse_func.h" #include "parser/parse_func.h"
#include "parser/parse_oper.h" #include "parser/parse_oper.h"
#include "parser/parse_type.h" #include "parser/parse_type.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/rel.h" #include "utils/rel.h"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "commands/publicationcmds.h" #include "commands/publicationcmds.h"
#include "funcapi.h" #include "funcapi.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/acl.h"
#include "utils/array.h" #include "utils/array.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/catcache.h" #include "utils/catcache.h"
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "replication/walsender.h" #include "replication/walsender.h"
#include "replication/worker_internal.h" #include "replication/worker_internal.h"
#include "storage/lmgr.h" #include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/guc.h" #include "utils/guc.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "nodes/nodeFuncs.h" #include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h" #include "optimizer/optimizer.h"
#include "pgstat.h" #include "pgstat.h"
#include "utils/acl.h"
#include "utils/array.h" #include "utils/array.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/datum.h" #include "utils/datum.h"
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "partitioning/partdesc.h" #include "partitioning/partdesc.h"
#include "partitioning/partprune.h" #include "partitioning/partprune.h"
#include "rewrite/rewriteManip.h" #include "rewrite/rewriteManip.h"
#include "utils/acl.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/partcache.h" #include "utils/partcache.h"
#include "utils/rls.h" #include "utils/rls.h"
......
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
#include "storage/pmsignal.h" #include "storage/pmsignal.h"
#include "storage/procarray.h" #include "storage/procarray.h"
#include "storage/procsignal.h" #include "storage/procsignal.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/guc.h" #include "utils/guc.h"
#include "utils/pg_lsn.h" #include "utils/pg_lsn.h"
......
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
#include "storage/procarray.h" #include "storage/procarray.h"
#include "tcop/dest.h" #include "tcop/dest.h"
#include "tcop/tcopprot.h" #include "tcop/tcopprot.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/guc.h" #include "utils/guc.h"
#include "utils/memutils.h" #include "utils/memutils.h"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "postmaster/autovacuum.h" #include "postmaster/autovacuum.h"
#include "statistics/extended_stats_internal.h" #include "statistics/extended_stats_internal.h"
#include "statistics/statistics.h" #include "statistics/statistics.h"
#include "utils/acl.h"
#include "utils/array.h" #include "utils/array.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/fmgroids.h" #include "utils/fmgroids.h"
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
#include "storage/proc.h" #include "storage/proc.h"
#include "storage/procarray.h" #include "storage/procarray.h"
#include "storage/spin.h" #include "storage/spin.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/rel.h" #include "utils/rel.h"
#include "utils/snapmgr.h" #include "utils/snapmgr.h"
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include "libpq/libpq-fs.h" #include "libpq/libpq-fs.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "storage/large_object.h" #include "storage/large_object.h"
#include "utils/acl.h"
#include "utils/fmgroids.h" #include "utils/fmgroids.h"
#include "utils/rel.h" #include "utils/rel.h"
#include "utils/snapmgr.h" #include "utils/snapmgr.h"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "miscadmin.h" #include "miscadmin.h"
#include "postmaster/syslogger.h" #include "postmaster/syslogger.h"
#include "storage/fd.h" #include "storage/fd.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/memutils.h" #include "utils/memutils.h"
#include "utils/syscache.h" #include "utils/syscache.h"
......
...@@ -126,6 +126,7 @@ ...@@ -126,6 +126,7 @@
#include "parser/parsetree.h" #include "parser/parsetree.h"
#include "statistics/statistics.h" #include "statistics/statistics.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/date.h" #include "utils/date.h"
#include "utils/datum.h" #include "utils/datum.h"
......
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
#include "storage/standby.h" #include "storage/standby.h"
#include "tcop/tcopprot.h" #include "tcop/tcopprot.h"
#include "tsearch/ts_cache.h" #include "tsearch/ts_cache.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/bytea.h" #include "utils/bytea.h"
#include "utils/float.h" #include "utils/float.h"
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#ifndef OBJECTADDRESS_H #ifndef OBJECTADDRESS_H
#define OBJECTADDRESS_H #define OBJECTADDRESS_H
#include "nodes/pg_list.h" #include "access/htup.h"
#include "nodes/parsenodes.h"
#include "storage/lockdefs.h" #include "storage/lockdefs.h"
#include "utils/acl.h"
#include "utils/relcache.h" #include "utils/relcache.h"
/* /*
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "catalog/genbki.h" #include "catalog/genbki.h"
#include "catalog/pg_namespace_d.h" #include "catalog/pg_namespace_d.h"
#include "utils/acl.h"
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* pg_namespace definition. * pg_namespace definition.
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#define COLLATIONCMDS_H #define COLLATIONCMDS_H
#include "catalog/objectaddress.h" #include "catalog/objectaddress.h"
#include "nodes/parsenodes.h" #include "parser/parse_node.h"
extern ObjectAddress DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_exists); extern ObjectAddress DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_exists);
extern void IsThereCollationInNamespace(const char *collname, Oid nspOid); extern void IsThereCollationInNamespace(const char *collname, Oid nspOid);
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "catalog/objectaddress.h" #include "catalog/objectaddress.h"
#include "nodes/params.h" #include "nodes/params.h"
#include "nodes/parsenodes.h" #include "parser/parse_node.h"
#include "tcop/dest.h" #include "tcop/dest.h"
#include "utils/queryenvironment.h" #include "utils/queryenvironment.h"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "access/xlogreader.h" #include "access/xlogreader.h"
#include "catalog/objectaddress.h" #include "catalog/objectaddress.h"
#include "lib/stringinfo.h" #include "lib/stringinfo.h"
#include "nodes/parsenodes.h" #include "parser/parse_node.h"
extern Oid createdb(ParseState *pstate, const CreatedbStmt *stmt); extern Oid createdb(ParseState *pstate, const CreatedbStmt *stmt);
extern void dropdb(const char *dbname, bool missing_ok, bool force); extern void dropdb(const char *dbname, bool missing_ok, bool force);
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "catalog/objectaddress.h" #include "catalog/objectaddress.h"
#include "nodes/params.h" #include "nodes/params.h"
#include "nodes/parsenodes.h" #include "parser/parse_node.h"
#include "tcop/dest.h" #include "tcop/dest.h"
#include "utils/array.h" #include "utils/array.h"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#define EXTENSION_H #define EXTENSION_H
#include "catalog/objectaddress.h" #include "catalog/objectaddress.h"
#include "nodes/parsenodes.h" #include "parser/parse_node.h"
/* /*
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "catalog/pg_class.h" #include "catalog/pg_class.h"
#include "catalog/pg_statistic.h" #include "catalog/pg_statistic.h"
#include "catalog/pg_type.h" #include "catalog/pg_type.h"
#include "nodes/parsenodes.h" #include "parser/parse_node.h"
#include "storage/buf.h" #include "storage/buf.h"
#include "storage/lock.h" #include "storage/lock.h"
#include "utils/relcache.h" #include "utils/relcache.h"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "parser/parse_type.h" #include "parser/parse_type.h"
#include "pgstat.h" #include "pgstat.h"
#include "tcop/tcopprot.h" #include "tcop/tcopprot.h"
#include "utils/acl.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/memutils.h" #include "utils/memutils.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment