diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index c7d0f9025a..91b7958c48 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -10,8 +10,8 @@ #include "postgres_fe.h" #include "catalog/pg_class_d.h" +#include "common/connect.h" #include "common/logging.h" -#include "fe_utils/connect.h" #include "getopt_long.h" #include "libpq-fe.h" #include "pg_getopt.h" diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c index 92bdf71356..e4019fafaa 100644 --- a/contrib/vacuumlo/vacuumlo.c +++ b/contrib/vacuumlo/vacuumlo.c @@ -22,8 +22,8 @@ #endif #include "catalog/pg_class_d.h" +#include "common/connect.h" #include "common/logging.h" -#include "fe_utils/connect.h" #include "getopt_long.h" #include "libpq-fe.h" #include "pg_getopt.h" diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c index 410116492e..c08003e7f2 100644 --- a/src/bin/pg_basebackup/streamutil.c +++ b/src/bin/pg_basebackup/streamutil.c @@ -18,11 +18,11 @@ #include #include "access/xlog_internal.h" +#include "common/connect.h" #include "common/fe_memutils.h" #include "common/file_perm.h" #include "common/logging.h" #include "datatype/timestamp.h" -#include "fe_utils/connect.h" #include "port/pg_bswap.h" #include "pqexpbuffer.h" #include "receivelog.h" diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c index 6dba7e19e4..94af11b80a 100644 --- a/src/bin/pg_dump/pg_backup_db.c +++ b/src/bin/pg_dump/pg_backup_db.c @@ -17,8 +17,8 @@ #include #endif +#include "common/connect.h" #include "dumputils.h" -#include "fe_utils/connect.h" #include "fe_utils/string_utils.h" #include "parallel.h" #include "pg_backup_archiver.h" diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 94459b3539..9c8436dde6 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -52,8 +52,8 @@ #include "catalog/pg_proc_d.h" #include "catalog/pg_trigger_d.h" #include "catalog/pg_type_d.h" +#include "common/connect.h" #include "dumputils.h" -#include "fe_utils/connect.h" #include "fe_utils/string_utils.h" #include "getopt_long.h" #include "libpq/libpq-fs.h" diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 8d54849102..2c82b39af0 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -18,10 +18,10 @@ #include #include +#include "common/connect.h" #include "common/file_utils.h" #include "common/logging.h" #include "dumputils.h" -#include "fe_utils/connect.h" #include "fe_utils/string_utils.h" #include "getopt_long.h" #include "pg_backup.h" diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c index c44648f823..bf4dfc23b9 100644 --- a/src/bin/pg_rewind/libpq_fetch.c +++ b/src/bin/pg_rewind/libpq_fetch.c @@ -15,8 +15,8 @@ #include #include "catalog/pg_type_d.h" +#include "common/connect.h" #include "datapagemap.h" -#include "fe_utils/connect.h" #include "fetch.h" #include "file_ops.h" #include "filemap.h" diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c index 79ec3f04c0..7db3c1d51f 100644 --- a/src/bin/pg_upgrade/server.c +++ b/src/bin/pg_upgrade/server.c @@ -9,7 +9,7 @@ #include "postgres_fe.h" -#include "fe_utils/connect.h" +#include "common/connect.h" #include "fe_utils/string_utils.h" #include "pg_upgrade.h" diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c index ee65cc3948..420d0d11a5 100644 --- a/src/bin/scripts/common.c +++ b/src/bin/scripts/common.c @@ -18,9 +18,9 @@ #include #include "common.h" +#include "common/connect.h" #include "common/logging.h" #include "fe_utils/cancel.h" -#include "fe_utils/connect.h" #include "fe_utils/string_utils.h" #define ERRCODE_UNDEFINED_TABLE "42P01" diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c index b7b19ccc1c..40dcbc9283 100644 --- a/src/bin/scripts/reindexdb.c +++ b/src/bin/scripts/reindexdb.c @@ -13,9 +13,9 @@ #include "catalog/pg_class_d.h" #include "common.h" +#include "common/connect.h" #include "common/logging.h" #include "fe_utils/cancel.h" -#include "fe_utils/connect.h" #include "fe_utils/simple_list.h" #include "fe_utils/string_utils.h" #include "scripts_parallel.h" diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c index 6a3c941158..125ed2ff5a 100644 --- a/src/bin/scripts/vacuumdb.c +++ b/src/bin/scripts/vacuumdb.c @@ -15,9 +15,9 @@ #include "catalog/pg_class_d.h" #include "common.h" +#include "common/connect.h" #include "common/logging.h" #include "fe_utils/cancel.h" -#include "fe_utils/connect.h" #include "fe_utils/simple_list.h" #include "fe_utils/string_utils.h" #include "scripts_parallel.h" diff --git a/src/fe_utils/cancel.c b/src/fe_utils/cancel.c index 51fb67d384..7004201748 100644 --- a/src/fe_utils/cancel.c +++ b/src/fe_utils/cancel.c @@ -18,8 +18,8 @@ #include +#include "common/connect.h" #include "fe_utils/cancel.h" -#include "fe_utils/connect.h" #include "fe_utils/string_utils.h" diff --git a/src/include/fe_utils/connect.h b/src/include/common/connect.h similarity index 96% rename from src/include/fe_utils/connect.h rename to src/include/common/connect.h index 8030af9a9f..2cc5d7dd25 100644 --- a/src/include/fe_utils/connect.h +++ b/src/include/common/connect.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * src/include/fe_utils/connect.h + * src/include/common/connect.h * *------------------------------------------------------------------------- */ diff --git a/src/tools/findoidjoins/findoidjoins.c b/src/tools/findoidjoins/findoidjoins.c index 5239332ea7..3d9ca26235 100644 --- a/src/tools/findoidjoins/findoidjoins.c +++ b/src/tools/findoidjoins/findoidjoins.c @@ -10,7 +10,7 @@ #include "access/transam.h" #include "catalog/pg_class_d.h" -#include "fe_utils/connect.h" +#include "common/connect.h" #include "libpq-fe.h" #include "pqexpbuffer.h"