Merge remote-tracking branch 'origin/104525318-history_import' into staging

This commit is contained in:
Vladimir Krylov 2016-01-18 13:08:56 +02:00
commit 5959d4a419
24 changed files with 766 additions and 24 deletions

View file

@ -221,6 +221,10 @@ class Domain < ActiveRecord::Base
)
end
def next_id
self.connection.select_value("SELECT nextval('#{self.sequence_name}')")
end
# rubocop: disable Metrics/AbcSize
# rubocop: disable Metrics/CyclomaticComplexity
# rubocop: disable Metrics/PerceivedComplexity
@ -821,8 +825,8 @@ class Domain < ActiveRecord::Base
log[:admin_contacts] = admin_contact_ids
log[:tech_contacts] = tech_contact_ids
log[:nameservers] = nameserver_ids
log[:dnskeys] = dnskey_ids
log[:registrant] = [registrant_id]
log[:domain_statuses] = domain_status_ids
log
end