aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/builder
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-11-09 05:42:04 -0800
committerJon Leighton <j@jonathanleighton.com>2012-11-09 05:42:04 -0800
commitdbb39e53414294818c056f1db336471dd347d413 (patch)
treeeaa22d1547eeb953a532e53dffe698780dfc42ab /activerecord/lib/active_record/associations/builder
parentedd94cee9af1688dd036fc58fd405adb30a5e0da (diff)
parent710e3710813e52ce71ee2cd5a754cf6462b2ecd3 (diff)
downloadrails-dbb39e53414294818c056f1db336471dd347d413.tar.gz
rails-dbb39e53414294818c056f1db336471dd347d413.tar.bz2
rails-dbb39e53414294818c056f1db336471dd347d413.zip
Merge pull request #8116 from senny/7993_configure_counter_cache_for_has_many
:counter_cache option for to support custom named counter caches
Diffstat (limited to 'activerecord/lib/active_record/associations/builder')
-rw-r--r--activerecord/lib/active_record/associations/builder/has_many.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/has_many.rb b/activerecord/lib/active_record/associations/builder/has_many.rb
index ab8225460a..0d1bdd21ee 100644
--- a/activerecord/lib/active_record/associations/builder/has_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_many.rb
@@ -5,7 +5,7 @@ module ActiveRecord::Associations::Builder
end
def valid_options
- super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of]
+ super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of, :counter_cache]
end
def valid_dependent_options