diff options
author | Yves Senn <yves.senn@gmail.com> | 2012-09-02 17:19:50 +0200 |
---|---|---|
committer | Yves Senn <yves.senn@garaio.com> | 2012-09-03 16:35:38 +0200 |
commit | 01d09a6079b0af387c722ba2148cf7af308d3f49 (patch) | |
tree | bee01cb37bfa634b2348d5ede8e8e68d43d6876e /activerecord/lib/active_record | |
parent | cabab374bfc6c1bd1d783ecc3c674047f17523c6 (diff) | |
download | rails-01d09a6079b0af387c722ba2148cf7af308d3f49.tar.gz rails-01d09a6079b0af387c722ba2148cf7af308d3f49.tar.bz2 rails-01d09a6079b0af387c722ba2148cf7af308d3f49.zip |
set the configured #inheritance_column on #become (#7503)
I had to create a new table because I needed an STI table,
which does not have both a "type" and a "custom_type"
the test fails with:
1) Error:
test_alt_becomes_works_with_sti(InheritanceTest):
NoMethodError: undefined method `type=' for #<Cabbage id: 1, name: "my cucumber", custom_type: "Cucumber">
/Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing'
/Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing'
/Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes'
test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti'
test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti'
Conflicts:
activerecord/test/cases/inheritance_test.rb
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/persistence.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index 038355deaa..8a3c3fed7d 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -162,7 +162,7 @@ module ActiveRecord became.instance_variable_set("@new_record", new_record?) became.instance_variable_set("@destroyed", destroyed?) became.instance_variable_set("@errors", errors) - became.type = klass.name unless self.class.descends_from_active_record? + became.send("#{klass.inheritance_column}=", klass.name) unless self.class.descends_from_active_record? became end |