Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3da890f8
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3da890f8
编写于
12月 02, 2015
作者:
Y
Yves Senn
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17169 from kuldeepaggarwal/fix-STI-default-type
STI cast new instances to `default type` on initialize.
上级
203db6b8
6b18bdd0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
47 addition
and
9 deletion
+47
-9
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+13
-0
activerecord/lib/active_record/inheritance.rb
activerecord/lib/active_record/inheritance.rb
+13
-9
activerecord/test/cases/inheritance_test.rb
activerecord/test/cases/inheritance_test.rb
+21
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
3da890f8
*
Respect the column default values for
`inheritance_column`
when
instantiating records through the base class.
Fixes #17121.
Example:
# The schema of BaseModel has `t.string :type, default: 'SubType'`
subtype = BaseModel.new
assert_equals SubType, subtype.class
*Kuldeep Aggarwal*
*
Fix
`rake db:structure:dump`
on Postgres when multiple schemas are used.
Fixes #22346.
...
...
activerecord/lib/active_record/inheritance.rb
浏览文件 @
3da890f8
...
...
@@ -51,8 +51,8 @@ def new(*args, &block)
end
attrs
=
args
.
first
if
subclass_from_attributes?
(
attrs
)
subclass
=
subclass_from_attributes
(
attrs
)
if
attribute_names
.
include?
(
inheritance_column
)
subclass
=
subclass_from_attributes
(
attrs
)
||
subclass_from_defaults
end
if
subclass
&&
subclass
!=
self
...
...
@@ -197,16 +197,20 @@ def type_condition(table = arel_table)
# is not self or a valid subclass, raises ActiveRecord::SubclassNotFound
# If this is a StrongParameters hash, and access to inheritance_column is not permitted,
# this will ignore the inheritance column and return nil
def
subclass_from_attributes?
(
attrs
)
attribute_names
.
include?
(
inheritance_column
)
&&
(
attrs
.
is_a?
(
Hash
)
||
attrs
.
respond_to?
(
:permitted?
))
end
def
subclass_from_attributes
(
attrs
)
attrs
=
attrs
.
to_h
if
attrs
.
respond_to?
(
:permitted?
)
subclass_name
=
attrs
.
with_indifferent_access
[
inheritance_column
]
if
attrs
.
is_a?
(
Hash
)
subclass_name
=
attrs
.
with_indifferent_access
[
inheritance_column
]
if
subclass_name
.
present?
find_sti_class
(
subclass_name
)
end
end
end
if
subclass_name
.
present?
find_sti_class
(
subclass_name
)
def
subclass_from_defaults
if
default
=
columns_hash
[
inheritance_column
].
default
find_sti_class
(
default
)
end
end
end
...
...
activerecord/test/cases/inheritance_test.rb
浏览文件 @
3da890f8
...
...
@@ -478,4 +478,25 @@ 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
firm
=
Company
.
new
# without arguments
assert_equal
'Firm'
,
firm
.
type
assert_instance_of
Firm
,
firm
firm
=
Company
.
new
(
firm_name:
'Shri Hans Plastic'
)
# with arguments
assert_equal
'Firm'
,
firm
.
type
assert_instance_of
Firm
,
firm
firm
=
Company
.
new
(
type:
'Client'
)
# overwrite the default type
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录