Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3e1ef198
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,发现更多精彩内容 >>
提交
3e1ef198
编写于
8月 19, 2009
作者:
E
Emilio Tagua
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove useless InnerJoinDependency, inner joins are performed through
Arel::InnerJoin.
上级
b3427286
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
22 deletion
+5
-22
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations.rb
+4
-21
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/base.rb
+1
-1
未找到文件。
activerecord/lib/active_record/associations.rb
浏览文件 @
3e1ef198
...
...
@@ -1787,7 +1787,7 @@ def joined_tables(options)
if
array_of_strings?
(
merged_joins
)
tables_in_string
(
merged_joins
.
join
(
' '
))
else
join_dependency
=
ActiveRecord
::
Associations
::
ClassMethods
::
Inner
JoinDependency
.
new
(
self
,
merged_joins
,
nil
)
join_dependency
=
ActiveRecord
::
Associations
::
ClassMethods
::
JoinDependency
.
new
(
self
,
merged_joins
,
nil
)
join_dependency
.
join_associations
.
collect
{
|
join_association
|
[
join_association
.
aliased_join_table_name
,
join_association
.
aliased_table_name
]}.
flatten
.
compact
end
else
...
...
@@ -2216,17 +2216,13 @@ def relation
end
end
def
join_type
Arel
::
OuterJoin
end
def
join_relation
(
joining_relation
,
join
=
nil
)
if
relation
.
is_a?
(
Array
)
joining_relation
.
joins
(
relation
.
first
,
join_type
).
on
(
association_join
.
first
).
joins
(
relation
.
last
,
join_type
).
on
(
association_join
.
last
)
joins
(
relation
.
first
,
Arel
::
OuterJoin
).
on
(
association_join
.
first
).
joins
(
relation
.
last
,
Arel
::
OuterJoin
).
on
(
association_join
.
last
)
else
joining_relation
.
joins
(
relation
,
join_type
).
on
(
association_join
)
joining_relation
.
joins
(
relation
,
Arel
::
OuterJoin
).
on
(
association_join
)
end
end
...
...
@@ -2267,19 +2263,6 @@ def interpolate_sql(sql)
end
end
end
class
InnerJoinDependency
<
JoinDependency
# :nodoc:
protected
def
build_join_association
(
reflection
,
parent
)
InnerJoinAssociation
.
new
(
reflection
,
self
,
parent
)
end
class
InnerJoinAssociation
<
JoinAssociation
def
join_type
Arel
::
InnerJoin
end
end
end
end
end
end
activerecord/lib/active_record/base.rb
浏览文件 @
3e1ef198
...
...
@@ -1812,7 +1812,7 @@ def merge_joins(*joins)
end
def
build_association_joins
(
joins
)
join_dependency
=
ActiveRecord
::
Associations
::
ClassMethods
::
Inner
JoinDependency
.
new
(
self
,
joins
,
nil
)
join_dependency
=
ActiveRecord
::
Associations
::
ClassMethods
::
JoinDependency
.
new
(
self
,
joins
,
nil
)
relation
=
arel_table
.
relation
join_dependency
.
join_associations
.
map
{
|
association
|
if
association
.
relation
.
is_a?
(
Array
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录