Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3b27a485
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,发现更多精彩内容 >>
提交
3b27a485
编写于
6月 23, 2009
作者:
E
Emilio Tagua
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactoring: Calculations now use construct_finder_sql instead they own method.
上级
b9088dce
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
25 deletion
+8
-25
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/base.rb
+4
-6
activerecord/lib/active_record/calculations.rb
activerecord/lib/active_record/calculations.rb
+4
-19
未找到文件。
activerecord/lib/active_record/base.rb
浏览文件 @
3b27a485
...
...
@@ -1696,11 +1696,9 @@ def arel_table(table = table_name)
@arel_table
=
Arel
::
Table
.
new
(
table
)
end
def
construct_finder_arel
(
options
)
scope
=
scope
(
:find
)
def
construct_finder_arel
(
options
,
scope
=
scope
(
:find
))
# TODO add lock to Arel
arel_table
(
table_name
).
arel_table
(
options
[
:from
]
||
table_name
).
join
(
construct_join
(
options
[
:joins
],
scope
)).
where
(
construct_conditions
(
options
[
:conditions
],
scope
)).
project
(
options
[
:select
]
||
(
scope
&&
scope
[
:select
])
||
default_select
(
options
[
:joins
]
||
(
scope
&&
scope
[
:joins
]))).
...
...
@@ -1711,8 +1709,8 @@ def construct_finder_arel(options)
)
end
def
construct_finder_sql
(
options
)
construct_finder_arel
(
options
).
to_sql
def
construct_finder_sql
(
options
,
scope
=
scope
(
:find
)
)
construct_finder_arel
(
options
,
scope
).
to_sql
end
def
construct_join
(
joins
,
scope
)
...
...
activerecord/lib/active_record/calculations.rb
浏览文件 @
3b27a485
...
...
@@ -169,11 +169,11 @@ def execute_simple_calculation(operation, column_name, options) #:nodoc:
(
column_name
==
:all
?
"*"
:
column_name
.
to_s
))
end
value
=
construct_
calculation_are
l
(
options
.
merge
(
value
=
construct_
finder_sq
l
(
options
.
merge
(
:select
=>
operation
==
'count'
?
column
.
count
(
options
[
:distinct
])
:
column
.
send
(
operation
)
))
)
,
nil
)
type_cast_calculated_value
(
connection
.
select_value
(
value
.
to_sql
),
column_for
(
column_name
),
operation
)
type_cast_calculated_value
(
connection
.
select_value
(
value
),
column_for
(
column_name
),
operation
)
end
def
execute_grouped_calculation
(
operation
,
column_name
,
options
)
#:nodoc:
...
...
@@ -194,7 +194,7 @@ def execute_grouped_calculation(operation, column_name, options) #:nodoc:
options
[
:select
]
<<
",
#{
group_field
}
AS
#{
group_alias
}
"
calculated_data
=
connection
.
select_all
(
construct_
calculation_arel
(
options
).
to_sql
)
calculated_data
=
connection
.
select_all
(
construct_
finder_sql
(
options
,
nil
)
)
if
association
key_ids
=
calculated_data
.
collect
{
|
row
|
row
[
group_alias
]
}
...
...
@@ -212,21 +212,6 @@ def execute_grouped_calculation(operation, column_name, options) #:nodoc:
end
protected
def
construct_calculation_arel
(
options
)
scope
=
scope
(
:find
)
arel_table
(
options
[
:from
]
||
table_name
).
join
(
options
[
:joins
]).
where
(
options
[
:conditions
]).
project
(
options
[
:select
]).
group
(
construct_group
(
options
[
:group
],
options
[
:having
],
scope
)).
order
(
options
[
:order
].
to_s
).
take
(
construct_limit
(
options
,
scope
)).
skip
(
construct_offset
(
options
,
scope
)
)
end
def
construct_count_options_from_args
(
*
args
)
options
=
{}
column_name
=
:all
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录