diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-02 09:23:02 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-02 15:58:49 -0300 |
commit | 3f0bc97912482c2da9e70683b029feb36de74c27 (patch) | |
tree | 68c9326af7dbba14f3978f2075ded7ad4ea33ade /activerecord/test/schema | |
parent | 2bad605873b5b720d77ae6388a995827ab7fe705 (diff) | |
download | rails-3f0bc97912482c2da9e70683b029feb36de74c27.tar.gz rails-3f0bc97912482c2da9e70683b029feb36de74c27.tar.bz2 rails-3f0bc97912482c2da9e70683b029feb36de74c27.zip |
Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-through
Fix reset_counters crashing on has_many :through associations.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/counter_cache.rb
Diffstat (limited to 'activerecord/test/schema')
-rw-r--r-- | activerecord/test/schema/schema.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index b8150c50b9..8a3dfbb35a 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -596,6 +596,7 @@ ActiveRecord::Schema.define do create_table :subscribers, :force => true, :id => false do |t| t.string :nick, :null => false t.string :name + t.column :books_count, :integer, :null => false, :default => 0 end add_index :subscribers, :nick, :unique => true |