Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1a7567d2
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,发现更多精彩内容 >>
提交
1a7567d2
编写于
12月 20, 2012
作者:
B
Boris Staal
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Eager loading made to use relation's in_clause_length instead of host's one (fixes #8474)
上级
42b555dc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
8 deletion
+13
-8
actionmailer/CHANGELOG.md
actionmailer/CHANGELOG.md
+5
-0
activerecord/lib/active_record/associations/preloader/association.rb
...d/lib/active_record/associations/preloader/association.rb
+1
-1
activerecord/test/cases/associations/eager_test.rb
activerecord/test/cases/associations/eager_test.rb
+7
-7
未找到文件。
actionmailer/CHANGELOG.md
浏览文件 @
1a7567d2
## Rails 4.0.0 (unreleased) ##
## Rails 4.0.0 (unreleased) ##
*
Eager loading made to use relation's in_clause_length instead of host's one.
Fix #8474
*Boris Staal*
*
Explicit multipart messages no longer set the order of the MIME parts.
*
Explicit multipart messages no longer set the order of the MIME parts.
*Nate Berkopec*
*Nate Berkopec*
...
...
activerecord/lib/active_record/associations/preloader/association.rb
浏览文件 @
1a7567d2
...
@@ -76,7 +76,7 @@ def associated_records_by_owner
...
@@ -76,7 +76,7 @@ def associated_records_by_owner
else
else
# Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
# Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
# Make several smaller queries if necessary or make one query if the adapter supports it
# Make several smaller queries if necessary or make one query if the adapter supports it
sliced
=
owner_keys
.
each_slice
(
model
.
connection
.
in_clause_length
||
owner_keys
.
size
)
sliced
=
owner_keys
.
each_slice
(
klass
.
connection
.
in_clause_length
||
owner_keys
.
size
)
records
=
sliced
.
map
{
|
slice
|
records_for
(
slice
).
to_a
}.
flatten
records
=
sliced
.
map
{
|
slice
|
records_for
(
slice
).
to_a
}.
flatten
end
end
...
...
activerecord/test/cases/associations/eager_test.rb
浏览文件 @
1a7567d2
...
@@ -93,31 +93,31 @@ def test_duplicate_middle_objects
...
@@ -93,31 +93,31 @@ def test_duplicate_middle_objects
end
end
def
test_preloading_has_many_in_multiple_queries_with_more_ids_than_database_can_handle
def
test_preloading_has_many_in_multiple_queries_with_more_ids_than_database_can_handle
Pos
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
5
)
Commen
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
5
)
posts
=
Post
.
all
.
merge!
(
:includes
=>
:comments
).
to_a
posts
=
Post
.
all
.
merge!
(
:includes
=>
:comments
).
to_a
assert_equal
11
,
posts
.
size
assert_equal
11
,
posts
.
size
end
end
def
test_preloading_has_many_in_one_queries_when_database_has_no_limit_on_ids_it_can_handle
def
test_preloading_has_many_in_one_queries_when_database_has_no_limit_on_ids_it_can_handle
Pos
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
nil
)
Commen
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
nil
)
posts
=
Post
.
all
.
merge!
(
:includes
=>
:comments
).
to_a
posts
=
Post
.
all
.
merge!
(
:includes
=>
:comments
).
to_a
assert_equal
11
,
posts
.
size
assert_equal
11
,
posts
.
size
end
end
def
test_preloading_habtm_in_multiple_queries_with_more_ids_than_database_can_handle
def
test_preloading_habtm_in_multiple_queries_with_more_ids_than_database_can_handle
Pos
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
5
)
Commen
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
5
)
posts
=
Post
.
all
.
merge!
(
:includes
=>
:categories
).
to_a
posts
=
Post
.
all
.
merge!
(
:includes
=>
:categories
).
to_a
assert_equal
11
,
posts
.
size
assert_equal
11
,
posts
.
size
end
end
def
test_preloading_habtm_in_one_queries_when_database_has_no_limit_on_ids_it_can_handle
def
test_preloading_habtm_in_one_queries_when_database_has_no_limit_on_ids_it_can_handle
Pos
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
nil
)
Commen
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
nil
)
posts
=
Post
.
all
.
merge!
(
:includes
=>
:categories
).
to_a
posts
=
Post
.
all
.
merge!
(
:includes
=>
:categories
).
to_a
assert_equal
11
,
posts
.
size
assert_equal
11
,
posts
.
size
end
end
def
test_load_associated_records_in_one_query_when_adapter_has_no_limit
def
test_load_associated_records_in_one_query_when_adapter_has_no_limit
Pos
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
nil
)
Commen
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
nil
)
post
=
posts
(
:welcome
)
post
=
posts
(
:welcome
)
assert_queries
(
2
)
do
assert_queries
(
2
)
do
...
@@ -126,7 +126,7 @@ def test_load_associated_records_in_one_query_when_adapter_has_no_limit
...
@@ -126,7 +126,7 @@ def test_load_associated_records_in_one_query_when_adapter_has_no_limit
end
end
def
test_load_associated_records_in_several_queries_when_many_ids_passed
def
test_load_associated_records_in_several_queries_when_many_ids_passed
Pos
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
1
)
Commen
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
1
)
post1
,
post2
=
posts
(
:welcome
),
posts
(
:thinking
)
post1
,
post2
=
posts
(
:welcome
),
posts
(
:thinking
)
assert_queries
(
3
)
do
assert_queries
(
3
)
do
...
@@ -135,7 +135,7 @@ def test_load_associated_records_in_several_queries_when_many_ids_passed
...
@@ -135,7 +135,7 @@ def test_load_associated_records_in_several_queries_when_many_ids_passed
end
end
def
test_load_associated_records_in_one_query_when_a_few_ids_passed
def
test_load_associated_records_in_one_query_when_a_few_ids_passed
Pos
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
3
)
Commen
t
.
connection
.
expects
(
:in_clause_length
).
at_least_once
.
returns
(
3
)
post
=
posts
(
:welcome
)
post
=
posts
(
:welcome
)
assert_queries
(
2
)
do
assert_queries
(
2
)
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录