Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
307a519d
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,发现更多精彩内容 >>
提交
307a519d
编写于
5月 14, 2014
作者:
M
Matthew Draper
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14833 from jyao6/attribute_inheritance
Fixed Attribute Inheritance Issue
上级
374d19a7
6de710d6
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
37 addition
and
5 deletion
+37
-5
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+7
-0
activerecord/lib/active_record/store.rb
activerecord/lib/active_record/store.rb
+14
-5
activerecord/test/cases/store_test.rb
activerecord/test/cases/store_test.rb
+16
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
307a519d
*
Fix
`stored_attributes`
to correctly merge the details of stored
attributes defined in parent classes.
Fixes #14672.
*Brad Bennett*, *Jessica Yao*, *Lakshmi Parthasarathy*
*
`change_column_default`
allows
`[]`
as argument to
`change_column_default`
.
*
`change_column_default`
allows
`[]`
as argument to
`change_column_default`
.
Fixes #11586.
Fixes #11586.
...
...
activerecord/lib/active_record/store.rb
浏览文件 @
307a519d
...
@@ -66,8 +66,9 @@ module Store
...
@@ -66,8 +66,9 @@ module Store
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
included
do
included
do
class_attribute
:stored_attributes
,
instance_accessor:
false
class
<<
self
self
.
stored_attributes
=
{}
attr_accessor
:local_stored_attributes
end
end
end
module
ClassMethods
module
ClassMethods
...
@@ -93,9 +94,9 @@ def store_accessor(store_attribute, *keys)
...
@@ -93,9 +94,9 @@ def store_accessor(store_attribute, *keys)
# assign new store attribute and create new hash to ensure that each class in the hierarchy
# assign new store attribute and create new hash to ensure that each class in the hierarchy
# has its own hash of stored attributes.
# has its own hash of stored attributes.
self
.
stored_attributes
=
{}
if
self
.
stored_attributes
.
blank?
self
.
local_stored_attributes
||=
{}
self
.
stored_attributes
[
store_attribute
]
||=
[]
self
.
local_
stored_attributes
[
store_attribute
]
||=
[]
self
.
stored_attributes
[
store_attribute
]
|=
keys
self
.
local_
stored_attributes
[
store_attribute
]
|=
keys
end
end
def
_store_accessors_module
def
_store_accessors_module
...
@@ -105,6 +106,14 @@ def _store_accessors_module
...
@@ -105,6 +106,14 @@ def _store_accessors_module
mod
mod
end
end
end
end
def
stored_attributes
parent
=
superclass
.
respond_to?
(
:stored_attributes
)
?
superclass
.
stored_attributes
:
{}
if
self
.
local_stored_attributes
parent
.
merge!
(
self
.
local_stored_attributes
)
{
|
k
,
a
,
b
|
a
|
b
}
end
parent
end
end
end
protected
protected
...
...
activerecord/test/cases/store_test.rb
浏览文件 @
307a519d
...
@@ -163,6 +163,22 @@ class StoreTest < ActiveRecord::TestCase
...
@@ -163,6 +163,22 @@ class StoreTest < ActiveRecord::TestCase
assert_equal
[
:width
,
:height
],
second_model
.
stored_attributes
[
:data
]
assert_equal
[
:width
,
:height
],
second_model
.
stored_attributes
[
:data
]
end
end
test
"stored_attributes are tracked per subclass"
do
first_model
=
Class
.
new
(
ActiveRecord
::
Base
)
do
store_accessor
:data
,
:color
end
second_model
=
Class
.
new
(
first_model
)
do
store_accessor
:data
,
:width
,
:height
end
third_model
=
Class
.
new
(
first_model
)
do
store_accessor
:data
,
:area
,
:volume
end
assert_equal
[
:color
],
first_model
.
stored_attributes
[
:data
]
assert_equal
[
:color
,
:width
,
:height
],
second_model
.
stored_attributes
[
:data
]
assert_equal
[
:color
,
:area
,
:volume
],
third_model
.
stored_attributes
[
:data
]
end
test
"YAML coder initializes the store when a Nil value is given"
do
test
"YAML coder initializes the store when a Nil value is given"
do
assert_equal
({},
@john
.
params
)
assert_equal
({},
@john
.
params
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录