Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
b8aebb02
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,发现更多精彩内容 >>
提交
b8aebb02
编写于
7月 23, 2013
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
acually get the actual source reflection :cry::gun:
上级
2aa20b36
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
9 deletion
+17
-9
activerecord/lib/active_record/reflection.rb
activerecord/lib/active_record/reflection.rb
+14
-7
activerecord/test/cases/reflection_test.rb
activerecord/test/cases/reflection_test.rb
+3
-2
未找到文件。
activerecord/lib/active_record/reflection.rb
浏览文件 @
b8aebb02
...
...
@@ -371,6 +371,12 @@ def polymorphic?
VALID_AUTOMATIC_INVERSE_MACROS
=
[
:has_many
,
:has_one
,
:belongs_to
]
INVALID_AUTOMATIC_INVERSE_OPTIONS
=
[
:conditions
,
:through
,
:polymorphic
,
:foreign_key
]
protected
def
actual_source_reflection
# FIXME: this is a horrible name
self
end
private
# Attempts to find the inverse association name automatically.
# If it cannot find a suitable inverse association name, it returns
...
...
@@ -588,15 +594,10 @@ def nested?
# We want to use the klass from this reflection, rather than just delegate straight to
# the source_reflection, because the source_reflection may be polymorphic. We still
# need to respect the source_reflection's :primary_key option, though.
def
association_primary_key
(
k
lass
=
nil
)
def
association_primary_key
(
target_c
lass
=
nil
)
# Get the "actual" source reflection if the immediate source reflection has a
# source reflection itself
source_reflection
=
self
.
source_reflection
while
source_reflection
.
source_reflection
source_reflection
=
source_reflection
.
source_reflection
end
source_reflection
.
options
[
:primary_key
]
||
primary_key
(
klass
||
self
.
klass
)
actual_source_reflection
.
options
[
:primary_key
]
||
primary_key
(
klass
||
self
.
klass
)
end
# Gets an array of possible <tt>:through</tt> source reflection names in both singular and plural form.
...
...
@@ -675,6 +676,12 @@ def check_validity!
check_validity_of_inverse!
end
protected
def
actual_source_reflection
# FIXME: this is a horrible name
source_reflection
.
actual_source_reflection
end
private
def
derive_class_name
# get the class_name of the belongs_to association of the through reflection
...
...
activerecord/test/cases/reflection_test.rb
浏览文件 @
b8aebb02
...
...
@@ -252,8 +252,9 @@ def test_association_primary_key_raises_when_missing_primary_key
reflection
=
ActiveRecord
::
Reflection
::
AssociationReflection
.
new
(
:fuu
,
:edge
,
nil
,
{},
Author
)
assert_raises
(
ActiveRecord
::
UnknownPrimaryKey
)
{
reflection
.
association_primary_key
}
through
=
ActiveRecord
::
Reflection
::
ThroughReflection
.
new
(
:fuu
,
:edge
,
nil
,
{},
Author
)
through
.
stubs
(
:source_reflection
).
returns
(
stub_everything
(
:options
=>
{},
:class_name
=>
'Edge'
))
through
=
Class
.
new
(
ActiveRecord
::
Reflection
::
ThroughReflection
)
{
define_method
(
:source_reflection
)
{
reflection
}
}.
new
(
:fuu
,
:edge
,
nil
,
{},
Author
)
assert_raises
(
ActiveRecord
::
UnknownPrimaryKey
)
{
through
.
association_primary_key
}
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录