X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/264b92bd9fe2ae088f3bf505e370079787a15c46..329b6faf91745b4b6760d975d8b5574c5ffdb181:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index d85b22c9b..a4ba76e91 100644
--- 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?