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

Merge pull request #2477 from mapycz/fix-plugin-sqlite

Browse source 
fix multiple attach to the same sqlite database
This commit is contained in:
Dane Springmeyer 2014-10-01 10:52:17 -07:00
commit 1b70ce8c3d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -278,9 +278,11 @@ sqlite_datasource::sqlite_datasource(parameters const& params)
mapnik::progress_timer __stats2__(std::clog, "sqlite_datasource::init(use_spatial_index)");
#endif
bool index_db_attached = false;
if (mapnik::util::exists(index_db))
{
dataset_->execute("attach database '" + index_db + "' as " + index_table_);
index_db_attached = true;
}
has_spatial_index_ = sqlite_utils::has_rtree(index_table_,dataset_);
@ -304,7 +306,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params)
{
//extent_initialized_ = true;
has_spatial_index_ = true;
if (mapnik::util::exists(index_db))
if (!index_db_attached && mapnik::util::exists(index_db))
{
dataset_->execute("attach database '" + index_db + "' as " + index_table_);
}