0
@@ -1457,7 +1457,7 @@ module ActiveRecord #:nodoc:
0
 
0
         def construct_finder_sql(options)
0
           scope = scope(:find)
0
-          sql  = "SELECT #{(scope && scope[:select]) || options[:select] || (options[:joins] && quoted_table_name + '.*') || '*'} "
0
+          sql  = "SELECT #{options[:select] || (scope && scope[:select]) || (options[:joins] && quoted_table_name + '.*') || '*'} "
0
           sql << "FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} "
0
 
0
           add_joins!(sql, options, scope)

0
@@ -50,6 +50,22 @@ class MethodScopingTest < ActiveRecord::TestCase
0
     end
0
   end
0
 
0
+  def test_scoped_find_select
0
+    Developer.with_scope(:find => { :select => "id, name" }) do
0
+      developer = Developer.find(:first, :conditions => "name = 'David'")
0
+      assert_equal "David", developer.name
0
+      assert !developer.has_attribute?(:salary)
0
+    end
0
+  end
0
+
0
+  def test_options_select_replaces_scope_select
0
+    Developer.with_scope(:find => { :select => "id, name" }) do
0
+      developer = Developer.find(:first, :select => 'id, salary', :conditions => "name = 'David'")
0
+      assert_equal 80000, developer.salary
0
+      assert !developer.has_attribute?(:name)
0
+    end
0
+  end
0
+
0
   def test_scoped_count
0
     Developer.with_scope(:find => { :conditions => "name = 'David'" }) do
0
       assert_equal 1, Developer.count