Make sure needed table joins are included :select option. [#110 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>

1 files changed, 15 insertions, 1 deletions

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