提交 6b18bdd0 编写于 作者: K Kuldeep Aggarwal

STI cast new instances to `default type` on initialize.

fixes #17121
上级 203db6b8
* Use the default inheritance `:type` when instantiating a new object.
Example:
# In the schema, BaseModel specifies 'SubType' as the default `:type` value
subtype = BaseModel.new
assert_equals SubType, subtype.class
*Kuldeep Aggarwal*
* Fix `rake db:structure:dump` on Postgres when multiple schemas are used.
Fixes #22346.
......
......@@ -55,6 +55,8 @@ def new(*args, &block)
subclass = subclass_from_attributes(attrs)
end
subclass ||= subclass_from_defaults
if subclass && subclass != self
subclass.new(*args, &block)
else
......@@ -201,6 +203,16 @@ def subclass_from_attributes?(attrs)
attribute_names.include?(inheritance_column) && (attrs.is_a?(Hash) || attrs.respond_to?(:permitted?))
end
def subclass_from_defaults?
attribute_names.include?(inheritance_column) && columns_hash[inheritance_column].try(:default)
end
def subclass_from_defaults
if subclass_from_defaults?
find_sti_class(columns_hash[inheritance_column].default)
end
end
def subclass_from_attributes(attrs)
attrs = attrs.to_h if attrs.respond_to?(:permitted?)
subclass_name = attrs.with_indifferent_access[inheritance_column]
......
......@@ -478,4 +478,24 @@ def test_sti_type_from_attributes_disabled_in_non_sti_class
product = Shop::Product.new(:type => phone)
assert product.save
end
def test_inheritance_new_with_subclass_as_default
original_type = Company.columns_hash["type"].default
ActiveRecord::Base.connection.change_column_default :companies, :type, 'Firm'
Company.reset_column_information
# this is the case when attrs is a +Hash+, but we didn't specify the type,
# so we need default type.
firm = Company.new(firm_name: 'Shri Hans Plastic')
assert_equal 'Firm', firm.type
assert_instance_of Firm, firm
firm = Company.new # this is the case when attrs is nil
assert_equal 'Firm', firm.type
assert_instance_of Firm, firm
firm = Company.new(type: 'Client')
assert_equal 'Client', firm.type
assert_instance_of Client, firm
ensure
ActiveRecord::Base.connection.change_column_default :companies, :type, original_type
Company.reset_column_information
end
end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册