Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
395c4f8d
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,发现更多精彩内容 >>
提交
395c4f8d
编写于
9月 04, 2016
作者:
E
Eileen M. Uchitelle
提交者:
GitHub
9月 04, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #26383 from kamipo/remove_unnecessary_count_for_collection_proxy
Remove unnecessary `count` method for collection proxy
上级
10fcf424
8ad03c97
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
36 deletion
+14
-36
activerecord/lib/active_record/associations/collection_association.rb
.../lib/active_record/associations/collection_association.rb
+0
-25
activerecord/lib/active_record/associations/collection_proxy.rb
...record/lib/active_record/associations/collection_proxy.rb
+14
-11
未找到文件。
activerecord/lib/active_record/associations/collection_association.rb
浏览文件 @
395c4f8d
...
...
@@ -183,31 +183,6 @@ def destroy_all
end
end
# Returns the number of records. If no arguments are given, it counts all
# columns using SQL. If one argument is given, it counts only the passed
# column using SQL. If a block is given, it counts the number of records
# yielding a true value.
def
count
(
column_name
=
nil
)
return
super
if
block_given?
relation
=
scope
if
association_scope
.
distinct_value
# This is needed because 'SELECT count(DISTINCT *)..' is not valid SQL.
column_name
||=
reflection
.
klass
.
primary_key
relation
=
relation
.
distinct
end
value
=
relation
.
count
(
column_name
)
limit
=
options
[
:limit
]
offset
=
options
[
:offset
]
if
limit
||
offset
[
[
value
-
offset
.
to_i
,
0
].
max
,
limit
.
to_i
].
min
else
value
end
end
# Removes +records+ from this association calling +before_remove+ and
# +after_remove+ callbacks.
#
...
...
activerecord/lib/active_record/associations/collection_proxy.rb
浏览文件 @
395c4f8d
...
...
@@ -743,6 +743,20 @@ def distinct
end
alias
uniq
distinct
def
calculate
(
operation
,
column_name
)
null_scope?
?
scope
.
calculate
(
operation
,
column_name
)
:
super
end
def
pluck
(
*
column_names
)
null_scope?
?
scope
.
pluck
(
*
column_names
)
:
super
end
##
# :method: count
#
# :call-seq:
# count(column_name = nil, &block)
#
# Count all records.
#
# class Person < ActiveRecord::Base
...
...
@@ -762,17 +776,6 @@ def distinct
# perform the count using Ruby.
#
# person.pets.count { |pet| pet.name.include?('-') } # => 2
def
count
(
column_name
=
nil
,
&
block
)
@association
.
count
(
column_name
,
&
block
)
end
def
calculate
(
operation
,
column_name
)
null_scope?
?
scope
.
calculate
(
operation
,
column_name
)
:
super
end
def
pluck
(
*
column_names
)
null_scope?
?
scope
.
pluck
(
*
column_names
)
:
super
end
# Returns the size of the collection. If the collection hasn't been loaded,
# it executes a <tt>SELECT COUNT(*)</tt> query. Else it calls <tt>collection.size</tt>.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录