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

sqlite: properly initialize rowid default

Browse source
This commit is contained in:
Dane Springmeyer 2011-08-16 23:05:19 +00:00
parent 5596ff5960
commit aaf9d960d7
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,10 +89,16 @@ sqlite_datasource::sqlite_datasource(parameters const& params, bool bind)
boost::optional<std::string> key_field_name = params_.get<std::string>("key_field");
if (key_field_name) {
if (key_field_name->empty())
std::string const& key_field_string = *key_field_name;
if (key_field_string.empty()) {
key_field_ = "rowid";
else
key_field_ = *key_field_name;
} else {
key_field_ = key_field_string;
}
}
else
{
key_field_ = "rowid";
}
boost::optional<std::string> wkb = params_.get<std::string>("wkb_format");
@ -571,7 +577,12 @@ featureset_ptr sqlite_datasource::features(query const& q) const
s << " FROM ";
std::string query (table_);
std::string query (table_);
/* todo
throw if select * and key_field == rowid?
or add schema support so sqlite throws
*/
if (has_spatial_index_)
{