From 25aa10ce4e25c73d198d491306ac396b38381fc1 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Mon, 29 Jul 2019 16:45:24 +0000 Subject: [PATCH] Handle NULL geometry values in pgsql2shp Closes #4209 git-svn-id: http://svn.osgeo.org/postgis/branches/2.3@17643 b70326c6-7e19-0410-871a-916f4a2858ee --- NEWS | 1 + loader/pgsql2shp-core.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 6ede78aa5..879cacde5 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ PostGIS 2.3.10 - #4327, Avoid pfree'ing the result of getenv (Raúl Marín) - #4406, Throw on invalid characters when decoding geohash (Raúl Marín) - #4466, Fix undefined behaviour in _postgis_gserialized_stats (Raúl Marín) + - #4209, Handle NULL geometry values in pgsql2shp (Paul Ramsey) PostGIS 2.3.9 diff --git a/loader/pgsql2shp-core.c b/loader/pgsql2shp-core.c index 97762b33e..3027edb65 100644 --- a/loader/pgsql2shp-core.c +++ b/loader/pgsql2shp-core.c @@ -887,15 +887,15 @@ getTableInfo(SHPDUMPERSTATE *state) { query = malloc(150 + 4 * strlen(state->geo_col_name) + strlen(state->schema) + strlen(state->table)); - sprintf(query, "SELECT count(\"%s\"), max(ST_zmflag(\"%s\"::geometry)), geometrytype(\"%s\"::geometry) FROM \"%s\".\"%s\" GROUP BY geometrytype(\"%s\"::geometry)", - state->geo_col_name, state->geo_col_name, state->geo_col_name, state->schema, state->table, state->geo_col_name); + sprintf(query, "SELECT count(1), max(ST_zmflag(\"%s\"::geometry)), geometrytype(\"%s\"::geometry) FROM \"%s\".\"%s\" GROUP BY 3", + state->geo_col_name, state->geo_col_name, state->schema, state->table); } else { query = malloc(150 + 4 * strlen(state->geo_col_name) + strlen(state->table)); - sprintf(query, "SELECT count(\"%s\"), max(ST_zmflag(\"%s\"::geometry)), geometrytype(\"%s\"::geometry) FROM \"%s\" GROUP BY geometrytype(\"%s\"::geometry)", - state->geo_col_name, state->geo_col_name, state->geo_col_name, state->table, state->geo_col_name); + sprintf(query, "SELECT count(1), max(ST_zmflag(\"%s\"::geometry)), geometrytype(\"%s\"::geometry) FROM \"%s\" GROUP BY 3", + state->geo_col_name, state->geo_col_name, state->table); } } else @@ -955,9 +955,14 @@ getTableInfo(SHPDUMPERSTATE *state) for (i = 0; i < PQntuples(res); i++) { - geometry_type_from_string(PQgetvalue(res, i, 2), &type, &dummy, &dummy); + /* skip null geometries */ + if (PQgetisnull(res, i, 2)) + { + state->rowcount += atoi(PQgetvalue(res, i, 0)); + continue; + } - if (!type) continue; /* skip null geometries */ + geometry_type_from_string(PQgetvalue(res, i, 2), &type, &dummy, &dummy); /* We can always set typefound to that of the first column found */ if (!typefound) -- 2.49.0