diff options
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index bf36e9815b..d15b7e9986 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -452,8 +452,10 @@ module ActiveRecord #:nodoc: # 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 |