Modify the parameter name of the database function

diff --git a/NativeLauncher/inc/db_manager.h b/NativeLauncher/inc/db_manager.h
index afae883..a9af787 100644 (file)
--- a/NativeLauncher/inc/db_manager.h
+++ b/NativeLauncher/inc/db_manager.h
@@ -29,7 +29,7 @@
                        VERSION         TEXT);"
 #define QUERY_MAX_LEN  4096
 
-sqlite3* dbCreate(std::string path);
+sqlite3* dbCreate(std::string path, std::string query);
 sqlite3* dbOpen(std::string path);
 void dbClose(sqlite3 *tac_db);
 void dbRollback(sqlite3 *tac_db);

diff --git a/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc b/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
index 2343fd6..b042405 100644 (file)
--- a/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
+++ b/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
@@ -278,7 +278,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
        }
 
        status = "install";
-       tac_db = dbCreate(TAC_APP_LIST_DB);
+       tac_db = dbCreate(TAC_APP_LIST_DB, CREATE_TAC_DB_TABLE);
        if (!tac_db) {
                _ERR("Sqlite create error");
                return 0;
@@ -414,7 +414,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
        }
 
        status = "update";
-       tac_db = dbCreate(TAC_APP_LIST_DB);
+       tac_db = dbCreate(TAC_APP_LIST_DB, CREATE_TAC_DB_TABLE);
        if (!tac_db) {
                _ERR("Sqlite open error");
                return 0;

diff --git a/NativeLauncher/tool/tac_common.cc b/NativeLauncher/tool/tac_common.cc
index 1baa97f..0c8df03 100644 (file)
--- a/NativeLauncher/tool/tac_common.cc
+++ b/NativeLauncher/tool/tac_common.cc
@@ -151,7 +151,7 @@ tac_error_e restoreTACDB()
                return TAC_ERROR_UNKNOWN;
        }
 
-       tac_db = dbCreate(TAC_APP_LIST_RESTORE_DB);
+       tac_db = dbCreate(TAC_APP_LIST_RESTORE_DB, CREATE_TAC_DB_TABLE);
        if (!tac_db) {
                fprintf(stderr, "Sqlite create error\n");
                return TAC_ERROR_UNKNOWN;

diff --git a/NativeLauncher/util/db_manager.cc b/NativeLauncher/util/db_manager.cc
index 6c1c6d1..6edadfb 100644 (file)
--- a/NativeLauncher/util/db_manager.cc
+++ b/NativeLauncher/util/db_manager.cc
@@ -39,7 +39,7 @@ static int dbIntegrityCheckCb(void *user_data, int argc, char **argv, char **not
        return 0;
 }
 
-sqlite3* dbCreate(std::string path)
+sqlite3* dbCreate(std::string path, std::string query)
 {
        sqlite3 *sqlite = NULL;
        bool is_db_corrupted = false;
@@ -50,7 +50,7 @@ sqlite3* dbCreate(std::string path)
                        _ERR("Sqlite error : [%d, %s]", ret, path.c_str());
                        return NULL;
                }
-               return dbCreate(path);
+               return dbCreate(path, query);
        }
        ret = sqlite3_exec(sqlite, "PRAGMA journal_mode = PERSIST", NULL, NULL, NULL);
        if (ret != SQLITE_OK) {
@@ -59,7 +59,7 @@ sqlite3* dbCreate(std::string path)
                sqlite = NULL;
                return sqlite;
        }
-       ret = sqlite3_exec(sqlite, CREATE_TAC_DB_TABLE, NULL, NULL, NULL);
+       ret = sqlite3_exec(sqlite, query.c_str(), NULL, NULL, NULL);
        if (ret != SQLITE_OK) {
                _ERR("Sqlite error : [%d, %s]", ret, path.c_str());
                sqlite3_close(sqlite);
@@ -75,7 +75,7 @@ sqlite3* dbCreate(std::string path)
                        sqlite = NULL;
                        return sqlite;
                }
-               return dbCreate(path);
+               return dbCreate(path, query);
        }
        return sqlite;
 }
@@ -115,75 +115,75 @@ void dbFinalize(sqlite3_stmt *stmt)
        }
 }
 
