zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Fixed SQLiteException when performing purges

Browse source
This commit is contained in:
Intelli 2025-03-20 13:21:43 -06:00
parent 5ebb9f72fc
commit 6cdc139772
2 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lang/en.yml
View file

@ -192,8 +192,10 @@ TELEPORT_PLAYERS: "Teleport command can only be used by players."
TIME_DAYS: "{0} {day|days}" TIME_DAYS: "{0} {day|days}"
TIME_HOURS: "{0} {hour|hours}" TIME_HOURS: "{0} {hour|hours}"
TIME_MINUTES: "{0} {minute|minutes}" TIME_MINUTES: "{0} {minute|minutes}"
TIME_MONTHS: "{0} {month|months}"
TIME_SECONDS: "{0} {second|seconds}" TIME_SECONDS: "{0} {second|seconds}"
TIME_WEEKS: "{0} {week|weeks}" TIME_WEEKS: "{0} {week|weeks}"
TIME_YEARS: "{0} {year|years}"
UPDATE_ERROR: "An error occurred while checking for updates." UPDATE_ERROR: "An error occurred while checking for updates."
UPDATE_HEADER: "{0} Update" UPDATE_HEADER: "{0} Update"
UPDATE_NOTICE: "Notice: {0} is now available." UPDATE_NOTICE: "Notice: {0} is now available."

60
src/main/java/net/coreprotect/database/Database.java
View file

@ -516,36 +516,36 @@ public class Database extends Queue {
private static void createSQLiteIndexes(String prefix, Statement statement, List<String> indexData, String attachDatabase, boolean purge) { private static void createSQLiteIndexes(String prefix, Statement statement, List<String> indexData, String attachDatabase, boolean purge) {
try { try {
createSQLiteIndex(statement, indexData, attachDatabase, "art_map_id_index", prefix + "art_map(id)"); createSQLiteIndex(statement, indexData, attachDatabase, "art_map_id_index", ConfigHandler.prefix + "art_map(id)");
createSQLiteIndex(statement, indexData, attachDatabase, "block_index", prefix + "block(wid,x,z,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "block_index", ConfigHandler.prefix + "block(wid,x,z,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "block_user_index", prefix + "block(user,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "block_user_index", ConfigHandler.prefix + "block(user,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "block_type_index", prefix + "block(type,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "block_type_index", ConfigHandler.prefix + "block(type,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "blockdata_map_id_index", prefix + "blockdata_map(id)"); createSQLiteIndex(statement, indexData, attachDatabase, "blockdata_map_id_index", ConfigHandler.prefix + "blockdata_map(id)");
createSQLiteIndex(statement, indexData, attachDatabase, "chat_index", prefix + "chat(time)"); createSQLiteIndex(statement, indexData, attachDatabase, "chat_index", ConfigHandler.prefix + "chat(time)");
createSQLiteIndex(statement, indexData, attachDatabase, "chat_user_index", prefix + "chat(user,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "chat_user_index", ConfigHandler.prefix + "chat(user,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "chat_wid_index", prefix + "chat(wid,x,z,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "chat_wid_index", ConfigHandler.prefix + "chat(wid,x,z,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "command_index", prefix + "command(time)"); createSQLiteIndex(statement, indexData, attachDatabase, "command_index", ConfigHandler.prefix + "command(time)");
createSQLiteIndex(statement, indexData, attachDatabase, "command_user_index", prefix + "command(user,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "command_user_index", ConfigHandler.prefix + "command(user,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "command_wid_index", prefix + "command(wid,x,z,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "command_wid_index", ConfigHandler.prefix + "command(wid,x,z,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "container_index", prefix + "container(wid,x,z,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "container_index", ConfigHandler.prefix + "container(wid,x,z,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "container_user_index", prefix + "container(user,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "container_user_index", ConfigHandler.prefix + "container(user,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "container_type_index", prefix + "container(type,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "container_type_index", ConfigHandler.prefix + "container(type,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "item_index", prefix + "item(wid,x,z,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "item_index", ConfigHandler.prefix + "item(wid,x,z,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "item_user_index", prefix + "item(user,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "item_user_index", ConfigHandler.prefix + "item(user,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "item_type_index", prefix + "item(type,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "item_type_index", ConfigHandler.prefix + "item(type,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "entity_map_id_index", prefix + "entity_map(id)"); createSQLiteIndex(statement, indexData, attachDatabase, "entity_map_id_index", ConfigHandler.prefix + "entity_map(id)");
createSQLiteIndex(statement, indexData, attachDatabase, "material_map_id_index", prefix + "material_map(id)"); createSQLiteIndex(statement, indexData, attachDatabase, "material_map_id_index", ConfigHandler.prefix + "material_map(id)");
createSQLiteIndex(statement, indexData, attachDatabase, "session_index", prefix + "session(wid,x,z,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "session_index", ConfigHandler.prefix + "session(wid,x,z,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "session_action_index", prefix + "session(action,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "session_action_index", ConfigHandler.prefix + "session(action,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "session_user_index", prefix + "session(user,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "session_user_index", ConfigHandler.prefix + "session(user,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "session_time_index", prefix + "session(time)"); createSQLiteIndex(statement, indexData, attachDatabase, "session_time_index", ConfigHandler.prefix + "session(time)");
createSQLiteIndex(statement, indexData, attachDatabase, "sign_index", prefix + "sign(wid,x,z,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "sign_index", ConfigHandler.prefix + "sign(wid,x,z,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "sign_user_index", prefix + "sign(user,time)"); createSQLiteIndex(statement, indexData, attachDatabase, "sign_user_index", ConfigHandler.prefix + "sign(user,time)");
createSQLiteIndex(statement, indexData, attachDatabase, "sign_time_index", prefix + "sign(time)"); createSQLiteIndex(statement, indexData, attachDatabase, "sign_time_index", ConfigHandler.prefix + "sign(time)");
createSQLiteIndex(statement, indexData, attachDatabase, "user_index", prefix + "user(user)"); createSQLiteIndex(statement, indexData, attachDatabase, "user_index", ConfigHandler.prefix + "user(user)");
createSQLiteIndex(statement, indexData, attachDatabase, "uuid_index", prefix + "user(uuid)"); createSQLiteIndex(statement, indexData, attachDatabase, "uuid_index", ConfigHandler.prefix + "user(uuid)");
createSQLiteIndex(statement, indexData, attachDatabase, "username_log_uuid_index", prefix + "username_log(uuid,user)"); createSQLiteIndex(statement, indexData, attachDatabase, "username_log_uuid_index", ConfigHandler.prefix + "username_log(uuid,user)");
createSQLiteIndex(statement, indexData, attachDatabase, "world_id_index", prefix + "world(id)"); createSQLiteIndex(statement, indexData, attachDatabase, "world_id_index", ConfigHandler.prefix + "world(id)");
} }
catch (Exception e) { catch (Exception e) {
Chat.console(Phrase.build(Phrase.DATABASE_INDEX_ERROR)); Chat.console(Phrase.build(Phrase.DATABASE_INDEX_ERROR));