kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Use present rather than any

Browse source
This commit is contained in:
Jeremy Kemper 2009-12-28 12:12:53 -08:00
parent f95fcdd3af
commit ea7b5ff99e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/relation.rb
View file

@ -25,7 +25,7 @@ module ActiveRecord
select(r.send(:select_clauses).join(', ')).
eager_load(r.eager_load_associations).
preload(r.associations_to_preload).
from(r.send(:sources).any? ? r.send(:from_clauses) : nil)
from(r.send(:sources).present? ? r.send(:from_clauses) : nil)
end
alias :& :merge
@ -158,7 +158,7 @@ module ActiveRecord
:conditions => where_clause,
:limit => @relation.taken,
:offset => @relation.skipped,
:from => (@relation.send(:from_clauses) if @relation.send(:sources).any?)
:from => (@relation.send(:from_clauses) if @relation.send(:sources).present?)
},
ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, @eager_load_associations, nil))
end