From a8170e6a14f42b3361ea046918f921615a9408c6 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 17 Mar 2021 13:46:18 +0000 Subject: [PATCH] Introduces an additional check before removing a deduplicated file (#34479). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by Jens Krämer. git-svn-id: http://svn.redmine.org/redmine/trunk@20812 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/attachment.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 7bce5ded6..3ffb1b51d 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -496,16 +496,15 @@ class Attachment < ActiveRecord::Base private def reuse_existing_file_if_possible - original_diskfile = nil + original_diskfile = diskfile + original_filename = disk_filename reused = with_lock do if existing = Attachment .where(digest: self.digest, filesize: self.filesize) - .where('id <> ? and disk_filename <> ?', - self.id, self.disk_filename) + .where.not(disk_filename: original_filename) .order(:id) .last existing.with_lock do - original_diskfile = self.diskfile existing_diskfile = existing.diskfile if File.readable?(original_diskfile) && File.readable?(existing_diskfile) && @@ -516,7 +515,7 @@ class Attachment < ActiveRecord::Base end end end - if reused + if reused && Attachment.where(disk_filename: original_filename).none? File.delete(original_diskfile) end rescue ActiveRecord::StatementInvalid, ActiveRecord::RecordNotFound -- 2.39.5