[Git][debian-gis-team/pgsql-ogr-fdw][master] 7 commits: Update branch in gbp.conf & Vcs-Git URL.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / pgsql-ogr-fdw


Commits:
95811d2b by Bas Couwenberg at 2021-06-25T06:04:40+02:00
Update branch in gbp.conf & Vcs-Git URL.

- - - - -
fd44d803 by Bas Couwenberg at 2021-06-25T06:05:13+02:00
New upstream version 1.1.1
- - - - -
53e5337f by Bas Couwenberg at 2021-06-25T06:05:14+02:00
Update upstream source from tag 'upstream/1.1.1'

Update to upstream version '1.1.1'
with Debian dir 0e55a80a55c01dac07a6ca5e05bb5e3a1f3871dc
- - - - -
76faa83a by Bas Couwenberg at 2021-06-25T06:05:31+02:00
New upstream release.

- - - - -
ba0244dc by Bas Couwenberg at 2021-06-25T06:25:09+02:00
Set distribution to experimental.

- - - - -
2e58661c by Bas Couwenberg at 2021-08-15T16:38:10+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."

This reverts commit 95811d2baf2a87f2f6dd96510391ce6771e3dc50.

- - - - -
4e96c152 by Bas Couwenberg at 2021-08-15T16:38:23+02:00
Move from experimental to unstable.

- - - - -


3 changed files:

- README.md
- debian/changelog
- 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


=====================================
debian/changelog
=====================================
@@ -1,8 +1,17 @@
-pgsql-ogr-fdw (1.1.0-2) UNRELEASED; urgency=medium
+pgsql-ogr-fdw (1.1.1-1) unstable; urgency=medium
 
+  * Team upload.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 15 Aug 2021 16:38:12 +0200
+
+pgsql-ogr-fdw (1.1.1-1~exp1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release.
   * Update watch file for GitHub URL changes.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sat, 20 Mar 2021 08:58:04 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 25 Jun 2021 06:07:21 +0200
 
 pgsql-ogr-fdw (1.1.0-1) unstable; urgency=medium
 


=====================================
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/-/compare/56098804e97974810bc6ae4d8206bc942687b808...4e96c1527f9e6f0317d6820c6b28c058811453a6

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pgsql-ogr-fdw/-/compare/56098804e97974810bc6ae4d8206bc942687b808...4e96c1527f9e6f0317d6820c6b28c058811453a6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210815/4da10842/attachment-0001.htm>