Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1b075220
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,发现更多精彩内容 >>
提交
1b075220
编写于
5月 30, 2012
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5810 from kennyj/fix_5797
Fix #5797. Error calling dup method on AR model with serialized field
上级
7c1b61e5
d09b2fd0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
5 deletion
+15
-5
activerecord/lib/active_record/attribute_methods/serialization.rb
...cord/lib/active_record/attribute_methods/serialization.rb
+4
-3
activerecord/lib/active_record/core.rb
activerecord/lib/active_record/core.rb
+1
-1
activerecord/lib/active_record/locking/optimistic.rb
activerecord/lib/active_record/locking/optimistic.rb
+1
-1
activerecord/test/cases/base_test.rb
activerecord/test/cases/base_test.rb
+9
-0
未找到文件。
activerecord/lib/active_record/attribute_methods/serialization.rb
浏览文件 @
1b075220
...
...
@@ -72,12 +72,13 @@ def serialize(attr_name, class_name = Object)
self
.
serialized_attributes
=
serialized_attributes
.
merge
(
attr_name
.
to_s
=>
coder
)
end
def
initialize_attributes
(
attributes
)
#:nodoc:
super
def
initialize_attributes
(
attributes
,
options
=
{})
#:nodoc:
serialized
=
(
options
.
delete
(
:serialized
)
{
true
})
?
:serialized
:
:unserialized
super
(
attributes
,
options
)
serialized_attributes
.
each
do
|
key
,
coder
|
if
attributes
.
key?
(
key
)
attributes
[
key
]
=
Attribute
.
new
(
coder
,
attributes
[
key
],
:
serialized
)
attributes
[
key
]
=
Attribute
.
new
(
coder
,
attributes
[
key
],
serialized
)
end
end
...
...
activerecord/lib/active_record/core.rb
浏览文件 @
1b075220
...
...
@@ -241,7 +241,7 @@ def init_with(coder)
##
def
initialize_dup
(
other
)
# :nodoc:
cloned_attributes
=
other
.
clone_attributes
(
:read_attribute_before_type_cast
)
self
.
class
.
initialize_attributes
(
cloned_attributes
)
self
.
class
.
initialize_attributes
(
cloned_attributes
,
:serialized
=>
false
)
cloned_attributes
.
delete
(
self
.
class
.
primary_key
)
...
...
activerecord/lib/active_record/locking/optimistic.rb
浏览文件 @
1b075220
...
...
@@ -168,7 +168,7 @@ def update_counters(id, counters)
# start the lock version at zero. Note we can't use
# <tt>locking_enabled?</tt> at this point as
# <tt>@attributes</tt> may not have been initialized yet.
def
initialize_attributes
(
attributes
)
#:nodoc:
def
initialize_attributes
(
attributes
,
options
=
{}
)
#:nodoc:
if
attributes
.
key?
(
locking_column
)
&&
lock_optimistically
attributes
[
locking_column
]
||=
0
end
...
...
activerecord/test/cases/base_test.rb
浏览文件 @
1b075220
...
...
@@ -1309,6 +1309,15 @@ def test_serialized_attribute_before_type_cast_returns_unserialized_value
assert_equal
({
:foo
=>
:bar
},
t
.
content_before_type_cast
)
end
def
test_serialized_attribute_calling_dup_method
klass
=
Class
.
new
(
ActiveRecord
::
Base
)
klass
.
table_name
=
"topics"
klass
.
serialize
:content
,
JSON
t
=
klass
.
new
(
:content
=>
{
:foo
=>
:bar
}).
dup
assert_equal
({
:foo
=>
:bar
},
t
.
content_before_type_cast
)
end
def
test_serialized_attribute_declared_in_subclass
hash
=
{
'important1'
=>
'value1'
,
'important2'
=>
'value2'
}
important_topic
=
ImportantTopic
.
create
(
"important"
=>
hash
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录