diff options
author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-09-12 16:44:17 -0700 |
---|---|---|
committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-09-13 15:42:02 -0700 |
commit | fb1aa4d6ee760188dbd0d53884c50ec77be8e9d7 (patch) | |
tree | 10ede5547595cb30510c2df25e34bbac8e4092f1 | |
parent | b755da9ce33e668ccead3cdaebebc45166e94c96 (diff) | |
download | qtlocation-mapboxgl-fb1aa4d6ee760188dbd0d53884c50ec77be8e9d7.tar.gz |
[core] Fix a query mege duplication.
-rw-r--r-- | platform/default/mbgl/storage/offline_database.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/default/mbgl/storage/offline_database.cpp b/platform/default/mbgl/storage/offline_database.cpp index 37490d2f6f..42e164a7ca 100644 --- a/platform/default/mbgl/storage/offline_database.cpp +++ b/platform/default/mbgl/storage/offline_database.cpp @@ -689,9 +689,9 @@ OfflineDatabase::mergeDatabase(const std::string& sideDatabasePath) { // clang-format off mapbox::sqlite::Query queryRegions{ getStatement( - "SELECT r.id, r.definition, r.description " - "FROM side.regions sr " - "JOIN regions r ON sr.definition = r.definition") }; + "SELECT DISTINCT r.id, r.definition, r.description " + "FROM side.regions sr " + "JOIN regions r ON sr.definition = r.definition AND sr.description IS r.description") }; // clang-format on OfflineRegions result; |