Skip to content
Browse files

move the deprecated options into active_record_deprecated_finders

  • Loading branch information...
1 parent 09d2f16 commit ac4d101a75335dc430a53203184e67753b6d99e0 @jonleighton jonleighton committed Jul 13, 2012
View
2 activerecord/lib/active_record/associations/builder/association.rb
@@ -4,7 +4,7 @@ class << self
attr_accessor :valid_options
end
- self.valid_options = [:class_name, :foreign_key, :select, :conditions, :include, :extend, :readonly, :validate, :references]
+ self.valid_options = [:class_name, :foreign_key, :validate]
attr_reader :model, :name, :scope, :options, :reflection
View
5 activerecord/lib/active_record/associations/builder/collection_association.rb
@@ -3,10 +3,7 @@ class CollectionAssociation < Association #:nodoc:
CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove]
def valid_options
- super + [
- :table_name, :order, :group, :having, :limit, :offset, :uniq, :finder_sql,
- :counter_sql, :before_add, :after_add, :before_remove, :after_remove
- ]
+ super + [:table_name, :finder_sql, :counter_sql, :before_add, :after_add, :before_remove, :after_remove]
end
attr_reader :block_extension

0 comments on commit ac4d101

Please sign in to comment.
Something went wrong with that request. Please try again.