Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
8edfa8f8
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,发现更多精彩内容 >>
提交
8edfa8f8
编写于
1月 03, 2010
作者:
P
Pratik Naik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move Relation#spawn and Relation#merge to a separate module
上级
3eca0ab8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
51 addition
and
46 deletion
+51
-46
activerecord/lib/active_record.rb
activerecord/lib/active_record.rb
+1
-0
activerecord/lib/active_record/relation.rb
activerecord/lib/active_record/relation.rb
+1
-46
activerecord/lib/active_record/relation/spawn_methods.rb
activerecord/lib/active_record/relation/spawn_methods.rb
+49
-0
未找到文件。
activerecord/lib/active_record.rb
浏览文件 @
8edfa8f8
...
...
@@ -55,6 +55,7 @@ module ActiveRecord
autoload
:FinderMethods
autoload
:CalculationMethods
autoload
:PredicateBuilder
autoload
:SpawnMethods
end
autoload
:Base
...
...
activerecord/lib/active_record/relation.rb
浏览文件 @
8edfa8f8
module
ActiveRecord
class
Relation
include
QueryMethods
,
FinderMethods
,
CalculationMethods
include
QueryMethods
,
FinderMethods
,
CalculationMethods
,
SpawnMethods
delegate
:length
,
:collect
,
:map
,
:each
,
:all?
,
:to
=>
:to_a
...
...
@@ -28,41 +28,6 @@ def create!(*args, &block)
with_create_scope
{
@klass
.
create!
(
*
args
,
&
block
)
}
end
def
merge
(
r
)
raise
ArgumentError
,
"Cannot merge a
#{
r
.
klass
.
name
}
relation with
#{
@klass
.
name
}
relation"
if
r
.
klass
!=
@klass
merged_relation
=
spawn
(
table
).
eager_load
(
r
.
eager_load_associations
).
preload
(
r
.
preload_associations
).
includes
(
r
.
include_associations
)
merged_relation
.
readonly
=
r
.
readonly
[
self
.
relation
,
r
.
relation
].
each
do
|
arel
|
merged_relation
=
merged_relation
.
joins
(
arel
.
joins
(
arel
)).
group
(
arel
.
groupings
).
limit
(
arel
.
taken
).
offset
(
arel
.
skipped
).
select
(
arel
.
send
(
:select_clauses
)).
from
(
arel
.
sources
)
end
relation_order
=
r
.
send
(
:order_clause
)
merged_order
=
relation_order
.
present?
?
relation_order
:
order_clause
merged_relation
=
merged_relation
.
order
(
merged_order
)
merged_wheres
=
@relation
.
wheres
r
.
wheres
.
each
do
|
w
|
if
w
.
is_a?
(
Arel
::
Predicates
::
Equality
)
merged_wheres
=
merged_wheres
.
reject
{
|
p
|
p
.
is_a?
(
Arel
::
Predicates
::
Equality
)
&&
p
.
operand1
.
name
==
w
.
operand1
.
name
}
end
merged_wheres
<<
w
end
merged_relation
.
where
(
*
merged_wheres
)
end
alias
:&
:merge
def
respond_to?
(
method
,
include_private
=
false
)
return
true
if
@relation
.
respond_to?
(
method
,
include_private
)
||
Array
.
method_defined?
(
method
)
...
...
@@ -164,16 +129,6 @@ def reset
self
end
def
spawn
(
relation
=
@relation
)
relation
=
Relation
.
new
(
@klass
,
relation
)
relation
.
readonly
=
@readonly
relation
.
preload_associations
=
@preload_associations
relation
.
eager_load_associations
=
@eager_load_associations
relation
.
include_associations
=
@include_associations
relation
.
table
=
table
relation
end
def
table
@table
||=
Arel
::
Table
.
new
(
@klass
.
table_name
,
Arel
::
Sql
::
Engine
.
new
(
@klass
))
end
...
...
activerecord/lib/active_record/relation/spawn_methods.rb
0 → 100644
浏览文件 @
8edfa8f8
module
ActiveRecord
module
SpawnMethods
def
spawn
(
relation
=
@relation
)
relation
=
Relation
.
new
(
@klass
,
relation
)
relation
.
readonly
=
@readonly
relation
.
preload_associations
=
@preload_associations
relation
.
eager_load_associations
=
@eager_load_associations
relation
.
include_associations
=
@include_associations
relation
.
table
=
table
relation
end
def
merge
(
r
)
raise
ArgumentError
,
"Cannot merge a
#{
r
.
klass
.
name
}
relation with
#{
@klass
.
name
}
relation"
if
r
.
klass
!=
@klass
merged_relation
=
spawn
(
table
).
eager_load
(
r
.
eager_load_associations
).
preload
(
r
.
preload_associations
).
includes
(
r
.
include_associations
)
merged_relation
.
readonly
=
r
.
readonly
[
self
.
relation
,
r
.
relation
].
each
do
|
arel
|
merged_relation
=
merged_relation
.
joins
(
arel
.
joins
(
arel
)).
group
(
arel
.
groupings
).
limit
(
arel
.
taken
).
offset
(
arel
.
skipped
).
select
(
arel
.
send
(
:select_clauses
)).
from
(
arel
.
sources
)
end
relation_order
=
r
.
send
(
:order_clause
)
merged_order
=
relation_order
.
present?
?
relation_order
:
order_clause
merged_relation
=
merged_relation
.
order
(
merged_order
)
merged_wheres
=
@relation
.
wheres
r
.
wheres
.
each
do
|
w
|
if
w
.
is_a?
(
Arel
::
Predicates
::
Equality
)
merged_wheres
=
merged_wheres
.
reject
{
|
p
|
p
.
is_a?
(
Arel
::
Predicates
::
Equality
)
&&
p
.
operand1
.
name
==
w
.
operand1
.
name
}
end
merged_wheres
<<
w
end
merged_relation
.
where
(
*
merged_wheres
)
end
alias
:&
:merge
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录