From 191340ebb4a91754c32ad76263cd0146b32d6d17 Mon Sep 17 00:00:00 2001
From: Julien Rouhaud <julien.rouhaud@free.fr>
Date: Tue, 3 Oct 2017 12:20:28 +0200
Subject: [PATCH] Fix pg9.6 compatiblity, thanks to Rob Stolarz for the report.

It was broken since 9c651cf4, where I blindly updated the code without
reading upstream coommit 65c5fcd353a.
---
 hypopg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hypopg.c b/hypopg.c
index 1e2cb04..cbd3ae1 100644
--- a/hypopg.c
+++ b/hypopg.c
@@ -329,8 +329,8 @@ hypo_newEntry(Oid relid, char *accessMethod, int ncolumns, List *options)
 	entry->amoptionalkey = amroutine->amoptionalkey;
 	entry->amsearcharray = amroutine->amsearcharray;
 	entry->amsearchnulls = amroutine->amsearchnulls;
-	entry->amhasgettuple = OidIsValid(amroutine->amgettuple);
-	entry->amhasgetbitmap = OidIsValid(amroutine->amgetbitmap);
+	entry->amhasgettuple = (amroutine->amgettuple != NULL);
+	entry->amhasgetbitmap = (amroutine->amgetbitmap != NULL);
 	entry->amcanunique = amroutine->amcanunique;
 	entry->amcanmulticol = amroutine->amcanmulticol;
 	amoptions = amroutine->amoptions;