sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid querying for srid when geometry_table is empty

Browse source 
- this can happen when the table detection fails - refs #2718
 - ideally this would not happen but it lessens the impact if it does
 - amends 4a1f4a9b5e
This commit is contained in:
Dane Springmeyer 2015-03-08 12:54:19 -07:00
parent acee056710
commit 073e46aad8
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
plugins/input/postgis/postgis_datasource.cpp
View file

@ -159,6 +159,10 @@ postgis_datasource::postgis_datasource(parameters const& params)
geometry_table_ = geometry_table_.substr(0); geometry_table_ = geometry_table_.substr(0);
} }
// NOTE: geometry_table_ how should ideally be a table name, but
// there are known edge cases where this will break down and
// geometry_table_ may even be empty: https://github.com/mapnik/mapnik/issues/2718
// If we do not know both the geometry_field and the srid // If we do not know both the geometry_field and the srid
// then first attempt to fetch the geometry name from a geometry_columns entry. // then first attempt to fetch the geometry name from a geometry_columns entry.
// This will return no records if we are querying a bogus table returned // This will return no records if we are querying a bogus table returned
@ -166,7 +170,7 @@ postgis_datasource::postgis_datasource(parameters const& params)
// the table parameter references a table, view, or subselect not // the table parameter references a table, view, or subselect not
// registered in the geometry columns. // registered in the geometry columns.
geometryColumn_ = geometry_field_; geometryColumn_ = geometry_field_;
if (geometryColumn_.empty() || srid_ == 0) if (!geometry_table_.empty() && (geometryColumn_.empty() || srid_ == 0))
{ {
#ifdef MAPNIK_STATS #ifdef MAPNIK_STATS
mapnik::progress_timer __stats2__(std::clog, "postgis_datasource::init(get_srid_and_geometry_column)"); mapnik::progress_timer __stats2__(std::clog, "postgis_datasource::init(get_srid_and_geometry_column)");
@ -223,12 +227,20 @@ postgis_datasource::postgis_datasource(parameters const& params)
// If we still do not know the srid then we can try to fetch // If we still do not know the srid then we can try to fetch
// it from the 'geometry_table_' parameter, which should work even if it is // it from the 'geometry_table_' parameter, which should work even if it is
// a subselect as long as we know the geometry_field to query // a subselect as long as we know the geometry_field to query
if (! geometryColumn_.empty() && srid_ <= 0) if (!geometryColumn_.empty() && srid_ <= 0)
{ {
std::ostringstream s; std::ostringstream s;
s << "SELECT ST_SRID(\"" << geometryColumn_ << "\") AS srid FROM " s << "SELECT ST_SRID(\"" << geometryColumn_ << "\") AS srid FROM ";
<< populate_tokens(geometry_table_) << " WHERE \"" << geometryColumn_ << "\" IS NOT NULL LIMIT 1;"; if (!geometry_table_.empty())
{
s << geometry_table_;
}
else
{
s << populate_tokens(table_);
}
s << " WHERE \"" << geometryColumn_ << "\" IS NOT NULL LIMIT 1;";
shared_ptr<ResultSet> rs = conn->executeQuery(s.str()); shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
if (rs->next()) if (rs->next())