From: Tomas Vondra <tomas.vondra@postgresql.org>
Date: Wed, 16 Oct 2019 14:08:40 +0000 (+0200)
Subject: Add missing include to pg_upgrade/version.c
X-Git-Tag: REL9_6_16~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e09ab32a22058f5f337533f8ac6992744b440caf;p=thirdparty%2Fpostgresql.git

Add missing include to pg_upgrade/version.c

Commit 8d48e6a724 uses RELKIND_ constants when building the query, but
did not include the header defining them. On 10+ this header is already
included, but on 9.6 and earlier it was missing. It compiles just fine,
but then fails during execution

  ERROR:  column "relkind_relation" does not exist

Fix by adding the necessary header file, and backpatch to 9.4-.

Backpatch-to: 9.4-
Discussion: https://postgr.es/m/16045-673e8fa6b5ace196%40postgresql.org
---

diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index 0028d518d0c..f185953a332 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -10,6 +10,8 @@
 #include "postgres_fe.h"
 
 #include "pg_upgrade.h"
+
+#include "catalog/pg_class.h"
 #include "fe_utils/string_utils.h"