diff options
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20210801211024_remove_orphaned_user_custom_values.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 62e95a696..cb0ad9e3a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -952,7 +952,7 @@ class User < Principal Watcher.where('user_id = ?', id).delete_all WikiContent.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id]) WikiContentVersion.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id]) - user_custom_field_ids = CustomField.where(field_format: 'user').pluck(:id) + user_custom_field_ids = CustomField.where(field_format: 'user').ids if user_custom_field_ids.any? CustomValue.where(custom_field_id: user_custom_field_ids, value: self.id.to_s).delete_all end diff --git a/db/migrate/20210801211024_remove_orphaned_user_custom_values.rb b/db/migrate/20210801211024_remove_orphaned_user_custom_values.rb index 446ef7f10..7d886321d 100644 --- a/db/migrate/20210801211024_remove_orphaned_user_custom_values.rb +++ b/db/migrate/20210801211024_remove_orphaned_user_custom_values.rb @@ -1,8 +1,8 @@ class RemoveOrphanedUserCustomValues < ActiveRecord::Migration[6.1] def up - user_custom_field_ids = CustomField.where(field_format: 'user').pluck(:id) + user_custom_field_ids = CustomField.where(field_format: 'user').ids if user_custom_field_ids.any? - user_ids = Principal.pluck(:id) + user_ids = Principal.ids CustomValue. where(custom_field_id: user_custom_field_ids). where.not(value: [nil, ''] + user_ids). |