diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-12-28 03:56:20 +0530 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-12-28 03:59:44 +0530 |
commit | 1c26ba486c23f229a12fea6ccad33e6cb3122b91 (patch) | |
tree | 87c964ab22dbeb1a517d293a5e4b7f696566d2db /activerecord/lib | |
parent | 6a776dcc9df437c0bcc3c1ff1d2a79966264bac9 (diff) | |
download | rails-1c26ba486c23f229a12fea6ccad33e6cb3122b91.tar.gz rails-1c26ba486c23f229a12fea6ccad33e6cb3122b91.tar.bz2 rails-1c26ba486c23f229a12fea6ccad33e6cb3122b91.zip |
Add Model.from and association_collection#from finder methods
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 2 | ||||
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index ac970f02b1..d2c61cdc78 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -21,7 +21,7 @@ module ActiveRecord construct_sql end - delegate :group, :order, :limit, :joins, :where, :preload, :eager_load, :to => :scoped + delegate :group, :order, :limit, :joins, :where, :preload, :eager_load, :from, :to => :scoped def select(select = nil, &block) if block_given? diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index bbc5bd77c5..3b880ce17f 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -652,7 +652,7 @@ module ActiveRecord #:nodoc: end end - delegate :select, :group, :order, :limit, :joins, :where, :preload, :eager_load, :to => :scoped + delegate :select, :group, :order, :limit, :joins, :where, :preload, :eager_load, :from, :to => :scoped # A convenience wrapper for <tt>find(:first, *args)</tt>. You can pass in all the # same arguments to this method as you can to <tt>find(:first)</tt>. |