Use association names with :joins instead of writing the SQL for the

join by hand.

diff --git a/app/models/node.rb b/app/models/node.rb
index d85b22c9b11ddcaad04e901fe2d9bfd7f677f4fb..a4ba76e91e1cc2d40c4c436421c8a478f91c72a0 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -131,11 +131,11 @@ class Node < ActiveRecord::Base
     # shouldn't be possible to get race conditions.
     Node.transaction do
       check_consistency(self, new_node, user)
-      way = WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", 
+      way = WayNode.find(:first, :joins => :way, 
                          :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])
       raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by way #{way.id}.") unless way.nil?
       
-      rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", 
+      rel = RelationMember.find(:first, :joins => :relation, 
                                 :conditions => [ "visible = ? AND member_type='Node' and member_id=? ", true, self.id])
       raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by relation #{rel.relation.id}.") unless rel.nil?
 

diff --git a/app/models/relation.rb b/app/models/relation.rb
index ae9d2f8446de5ff55cd3a09bb23c3a71df649cad..09143294ceb48fab466f9780a5f34fb7706d6daf 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -242,7 +242,8 @@ class Relation < ActiveRecord::Base
     Relation.transaction do
       check_consistency(self, new_relation, user)
       # This will check to see if this relation is used by another relation
-      rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = ? AND member_type='Relation' and member_id=? ", true, self.id ])
+      rel = RelationMember.find(:first, :joins => :relation, 
+                                :conditions => [ "visible = ? AND member_type='Relation' and member_id=? ", true, self.id ])
       raise OSM::APIPreconditionFailedError.new("The relation #{new_relation.id} is used in relation #{rel.relation.id}.") unless rel.nil?
 
       self.changeset_id = new_relation.changeset_id

diff --git a/app/models/way.rb b/app/models/way.rb
index d37fb1533dbbe7893874187ea6fac07dce9b5795..64b3991336c7d9bf21664f4c0979405550a805ab 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -251,7 +251,7 @@ class Way < ActiveRecord::Base
     # shouldn't be possible to get race conditions.
     Way.transaction do
       check_consistency(self, new_way, user)
-      if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
+      if RelationMember.find(:first, :joins => :relation,
                              :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])
         raise OSM::APIPreconditionFailedError.new("You need to make sure that the way with id: #{self.id} is not a member of a relation.")
       else