Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
49d94cc4
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,发现更多精彩内容 >>
提交
49d94cc4
编写于
9月 25, 2013
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12362 from arthurnn/inverse_on_find
fix .find when inverse is loaded
上级
d1e36842
dfd3b809
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
5 deletion
+22
-5
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+6
-0
activerecord/lib/active_record/associations/collection_association.rb
.../lib/active_record/associations/collection_association.rb
+4
-5
activerecord/test/cases/associations/has_many_associations_test.rb
...ord/test/cases/associations/has_many_associations_test.rb
+12
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
49d94cc4
*
Fixed
`ActiveRecord::Associations::CollectionAssociation#find`
when using
`has_many`
association with
`:inverse_of`
and finding an array of one element,
it should return an array of one element too.
*arthurnn*
*
Callbacks on has_many should access the in memory parent if a inverse_of is set.
*arthurnn*
...
...
activerecord/lib/active_record/associations/collection_association.rb
浏览文件 @
49d94cc4
...
...
@@ -80,14 +80,13 @@ def find(*args)
load_target
.
find
(
*
args
)
{
|*
block_args
|
yield
(
*
block_args
)
}
else
if
options
[
:inverse_of
]
&&
loaded?
args
=
args
.
flatten
raise
RecordNotFound
,
"Couldn't find
#{
scope
.
klass
.
name
}
without an ID"
if
args
.
blank?
args_flatten
=
args
.
flatten
raise
RecordNotFound
,
"Couldn't find
#{
scope
.
klass
.
name
}
without an ID"
if
args_flatten
.
blank?
result
=
find_by_scan
(
*
args
)
result_size
=
Array
(
result
).
size
if
!
result
||
result_size
!=
args
.
size
scope
.
raise_record_not_found_exception!
(
args
,
result_size
,
args
.
size
)
if
!
result
||
result_size
!=
args
_flatten
.
size
scope
.
raise_record_not_found_exception!
(
args
_flatten
,
result_size
,
args_flatten
.
size
)
else
result
end
...
...
activerecord/test/cases/associations/has_many_associations_test.rb
浏览文件 @
49d94cc4
...
...
@@ -337,6 +337,18 @@ def test_find_ids
assert_raise
(
ActiveRecord
::
RecordNotFound
)
{
firm
.
clients
.
find
(
2
,
99
)
}
end
def
test_find_ids_and_inverse_of
force_signal37_to_load_all_clients_of_firm
firm
=
companies
(
:first_firm
)
client
=
firm
.
clients_of_firm
.
find
(
3
)
assert_kind_of
Client
,
client
client_ary
=
firm
.
clients_of_firm
.
find
([
3
])
assert_kind_of
Array
,
client_ary
assert_equal
client
,
client_ary
.
first
end
def
test_find_all
firm
=
Firm
.
all
.
merge!
(
:order
=>
"id"
).
first
assert_equal
2
,
firm
.
clients
.
where
(
"
#{
QUOTED_TYPE
}
= 'Client'"
).
to_a
.
length
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录