diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-23 23:39:18 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-23 23:39:18 +0000 |
commit | a5c694283010c05ee39bc0757e8013b3aa382992 (patch) | |
tree | 699e52cd748c9675c790535f7a77c8144565d514 | |
parent | 5f5f19b06d8a4db4a61055280660dc57180ff47c (diff) | |
download | rails-a5c694283010c05ee39bc0757e8013b3aa382992.tar.gz rails-a5c694283010c05ee39bc0757e8013b3aa382992.tar.bz2 rails-a5c694283010c05ee39bc0757e8013b3aa382992.zip |
Fixed that :counter_cache option would look for a line_items_count column for a LineItem object instead of lineitems_count
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@989 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
-rwxr-xr-x | activerecord/lib/active_record/associations.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 8f3846a482..74780f52dd 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that :counter_cache option would look for a line_items_count column for a LineItem object instead of lineitems_count + * Fixed that AR exists?() would explode on postgresql if the passed id did not match the PK type #900 [Scott Barron] * Fixed the MS SQL adapter to work with the new limit/offset approach and with binary data (still suffering from 7KB limit, though) #901 [delynnb] diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 229cfb5cfa..f9f5ec98a6 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -376,12 +376,12 @@ module ActiveRecord if options[:counter_cache] module_eval( - "after_create '#{association_class_name}.increment_counter(\"#{Inflector.pluralize(self.to_s.downcase). + "_count"}\", #{association_class_primary_key_name})" + + "after_create '#{association_class_name}.increment_counter(\"#{self.to_s.underscore.pluralize + "_count"}\", #{association_class_primary_key_name})" + " unless #{association_name}.nil?'" ) module_eval( - "before_destroy '#{association_class_name}.decrement_counter(\"#{Inflector.pluralize(self.to_s.downcase) + "_count"}\", #{association_class_primary_key_name})" + + "before_destroy '#{association_class_name}.decrement_counter(\"#{self.to_s.underscore.pluralize + "_count"}\", #{association_class_primary_key_name})" + " unless #{association_name}.nil?'" ) end |