Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
02a43f9f
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,发现更多精彩内容 >>
提交
02a43f9f
编写于
3月 12, 2011
作者:
J
Jon Leighton
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve some TODO comments which I decided did not need anything done
上级
39a6f4f2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
9 deletion
+5
-9
activerecord/lib/active_record/associations/alias_tracker.rb
activerecord/lib/active_record/associations/alias_tracker.rb
+1
-1
activerecord/lib/active_record/associations/through_association.rb
...ord/lib/active_record/associations/through_association.rb
+4
-7
activerecord/lib/active_record/relation/query_methods.rb
activerecord/lib/active_record/relation/query_methods.rb
+0
-1
未找到文件。
activerecord/lib/active_record/associations/alias_tracker.rb
浏览文件 @
02a43f9f
...
...
@@ -16,7 +16,7 @@ def initialize(table_joins = [])
def
aliased_table_for
(
table_name
,
aliased_name
=
nil
)
table_alias
=
aliased_name_for
(
table_name
,
aliased_name
)
if
table_alias
==
table_name
# TODO: Is this conditional necessary?
if
table_alias
==
table_name
Arel
::
Table
.
new
(
table_name
)
else
Arel
::
Table
.
new
(
table_name
).
alias
(
table_alias
)
...
...
activerecord/lib/active_record/associations/through_association.rb
浏览文件 @
02a43f9f
...
...
@@ -9,12 +9,8 @@ module ThroughAssociation #:nodoc:
# We merge in these scopes for two reasons:
#
# 1. To get the scope_for_create on through reflection when building associated objects
# 2. To get the type conditions for any STI classes in the chain
#
# TODO: Don't actually do this. Getting the creation attributes for a non-nested through
# is a special case. The rest (STI conditions) should be handled by the reflection
# itself.
# 1. To get the default_scope conditions for any of the other reflections in the chain
# 2. To get the type conditions for any STI models in the chain
def
target_scope
scope
=
super
chain
[
1
..-
1
].
each
do
|
reflection
|
...
...
@@ -61,7 +57,8 @@ def construct_join_attributes(*records)
end
end
# TODO: Think about this in the context of nested associations
# Note: this does not capture all cases, for example it would be crazy to try to
# properly support stale-checking for nested associations.
def
stale_state
if
through_reflection
.
macro
==
:belongs_to
owner
[
through_reflection
.
foreign_key
].
to_s
...
...
activerecord/lib/active_record/relation/query_methods.rb
浏览文件 @
02a43f9f
...
...
@@ -260,7 +260,6 @@ def build_joins(manager, joins)
join_list
)
# TODO: Necessary?
join_nodes
.
each
do
|
join
|
join_dependency
.
alias_tracker
.
aliased_name_for
(
join
.
left
.
name
.
downcase
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录