Issue #49: Version 1.0.6 does not compile for PostgreSQL 9.5 rc1

tds-fdw · Jan 6, 2016 · 0809800 · 0809800
1 parent 22199af
commit 0809800
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/include/tds_fdw.h b/include/tds_fdw.h
@@ -75,7 +75,11 @@ void tdsGetForeignRelSize(PlannerInfo *root, RelOptInfo *baserel, Oid foreigntab
 void tdsEstimateCosts(PlannerInfo *root, RelOptInfo *baserel, Cost *startup_cost, Cost *total_cost, Oid foreigntableid);
 void tdsGetForeignPaths(PlannerInfo *root, RelOptInfo *baserel, Oid foreigntableid);
 bool tdsAnalyzeForeignTable(Relation relation, AcquireSampleRowsFunc *func, BlockNumber *totalpages);
+#if (PG_VERSION_NUM >= 90500)
+ForeignScan* tdsGetForeignPlan(PlannerInfo *root, RelOptInfo *baserel, Oid foreigntableid, ForeignPath *best_path, List *tlist, List *scan_clauses, Plan *outer_plan);
+#else
 ForeignScan* tdsGetForeignPlan(PlannerInfo *root, RelOptInfo *baserel, Oid foreigntableid, ForeignPath *best_path, List *tlist, List *scan_clauses);
+#endif
 /* routines for versions older than 9.2.0 */
 #else
 FdwPlan* tdsPlanForeignScan(Oid foreigntableid, PlannerInfo *root, RelOptInfo *baserel);

diff --git a/src/tds_fdw.c b/src/tds_fdw.c
@@ -1898,7 +1898,7 @@ void tdsGetForeignPaths(PlannerInfo *root, RelOptInfo *baserel, Oid foreigntable
 
 	add_path(baserel, 
 		(Path *) create_foreignscan_path(root, baserel, baserel->rows, startup_cost, total_cost,
-			NIL, NULL, NIL));
+			NIL, NULL, NULL, NIL));
 
 	#ifdef DEBUG
 		ereport(NOTICE,
@@ -1925,7 +1925,7 @@ bool tdsAnalyzeForeignTable(Relation relation, AcquireSampleRowsFunc *func, Bloc
 }
 
 ForeignScan* tdsGetForeignPlan(PlannerInfo *root, RelOptInfo *baserel, 
-	Oid foreigntableid, ForeignPath *best_path, List *tlist, List *scan_clauses)
+	Oid foreigntableid, ForeignPath *best_path, List *tlist, List *scan_clauses, Plan *outer_plan)
 {
 	Index scan_relid = baserel->relid;
 	#ifdef DEBUG
@@ -1943,7 +1943,7 @@ ForeignScan* tdsGetForeignPlan(PlannerInfo *root, RelOptInfo *baserel,
 	#endif
 
 	#if (PG_VERSION_NUM >= 90500)
-		return make_foreignscan(tlist, scan_clauses, scan_relid, NIL, NIL, NIL);
+		return make_foreignscan(tlist, scan_clauses, scan_relid, NIL, NIL, NIL, NIL, NULL);
 	#else
 		return make_foreignscan(tlist, scan_clauses, scan_relid, NIL, NIL);
 	#endif