11.0 sql fix (#216)

Author: bucanero

include/saves.h

@@ -120,7 +120,6 @@ enum cmd_code_enum
     CMD_EXP_PS1_VM1,
     CMD_EXP_DATABASE,
     CMD_DB_REBUILD,
-    CMD_DB_DEL_FIX,
     CMD_DB_DLC_REBUILD,
 
 // Import commands

source/exec_cmd.c

@@ -1853,15 +1853,6 @@ void execCodeCommand(code_entry_t* code, const char* codecmd)
 			code->activated = 0;
 			break;
 
-		case CMD_DB_DEL_FIX:
-			if (appdb_fix_delete(code->file, apollo_config.user_id))
-				show_message("User %x database fixed successfully!\nLog out for changes to take effect", apollo_config.user_id);
-			else
-				show_message("Database fix failed!");
-
-			code->activated = 0;
-			break;
-
 		case CMD_DB_DLC_REBUILD:
 			if (addcont_dlc_rebuild(code->file))
 				show_message("DLC database fixed successfully!\nLog out for changes to take effect");

source/saves.c

@@ -1157,10 +1157,6 @@ int ReadBackupCodes(save_entry_t * bup)
 		asprintf(&cmd->file, "%saddcont.db", bup->path);
 		list_append(bup->codes, cmd);
 
-		cmd = _createCmdCode(PATCH_COMMAND, "\x18 Restore Delete option to XMB items (app.db fix)", CMD_DB_DEL_FIX);
-		asprintf(&cmd->file, "%sapp.db", bup->path);
-		list_append(bup->codes, cmd);
-
 		cmd = _createCmdCode(PATCH_COMMAND, CHAR_ICON_COPY " Backup System Database Folder", CMD_EXP_DATABASE);
 		list_append(bup->codes, cmd);
 

source/sqlite_db.c

@@ -238,7 +238,7 @@ static void insert_appinfo_sfo_value_int(sqlite3* db, const char* titleId, const
 
 int appdb_rebuild(const char* db_path, uint32_t userid)
 {
-    int fw, i;
+    int i;
     DIR *dp;
     struct dirent *dirp;
     char path[256];
@@ -247,9 +247,6 @@ int appdb_rebuild(const char* db_path, uint32_t userid)
     sfo_context_t* sfo;
     uint64_t pkg_size;
 
-    if ((fw = get_firmware_version()) < 0)
-        return 0;
-
     dp = opendir("/user/app");
     if (!dp)
     {
@@ -297,13 +294,20 @@ int appdb_rebuild(const char* db_path, uint32_t userid)
             sfo_category = "gd";
 
         LOG("Adding (%s) %s '%s' to tbl_appbrowse_%010d...", sfo_titleid, sfo_content, sfo_title, userid);
-        char* query = sqlite3_mprintf("INSERT INTO tbl_appbrowse_%010d VALUES (%Q, %Q, %Q, '/user/appmeta/%s',"
+        char* query = sqlite3_mprintf("INSERT INTO tbl_appbrowse_%010d (titleId, contentId, titleName,"
+            "metaDataPath, lastAccessTime, contentStatus, onDisc, parentalLevel, visible,"
+            "sortPriority, pathInfo, lastAccessIndex, dispLocation, canRemove, category, contentType, pathInfo2,"
+            "presentBoxStatus, entitlement, thumbnailUrl, lastUpdateTime, playableDate, contentSize,"
+            "installDate, platform, uiCategory, skuId, disableLiveDetail, linkType, linkUri,"
+            "serviceIdAddCont1, serviceIdAddCont2, serviceIdAddCont3, serviceIdAddCont4,"
+            "serviceIdAddCont5, serviceIdAddCont6, serviceIdAddCont7, folderType, folderInfo,"
+            "parentFolderId, positionInFolder, activeDate, entitlementTitleName, hddLocation,"
+            "externalHddAppStatus, entitlementIdKamaji, mTime) VALUES (%Q, %Q, %Q, '/user/appmeta/%s',"
             "'2020-01-01 20:20:03.000', 0, 0, 5, 1, 100, 0, 1, 5, 1, %Q, 0, 0, 0, 0, NULL, NULL, NULL, %ld,"
             "'2020-01-01 20:20:01.000', 0, %Q, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,"
-            "0, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, '2020-01-01 20:20:02.000'%s)",
+            "0, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, '2020-01-01 20:20:02.000')",
             userid, sfo_titleid, sfo_content, sfo_title, dirp->d_name, sfo_category, pkg_size,
-            (strcmp(sfo_category, "gde") == 0) ? "app" : "game",
-            (fw <= 0x555) ? "" : ",0,0,0,0,0,NULL");
+            (strcmp(sfo_category, "gde") == 0) ? "app" : "game");
 
         if (sqlite3_exec(db, query, NULL, NULL, NULL) != SQLITE_OK)
         {