Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a3f3fab7
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,发现更多精彩内容 >>
提交
a3f3fab7
编写于
12月 27, 2009
作者:
P
Pratik Naik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add relation.from as a temporary workaround until arel relation has .from option
上级
6f5e3a04
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
4 deletion
+15
-4
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/base.rb
+2
-1
activerecord/lib/active_record/relation.rb
activerecord/lib/active_record/relation.rb
+13
-3
未找到文件。
activerecord/lib/active_record/base.rb
浏览文件 @
a3f3fab7
...
...
@@ -1632,7 +1632,8 @@ def construct_finder_arel(options = {}, scope = scope(:find))
group
(
construct_group
(
options
[
:group
],
options
[
:having
],
scope
)).
order
(
construct_order
(
options
[
:order
],
scope
)).
limit
(
construct_limit
(
options
[
:limit
],
scope
)).
offset
(
construct_offset
(
options
[
:offset
],
scope
))
offset
(
construct_offset
(
options
[
:offset
],
scope
)).
from
(
options
[
:from
])
relation
=
relation
.
readonly
if
options
[
:readonly
]
...
...
activerecord/lib/active_record/relation.rb
浏览文件 @
a3f3fab7
...
...
@@ -28,6 +28,14 @@ def select(selects)
create_new_relation
(
@relation
.
project
(
selects
))
end
# TODO : This is temporary. We need .from in Arel.
attr_writer
:from
def
from
(
from
)
relation
=
create_new_relation
relation
.
from
=
from
relation
end
def
group
(
groups
)
create_new_relation
(
@relation
.
group
(
groups
))
end
...
...
@@ -94,7 +102,7 @@ def to_a
:conditions
=>
where_clause
,
:limit
=>
@relation
.
taken
,
:offset
=>
@relation
.
skipped
,
:from
=>
@
relation
.
send
(
:table_sql
,
Arel
::
Sql
::
TableReference
.
new
(
@relation
))
:from
=>
@
from
},
ActiveRecord
::
Associations
::
ClassMethods
::
JoinDependency
.
new
(
@klass
,
@eager_load_associations
,
nil
))
end
...
...
@@ -242,8 +250,10 @@ def find_some(ids)
end
end
def
create_new_relation
(
relation
,
readonly
=
@readonly
,
preload
=
@associations_to_preload
,
eager_load
=
@eager_load_associations
)
Relation
.
new
(
@klass
,
relation
,
readonly
,
preload
,
eager_load
)
def
create_new_relation
(
relation
=
@relation
,
readonly
=
@readonly
,
preload
=
@associations_to_preload
,
eager_load
=
@eager_load_associations
)
r
=
self
.
class
.
new
(
@klass
,
relation
,
readonly
,
preload
,
eager_load
)
r
.
from
=
@from
r
end
def
where_clause
(
join_string
=
"
\n\t
AND "
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录