github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

removing useless code, cleaning variable names

Browse Source
This commit is contained in:
Aaron Patterson
2010-09-07 11:28:01 -07:00
parent 604281221c
commit 2e8a3d0f43
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
activerecord/lib/active_record/relation/query_methods.rb
View File

@@ -228,7 +228,6 @@ module ActiveRecord
private
def build_joins(relation, joins)
joined_associations = []
association_joins = []
joins = @joins_values.map {|j| j.respond_to?(:strip) ? j.strip : j}.uniq
@@ -259,11 +258,8 @@ module ActiveRecord
end
end
to_join.each do |tj|
unless joined_associations.detect {|ja| ja[0] == tj[0] && ja[1] == tj[1] && ja[2] == tj[2] }
joined_associations << tj
relation = relation.join(tj[0], tj[1]).on(*tj[2])
end
to_join.uniq.each do |left, join_class, right|
relation = relation.join(left, join_class).on(*right)
end
relation.join(custom_joins)