diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-12-12 16:47:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 16:47:51 -0500 |
| commit | 185a30f75289ab158abd3c21536930c37af61338 (patch) | |
| tree | 265389a1c174006be2b5200ff4609ae6b7a31093 /activerecord/test/schema | |
| parent | 2eee8c3bad674bc3170cfac3e8586127560a4ea5 (diff) | |
| parent | 6ddba9b46c1d307ea7e03d753d0988183b9cb80c (diff) | |
| download | rails-185a30f75289ab158abd3c21536930c37af61338.tar.gz rails-185a30f75289ab158abd3c21536930c37af61338.tar.bz2 rails-185a30f75289ab158abd3c21536930c37af61338.zip | |
Merge pull request #31405 from bogdanvlviv/fix-conflicts-counter_cache-with-touch-by-optimistic_locking
Fix conflicts `counter_cache` with `touch: true` by optimistic locking.
Diffstat (limited to 'activerecord/test/schema')
| -rw-r--r-- | activerecord/test/schema/schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index bf66846840..3205c4c20a 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -123,7 +123,7 @@ ActiveRecord::Schema.define do create_table :cars, force: true do |t| t.string :name t.integer :engines_count - t.integer :wheels_count + t.integer :wheels_count, default: 0 t.column :lock_version, :integer, null: false, default: 0 t.timestamps null: false end @@ -964,6 +964,7 @@ ActiveRecord::Schema.define do end create_table :wheels, force: true do |t| + t.integer :size t.references :wheelable, polymorphic: true end |