hotfix for old database

Author: dorin-ga

source/gameanalytics/GADevice.cpp

@@ -225,11 +225,7 @@ namespace gameanalytics
         {
             if (_platform)
             {
-                _writablepath = _platform->getPersistentPath() + "/" + state::GAState::getGameKey();
-                if(!std::filesystem::exists(_writablepath))
-                {
-                    std::filesystem::create_directory(_writablepath);
-                }
+                _writablepath = _platform->getPersistentPath();
             }
         }
     }

source/gameanalytics/GAStore.cpp

@@ -207,18 +207,36 @@ namespace gameanalytics
             return sqlDatabase;
         }
 
+        bool GAStore::fixOldDatabase()
+        {
+            std::string oldPath = device::GADevice::getWritablePath() + "/ga.sqlite3";
+            std::string newPath = device::GADevice::getWritablePath() + "/" + state::GAState::getGameKey() + "/ga.sqlite3";
+            if(std::filesystem::exists(oldPath))
+            {
+                std::filesystem::rename(oldPath, newPath);
+                return true;
+            }
+
+            return false;
+        }
+
         bool GAStore::ensureDatabase(bool dropDatabase, std::string const& key)
         {
             // lazy creation of db path
             if(getInstance().dbPath.empty())
             {
-                std::string path = device::GADevice::getWritablePath();
-                path += utilities::printString("/%s/ga.sqlite3", key.c_str());
+                std::string dir  = device::GADevice::getWritablePath() + "/" + key;
+                if(!std::filesystem::exists(dir))
+                {
+                    std::filesystem::create_directory(dir);
+                }
 
+                std::string path = dir + "/ga.sqlite3";
                 getInstance().dbPath = path;
             }
 
             const std::string dbPath = getInstance().dbPath;
+            const bool shouldFixDb   = getInstance().fixOldDatabase();
 
             // Open database
             if (sqlite3_open(dbPath.c_str(), &getInstance().sqlDatabase) != SQLITE_OK)
@@ -232,7 +250,7 @@ namespace gameanalytics
                 getInstance().dbReady = true;
                 logging::GALogger::i("Database opened: %s", dbPath.c_str());
             }
-
+            
             if (dropDatabase)
             {
                 logging::GALogger::d("Drop tables");
@@ -242,6 +260,13 @@ namespace gameanalytics
                 GAStore::executeQuerySync("DROP TABLE ga_progression");
                 GAStore::executeQuerySync("VACUUM");
             }
+            else if(shouldFixDb)
+            {
+                GAStore::executeQuerySync("DROP TABLE ga_events");
+                GAStore::executeQuerySync("DROP TABLE ga_progression");
+                GAStore::executeQuerySync("DROP TABLE ga_session");
+                GAStore::executeQuerySync("VACUUM");
+            }
 
             // Create statements
             constexpr const char* sql_ga_events = "CREATE TABLE IF NOT EXISTS ga_events(status CHAR(50) NOT NULL, category CHAR(50) NOT NULL, session_id CHAR(50) NOT NULL, client_ts CHAR(50) NOT NULL, event TEXT NOT NULL);";

source/gameanalytics/GAStore.h

@@ -50,6 +50,7 @@ namespace gameanalytics
 
             static GAStore& getInstance();
 
+            bool fixOldDatabase();
             bool trimEventTable();
 
             // set when calling "ensureDatabase"

source/gameanalytics/GameAnalytics.cpp

@@ -356,8 +356,7 @@ namespace gameanalytics
         {
             return;
         }
-
-
+        
         threading::GAThreading::performTaskOnGAThread([gameKey, gameSecret]()
         {
             if (isSdkReady(true, false))

source/gameanalytics/Platform/GADevicePlatform.h

@@ -49,5 +49,3 @@ namespace gameanalytics
         return std::make_unique<GADevicePlatform>();
     }
 }
-
-