Issue - (EnterpriseDB#67) PostgreSQL 9.6 support.

Makefile

@@ -47,6 +47,6 @@ ifndef MAJORVERSION
     MAJORVERSION := $(basename $(VERSION))
 endif
 
-ifeq (,$(findstring $(MAJORVERSION), 9.3 9.4 9.5))
-    $(error PostgreSQL 9.3, 9.4 or 9.5 is required to compile this extension)
+ifeq (,$(findstring $(MAJORVERSION), 9.3 9.4 9.5 9.6))
+    $(error PostgreSQL 9.3, 9.4, 9.5 or 9.6 is required to compile this extension)
 endif

Makefile.legacy

@@ -47,6 +47,6 @@ ifndef MAJORVERSION
     MAJORVERSION := $(basename $(VERSION))
 endif
 
-ifeq (,$(findstring $(MAJORVERSION), 9.3 9.4 9.5))
-    $(error PostgreSQL 9.3, 9.4 or 9.5 is required to compile this extension)
+ifeq (,$(findstring $(MAJORVERSION), 9.3 9.4 9.5 9.6))
+    $(error PostgreSQL 9.3, 9.4, 9.5 or 9.6 is required to compile this extension)
 endif

README.md

@@ -2,7 +2,7 @@
 
 This [MongoDB][1] extension implements the PostgreSQL's Foreign Data Wrapper.
 
-Please note that this version of mongo_fdw works with PostgreSQL and EDB Postgres Advanced Server 9.3, 9.4 and 9.5. Work is underway for certification with 9.6Beta.
+Please note that this version of mongo_fdw works with PostgreSQL and EDB Postgres Advanced Server 9.3, 9.4, 9.5 and 9.6. Work is underway for certification with 9.6Beta.
 
 Installation
 ------------

mongo_fdw.c

@@ -318,14 +318,20 @@ MongoGetForeignPaths(PlannerInfo *root, RelOptInfo *baserel, Oid foreignTableId)
 	}
 
 	/* create a foreign path node */
-	foreignPath = (Path *) create_foreignscan_path(root, baserel, baserel->rows,
-												   startupCost, totalCost,
-												   NIL,	 /* no pathkeys */
-												   NULL, /* no outer rel either */
+
+	create_foreignscan_path(root, baserel,
+#if PG_VERSION_NUM >= 90600
+				NULL,          /* default pathtarget */
+#endif
+				baserel->rows,
+				startupCost,
+				totalCost,
+				NIL,   /* no pathkeys */
+				NULL,  /* no outer rel either */
 #if PG_VERSION_NUM >= 90500
-									 NULL,	/* no extra plan */
+				NULL,  /* no extra plan */
 #endif
-												   NIL); /* no fdw_private data */
+				NULL);        /* no fdw_private data */
 
 	/* add foreign path as the only possible path */
 	add_path(baserel, foreignPath);	

mongo_query.c

@@ -644,7 +644,12 @@ ColumnList(RelOptInfo *baserel)
 	List *neededColumnList = NIL;
 	AttrNumber columnIndex = 1;
 	AttrNumber columnCount = baserel->max_attr;
+
+#if PG_VERSION_NUM >= 90600
+        List *targetColumnList = baserel->reltarget->exprs;
+#else
 	List *targetColumnList = baserel->reltargetlist;
+#endif
 	List *restrictInfoList = baserel->baserestrictinfo;
 	ListCell *restrictInfoCell = NULL;
 
@@ -660,8 +665,10 @@ ColumnList(RelOptInfo *baserel)
 
 		/* recursively pull up any columns used in the restriction clause */
 		clauseColumnList = pull_var_clause(restrictClause,
-										   PVC_RECURSE_AGGREGATES,
-										   PVC_RECURSE_PLACEHOLDERS);
+#if PG_VERSION_NUM < 90600
+							PVC_RECURSE_AGGREGATES,
+#endif
+							PVC_RECURSE_PLACEHOLDERS);
 
 		neededColumnList = list_union(neededColumnList, clauseColumnList);
 	}