@@ -1457,7 +1457,7 @@ module ActiveRecord #:nodoc: def construct_finder_sql(options) scope = scope(:find) - sql = "SELECT #{(scope && scope[:select]) || options[:select] || (options[:joins] && quoted_table_name + '.*') || '*'} " + sql = "SELECT #{options[:select] || (scope && scope[:select]) || (options[:joins] && quoted_table_name + '.*') || '*'} " sql << "FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} " add_joins!(sql, options, scope) activerecord/lib/active_record/base.rb @@ -50,6 +50,22 @@ class MethodScopingTest < ActiveRecord::TestCase end end + def test_scoped_find_select + Developer.with_scope(:find => { :select => "id, name" }) do + developer = Developer.find(:first, :conditions => "name = 'David'") + assert_equal "David", developer.name + assert !developer.has_attribute?(:salary) + end + end + + def test_options_select_replaces_scope_select + Developer.with_scope(:find => { :select => "id, name" }) do + developer = Developer.find(:first, :select => 'id, salary', :conditions => "name = 'David'") + assert_equal 80000, developer.salary + assert !developer.has_attribute?(:name) + end + end + def test_scoped_count Developer.with_scope(:find => { :conditions => "name = 'David'" }) do assert_equal 1, Developer.count activerecord/test/cases/method_scoping_test.rb cf6299dbd73a8cb6d74265df03d01abe885e686a Andrew White andyw@pixeltrix.co.uk http://github.com/rails/rails/commit/235d635708dd72bee0828457af5397c79750483a 235d635708dd72bee0828457af5397c79750483a 2008-05-29T06:10:24-07:00 2008-05-29T04:59:29-07:00 Ensure :select passed in options overrides the one from the scope. [#239 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> 51f09f956b8f4d84d6f0e81dd697d577ffcd7f92 Pratik Naik pratiknaik@gmail.com