diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-03-30 06:08:05 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-03-30 06:08:05 -0700 |
| commit | 2eb111815d5f7a86a7dbd317075e396c94ab2c3d (patch) | |
| tree | e6a5ced27b7fd486252b44b6d4f5dff304fcf58c /activerecord/test/schema/schema.rb | |
| parent | 34320cd6ba3423be7e0828c1486601aca53abc82 (diff) | |
| parent | 2931f413a51f75e7365ac7dfe2e0bc2a27224c94 (diff) | |
| download | rails-2eb111815d5f7a86a7dbd317075e396c94ab2c3d.tar.gz rails-2eb111815d5f7a86a7dbd317075e396c94ab2c3d.tar.bz2 rails-2eb111815d5f7a86a7dbd317075e396c94ab2c3d.zip | |
Merge pull request #5334 from courtland/master
Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled.
Diffstat (limited to 'activerecord/test/schema/schema.rb')
| -rw-r--r-- | activerecord/test/schema/schema.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index d5e4f165cb..04c20c9128 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -469,6 +469,11 @@ ActiveRecord::Schema.define do t.references :best_friend_of t.timestamps end + + create_table :peoples_treasures, :id => false, :force => true do |t| + t.column :rich_person_id, :integer + t.column :treasure_id, :integer + end create_table :pets, :primary_key => :pet_id ,:force => true do |t| t.string :name |