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

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index b323f0b4f0eb65bef77b0750008d6a3d95d326cf..bb4022ba33aee65cba3d2d2951fbd1f31cf2ef17 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -2,14 +2,14 @@
 #
 # Table name: nodes
 #
 #
 # Table name: nodes
 #

-#  node_id      :bigint(8)        not null, primary key
+#  node_id      :bigint           not null, primary key

 #  latitude     :integer          not null
 #  longitude    :integer          not null
 #  latitude     :integer          not null
 #  longitude    :integer          not null

-#  changeset_id :bigint(8)        not null
+#  changeset_id :bigint           not null

 #  visible      :boolean          not null
 #  timestamp    :datetime         not null
 #  visible      :boolean          not null
 #  timestamp    :datetime         not null

-#  tile         :bigint(8)        not null
-#  version      :bigint(8)        not null, primary key
+#  tile         :bigint           not null
+#  version      :bigint           not null, primary key

 #  redaction_id :integer
 #
 # Indexes
 #  redaction_id :integer
 #
 # Indexes


@@ -47,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?


@@ -85,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
     []