-void dbClose(sqlite3 *tac_db)
+void dbClose(sqlite3 *sqlite)
 {
-       if (tac_db) {
-               sqlite3_exec(tac_db, "COMMIT;", NULL, NULL, NULL);
-               sqlite3_close(tac_db);
-               tac_db = NULL;
+       if (sqlite) {
+               sqlite3_exec(sqlite, "COMMIT;", NULL, NULL, NULL);
+               sqlite3_close(sqlite);
+               sqlite = NULL;
        }
 }
 
-void dbRollback(sqlite3 *tac_db)
+void dbRollback(sqlite3 *sqlite)
 {
-       if (tac_db) {
-               sqlite3_exec(tac_db, "ROLLBACK;", NULL, NULL, NULL);
-               sqlite3_close(tac_db);
-               tac_db = NULL;
+       if (sqlite) {
+               sqlite3_exec(sqlite, "ROLLBACK;", NULL, NULL, NULL);
+               sqlite3_close(sqlite);
+               sqlite = NULL;
        }
 }
 
-bool dbUpdate(sqlite3 *tac_db, std::string path, std::string query)
+bool dbUpdate(sqlite3 *sqlite, std::string path, std::string query)
 {
        sqlite3_stmt *stmt = NULL;
-       int ret = sqlite3_exec(tac_db, "BEGIN;", NULL, NULL, NULL);
-       ret = sqlite3_prepare(tac_db, query.c_str(), QUERY_MAX_LEN , &stmt, NULL);
+       int ret = sqlite3_exec(sqlite, "BEGIN;", NULL, NULL, NULL);
+       ret = sqlite3_prepare(sqlite, query.c_str(), QUERY_MAX_LEN , &stmt, NULL);
        if (ret != SQLITE_OK) {
-               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(tac_db));
-               dbClose(tac_db);
+               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(sqlite));
+               dbClose(sqlite);
                return false;
        }
        ret = sqlite3_step(stmt);
        if (ret != SQLITE_DONE && ret != SQLITE_ROW && ret != SQLITE_OK) {
-               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(tac_db));
+               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(sqlite));
                dbFinalize(stmt);
-               dbClose(tac_db);
+               dbClose(sqlite);
                return false;
        }
        dbFinalize(stmt);
        return true;
 }
 
-bool dbInsert(sqlite3 *tac_db, std::string path, std::string query)
+bool dbInsert(sqlite3 *sqlite, std::string path, std::string query)
 {
        sqlite3_stmt *stmt = NULL;
-       int ret = sqlite3_exec(tac_db, "BEGIN;", NULL, NULL, NULL);
-       ret = sqlite3_prepare(tac_db, query.c_str(), QUERY_MAX_LEN , &stmt, NULL);
+       int ret = sqlite3_exec(sqlite, "BEGIN;", NULL, NULL, NULL);
+       ret = sqlite3_prepare(sqlite, query.c_str(), QUERY_MAX_LEN , &stmt, NULL);
        if (ret != SQLITE_OK) {
-               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(tac_db));
-               dbClose(tac_db);
+               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(sqlite));
+               dbClose(sqlite);
                return false;
        }
        ret = sqlite3_step(stmt);
        if (ret != SQLITE_DONE && ret != SQLITE_ROW && ret != SQLITE_OK) {
-               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(tac_db));
+               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(sqlite));
                dbFinalize(stmt);
-               dbClose(tac_db);
+               dbClose(sqlite);
                return false;
        }
        dbFinalize(stmt);
        return true;
 }
 
-std::vector<std::string> dbSelect(sqlite3 *tac_db, std::string path, std::string query)
+std::vector<std::string> dbSelect(sqlite3 *sqlite, std::string path, std::string query)
 {
        std::vector<std::string> updateDB;
        sqlite3_stmt* stmt = NULL;
        const char* str = NULL;
-       int ret = sqlite3_prepare_v2(tac_db, query.c_str(), strlen(query.c_str()), &stmt, NULL);
+       int ret = sqlite3_prepare_v2(sqlite, query.c_str(), strlen(query.c_str()), &stmt, NULL);
        if (ret != SQLITE_OK) {
-               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(tac_db));
-               dbClose(tac_db);
+               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(sqlite));
+               dbClose(sqlite);
                return updateDB;
        }
        while (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -194,21 +194,21 @@ std::vector<std::string> dbSelect(sqlite3 *tac_db, std::string path, std::string
        return updateDB;
 }
 
-bool dbDelete(sqlite3 *tac_db, std::string path, std::string query)
+bool dbDelete(sqlite3 *sqlite, std::string path, std::string query)
 {
        sqlite3_stmt *stmt = NULL;
-       int ret = sqlite3_exec(tac_db, "BEGIN;", NULL, NULL, NULL);
-       ret = sqlite3_prepare(tac_db, query.c_str(), QUERY_MAX_LEN , &stmt, NULL);
+       int ret = sqlite3_exec(sqlite, "BEGIN;", NULL, NULL, NULL);
+       ret = sqlite3_prepare(sqlite, query.c_str(), QUERY_MAX_LEN , &stmt, NULL);
        if (ret != SQLITE_OK) {
-               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(tac_db));
-               dbClose(tac_db);
+               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(sqlite));
+               dbClose(sqlite);
                return false;
        }
        ret = sqlite3_step(stmt);
        if (ret != SQLITE_DONE && ret != SQLITE_ROW && ret != SQLITE_OK) {
-               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(tac_db));
+               _ERR("Sqlite error : [%d, %s]", ret, sqlite3_errmsg(sqlite));
                dbFinalize(stmt);
-               dbClose(tac_db);
+               dbClose(sqlite);
                return false;
        }
        dbFinalize(stmt);