diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/batches_test.rb | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index c46cafdd09..3e3a7679ac 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -86,6 +86,10 @@ module ActiveRecord self.error_on_ignored_order end + def error_on_ignored_order_or_limit + self.class.error_on_ignored_order_or_limit + end + def self.error_on_ignored_order_or_limit=(value) ActiveSupport::Deprecation.warn(<<-MSG.squish) The flag error_on_ignored_order_or_limit is deprecated. Limits are diff --git a/activerecord/test/cases/batches_test.rb b/activerecord/test/cases/batches_test.rb index 837ad76686..8a4c1bd615 100644 --- a/activerecord/test/cases/batches_test.rb +++ b/activerecord/test/cases/batches_test.rb @@ -587,7 +587,7 @@ class EachTest < ActiveRecord::TestCase end end - test 'error_on_ignored_order_or_limit= is deprecated' do + test '.error_on_ignored_order_or_limit= is deprecated' do begin prev = ActiveRecord::Base.error_on_ignored_order assert_deprecated 'Please use error_on_ignored_order= instead.' do @@ -599,11 +599,19 @@ class EachTest < ActiveRecord::TestCase end end - test 'error_on_ignored_order_or_limit is deprecated' do + test '.error_on_ignored_order_or_limit is deprecated' do expected = ActiveRecord::Base.error_on_ignored_order actual = assert_deprecated 'Please use error_on_ignored_order instead.' do ActiveRecord::Base.error_on_ignored_order_or_limit end assert_equal expected, actual end + + test '#error_on_ignored_order_or_limit is deprecated' do + expected = ActiveRecord::Base.error_on_ignored_order + actual = assert_deprecated 'Please use error_on_ignored_order instead.' do + Post.new.error_on_ignored_order_or_limit + end + assert_equal expected, actual + end end |