TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Added a join parameter as the third argument to Base.find_first and as the second to Base.count #426, #988 [skaes@web.de]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1058 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-04-02 08:29:54 +00:00
parent 0ca544d7b3
commit 06a6133fff
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/CHANGELOG
View File

@ -1,6 +1,6 @@
*SVN*
* Added a join parameter as the third argument to Base.find_first #426 [skaes@web.de]
* Added a join parameter as the third argument to Base.find_first and as the second to Base.count #426, #988 [skaes@web.de]
* Fixed bug in Base#hash method that would treat records with the same string-based id as different [Dave Thomas]

6
activerecord/lib/active_record/base.rb
View File

@ -452,8 +452,10 @@ def delete_all(conditions = nil)
# Returns the number of records that meets the +conditions+. Zero is returned if no records match. Example:
# Product.count "sales > 1"
def count(conditions = nil)
sql = "SELECT COUNT(*) FROM #{table_name} "
def count(conditions = nil, joins = nil)
tbl_var_name = joins ? table_name[0,1].downcase : ""
sql = "SELECT COUNT(*) FROM #{table_name} #{tbl_var_name} "
sql << ", #{joins} " if joins
add_conditions!(sql, conditions)
count_by_sql(sql)
end