Handle NULL geometry values in pgsql2shp

References #4209

git-svn-id: http://svn.osgeo.org/postgis/branches/2.5@17641 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/NEWS b/NEWS
index e8c0a49a264d16ed5413b2649fb353dfe13c69e9..06062eb5b2c7bac0f911896a0dad69642efb326e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ PostGIS 2.5.3
   - #4440, Internal type lookups fail over FDW (Paul Ramsey)
   - #4445, Fix bug in lwgeom_le (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.5.2

diff --git a/loader/pgsql2shp-core.c b/loader/pgsql2shp-core.c
index aa9c26b5e07abf15761adda1f972a1218073ee8b..1b0a650c1e679ac4078856ee207b81780137859e 100644 (file)
--- 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)