Bas Couwenberg pushed to branch upstream at Debian GIS Project / pgsql-ogr-fdw
Commits: fd44d803 by Bas Couwenberg at 2021-06-25T06:05:13+02:00 New upstream version 1.1.1 - - - - - 2 changed files: - README.md - ogr_fdw.c Changes: ===================================== README.md ===================================== @@ -22,7 +22,7 @@ This implementation currently has the following limitations: * Linux * [Arch Linux](https://aur.archlinux.org/packages/pgsql-ogr-fdw/) * [Ubuntu](https://launchpad.net/ubuntu/+source/pgsql-ogr-fdw) - * [Red Hat](https://yum.postgresql.org/news-packagelist.php) + * [Red Hat](https://yum.postgresql.org/) * OSX ## Basic Operation ===================================== ogr_fdw.c ===================================== @@ -7,6 +7,10 @@ * *------------------------------------------------------------------------- */ +/* +* PostgreSQL +*/ +#include "postgres.h" /* * System @@ -14,7 +18,6 @@ #include <sys/stat.h> #include <unistd.h> -#include "postgres.h" /* * Require PostgreSQL >= 9.3 @@ -130,9 +133,17 @@ static void ogrEndForeignScan(ForeignScanState* node); /* * FDW modify callback routines */ +#if PG_VERSION_NUM >= 140000 +static void ogrAddForeignUpdateTargets(PlannerInfo* planinfo, + unsigned int rte_index, + RangeTblEntry* target_rte, + Relation target_relation); +#else static void ogrAddForeignUpdateTargets(Query* parsetree, RangeTblEntry* target_rte, Relation target_relation); +#endif + static void ogrBeginForeignModify(ModifyTableState* mtstate, ResultRelInfo* rinfo, List* fdw_private, @@ -1535,8 +1546,10 @@ ogrLookupGeometryFunctionOid(const char* proname) names = stringToQualifiedNameList(proname); #if PG_VERSION_NUM < 90400 clist = FuncnameGetCandidates(names, -1, NIL, false, false); -#else +#elif PG_VERSION_NUM < 140000 clist = FuncnameGetCandidates(names, -1, NIL, false, false, false); +#else + clist = FuncnameGetCandidates(names, -1, NIL, false, false, false, false); #endif if (streq(proname, "st_setsrid")) { @@ -2454,11 +2467,22 @@ ogrGetFidColumn(const TupleDesc td) * there could always be a virtual fid travelling with the queries, * and the FDW table itself wouldn't need such a column? */ +#if PG_VERSION_NUM >= 140000 +static void +ogrAddForeignUpdateTargets(PlannerInfo* planinfo, + unsigned int rte_index, + RangeTblEntry* target_rte, + Relation target_relation) +{ + Query* parsetree = planinfo->parse; +#else + static void ogrAddForeignUpdateTargets(Query* parsetree, RangeTblEntry* target_rte, Relation target_relation) { +#endif ListCell* cell; Form_pg_attribute att; Var* var; View it on GitLab: https://salsa.debian.org/debian-gis-team/pgsql-ogr-fdw/-/commit/fd44d803f4d46585b880d31e95c563732d59ab64 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/pgsql-ogr-fdw/-/commit/fd44d803f4d46585b880d31e95c563732d59ab64 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
