1 files changed, 0 insertions, 43 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index fd939ab9ba..f1a9f254b1 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -22,49 +22,6 @@ module ActiveRecord::Associations::Builder
       else
         @scope   = nil
         @options = scope
-
-        convert_deprecated_options_to_scope!
-      end
-    end
-
-    # FIXME: references should not be in this list
-    DEPRECATED_OPTIONS = [:readonly, :references, :order, :limit, :joins, :group, :having,
-                          :offset, :select, :uniq, :include, :conditions]
-
-    class DeprecatedOptionsProc
-      attr_reader :options
-
-      def initialize(options)
-        @options = options
-      end
-
-      def to_proc
-        options = self.options
-        proc do |owner|
-          if options[:where].respond_to?(:to_proc)
-            context = owner || self
-            where(context.instance_eval(&options[:where]))
-              .merge!(options.except(:where))
-          else
-            scoped(options)
-          end
-        end
-      end
-
-      def arity
-        1
-      end
-    end
-
-    def convert_deprecated_options_to_scope!
-      deprecated_options = options.slice(*DEPRECATED_OPTIONS)
-
-      unless deprecated_options.empty?
-        deprecated_options[:includes] = deprecated_options.delete(:include)    if deprecated_options[:include]
-        deprecated_options[:where]    = deprecated_options.delete(:conditions) if deprecated_options[:conditions]
-
-        @scope   = DeprecatedOptionsProc.new(deprecated_options)
-        @options = options.except(*DEPRECATED_OPTIONS)
       end
     end