diff --git a/app/models/legacy/object_history.rb b/app/models/legacy/object_history.rb new file mode 100644 index 000000000..35115b4d5 --- /dev/null +++ b/app/models/legacy/object_history.rb @@ -0,0 +1,12 @@ +module Legacy + class ObjectHistory < Db + self.table_name = :object_history + + belongs_to :object_registry, foreign_key: :historyid + + def self.instance_method_already_implemented?(method_name) + return true if method_name == 'update' + super + end + end +end diff --git a/app/models/legacy/object_registry.rb b/app/models/legacy/object_registry.rb index c6885318c..96a6fc6e6 100644 --- a/app/models/legacy/object_registry.rb +++ b/app/models/legacy/object_registry.rb @@ -3,5 +3,6 @@ module Legacy self.table_name = :object_registry self.inheritance_column = nil belongs_to :registrar, foreign_key: :crid, primary_key: :legacy_id, class_name: '::Registrar' + belongs_to :object_history, foreign_key: :historyid end end diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index 38abcd6c8..2b8f72fed 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -374,7 +374,7 @@ namespace :import do x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name), x.id, nsset.object_registry.try(:crdate), - nsset.object.read_attribute(:update).nil? ? x.object_registry.try(:crdate) : x.object.read_attribute(:update) + nsset.object_registry.try(:object_history).read_attribute(:update).nil? ? nsset.object_registry.try(:crdate) : nsset.object_registry.try(:object_history).read_attribute(:update) ] end if x.nsset && x.nsset.hosts @@ -389,7 +389,7 @@ namespace :import do x.object_registry.try(:registrar).try(:name), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name), x.id, - key.object.read_attribute(:update).nil? ? x.object_registry.try(:crdate) : x.object.read_attribute(:update) + key.object_registry.try(:object_history).read_attribute(:update).nil? ? key.try(:crdate) : key.object_registry.try(:object_history).read_attribute(:update) ] end