From 184d7a1701fabd8e1bb3ec18206b4ba43b38dd40 Mon Sep 17 00:00:00 2001 From: Eggbertx Date: Fri, 18 Oct 2024 16:30:02 -0700 Subject: [PATCH] Fix syntax errors in view reset file --- cmd/gochan/main.go | 2 +- sql/reset_views.sql | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/gochan/main.go b/cmd/gochan/main.go index 3738b20c..1398b6ae 100644 --- a/cmd/gochan/main.go +++ b/cmd/gochan/main.go @@ -82,7 +82,7 @@ func main() { return nil }) if err = gcsql.ResetViews(); err != nil { - gcutil.LogFatal().Err(err).Send() + gcutil.LogFatal().Err(err).Caller().Msg("Failed resetting SQL views") } parseCommandLine() diff --git a/sql/reset_views.sql b/sql/reset_views.sql index 64fd42a9..152a2970 100644 --- a/sql/reset_views.sql +++ b/sql/reset_views.sql @@ -50,7 +50,7 @@ WHERE is_deleted = FALSE; CREATE VIEW DBPREFIXv_recent_posts AS SELECT p.*, b.id as board_id FROM DBPREFIXv_building_posts p -left join DBPREFIXboards b; +inner join DBPREFIXboards b on b.dir = p.dir; CREATE VIEW DBPREFIXv_posts_to_delete AS @@ -91,7 +91,7 @@ tripcode, is_role_signature, email, subject, message, message_raw, password, deleted_at, is_deleted, banned_message FROM DBPREFIXposts LEFT JOIN DBPREFIXv_thread_board_ids t on t.id = DBPREFIXposts.thread_id -WHERE is_deleted = FALSE AND is_top_post +WHERE is_deleted = FALSE AND is_top_post; CREATE VIEW DBPREFIXv_upload_info AS SELECT p1.id as id, (SELECT id FROM DBPREFIXposts p2 WHERE p2.is_top_post AND p1.thread_id = p2.thread_id LIMIT 1) AS op, @@ -100,10 +100,10 @@ FROM DBPREFIXposts p1 JOIN DBPREFIXthreads t ON t.id = p1.thread_id JOIN DBPREFIXboards b ON b.id = t.board_id LEFT JOIN DBPREFIXfiles f ON f.post_id = p1.id -WHERE p1.is_deleted = FALSE AND filename IS NOT NULL AND filename != 'deleted' +WHERE p1.is_deleted = FALSE AND filename IS NOT NULL AND filename != 'deleted'; CREATE VIEW DBPREFIXv_top_post_board_dir AS SELECT op.id, (SELECT dir FROM DBPREFIXboards WHERE id = t.board_id) AS dir FROM DBPREFIXposts LEFT JOIN DBPREFIXv_thread_board_ids t ON t.id = DBPREFIXposts.thread_id -INNER JOIN DBPREFIXv_top_post_thread_ids op on op.thread_id = DBPREFIXposts.thread_id \ No newline at end of file +INNER JOIN DBPREFIXv_top_post_thread_ids op on op.thread_id = DBPREFIXposts.thread_id; \ No newline at end of file