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

sqlite: ensure non-existant columns requested in query prompt error by switching quoting character to brackets - closes #984 - refs #792

Browse source
This commit is contained in:
Dane Springmeyer 2011-12-05 13:22:00 -08:00
parent bc63c9b589
commit 17852d5140
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/input/sqlite/sqlite_datasource.cpp
View file

@ -453,7 +453,9 @@ featureset_ptr sqlite_datasource::features(query const& q) const
std::set<std::string>::const_iterator end = props.end(); std::set<std::string>::const_iterator end = props.end();
while (pos != end) while (pos != end)
{ {
s << ",\"" << *pos << "\""; // TODO - should we restrict duplicate key query?
//if (*pos != key_field_)
s << ",[" << *pos << "]";
++pos; ++pos;
} }
@ -492,7 +494,7 @@ featureset_ptr sqlite_datasource::features(query const& q) const
#ifdef MAPNIK_DEBUG #ifdef MAPNIK_DEBUG
std::clog << "Sqlite Plugin: table: " << table_ << "\n\n"; std::clog << "Sqlite Plugin: table: " << table_ << "\n\n";
std::clog << "Sqlite Plugin: query:" << s.str() << "\n\n"; std::clog << "Sqlite Plugin: query: " << s.str() << "\n\n";
#endif #endif
boost::shared_ptr<sqlite_resultset> rs(dataset_->execute_query(s.str())); boost::shared_ptr<sqlite_resultset> rs(dataset_->execute_query(s.str()));
@ -527,7 +529,7 @@ featureset_ptr sqlite_datasource::features_at_point(coord2d const& pt) const
std::string fld_name = itr->get_name(); std::string fld_name = itr->get_name();
if (fld_name != key_field_) if (fld_name != key_field_)
{ {
s << ",\"" << itr->get_name() << "\""; s << ",[" << itr->get_name() << "]";
} }
++itr; ++itr;