diff options
| author | Ujjwal Thaakar <ujjwalthaakar@gmail.com> | 2014-01-14 18:53:45 +0530 |
|---|---|---|
| committer | Ujjwal Thaakar <ujjwalthaakar@gmail.com> | 2014-01-14 18:53:45 +0530 |
| commit | e8d1d84837a59ef7d73b29b16ee05cd610d30a90 (patch) | |
| tree | cc13fee530ff0a6045b8a4acb58e9a96e4b818cc /activerecord/test/schema | |
| parent | b242b2dbe75f0b5e86e2ce9ef7c2c5ee96e17862 (diff) | |
| download | rails-e8d1d84837a59ef7d73b29b16ee05cd610d30a90.tar.gz rails-e8d1d84837a59ef7d73b29b16ee05cd610d30a90.tar.bz2 rails-e8d1d84837a59ef7d73b29b16ee05cd610d30a90.zip | |
Don't try to get the subclass if the inheritance column doesn't exist
The `subclass_from_attrs` method is called even if the column specified by
the `inheritance_column` setting doesn't exist. This prevents setting associations
via the attributes hash if the association name clashes with the value of the setting,
typically `:type`. This worked previously in Rails 3.2.
Diffstat (limited to 'activerecord/test/schema')
| -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 ddfc1ac0d6..9a7d918a25 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -557,9 +557,14 @@ ActiveRecord::Schema.define do create_table :products, force: true do |t| t.references :collection + t.references :type t.string :name end + create_table :product_types, force: true do |t| + t.string :name + end + create_table :projects, force: true do |t| t.string :name t.string :type |