0
@@ -1500,6 +1500,12 @@ module ActiveRecord
0
           order.scan(/([\.\w]+).?\./).flatten
0
         end
0
 
0
+        def selects_tables(options)
0
+          select = options[:select]
0
+          return [] unless select && select.is_a?(String)
0
+          select.scan(/"?([\.\w]+)"?.?\./).flatten
0
+        end
0
+
0
         # Checks if the conditions reference a table other than the current model table
0
         def include_eager_conditions?(options,tables = nil)
0
           tables = conditions_tables(options)
0
@@ -1518,8 +1524,16 @@ module ActiveRecord
0
           end
0
         end
0
 
0
+        def include_eager_select?(options)
0
+          selects = selects_tables(options)
0
+          return false unless selects.any?
0
+          selects.any? do |select|
0
+            select != table_name
0
+          end
0
+        end
0
+
0
         def references_eager_loaded_tables?(options)
0
-          include_eager_order?(options) || include_eager_conditions?(options)
0
+          include_eager_order?(options) || include_eager_conditions?(options) || include_eager_select?(options)
0
         end
0
 
0
         def using_limitable_reflections?(reflections)

0
@@ -859,12 +859,15 @@ class FinderTest < ActiveRecord::TestCase
0
   end
0
 
0
   def test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct
0
-    assert_equal 2, Post.find(:all,:include=>{:authors=>:author_address},:order=>' author_addresses.id DESC ', :limit=>2).size
0
+    assert_equal 2, Post.find(:all, :include => { :authors => :author_address }, :order => ' author_addresses.id DESC ', :limit => 2).size
0
 
0
-    assert_equal 3, Post.find(:all,:include=>{:author=>:author_address,:authors=>:author_address},
0
-                              :order=>' author_addresses_authors.id DESC ', :limit=>3).size
0
+    assert_equal 3, Post.find(:all, :include => { :author => :author_address, :authors => :author_address},
0
+                              :order => ' author_addresses_authors.id DESC ', :limit => 3).size
0
   end
0
 
0
+  def test_with_limiting_with_custom_select
0
+    assert_equal 3, Post.find(:all, :include => :author, :select => ' posts.*, authors.id as "author_id"', :limit => 3).size
0
+  end
0
 
0
   protected
0
     def bind(statement, *vars)