Skip to content

Commit

Permalink
Remove support for v11.
Browse files Browse the repository at this point in the history
Standard Support for both EDB Postgres Advanced Server 11 and
PostgreSQL 11 is already ended.  Thus, adjust Makefile so that we
restrict compilation of mongo_fdw code against v11.  Update the README
accordingly.  Also, clean up the code for the same.

FDW-673, Suraj Kharage, reviewed by Sravan Velagandula, tested by
Ajaykumar Pal.
  • Loading branch information
jeevanchalke committed Apr 3, 2024
1 parent 2cfaa39 commit d07ef2d
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 4,658 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ ifndef MAJORVERSION
MAJORVERSION := $(basename $(VERSION))
endif

ifeq (,$(findstring $(MAJORVERSION), 11 12 13 14 15 16))
$(error PostgreSQL 11, 12, 13, 14, 15, or 16 is required to compile this extension)
ifeq (,$(findstring $(MAJORVERSION), 12 13 14 15 16))
$(error PostgreSQL 12, 13, 14, 15, or 16 is required to compile this extension)
endif
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This PostgreSQL extension implements a Foreign Data Wrapper (FDW) for
[MongoDB][1].

Please note that this version of mongo_fdw works with PostgreSQL and EDB
Postgres Advanced Server 11, 12, 13, 14, 15 and 16.
Postgres Advanced Server 12, 13, 14, 15 and 16.

<img src="https://upload.wikimedia.org/wikipedia/commons/2/29/Postgresql_elephant.svg" align="center" height="100" alt="PostgreSQL"/> + <img src="https://www.tutorialsteacher.com/Content/images/home/mongodb.svg" align="center" height="100" alt="MongoDB"/>

Expand Down
10 changes: 0 additions & 10 deletions deparse.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,7 @@
#endif
#include "mongoc.h"
#include "mongo_query.h"
#if PG_VERSION_NUM < 120000
#include "nodes/relation.h"
#include "optimizer/var.h"
#endif
#if PG_VERSION_NUM >= 120000
#include "optimizer/optimizer.h"
#endif
#include "parser/parsetree.h"
#include "utils/rel.h"
#include "utils/syscache.h"
Expand Down Expand Up @@ -677,9 +671,5 @@ mongo_is_foreign_pathkey(PlannerInfo *root, RelOptInfo *baserel,
bool
mongo_is_builtin(Oid oid)
{
#if PG_VERSION_NUM >= 120000
return (oid < FirstGenbkiObjectId);
#else
return (oid < FirstBootstrapObjectId);
#endif
}
Loading

0 comments on commit d07ef2d

Please sign in to comment.