[android] explicitly set temp directory for SQLite3

mapbox · Sep 26, 2018 · 4004a85 · 4004a85
1 parent 4148a5a
commit 4004a85
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp
@@ -6,6 +6,8 @@
 #include <mbgl/storage/resource_transform.hpp>
 #include <mbgl/util/logging.hpp>
 
+#include <sqlite3.hpp>
+
 #include "asset_manager_file_source.hpp"
 
 namespace mbgl {
@@ -17,6 +19,8 @@ FileSource::FileSource(jni::JNIEnv& _env,
                        const jni::String& accessToken,
                        const jni::String& _cachePath,
                        const jni::Object<AssetManager>& assetManager) {
+    mapbox::sqlite::setTempPath(jni::Make<std::string>(_env, _cachePath));
+
     // Create a core default file source
     fileSource = std::make_unique<mbgl::DefaultFileSource>(
         jni::Make<std::string>(_env, _cachePath) + "/mbgl-offline.db",

diff --git a/platform/default/sqlite3.cpp b/platform/default/sqlite3.cpp
@@ -40,6 +40,10 @@ static_assert(mbgl::underlying_type(ResultCode::Auth) == SQLITE_AUTH, "error");
 static_assert(mbgl::underlying_type(ResultCode::Range) == SQLITE_RANGE, "error");
 static_assert(mbgl::underlying_type(ResultCode::NotADB) == SQLITE_NOTADB, "error");
 
+void setTempPath(const std::string& path) {
+    sqlite3_temp_directory = sqlite3_mprintf("%s", path.c_str());
+}
+
 class DatabaseImpl {
 public:
     DatabaseImpl(sqlite3* db_)

diff --git a/platform/default/sqlite3.hpp b/platform/default/sqlite3.hpp
@@ -67,6 +67,8 @@ class StatementImpl;
 class Query;
 class Transaction;
 
+void setTempPath(const std::string&);
+
 class Database {
 private:
     Database(std::unique_ptr<DatabaseImpl>);