Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ea6f28c8
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,发现更多精彩内容 >>
提交
ea6f28c8
编写于
6月 10, 2014
作者:
S
Sean Griffin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove unused column types override
上级
584498a6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
11 deletion
+2
-11
activerecord/lib/active_record/core.rb
activerecord/lib/active_record/core.rb
+0
-3
activerecord/lib/active_record/persistence.rb
activerecord/lib/active_record/persistence.rb
+2
-8
未找到文件。
activerecord/lib/active_record/core.rb
浏览文件 @
ea6f28c8
...
@@ -256,7 +256,6 @@ def initialize(attributes = nil, options = {})
...
@@ -256,7 +256,6 @@ def initialize(attributes = nil, options = {})
end
end
@attributes
=
defaults
@attributes
=
defaults
@column_types_override
=
nil
@column_types
=
self
.
class
.
column_types
@column_types
=
self
.
class
.
column_types
init_internals
init_internals
...
@@ -283,7 +282,6 @@ def initialize(attributes = nil, options = {})
...
@@ -283,7 +282,6 @@ def initialize(attributes = nil, options = {})
# post.title # => 'hello world'
# post.title # => 'hello world'
def
init_with
(
coder
)
def
init_with
(
coder
)
@attributes
=
coder
[
'attributes'
]
@attributes
=
coder
[
'attributes'
]
@column_types_override
=
coder
[
'column_types'
]
@column_types
=
self
.
class
.
column_types
@column_types
=
self
.
class
.
column_types
init_internals
init_internals
...
@@ -357,7 +355,6 @@ def encode_with(coder)
...
@@ -357,7 +355,6 @@ def encode_with(coder)
# FIXME: Remove this when we better serialize attributes
# FIXME: Remove this when we better serialize attributes
coder
[
'raw_attributes'
]
=
attributes_before_type_cast
coder
[
'raw_attributes'
]
=
attributes_before_type_cast
coder
[
'attributes'
]
=
@attributes
coder
[
'attributes'
]
=
@attributes
coder
[
'column_types'
]
=
@column_types_override
coder
[
'new_record'
]
=
new_record?
coder
[
'new_record'
]
=
new_record?
end
end
...
...
activerecord/lib/active_record/persistence.rb
浏览文件 @
ea6f28c8
...
@@ -53,12 +53,7 @@ def instantiate(attributes, column_types = {})
...
@@ -53,12 +53,7 @@ def instantiate(attributes, column_types = {})
type
=
column_types
.
fetch
(
name
)
{
klass
.
type_for_attribute
(
name
)
}
type
=
column_types
.
fetch
(
name
)
{
klass
.
type_for_attribute
(
name
)
}
h
[
name
]
=
Attribute
.
from_database
(
value
,
type
)
h
[
name
]
=
Attribute
.
from_database
(
value
,
type
)
end
end
klass
.
allocate
.
init_with
(
'attributes'
=>
attributes
,
'new_record'
=>
false
)
klass
.
allocate
.
init_with
(
'attributes'
=>
attributes
,
'column_types'
=>
column_types
,
'new_record'
=>
false
,
)
end
end
private
private
...
@@ -406,8 +401,7 @@ def reload(options = nil)
...
@@ -406,8 +401,7 @@ def reload(options = nil)
@attributes
.
update
(
fresh_object
.
instance_variable_get
(
'@attributes'
))
@attributes
.
update
(
fresh_object
.
instance_variable_get
(
'@attributes'
))
@column_types
=
self
.
class
.
column_types
@column_types
=
self
.
class
.
column_types
@column_types_override
=
fresh_object
.
instance_variable_get
(
'@column_types_override'
)
self
self
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录