diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-06-07 18:41:11 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-06-07 18:41:11 +0100 |
| commit | 2b763131eacaae5bff9ffb5015fbf367d594dc64 (patch) | |
| tree | 98c9557fcaa3f9cdfc98a201b9ede311d0ec35d5 /activerecord | |
| parent | 257fa6897d9c85da16b7c9fcb4ae3008198d320e (diff) | |
| download | rails-2b763131eacaae5bff9ffb5015fbf367d594dc64.tar.gz rails-2b763131eacaae5bff9ffb5015fbf367d594dc64.tar.bz2 rails-2b763131eacaae5bff9ffb5015fbf367d594dc64.zip | |
Revert "Merge pull request #10539 from davidcelis/ar-sql-improvements"
This reverts commit 257fa6897d9c85da16b7c9fcb4ae3008198d320e, reversing
changes made to 94725b81f5588e4b0f43222c4f142c3135941b4b.
The build failed
https://travis-ci.org/rails/rails/builds/7883546
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 5e525a49c0..d54479edbb 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -21,7 +21,6 @@ module ActiveRecord alias :model :klass alias :loaded? :loaded alias :default_scoped? :default_scoped - alias :blank? :empty? def initialize(klass, table, values = {}) @klass = klass @@ -576,6 +575,11 @@ module ActiveRecord end end + # Returns true if relation is blank. + def blank? + to_a.blank? + end + def values Hash[@values] end |