diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2014-01-14 07:05:54 -0800 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2014-01-14 07:05:54 -0800 |
| commit | 8a60f479b0580e88bae77c0ab3dd9e95082cb437 (patch) | |
| tree | cc13fee530ff0a6045b8a4acb58e9a96e4b818cc /activerecord/test/models/shop.rb | |
| parent | b242b2dbe75f0b5e86e2ce9ef7c2c5ee96e17862 (diff) | |
| parent | e8d1d84837a59ef7d73b29b16ee05cd610d30a90 (diff) | |
| download | rails-8a60f479b0580e88bae77c0ab3dd9e95082cb437.tar.gz rails-8a60f479b0580e88bae77c0ab3dd9e95082cb437.tar.bz2 rails-8a60f479b0580e88bae77c0ab3dd9e95082cb437.zip | |
Merge pull request #13710 from ujjwalt/hotfix/sti
Active Record's subclass_from_attributes shouldn't assume :type is for STI unless there is a type column.
Diffstat (limited to 'activerecord/test/models/shop.rb')
| -rw-r--r-- | activerecord/test/models/shop.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/models/shop.rb b/activerecord/test/models/shop.rb index 81414227ea..607a0a5b41 100644 --- a/activerecord/test/models/shop.rb +++ b/activerecord/test/models/shop.rb @@ -5,6 +5,11 @@ module Shop class Product < ActiveRecord::Base has_many :variants, :dependent => :delete_all + belongs_to :type + + class Type < ActiveRecord::Base + has_many :products + end end class Variant < ActiveRecord::Base |