X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cbcc7dc49f83f60489fde04b0750cf081e7439fb..8f57efe850bf9805d9bfb073d16d4cf1d06882f5:/app/models/old_node.rb diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 077039ac3..3ec5cd415 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -29,7 +29,6 @@ class OldNode < ApplicationRecord include ConsistencyValidations self.table_name = "nodes" - self.primary_keys = "node_id", "version" # NOTE: this needs to be included after the table name changes, or # the queries generated by Redactable will use the wrong table name. @@ -49,7 +48,7 @@ class OldNode < ApplicationRecord belongs_to :redaction, :optional => true belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes - has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version], :inverse_of => :old_node + has_many :old_tags, :class_name => "OldNodeTag", :query_constraints => [:node_id, :version], :inverse_of => :old_node def validate_position errors.add(:base, "Node is not in the world") unless in_world?