From: Tom Hughes <tom@compton.nu>
Date: Sat, 10 Jan 2015 15:54:58 +0000 (+0000)
Subject: Remove some (hopefully) redundant code
X-Git-Tag: live~4862^2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6e565802786cfed6350534c984ad20ed49348f01?hp=--cc

Remove some (hopefully) redundant code
---

6e565802786cfed6350534c984ad20ed49348f01
diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 90304acae..5ea3a778b 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -63,11 +63,6 @@ class OldNode < ActiveRecord::Base
 
   def save_with_dependencies!
     save!
-    #not sure whats going on here
-    clear_aggregation_cache
-    clear_association_cache
-    #ok from here
-    @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
diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index dc89afa50..5496f7115 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -31,14 +31,7 @@ class OldRelation < ActiveRecord::Base
   end
 
   def save_with_dependencies!
-
-    # see comment in old_way.rb ;-)
     save!
-    clear_aggregation_cache
-    clear_association_cache
-    @attributes.update(OldRelation.where(:relation_id => self.relation_id, :timestamp => self.timestamp).order("version DESC").first.instance_variable_get('@attributes'))
-
-    # ok, you can touch from here on
 
     self.tags.each do |k,v|
       tag = OldRelationTag.new
diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 1552bae04..dbdcdd46d 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -31,19 +31,7 @@ class OldWay < ActiveRecord::Base
   end
 
   def save_with_dependencies!
-
-    # dont touch this unless you really have figured out why it's called
-    # (Rails doesn't deal well with the old ways table (called 'ways') because
-    # it doesn't have a unique key. It knows how to insert and auto_increment
-    # id and get it back but we have that and we want to get the 'version' back
-    # we could add another column but thats a lot of data. No, set_primary_key
-    # doesn't work either.
     save!
-    clear_aggregation_cache
-    clear_association_cache
-    @attributes.update(OldWay.where(:way_id => self.way_id, :timestamp => self.timestamp).order("version DESC").first.instance_variable_get('@attributes'))
-
-    # ok, you can touch from here on
 
     self.tags.each do |k,v|
       tag = OldWayTag.new