diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-07-18 13:42:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 13:42:57 -0400 |
| commit | 36ff7b63ec083924a5b407cf3df7ae90e22183e2 (patch) | |
| tree | 8cbdbe138f13a0dc7c3666f036fda685c644d262 /activerecord/test/schema/schema.rb | |
| parent | 425ba83c28214ca97c5d3600c16ad7a796cd33e6 (diff) | |
| parent | f47bac481949a69a519ea7d833e1a8d435332d52 (diff) | |
| download | rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.tar.gz rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.tar.bz2 rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.zip | |
Merge branch 'master' into fix_unscope_where_column_with_or
Diffstat (limited to 'activerecord/test/schema/schema.rb')
| -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| |