From b0d56000b11846bfa892d89de83dcabf88d2ff45 Mon Sep 17 00:00:00 2001 From: Natsumi Date: Thu, 4 Sep 2025 19:13:45 +1200 Subject: [PATCH] Fix SQL errors --- src/service/database/gameLog.js | 4 ++-- src/service/database/tableFixes.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/service/database/gameLog.js b/src/service/database/gameLog.js index ff9bac2d..bf4f9e0e 100644 --- a/src/service/database/gameLog.js +++ b/src/service/database/gameLog.js @@ -964,7 +964,7 @@ const gameLog = { SELECT DISTINCT location, world_name, group_name FROM gamelog_location ) - SELECT gamelog_join_leave.created_at, strftime("%s", gamelog_join_leave.created_at) * 1000 created_at_ts, gamelog_join_leave.location, gamelog_join_leave.time, grouped_locations.world_name, grouped_locations.group_name, gamelog_join_leave.id, gamelog_join_leave.type + SELECT gamelog_join_leave.created_at, strftime('%s', gamelog_join_leave.created_at) * 1000 created_at_ts, gamelog_join_leave.location, gamelog_join_leave.time, grouped_locations.world_name, grouped_locations.group_name, gamelog_join_leave.id, gamelog_join_leave.type FROM gamelog_join_leave INNER JOIN grouped_locations ON gamelog_join_leave.location = grouped_locations.location WHERE user_id = @userId OR display_name = @displayName @@ -1140,7 +1140,7 @@ const gameLog = { * FROM gamelog_join_leave - WHERE type = "OnPlayerLeft" + WHERE type = 'OnPlayerLeft' AND ( strftime('%Y-%m-%dT%H:%M:%SZ', created_at, '-' || (time * 1.0 / 1000) || ' seconds') BETWEEN @utc_start_date AND @utc_end_date OR created_at BETWEEN @utc_start_date AND @utc_end_date diff --git a/src/service/database/tableFixes.js b/src/service/database/tableFixes.js index e209594a..4038719c 100644 --- a/src/service/database/tableFixes.js +++ b/src/service/database/tableFixes.js @@ -23,7 +23,7 @@ const tableFixes = { time: dbRow[6] }; travelingList.unshift(row); - }, 'SELECT * FROM gamelog_join_leave WHERE type = "OnPlayerLeft" AND location = "traveling"'); + }, "SELECT * FROM gamelog_join_leave WHERE type = 'OnPlayerLeft' AND location = 'traveling'"); travelingList.forEach(async (travelingEntry) => { await sqliteService.execute( (dbRow) => { @@ -44,7 +44,7 @@ const tableFixes = { } ); }, - 'SELECT * FROM gamelog_join_leave WHERE type = "OnPlayerJoined" AND display_name = @displayName AND created_at <= @created_at ORDER BY created_at DESC LIMIT 1', + "SELECT * FROM gamelog_join_leave WHERE type = 'OnPlayerJoined' AND display_name = @displayName AND created_at <= @created_at ORDER BY created_at DESC LIMIT 1", { '@displayName': travelingEntry.displayName, '@created_at': travelingEntry.created_at @@ -134,7 +134,7 @@ const tableFixes = { id: dbRow[0], displayName: dbRow[1] }); - }, 'SELECT id, display_name FROM gamelog_join_leave WHERE display_name LIKE "% (%"'); + }, "SELECT id, display_name FROM gamelog_join_leave WHERE display_name LIKE '% (%'"); return badEntries; },