Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
929c2261
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,发现更多精彩内容 >>
提交
929c2261
编写于
12月 11, 2013
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Mark the arguments needed by activerecord-deprecated_finders with a TODO
上级
e1ce0059
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
2 deletion
+20
-2
activerecord/lib/active_record/associations/collection_association.rb
.../lib/active_record/associations/collection_association.rb
+2
-0
activerecord/lib/active_record/associations/collection_proxy.rb
...record/lib/active_record/associations/collection_proxy.rb
+2
-0
activerecord/lib/active_record/null_relation.rb
activerecord/lib/active_record/null_relation.rb
+4
-2
activerecord/lib/active_record/relation/calculations.rb
activerecord/lib/active_record/relation/calculations.rb
+12
-0
未找到文件。
activerecord/lib/active_record/associations/collection_association.rb
浏览文件 @
929c2261
...
...
@@ -194,6 +194,8 @@ def destroy_all
# Count all records using SQL. Construct options and pass them with
# scope to the target class's +count+.
def
count
(
column_name
=
nil
,
count_options
=
{})
# TODO: Remove count_options argument as soon we remove support to
# activerecord-deprecated_finders.
column_name
,
count_options
=
nil
,
column_name
if
column_name
.
is_a?
(
Hash
)
relation
=
scope
...
...
activerecord/lib/active_record/associations/collection_proxy.rb
浏览文件 @
929c2261
...
...
@@ -670,6 +670,8 @@ def distinct
# # #<Pet id: 3, name: "Choo-Choo", person_id: 1>
# # ]
def
count
(
column_name
=
nil
,
options
=
{})
# TODO: Remove options argument as soon we remove support to
# activerecord-deprecated_finders.
@association
.
count
(
column_name
,
options
)
end
...
...
activerecord/lib/active_record/null_relation.rb
浏览文件 @
929c2261
...
...
@@ -50,8 +50,10 @@ def sum(*)
0
end
def
calculate
(
_operation
,
_column_name
,
_options
=
{})
if
_operation
==
:count
def
calculate
(
operation
,
_column_name
,
_options
=
{})
# TODO: Remove _options argument as soon we remove support to
# activerecord-deprecated_finders.
if
operation
==
:count
0
else
nil
...
...
activerecord/lib/active_record/relation/calculations.rb
浏览文件 @
929c2261
...
...
@@ -20,6 +20,8 @@ module Calculations
# Person.group(:city).count
# # => { 'Rome' => 5, 'Paris' => 3 }
def
count
(
column_name
=
nil
,
options
=
{})
# TODO: Remove options argument as soon we remove support to
# activerecord-deprecated_finders.
column_name
,
options
=
nil
,
column_name
if
column_name
.
is_a?
(
Hash
)
calculate
(
:count
,
column_name
,
options
)
end
...
...
@@ -29,6 +31,8 @@ def count(column_name = nil, options = {})
#
# Person.average(:age) # => 35.8
def
average
(
column_name
,
options
=
{})
# TODO: Remove options argument as soon we remove support to
# activerecord-deprecated_finders.
calculate
(
:average
,
column_name
,
options
)
end
...
...
@@ -38,6 +42,8 @@ def average(column_name, options = {})
#
# Person.minimum(:age) # => 7
def
minimum
(
column_name
,
options
=
{})
# TODO: Remove options argument as soon we remove support to
# activerecord-deprecated_finders.
calculate
(
:minimum
,
column_name
,
options
)
end
...
...
@@ -47,6 +53,8 @@ def minimum(column_name, options = {})
#
# Person.maximum(:age) # => 93
def
maximum
(
column_name
,
options
=
{})
# TODO: Remove options argument as soon we remove support to
# activerecord-deprecated_finders.
calculate
(
:maximum
,
column_name
,
options
)
end
...
...
@@ -91,6 +99,8 @@ def sum(*args)
#
# Person.sum("2 * age")
def
calculate
(
operation
,
column_name
,
options
=
{})
# TODO: Remove options argument as soon we remove support to
# activerecord-deprecated_finders.
if
column_name
.
is_a?
(
Symbol
)
&&
attribute_alias?
(
column_name
)
column_name
=
attribute_alias
(
column_name
)
end
...
...
@@ -182,6 +192,8 @@ def has_include?(column_name)
end
def
perform_calculation
(
operation
,
column_name
,
options
=
{})
# TODO: Remove options argument as soon we remove support to
# activerecord-deprecated_finders.
operation
=
operation
.
to_s
.
downcase
# If #count is used with #distinct / #uniq it is considered distinct. (eg. relation.distinct.count)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录