From 47134a04bbce216f9c31473b1a0c1a077d624692 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 25 Jun 2010 20:31:10 -0300
Subject: [PATCH] blocks removed from all the ActiveRelation query_methods,
 extend method added instead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activerecord/lib/active_record/relation.rb           |  9 +++++++++
 .../lib/active_record/relation/query_methods.rb      | 12 ++++--------
 activerecord/test/cases/relations_test.rb            |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index a51b317dc3..fd0660a138 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -328,6 +328,15 @@ module ActiveRecord
       to_a.inspect
     end
 
+    def extend(*args, &block)
+      if block_given?
+        apply_modules Module.new(&block)
+        self
+      else
+        super
+      end
+    end
+
     protected
 
     def method_missing(method, *args, &block)
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index f7c4c7991b..ff5bce9d8b 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -11,9 +11,8 @@ module ActiveRecord
 
         next if [:where, :having, :select].include?(query_method)
         class_eval <<-CEVAL, __FILE__, __LINE__ + 1
-          def #{query_method}(*args, &block)
+          def #{query_method}(*args)
             new_relation = clone
-            new_relation.send(:apply_modules, Module.new(&block)) if block_given?
             value = Array.wrap(args.flatten).reject {|x| x.blank? }
             new_relation.#{query_method}_values += value if value.present?
             new_relation
@@ -21,9 +20,8 @@ module ActiveRecord
         CEVAL
       end
 
-      def reorder(*args, &block)
+      def reorder(*args)
         new_relation = clone
-        new_relation.send(:apply_modules, Module.new(&block)) if block_given?
         value = Array.wrap(args.flatten).reject {|x| x.blank? }
         new_relation.order_values = value if value.present?
         new_relation
@@ -42,9 +40,8 @@ module ActiveRecord
 
       [:where, :having].each do |query_method|
         class_eval <<-CEVAL, __FILE__, __LINE__ + 1
-          def #{query_method}(*args, &block)
+          def #{query_method}(*args)
             new_relation = clone
-            new_relation.send(:apply_modules, Module.new(&block)) if block_given?
             value = build_where(*args)
             new_relation.#{query_method}_values += Array.wrap(value) if value.present?
             new_relation
@@ -56,9 +53,8 @@ module ActiveRecord
         attr_accessor :"#{query_method}_value"
 
         class_eval <<-CEVAL, __FILE__, __LINE__ + 1
-          def #{query_method}(value = true, &block)
+          def #{query_method}(value = true)
             new_relation = clone
-            new_relation.send(:apply_modules, Module.new(&block)) if block_given?
             new_relation.#{query_method}_value = value
             new_relation
           end
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index d37f7bd09c..d27a69ea1c 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -618,7 +618,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_anonymous_extension
-    relation = Post.where(:author_id => 1).order('id ASC') do
+    relation = Post.where(:author_id => 1).order('id ASC').extend do
       def author
         'lifo'
       end