diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-21 14:10:33 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-21 14:36:04 -0300 |
| commit | 648c5a1369ed64608c3ca43a5ebc917687d20010 (patch) | |
| tree | 834ad77d7aec2718cb6148e6ec6cd0a42a9012fc /activerecord/test/schema | |
| parent | c091fae21f32250b19475f124c3b680dbbc163d9 (diff) | |
| download | rails-648c5a1369ed64608c3ca43a5ebc917687d20010.tar.gz rails-648c5a1369ed64608c3ca43a5ebc917687d20010.tar.bz2 rails-648c5a1369ed64608c3ca43a5ebc917687d20010.zip | |
Merge pull request #5210 from Pliny/masteri
Fix for #5200
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index 2b7ea0ce34..b3ae2abbc4 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -265,6 +265,11 @@ ActiveRecord::Schema.define do t.string :name end + create_table :friendships, :force => true do |t| + t.integer :friend_id + t.integer :person_id + end + create_table :goofy_string_id, :force => true, :id => false do |t| t.string :id, :null => false t.string :info @@ -465,6 +470,7 @@ ActiveRecord::Schema.define do t.references :number1_fan t.integer :lock_version, :null => false, :default => 0 t.string :comments + t.integer :followers_count, :default => 0 t.references :best_friend t.references :best_friend_of t.timestamps |