Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
304d38c0
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,发现更多精彩内容 >>
提交
304d38c0
编写于
12月 28, 2010
作者:
S
Santiago Pastorino
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow primary_key to be an attribute when the model is a new record
上级
897b56bb
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
4 addition
and
4 deletion
+4
-4
activerecord/lib/active_record/persistence.rb
activerecord/lib/active_record/persistence.rb
+1
-1
activerecord/lib/active_record/transactions.rb
activerecord/lib/active_record/transactions.rb
+2
-2
activerecord/test/cases/attribute_methods_test.rb
activerecord/test/cases/attribute_methods_test.rb
+1
-1
未找到文件。
activerecord/lib/active_record/persistence.rb
浏览文件 @
304d38c0
...
...
@@ -282,7 +282,7 @@ def create
# that instances loaded from the database would.
def
attributes_from_column_definition
Hash
[
self
.
class
.
columns
.
map
do
|
column
|
[
column
.
name
,
column
.
default
]
unless
column
.
name
==
self
.
class
.
primary_key
[
column
.
name
,
column
.
default
]
end
]
end
end
...
...
activerecord/lib/active_record/transactions.rb
浏览文件 @
304d38c0
...
...
@@ -301,8 +301,8 @@ def with_transaction_returning_status
# Save the new record state and id of a record so it can be restored later if a transaction fails.
def
remember_transaction_record_state
#:nodoc
@_start_transaction_state
||=
{}
unless
@_start_transaction_state
.
include?
(
:new_record
)
@_start_transaction_state
[
:id
]
=
id
if
has_attribute?
(
self
.
class
.
primary_key
)
unless
@_start_transaction_state
.
include?
(
:new_record
)
@_start_transaction_state
[
:new_record
]
=
@new_record
end
unless
@_start_transaction_state
.
include?
(
:destroyed
)
...
...
@@ -329,7 +329,7 @@ def restore_transaction_record_state(force = false) #:nodoc
@attributes
=
@attributes
.
dup
if
@attributes
.
frozen?
@new_record
=
restore_state
[
:new_record
]
@destroyed
=
restore_state
[
:destroyed
]
if
restore_state
[
:id
]
if
restore_state
.
has_key?
(
:id
)
self
.
id
=
restore_state
[
:id
]
else
@attributes
.
delete
(
self
.
class
.
primary_key
)
...
...
activerecord/test/cases/attribute_methods_test.rb
浏览文件 @
304d38c0
...
...
@@ -105,7 +105,7 @@ def test_array_content
def
test_read_attributes_before_type_cast
category
=
Category
.
new
({
:name
=>
"Test categoty"
,
:type
=>
nil
})
category_attrs
=
{
"name"
=>
"Test categoty"
,
"type"
=>
nil
,
"categorizations_count"
=>
nil
}
category_attrs
=
{
"name"
=>
"Test categoty"
,
"
id"
=>
nil
,
"
type"
=>
nil
,
"categorizations_count"
=>
nil
}
assert_equal
category_attrs
,
category
.
attributes_before_type_cast
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录