diff options
| -rw-r--r-- | activerecord/CHANGELOG | 5 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/finder_test.rb | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 3c318df4f3..e15f0a042b 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* Added :select option to find which can specify a different value than the default *, like find(:all, :select => "first_name, last_name"), if you either only want to select part of the columns or exclude columns otherwise included from a join #1338 [Stefan Kaes] + + *1.11.1* (11 July, 2005) * Added support for limit and offset with eager loading of has_one and belongs_to associations. Using the options with has_many and has_and_belongs_to_many associations will now raise an ActiveRecord::ConfigurationError #1692 [Rick Olsen] diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index be64c1bbd3..936e61a688 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -315,6 +315,8 @@ module ActiveRecord #:nodoc: # * <tt>:joins</tt>: An SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id". (Rarely needed). # * <tt>:include</tt>: Names associations that should be loaded alongside using LEFT OUTER JOINs. The symbols named refer # to already defined associations. See eager loading under Associations. + # * <tt>:select</tt>: By default, this is * as in SELECT * FROM, but can be changed if you for example want to do a join, but not + # include the joined columns. # # Examples for find by id: # Person.find(1) # returns the object for ID = 1 @@ -739,7 +741,7 @@ module ActiveRecord #:nodoc: end def construct_finder_sql(options) - sql = "SELECT * FROM #{table_name} " + sql = "SELECT #{options[:select] || '*'} FROM #{table_name} " sql << " #{options[:joins]} " if options[:joins] add_conditions!(sql, options[:conditions]) sql << "ORDER BY #{options[:order]} " if options[:order] diff --git a/activerecord/test/finder_test.rb b/activerecord/test/finder_test.rb index 61400f2772..2f23503ce1 100644 --- a/activerecord/test/finder_test.rb +++ b/activerecord/test/finder_test.rb @@ -93,6 +93,10 @@ class FinderTest < Test::Unit::TestCase Topic.find(2).parent end + + def test_find_only_some_columns + assert_raises(NoMethodError) { Topic.find(1, :select => "author_name").title } + end def test_find_on_conditions assert Topic.find(1, :conditions => "approved = 0") |