Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
32c8aee0
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,发现更多精彩内容 >>
提交
32c8aee0
编写于
12月 23, 2013
作者:
Y
Yves Senn
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #13455 from jetthoughts/13445_fix_touch_destroyed_record
On destroying do not touch destroyed belongs to association.
上级
00fc64a6
2bcf7158
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
22 addition
and
1 deletion
+22
-1
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+13
-0
activerecord/lib/active_record/associations/builder/belongs_to.rb
...cord/lib/active_record/associations/builder/belongs_to.rb
+1
-1
activerecord/test/cases/associations/belongs_to_associations_test.rb
...d/test/cases/associations/belongs_to_associations_test.rb
+8
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
32c8aee0
*
Do not raise
`'can not touch on a new record object'`
exception on destroying already destroyed
`belongs_to`
association with
`touch: true`
option
Fixes: #13445
Example:
# Given Comment has belongs_to :post, touch: true
comment.post.destroy
comment.destroy # no longer raises an error
*Paul Nikitochkin*
*
Fix a bug when assigning an array containing string numbers to a
*
Fix a bug when assigning an array containing string numbers to a
PostgreSQL integer array column.
PostgreSQL integer array column.
...
...
activerecord/lib/active_record/associations/builder/belongs_to.rb
浏览文件 @
32c8aee0
...
@@ -112,7 +112,7 @@ def self.touch_record(o, foreign_key, name, touch) # :nodoc:
...
@@ -112,7 +112,7 @@ def self.touch_record(o, foreign_key, name, touch) # :nodoc:
end
end
record
=
o
.
send
name
record
=
o
.
send
name
unless
record
.
nil?
||
record
.
new_recor
d?
if
record
&&
record
.
persiste
d?
if
touch
!=
true
if
touch
!=
true
record
.
touch
touch
record
.
touch
touch
else
else
...
...
activerecord/test/cases/associations/belongs_to_associations_test.rb
浏览文件 @
32c8aee0
...
@@ -356,6 +356,14 @@ def test_belongs_to_with_touch_option_on_destroy
...
@@ -356,6 +356,14 @@ def test_belongs_to_with_touch_option_on_destroy
assert_queries
(
2
)
{
line_item
.
destroy
}
assert_queries
(
2
)
{
line_item
.
destroy
}
end
end
def
test_belongs_to_with_touch_option_on_destroy_with_destroyed_parent
line_item
=
LineItem
.
create!
invoice
=
Invoice
.
create!
(
line_items:
[
line_item
])
invoice
.
destroy
assert_queries
(
1
)
{
line_item
.
destroy
}
end
def
test_belongs_to_with_touch_option_on_touch_and_reassigned_parent
def
test_belongs_to_with_touch_option_on_touch_and_reassigned_parent
line_item
=
LineItem
.
create!
line_item
=
LineItem
.
create!
Invoice
.
create!
(
line_items:
[
line_item
])
Invoice
.
create!
(
line_items:
[
line_item
])
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录