Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ec63fdcf
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,发现更多精彩内容 >>
提交
ec63fdcf
编写于
1月 19, 2010
作者:
P
Pratik Naik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Get rid of construct_count_options_from_args
上级
73b179eb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
33 deletion
+4
-33
activerecord/lib/active_record/associations/association_collection.rb
.../lib/active_record/associations/association_collection.rb
+4
-3
activerecord/lib/active_record/relation/calculation_methods.rb
...erecord/lib/active_record/relation/calculation_methods.rb
+0
-30
未找到文件。
activerecord/lib/active_record/associations/association_collection.rb
浏览文件 @
ec63fdcf
...
...
@@ -176,14 +176,15 @@ def sum(*args)
# be used for the query. If no +:counter_sql+ was supplied, but +:finder_sql+ was set, the
# descendant's +construct_sql+ method will have set :counter_sql automatically.
# Otherwise, construct options and pass them with scope to the target class's +count+.
def
count
(
*
args
)
def
count
(
column_name
=
nil
,
options
=
{}
)
if
@reflection
.
options
[
:counter_sql
]
@reflection
.
klass
.
count_by_sql
(
@counter_sql
)
else
column_name
,
options
=
@reflection
.
klass
.
scoped
.
send
(
:construct_count_options_from_args
,
*
args
)
column_name
,
options
=
nil
,
column_name
if
column_name
.
is_a?
(
Hash
)
if
@reflection
.
options
[
:uniq
]
# This is needed because 'SELECT count(DISTINCT *)..' is not valid SQL.
column_name
=
"
#{
@reflection
.
quoted_table_name
}
.
#{
@reflection
.
klass
.
primary_key
}
"
if
column_name
==
:all
column_name
=
"
#{
@reflection
.
quoted_table_name
}
.
#{
@reflection
.
klass
.
primary_key
}
"
unless
column_name
options
.
merge!
(
:distinct
=>
true
)
end
...
...
activerecord/lib/active_record/relation/calculation_methods.rb
浏览文件 @
ec63fdcf
...
...
@@ -180,32 +180,6 @@ def execute_grouped_calculation(operation, column_name) #:nodoc:
end
end
def
construct_count_options_from_args
(
*
args
)
options
=
{}
column_name
=
:all
# Handles count(), count(:column), count(:distinct => true), count(:column, :distinct => true)
case
args
.
size
when
0
select
=
get_projection_name_from_chained_relations
column_name
=
select
if
select
!~
/(,|\*)/
when
1
if
args
[
0
].
is_a?
(
Hash
)
select
=
get_projection_name_from_chained_relations
column_name
=
select
if
select
!~
/(,|\*)/
options
=
args
[
0
]
else
column_name
=
args
[
0
]
end
when
2
column_name
,
options
=
args
else
raise
ArgumentError
,
"Unexpected parameters passed to count():
#{
args
.
inspect
}
"
end
[
column_name
||
:all
,
options
]
end
# Converts the given keys to the value that the database adapter returns as
# a usable column name:
#
...
...
@@ -243,10 +217,6 @@ def type_cast_using_column(value, column)
column
?
column
.
type_cast
(
value
)
:
value
end
def
get_projection_name_from_chained_relations
@select_values
.
join
(
", "
)
if
@select_values
.
present?
end
def
select_for_count
if
@select_values
.
present?
select
=
@select_values
.
join
(
", "
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录