From 590e2d12f0e17aed39a64050f2dddc0d9f56c1ba Mon Sep 17 00:00:00 2001 From: Alvaro Herrera <alvherre@alvh.no-ip.org> Date: Mon, 28 Sep 2015 15:14:08 -0300 Subject: [PATCH] COPY: use pg_plan_query() instead of planner() While at it, trim the includes list in copy.c. The planner headers cannot be removed, but there are a few others that are not of any use. --- src/backend/commands/copy.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 8db1b35fe82..f409aa7393a 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -25,7 +25,6 @@ #include "access/sysattr.h" #include "access/xact.h" #include "access/xlog.h" -#include "catalog/namespace.h" #include "catalog/pg_type.h" #include "commands/copy.h" #include "commands/defrem.h" @@ -37,12 +36,10 @@ #include "miscadmin.h" #include "optimizer/clauses.h" #include "optimizer/planner.h" -#include "parser/parse_relation.h" #include "nodes/makefuncs.h" #include "rewrite/rewriteHandler.h" #include "storage/fd.h" #include "tcop/tcopprot.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/memutils.h" @@ -1413,7 +1410,7 @@ BeginCopy(bool is_from, Assert(query->utilityStmt == NULL); /* plan the query */ - plan = planner(query, 0, NULL); + plan = pg_plan_query(query, 0, NULL); /* * With row level security and a user using "COPY relation TO", we -- GitLab