Permalink
Browse files

Merge pull request #13107 from chancancode/has_one_counter_cache_shou…

…ld_raise

Raise `ArgumentError` when `has_one` is used with `counter_cache`
  • Loading branch information...
2 parents 31c20a2 + 35fd2d4 commit 61ad8d5c32422c523293428d25277be1759b597c @senny senny committed Nov 30, 2013
View
7 activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Previously, the `has_one` macro incorrectly accepts the `counter_cache`
+ option due to a bug, although that options was never supported nor
+ functional on `has_one` and `has_one ... through` relationships. It now
+ correctly raises an `ArgumentError` when passed that option.
+
+ *Godfrey Chan*
+
* Implement rename_index natively for MySQL >= 5.7.
*Cody Cutrer*
View
2 activerecord/lib/active_record/associations/builder/belongs_to.rb
@@ -5,7 +5,7 @@ def self.macro
end
def self.valid_options(options)
- super + [:foreign_type, :polymorphic, :touch]
+ super + [:foreign_type, :polymorphic, :touch, :counter_cache]
end
def self.valid_dependent_options
View
2 activerecord/lib/active_record/associations/builder/singular_association.rb
@@ -3,7 +3,7 @@
module ActiveRecord::Associations::Builder
class SingularAssociation < Association #:nodoc:
def self.valid_options(options)
- super + [:remote, :dependent, :counter_cache, :primary_key, :inverse_of]
+ super + [:remote, :dependent, :primary_key, :inverse_of]
end
def self.define_accessors(model, reflection)
View
8 activerecord/test/cases/associations/has_one_associations_test.rb
@@ -549,4 +549,12 @@ def test_has_one_autosave_with_primary_key_manually_set
assert_not_nil author.post
assert_equal author.post, post
end
+
+ def test_has_one_relationship_cannot_have_a_counter_cache
+ assert_raise(ArgumentError) do
+ Class.new(ActiveRecord::Base) do
+ has_one :thing, counter_cache: true
+ end
+ end
+ end
end
View
8 activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -315,4 +315,12 @@ def test_assigning_has_one_through_belongs_to_with_new_record_owner
def test_has_one_through_with_custom_select_on_join_model_default_scope
assert_equal clubs(:boring_club), members(:groucho).selected_club
end
+
+ def test_has_one_through_relationship_cannot_have_a_counter_cache
+ assert_raise(ArgumentError) do
+ Class.new(ActiveRecord::Base) do
+ has_one :thing, through: :other_thing, counter_cache: true
+ end
+ end
+ end
end

0 comments on commit 61ad8d5

Please sign in to comment.