diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-08-09 15:11:18 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-08-09 15:11:18 +0000 |
| commit | d3cf2a6689a7c4d7889029cec78d003feb40c85a (patch) | |
| tree | 0d6bd909553593a743876c98739213b64b805440 | |
| parent | d568fb61373074e015083ad39e0dc8168e81733b (diff) | |
| download | rails-d3cf2a6689a7c4d7889029cec78d003feb40c85a.tar.gz rails-d3cf2a6689a7c4d7889029cec78d003feb40c85a.tar.bz2 rails-d3cf2a6689a7c4d7889029cec78d003feb40c85a.zip | |
Document find's :from option. Closes #5762. [andrew@redlinesoftware.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4739 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 37b367f4f1..0b4f8e1a00 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Document find's :from option. Closes #5762. [andrew@redlinesoftware.com] + * PostgreSQL: autodetected sequences work correctly with multiple schemas. Rely on the schema search_path instead of explicitly qualifying the sequence name with its schema. #5280 [guy.naor@famundo.com] * Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar] diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index d1d10b41b4..0342e9bb4e 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -374,6 +374,8 @@ module ActiveRecord #:nodoc: # 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. + # * <tt>:from</tt>: By default, this is the table name of the class, but can be changed to an alternate table name (or even the name + # of a database view). # * <tt>:readonly</tt>: Mark the returned records read-only so they cannot be saved or updated. # * <tt>:lock</tt>: An SQL fragment like "FOR UPDATE" or "LOCK IN SHARE MODE". # :lock => true gives connection's default exclusive lock, usually "FOR UPDATE". |