Ticket #2836: valid_options_r2.diff

activerecord/lib/active_record/base.rb

@@ -349 +349 @@
-    # adapters for, e.g., your development and test environments.
-    cattr_accessor :schema_format 
-    @@schema_format = :sql
+    
+    # Specifies what options ActiveRecord#find accepts as valid.
+    cattr_accessor :valid_find_options
+    @@valid_find_options = [:conditions, :include, :joins, :limit, :offset, :order, :select, :readonly, :group]
-
-    class << self # Class methods
-      # Find operates with three different retrieval approaches:
@@ -1181 +1185 @@
-        end
-
-        def validate_find_options(options)
-[:conditions, :include, :joins, :limit, :offset, :order, :select, :readonly, :group]
+valid_find_options
-        end
-
-        def encode_quoted_value(value)