aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/builder/has_many.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-11 19:28:32 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-11 19:28:32 -0200
commit7a036ebd30a6333f22684bdd33dcf5ad4d101d26 (patch)
treea49115491e36ea6a9b3862d3bd0c70d996534e35 /activerecord/lib/active_record/associations/builder/has_many.rb
parent5853c64a4ba77134b7a4ff942b7ae711cb7bcc46 (diff)
downloadrails-7a036ebd30a6333f22684bdd33dcf5ad4d101d26.tar.gz
rails-7a036ebd30a6333f22684bdd33dcf5ad4d101d26.tar.bz2
rails-7a036ebd30a6333f22684bdd33dcf5ad4d101d26.zip
Revert the whole refactoring in the association builder classes.
This is to get activerecord-deprecated_finders work again
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/has_many.rb')
-rw-r--r--activerecord/lib/active_record/associations/builder/has_many.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/builder/has_many.rb b/activerecord/lib/active_record/associations/builder/has_many.rb
index 4ec808bc77..7909b93622 100644
--- a/activerecord/lib/active_record/associations/builder/has_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_many.rb
@@ -1,10 +1,10 @@
module ActiveRecord::Associations::Builder
class HasMany < CollectionAssociation #:nodoc:
- def self.macro
+ def macro
:has_many
end
- def self.build_valid_options(options)
+ def valid_options
super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of, :counter_cache]
end