Merge remote-tracking branch 'upstream/pull/5315'

[rails.git] / app / models / old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 3ec5cd4152939a24bf1816045dfe66bc23b4a262..f29eed9dda9cbaf7d3532fde9cd22432eca08b1f 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -26,7 +26,6 @@
 
 class OldNode < ApplicationRecord
   include GeoRecord
 
 class OldNode < ApplicationRecord
   include GeoRecord

-  include ConsistencyValidations

 
   self.table_name = "nodes"
 
 
   self.table_name = "nodes"
 


@@ -48,7 +47,7 @@ class OldNode < ApplicationRecord
   belongs_to :redaction, :optional => true
   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes
 
   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", :query_constraints => [:node_id, :version], :inverse_of => :old_node
+  has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version], :inverse_of => :old_node

 
   def validate_position
     errors.add(:base, "Node is not in the world") unless in_world?
 
   def validate_position
     errors.add(:base, "Node is not in the world") unless in_world?


@@ -86,10 +85,6 @@ class OldNode < ApplicationRecord
 
   attr_writer :tags
 
 
   attr_writer :tags
 

-  def tags_as_hash
-    tags
-  end
-

   # Pretend we're not in any ways
   def ways
     []
   # Pretend we're not in any ways
   def ways
     []