Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid hardcoding db name in `Upload.migrate_to_new_scheme`.

This commit is contained in:
Guo Xiang Tan 2019-04-24 15:24:36 +08:00
parent 8d697bbbd3
commit c811e59898
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/upload.rb
View File

@ -208,8 +208,9 @@ class Upload < ActiveRecord::Base
if SiteSetting.migrate_to_new_scheme
max_file_size_kb = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
local_store = FileStore::LocalStore.new
db = RailsMultisite::ConnectionManagement.current_db
scope = Upload.by_users.where("url NOT LIKE '%/original/_X/%' AND url LIKE '%/uploads/#{RailsMultisite::ConnectionManagement.current_db}%'").order(id: :desc)
scope = Upload.by_users.where("url NOT LIKE '%/original/_X/%' AND url LIKE '%/uploads/#{db}%'").order(id: :desc)
scope = scope.limit(limit) if limit
@ -273,7 +274,7 @@ class Upload < ActiveRecord::Base
remap_scope ||= begin
Post.with_deleted
.where("raw ~ '/uploads/default/\\d+/'")
.where("raw ~ '/uploads/#{db}/\\d+/'")
.select(:raw, :cooked)
.all
end