move the deprecated options into active_record_deprecated_finders

rails · Jul 13, 2012 · ac4d101 · ac4d101
1 parent 09d2f16
commit ac4d101
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/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
 

diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/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 + [
+      super + [:table_name, :finder_sql, :counter_sql, :before_add, :after_add, :before_remove, :after_remove]
-        :table_name, :order, :group, :having, :limit, :offset, :uniq, :finder_sql,
-        :counter_sql, :before_add, :after_add, :before_remove, :after_remove
-      ]
     end
 
     attr_reader :block_extension