diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 83dddd1f4e..23dde00259 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix typo in count_by_sql documentation #1969 [Alexey Verkhovsky] + * Allow add_column and create_table to specify NOT NULL #1712 [emptysands@gmail.com] * Fix create_table so that id column is implicitly added [Rick Olson] diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 84bf0cdcff..16554ffb55 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -458,7 +458,7 @@ module ActiveRecord #:nodoc: end # Returns the result of an SQL statement that should only include a COUNT(*) in the SELECT part. - # Product.count "SELECT COUNT(*) FROM sales s, customers c WHERE s.customer_id = c.id" + # Product.count_by_sql "SELECT COUNT(*) FROM sales s, customers c WHERE s.customer_id = c.id" def count_by_sql(sql) sql = sanitize_conditions(sql) rows = connection.select_one(sql, "#{name} Count") |