Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a58cafeb
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,发现更多精彩内容 >>
提交
a58cafeb
编写于
10月 30, 2012
作者:
A
Alexis Bernard
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix find_in_batches against string IDs when start option is not specified.
上级
6a6909dc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
2 deletion
+15
-2
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+4
-0
activerecord/lib/active_record/relation/batches.rb
activerecord/lib/active_record/relation/batches.rb
+2
-2
activerecord/test/cases/batches_test.rb
activerecord/test/cases/batches_test.rb
+9
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
a58cafeb
## Rails 4.0.0 (unreleased) ##
*
Fix
`find_in_batches`
crashing when IDs are strings and start option is not specified.
*Alexis Bernard*
*
`AR::Base#attributes_before_type_cast`
now returns unserialized values for serialized attributes.
*Nikita Afanasenko*
...
...
activerecord/lib/active_record/relation/batches.rb
浏览文件 @
a58cafeb
...
...
@@ -62,11 +62,11 @@ def find_in_batches(options = {})
ActiveRecord
::
Base
.
logger
.
warn
(
"Scoped order and limit are ignored, it's forced to be batch order and batch size"
)
end
start
=
options
.
delete
(
:start
)
||
0
start
=
options
.
delete
(
:start
)
batch_size
=
options
.
delete
(
:batch_size
)
||
1000
relation
=
relation
.
reorder
(
batch_order
).
limit
(
batch_size
)
records
=
relation
.
where
(
table
[
primary_key
].
gteq
(
start
))
.
to_a
records
=
start
?
relation
.
where
(
table
[
primary_key
].
gteq
(
start
)).
to_a
:
relation
.
to_a
while
records
.
any?
records_size
=
records
.
size
...
...
activerecord/test/cases/batches_test.rb
浏览文件 @
a58cafeb
...
...
@@ -136,4 +136,13 @@ def test_find_in_batches_should_use_any_column_as_primary_key
assert_equal
nick_order_subscribers
[
1
..-
1
].
map
(
&
:id
),
subscribers
.
map
(
&
:id
)
end
def
test_find_in_batches_should_use_any_column_as_primary_key_when_start_is_not_specified
Subscriber
.
count
(
'nick'
)
# preheat arel's table cache
assert_queries
(
Subscriber
.
count
+
1
)
do
Subscriber
.
find_each
(
:batch_size
=>
1
)
do
|
subscriber
|
assert_kind_of
Subscriber
,
subscriber
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录