diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2017-07-18 13:11:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-18 13:11:01 -0400 |
commit | 41d51b07160484b616e48658ddb76d1d1d13a6c0 (patch) | |
tree | 8667114fb9c227ad1459782f8405583828040a2f /activerecord/test/schema | |
parent | 8ebe1f2feed30809abb3f114242dda7379e66e4b (diff) | |
parent | 9aa04315febfb37b50f52471a2837c40313a2d5f (diff) | |
download | rails-41d51b07160484b616e48658ddb76d1d1d13a6c0.tar.gz rails-41d51b07160484b616e48658ddb76d1d1d13a6c0.tar.bz2 rails-41d51b07160484b616e48658ddb76d1d1d13a6c0.zip |
Merge pull request #29834 from kamipo/fix_unscoping_default_scope_with_sti_association
Fix unscoping `default_scope` in STI associations
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 f534e9c00e..90185ff6c5 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -189,6 +189,7 @@ ActiveRecord::Schema.define do t.string :resource_id t.string :resource_type t.integer :developer_id + t.datetime :deleted_at end create_table :companies, force: true do |t| |