From a788427b468e4bb14d747ea955401e288bff4357 Mon Sep 17 00:00:00 2001 From: Blake Erickson Date: Wed, 27 May 2020 12:39:30 -0600 Subject: [PATCH] FIX: broken query if upload id is missing (#9900) Log warnings if there are any errors trying to upload group flair image and ensure upload.id exists before trying to use it in a sql query. --- app/jobs/onceoff/migrate_group_flair_images.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/jobs/onceoff/migrate_group_flair_images.rb b/app/jobs/onceoff/migrate_group_flair_images.rb index 2b862cdf175..d613706065b 100644 --- a/app/jobs/onceoff/migrate_group_flair_images.rb +++ b/app/jobs/onceoff/migrate_group_flair_images.rb @@ -77,7 +77,11 @@ module Jobs origin: UrlHelper.absolute(old_url) ).create_for(Discourse.system_user.id) - DB.exec("UPDATE groups SET flair_url = NULL, flair_upload_id = #{upload.id} WHERE id = #{group.id}") if upload.present? + if upload.errors.count > 0 + logger.warn("Failed to create upload for '#{group_name}' group_flair: #{upload.errors.full_messages}") + else + DB.exec("UPDATE groups SET flair_url = NULL, flair_upload_id = #{upload.id} WHERE id = #{group.id}") if upload&.id.present? + end end end