diff options
author | Francesco Rodriguez <lrodriguezsanc@gmail.com> | 2012-04-30 10:49:20 -0500 |
---|---|---|
committer | Francesco Rodriguez <lrodriguezsanc@gmail.com> | 2012-04-30 10:49:20 -0500 |
commit | 2f681254ee9481f30baa53720c1570decb437725 (patch) | |
tree | b6d542a160a1a870984e79b961aec392e4e0f982 | |
parent | 7d5146efad1c3bd471f315e4d259e00052eacbb6 (diff) | |
download | rails-2f681254ee9481f30baa53720c1570decb437725.tar.gz rails-2f681254ee9481f30baa53720c1570decb437725.tar.bz2 rails-2f681254ee9481f30baa53720c1570decb437725.zip |
delete_all raise an error if a limit is provided - fixes #4979
-rw-r--r-- | activerecord/lib/active_record/relation.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/relations_test.rb | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 333d31d8a3..779e052e3c 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -390,6 +390,8 @@ module ActiveRecord # If you need to destroy dependent associations or call your <tt>before_*</tt> or # +after_destroy+ callbacks, use the +destroy_all+ method instead. def delete_all(conditions = nil) + raise ActiveRecordError.new("delete_all doesn't support limit scope") if self.limit_value + if conditions where(conditions).delete_all else diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 4b8b57bac2..3ef357e297 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -688,6 +688,10 @@ class RelationTest < ActiveRecord::TestCase assert davids.loaded? end + def test_delete_all_limit_error + assert_raises(ActiveRecord::ActiveRecordError) { Author.limit(10).delete_all } + end + def test_select_argument_error assert_raises(ArgumentError) { Developer.select } end |