Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
de0ea386
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,体验更适合开发者的 AI 搜索 >>
提交
de0ea386
编写于
4月 20, 2009
作者:
P
Pratik Naik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure :dependent => :delete_all works for association with hash conditions
上级
489abfd3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
9 deletion
+14
-9
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations.rb
+1
-1
activerecord/test/cases/associations/has_many_associations_test.rb
...ord/test/cases/associations/has_many_associations_test.rb
+6
-0
activerecord/test/models/author.rb
activerecord/test/models/author.rb
+1
-1
activerecord/test/models/company.rb
activerecord/test/models/company.rb
+6
-7
未找到文件。
activerecord/lib/active_record/associations.rb
浏览文件 @
de0ea386
...
...
@@ -1375,7 +1375,7 @@ def configure_dependency_for_has_many(reflection, extra_conditions = nil)
dependent_conditions
=
[]
dependent_conditions
<<
"
#{
reflection
.
primary_key_name
}
=
\#
{record.quoted_id}"
dependent_conditions
<<
"
#{
reflection
.
options
[
:as
]
}
_type = '
#{
base_class
.
name
}
'"
if
reflection
.
options
[
:as
]
dependent_conditions
<<
sanitize_sql
(
reflection
.
options
[
:conditions
])
if
reflection
.
options
[
:conditions
]
dependent_conditions
<<
sanitize_sql
(
reflection
.
options
[
:conditions
]
,
reflection
.
quoted_table_name
)
if
reflection
.
options
[
:conditions
]
dependent_conditions
<<
extra_conditions
if
extra_conditions
dependent_conditions
=
dependent_conditions
.
collect
{
|
where
|
"(
#{
where
}
)"
}.
join
(
" AND "
)
dependent_conditions
=
dependent_conditions
.
gsub
(
'@'
,
'\@'
)
...
...
activerecord/test/cases/associations/has_many_associations_test.rb
浏览文件 @
de0ea386
...
...
@@ -719,6 +719,12 @@ def test_dependence
assert
Client
.
find
(
:all
,
:conditions
=>
"firm_id=
#{
firm
.
id
}
"
).
empty?
end
def
test_dependence_for_associations_with_hash_condition
david
=
authors
(
:david
)
post
=
posts
(
:thinking
).
id
assert_difference
(
'Post.count'
,
-
1
)
{
assert
david
.
destroy
}
end
def
test_destroy_dependent_when_deleted_from_association
firm
=
Firm
.
find
(
:first
)
assert_equal
2
,
firm
.
clients
.
size
...
...
activerecord/test/models/author.rb
浏览文件 @
de0ea386
...
...
@@ -25,7 +25,7 @@ def testing_proxy_target
has_many
:comments_with_order_and_conditions
,
:through
=>
:posts
,
:source
=>
:comments
,
:order
=>
'comments.body'
,
:conditions
=>
"comments.body like 'Thank%'"
has_many
:comments_with_include
,
:through
=>
:posts
,
:source
=>
:comments
,
:include
=>
:post
has_many
:thinking_posts
,
:class_name
=>
'Post'
,
:conditions
=>
{
:title
=>
'So I was thinking'
}
has_many
:thinking_posts
,
:class_name
=>
'Post'
,
:conditions
=>
{
:title
=>
'So I was thinking'
}
,
:dependent
=>
:delete_all
has_many
:welcome_posts
,
:class_name
=>
'Post'
,
:conditions
=>
{
:title
=>
'Welcome to the weblog'
}
has_many
:comments_desc
,
:through
=>
:posts
,
:source
=>
:comments
,
:order
=>
'comments.id DESC'
...
...
activerecord/test/models/company.rb
浏览文件 @
de0ea386
...
...
@@ -78,13 +78,6 @@ class DependentFirm < Company
has_many
:companies
,
:foreign_key
=>
'client_of'
,
:order
=>
"id"
,
:dependent
=>
:nullify
end
class
ExclusivelyDependentFirm
<
Company
has_one
:account
,
:foreign_key
=>
"firm_id"
,
:dependent
=>
:delete
has_many
:dependent_sanitized_conditional_clients_of_firm
,
:foreign_key
=>
"client_of"
,
:class_name
=>
"Client"
,
:order
=>
"id"
,
:dependent
=>
:delete_all
,
:conditions
=>
"name = 'BigShot Inc.'"
has_many
:dependent_conditional_clients_of_firm
,
:foreign_key
=>
"client_of"
,
:class_name
=>
"Client"
,
:order
=>
"id"
,
:dependent
=>
:delete_all
,
:conditions
=>
[
"name = ?"
,
'BigShot Inc.'
]
has_many
:dependent_hash_conditional_clients_of_firm
,
:foreign_key
=>
"client_of"
,
:class_name
=>
"Client"
,
:order
=>
"id"
,
:dependent
=>
:delete_all
,
:conditions
=>
{
:name
=>
'BigShot Inc.'
}
end
class
Client
<
Company
belongs_to
:firm
,
:foreign_key
=>
"client_of"
belongs_to
:firm_with_basic_id
,
:class_name
=>
"Firm"
,
:foreign_key
=>
"firm_id"
...
...
@@ -125,6 +118,12 @@ def private_method
end
end
class
ExclusivelyDependentFirm
<
Company
has_one
:account
,
:foreign_key
=>
"firm_id"
,
:dependent
=>
:delete
has_many
:dependent_sanitized_conditional_clients_of_firm
,
:foreign_key
=>
"client_of"
,
:class_name
=>
"Client"
,
:order
=>
"id"
,
:dependent
=>
:delete_all
,
:conditions
=>
"name = 'BigShot Inc.'"
has_many
:dependent_conditional_clients_of_firm
,
:foreign_key
=>
"client_of"
,
:class_name
=>
"Client"
,
:order
=>
"id"
,
:dependent
=>
:delete_all
,
:conditions
=>
[
"name = ?"
,
'BigShot Inc.'
]
has_many
:dependent_hash_conditional_clients_of_firm
,
:foreign_key
=>
"client_of"
,
:class_name
=>
"Client"
,
:order
=>
"id"
,
:dependent
=>
:delete_all
,
:conditions
=>
{
:name
=>
'BigShot Inc.'
}
end
class
SpecialClient
<
Client
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录