X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/137509534304be853ab01ca554111c524a9a1bca..5eb21cc2da0dea996cd0e524d67589378335dfa1:/app/models/old_node.rb?ds=inline

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index be115c53e..ca179e0e9 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -4,6 +4,10 @@ class OldNode < ActiveRecord::Base
 
   set_table_name 'nodes'
   
+  # Should probably have the composite primary key set in the model
+  # however there are some weird bugs happening when you do
+  #set_primary_keys :id, :version
+  
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
@@ -13,7 +17,7 @@ class OldNode < ActiveRecord::Base
   belongs_to :changeset
  
   def validate_position
-    errors.add_to_base("Node is not in the world") unless in_world?
+    errors.add(:base, "Node is not in the world") unless in_world?
   end
 
   def self.from_node(node)
@@ -65,7 +69,7 @@ class OldNode < ActiveRecord::Base
     clear_aggregation_cache
     clear_association_cache
     #ok from here
-    @attributes.update(OldNode.find(:first, :conditions => ['id = ? AND timestamp = ? AND version = ?', self.id, self.timestamp, self.version]).instance_variable_get('@attributes'))
+    @attributes.update(OldNode.where('id = ? AND timestamp = ? AND version = ?', self.id, self.timestamp, self.version).first.instance_variable_get('@attributes'))
    
     self.tags.each do |k,v|
       tag = OldNodeTag.new
@@ -80,7 +84,7 @@ class OldNode < ActiveRecord::Base
   def tags
     unless @tags
         @tags = Hash.new
-        OldNodeTag.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag|
+        OldNodeTag.where("id = ? AND version = ?", self.id, self.version).each do |tag|
             @tags[tag.k] = tag.v
         end
     end