X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb..85d17f257c338f668a1d17d9fc62a2f48ec84230:/app/models/old_node.rb?ds=inline diff --git a/app/models/old_node.rb b/app/models/old_node.rb index be115c53e..64ae1a70c 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -2,8 +2,9 @@ class OldNode < ActiveRecord::Base include GeoRecord include ConsistencyValidations - set_table_name 'nodes' - + self.table_name = "nodes" + self.primary_keys = "node_id", "version" + validates_presence_of :changeset_id, :timestamp validates_inclusion_of :visible, :in => [ true, false ] validates_numericality_of :latitude, :longitude @@ -13,7 +14,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) @@ -24,7 +25,7 @@ class OldNode < ActiveRecord::Base old_node.tags = node.tags old_node.timestamp = node.timestamp old_node.changeset_id = node.changeset_id - old_node.id = node.id + old_node.node_id = node.id old_node.version = node.version return old_node end @@ -37,7 +38,7 @@ class OldNode < ActiveRecord::Base def to_xml_node el1 = XML::Node.new 'node' - el1['id'] = self.id.to_s + el1['id'] = self.node_id.to_s el1['lat'] = self.lat.to_s el1['lon'] = self.lon.to_s el1['changeset'] = self.changeset.id.to_s @@ -65,13 +66,13 @@ 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(:node_id => self.node_id, :timestamp => self.timestamp, :version => self.version).first.instance_variable_get('@attributes')) self.tags.each do |k,v| tag = OldNodeTag.new tag.k = k tag.v = v - tag.id = self.id + tag.node_id = self.node_id tag.version = self.version tag.save! end @@ -79,10 +80,10 @@ 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| - @tags[tag.k] = tag.v - end + @tags = Hash.new + OldNodeTag.where(:node_id => self.node_id, :version => self.version).each do |tag| + @tags[tag.k] = tag.v + end end @tags = Hash.new unless @tags @tags