diff --git a/app/models/concerns/domain/discardable.rb b/app/models/concerns/domain/discardable.rb index a5aa3d2b4..68ba9406a 100644 --- a/app/models/concerns/domain/discardable.rb +++ b/app/models/concerns/domain/discardable.rb @@ -3,7 +3,8 @@ module Concerns::Domain::Discardable class_methods do def discard_domains - domains = where('delete_at < ? AND ? != ALL(statuses) AND ? != ALL(statuses)', + domains = where('delete_at < ? AND ? != ALL(coalesce(statuses, array[]::varchar[])) AND' \ + ' ? != ALL(COALESCE(statuses, array[]::varchar[]))', Time.zone.now, DomainStatus::SERVER_DELETE_PROHIBITED, DomainStatus::DELETE_CANDIDATE)