cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
join by hand.
This commit is contained in:
Tom Hughes 2009-04-30 23:45:55 +00:00
parent 264b92bd9f
commit 329b6faf91
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/node.rb
View file

@ -131,11 +131,11 @@ class Node < ActiveRecord::Base
# shouldn't be possible to get race conditions. # shouldn't be possible to get race conditions.
Node.transaction do Node.transaction do
check_consistency(self, new_node, user) 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 ]) :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? 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]) :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? raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by relation #{rel.relation.id}.") unless rel.nil?

3
app/models/relation.rb
View file

@ -242,7 +242,8 @@ class Relation < ActiveRecord::Base
Relation.transaction do Relation.transaction do
check_consistency(self, new_relation, user) check_consistency(self, new_relation, user)
# This will check to see if this relation is used by another relation # 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? 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 self.changeset_id = new_relation.changeset_id

2
app/models/way.rb
View file

@ -251,7 +251,7 @@ class Way < ActiveRecord::Base
# shouldn't be possible to get race conditions. # shouldn't be possible to get race conditions.
Way.transaction do Way.transaction do
check_consistency(self, new_way, user) 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]) :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.") raise OSM::APIPreconditionFailedError.new("You need to make sure that the way with id: #{self.id} is not a member of a relation.")
else else