diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-01-18 02:08:13 -0800 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-01-18 02:08:13 -0800 |
| commit | e8d80f73996bc19b2fab46c7519c384ce96f1928 (patch) | |
| tree | c7ef359809a33d8612761d05f0eca46c9387f489 /activerecord/lib/active_record | |
| parent | 9da9763e0a848906725f8805f44d2ce0c0b9ab9e (diff) | |
| parent | ec07735641e4df13b644a85f1f300cf20134995a (diff) | |
| download | rails-e8d80f73996bc19b2fab46c7519c384ce96f1928.tar.gz rails-e8d80f73996bc19b2fab46c7519c384ce96f1928.tar.bz2 rails-e8d80f73996bc19b2fab46c7519c384ce96f1928.zip | |
Merge pull request #8912 from senny/8879_association_empty_method
`CollectionAssociation#empty?` respects newly builded records
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 832b963052..5feb149946 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -273,7 +273,7 @@ module ActiveRecord if loaded? || options[:counter_sql] size.zero? else - !scope.exists? + @target.blank? && !scope.exists? end end |