diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-06-07 03:03:18 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-06-07 03:03:18 -0700 |
| commit | a68c6cccf05310546e82c4c81fe70818a454bf4e (patch) | |
| tree | 85aa3575f831371417d37bfe2f44e6d897d0722f /activerecord/lib/active_record/errors.rb | |
| parent | ec647495ebac9e5ace422b7638962d1e9574cfeb (diff) | |
| parent | 118147af53bebf71bf2a1d3ded4fc6491a708697 (diff) | |
| download | rails-a68c6cccf05310546e82c4c81fe70818a454bf4e.tar.gz rails-a68c6cccf05310546e82c4c81fe70818a454bf4e.tar.bz2 rails-a68c6cccf05310546e82c4c81fe70818a454bf4e.zip | |
Merge pull request #10561 from Empact/nix-throwresult
Rather than raising ThrowResult when construct_limited_ids_conditions comes up empty, set the relation to NullRelation and rely on its results.
Diffstat (limited to 'activerecord/lib/active_record/errors.rb')
| -rw-r--r-- | activerecord/lib/active_record/errors.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/errors.rb b/activerecord/lib/active_record/errors.rb index 017b8bace6..7e38719811 100644 --- a/activerecord/lib/active_record/errors.rb +++ b/activerecord/lib/active_record/errors.rb @@ -69,10 +69,6 @@ module ActiveRecord end end - # Raised when SQL statement is invalid and the application gets a blank result. - class ThrowResult < ActiveRecordError - end - # Defunct wrapper class kept for compatibility. # +StatementInvalid+ wraps the original exception now. class WrappedDatabaseException < StatementInvalid |