[pgsql-ogr-fdw] 03/05: New upstream release.

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository pgsql-ogr-fdw.

commit 248135695064745d808b86573b8ac057e6060baa
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Oct 17 16:49:33 2017 +0200

    New upstream release.
    
    * New upstream release.
    * Drop gdal-2.2 patch, included by upstream.
---
 debian/changelog        |  7 ++++++
 debian/patches/gdal-2.2 | 61 -------------------------------------------------
 debian/patches/series   |  1 -
 3 files changed, 7 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0a0f36..ddf62b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pgsql-ogr-fdw (1.0.4-1) UNRELEASED; urgency=low
+
+  * Drop gdal-2.2 patch, included by upstream.
+  * New upstream release.
+
+ -- Michael Fladischer <fladi at debian.org>  Tue, 17 Oct 2017 16:49:13 +0200
+
 pgsql-ogr-fdw (1.0.3-1) unstable; urgency=medium
 
   * New upstream version with PostgreSQL 10 support.
diff --git a/debian/patches/gdal-2.2 b/debian/patches/gdal-2.2
deleted file mode 100644
index 82432b9..0000000
--- a/debian/patches/gdal-2.2
+++ /dev/null
@@ -1,61 +0,0 @@
-commit df22bcb661d67e52997b40686c38dbcc6a7a8b07
-Author: Paul Ramsey <pramsey at cleverelephant.ca>
-Date:   Tue Oct 3 05:56:15 2017 -0700
-
-    Properly handle NULL fields using the new GDAL 2.2 API (Closes #133)
-
-diff --git a/ogr_fdw.c b/ogr_fdw.c
-index 78965ac..18e2ab6 100644
---- a/ogr_fdw.c
-+++ b/ogr_fdw.c
-@@ -1544,11 +1544,17 @@ ogrFeatureToSlot(const OGRFeatureH feat, TupleTableSlot *slot, const OgrFdwExecS
- 		}
- 		else if ( ogrvariant == OGR_FIELD )
- 		{
-+#if GDAL_VERSION_MAJOR >= 2 && GDAL_VERSION_MINOR >= 2
-+			int field_not_null = OGR_F_IsFieldSet(feat, ogrfldnum) && ! OGR_F_IsFieldNull(feat, ogrfldnum);
-+#else
-+			int field_not_null = OGR_F_IsFieldSet(feat, ogrfldnum);
-+#endif
-+
- 			/* Ensure that the OGR data type fits the destination Pg column */
- 			ogrCanConvertToPg(ogrfldtype, pgtype, pgname, tbl->tblname);
- 
- 			/* Only convert non-null fields */
--			if ( OGR_F_IsFieldSet(feat, ogrfldnum) )
-+			if ( field_not_null )
- 			{
- 				switch(ogrfldtype)
- 				{
-@@ -1579,18 +1585,11 @@ ogrFeatureToSlot(const OGRFeatureH feat, TupleTableSlot *slot, const OgrFdwExecS
- 						 * Handling numbers directly would be faster, but require a lot of extra code.
- 						 * For now, we go via text.
- 						 */
--						const char *cstr = OGR_F_GetFieldAsString(feat, ogrfldnum);
--						size_t cstr_len = strlen(cstr);
--						if ( cstr && cstr_len > 0 )
--						{
--							char *cstr_decoded = pg_any_to_server(cstr, cstr_len, PG_UTF8);
--							nulls[i] = false;
--							values[i] = pgDatumFromCString(cstr_decoded, pgtype, pgtypmod, pginputfunc);
--						}
--						else
--						{
--							ogrNullSlot(values, nulls, i);
--						}
-+						const char *cstr_in = OGR_F_GetFieldAsString(feat, ogrfldnum);
-+						size_t cstr_len = cstr_in ? strlen(cstr_in) : 0;
-+						char *cstr_decoded = pg_any_to_server(cstr_in, cstr_len, PG_UTF8);
-+						nulls[i] = false;
-+						values[i] = pgDatumFromCString(cstr_decoded, pgtype, pgtypmod, pginputfunc);
- 						break;
- 					}
- 					case OFTDate:
-@@ -1621,7 +1620,6 @@ ogrFeatureToSlot(const OGRFeatureH feat, TupleTableSlot *slot, const OgrFdwExecS
- 						{
- 							snprintf(cstr, 256, "%d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, minute, second);
- 						}
--
- 						nulls[i] = false;
- 						values[i] = pgDatumFromCString(cstr, pgtype, pgtypmod, pginputfunc);
- 						break;
diff --git a/debian/patches/series b/debian/patches/series
index a51d0b5..c01cd3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 install.patch
 test-import-schema
-gdal-2.2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pgsql-ogr-fdw.git