Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7db17040
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,发现更多精彩内容 >>
提交
7db17040
编写于
12月 26, 2008
作者:
F
Frederick Cheung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix :include of has_many associations with :primary_key option
上级
f4f8923c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
2 deletion
+19
-2
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/association_preload.rb
+1
-1
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations.rb
+1
-1
activerecord/test/cases/associations/eager_test.rb
activerecord/test/cases/associations/eager_test.rb
+17
-0
未找到文件。
activerecord/lib/active_record/association_preload.rb
浏览文件 @
7db17040
...
...
@@ -229,7 +229,7 @@ def preload_has_many_association(records, reflection, preload_options={})
options
=
reflection
.
options
primary_key_name
=
reflection
.
through_reflection_primary_key_name
id_to_record_map
,
ids
=
construct_id_map
(
records
,
primary_key_name
)
id_to_record_map
,
ids
=
construct_id_map
(
records
,
primary_key_name
||
reflection
.
options
[
:primary_key
]
)
records
.
each
{
|
record
|
record
.
send
(
reflection
.
name
).
loaded
}
if
options
[
:through
]
...
...
activerecord/lib/active_record/associations.rb
浏览文件 @
7db17040
...
...
@@ -2171,7 +2171,7 @@ def association_join
aliased_table_name
,
foreign_key
,
parent
.
aliased_table_name
,
parent
.
primary_key
reflection
.
options
[
:primary_key
]
||
parent
.
primary_key
]
end
when
:belongs_to
...
...
activerecord/test/cases/associations/eager_test.rb
浏览文件 @
7db17040
...
...
@@ -786,4 +786,21 @@ def test_preload_has_many_uses_exclusive_scope
assert_equal
Person
.
find
(
person
.
id
).
agents
,
person
.
agents
end
end
def
test_preload_has_many_using_primary_key
expected
=
Firm
.
find
(
:first
).
clients_using_primary_key
.
to_a
firm
=
Firm
.
find
:first
,
:include
=>
:clients_using_primary_key
assert_no_queries
do
assert_equal
expected
,
firm
.
clients_using_primary_key
end
end
def
test_include_has_many_using_primary_key
expected
=
Firm
.
find
(
1
).
clients_using_primary_key
.
sort_by
&
:name
firm
=
Firm
.
find
1
,
:include
=>
:clients_using_primary_key
,
:order
=>
'clients_using_primary_keys_companies.name'
assert_no_queries
do
assert_equal
expected
,
firm
.
clients_using_primary_key
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录