Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
8244a45e
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,发现更多精彩内容 >>
提交
8244a45e
编写于
8月 14, 2017
作者:
R
Rafael França
提交者:
GitHub
8月 14, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #27609 from kamipo/fix_association_primary_key
Fix `reflection.association_primary_key` for `has_many` association
上级
efad56a0
b23e8696
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
21 deletion
+25
-21
activerecord/lib/active_record/associations/collection_association.rb
.../lib/active_record/associations/collection_association.rb
+7
-4
activerecord/lib/active_record/reflection.rb
activerecord/lib/active_record/reflection.rb
+4
-0
activerecord/test/cases/associations/has_many_associations_test.rb
...ord/test/cases/associations/has_many_associations_test.rb
+14
-3
activerecord/test/cases/associations/has_many_through_associations_test.rb
.../cases/associations/has_many_through_associations_test.rb
+0
-14
未找到文件。
activerecord/lib/active_record/associations/collection_association.rb
浏览文件 @
8244a45e
...
...
@@ -55,13 +55,16 @@ def ids_writer(ids)
pk_type
=
reflection
.
association_primary_key_type
ids
=
Array
(
ids
).
reject
(
&
:blank?
)
ids
.
map!
{
|
i
|
pk_type
.
cast
(
i
)
}
records
=
klass
.
where
(
reflection
.
association_primary_key
=>
ids
).
index_by
do
|
r
|
r
.
send
(
reflection
.
association_primary_key
)
primary_key
=
reflection
.
association_primary_key
records
=
klass
.
where
(
primary_key
=>
ids
).
index_by
do
|
r
|
r
.
public_send
(
primary_key
)
end
.
values_at
(
*
ids
).
compact
if
records
.
size
!=
ids
.
size
found_ids
=
records
.
map
{
|
record
|
record
.
send
(
reflection
.
association_
primary_key
)
}
found_ids
=
records
.
map
{
|
record
|
record
.
public_send
(
primary_key
)
}
not_found_ids
=
ids
-
found_ids
klass
.
all
.
raise_record_not_found_exception!
(
ids
,
records
.
size
,
ids
.
size
,
reflection
.
association_
primary_key
,
not_found_ids
)
klass
.
all
.
raise_record_not_found_exception!
(
ids
,
records
.
size
,
ids
.
size
,
primary_key
,
not_found_ids
)
else
replace
(
records
)
end
...
...
activerecord/lib/active_record/reflection.rb
浏览文件 @
8244a45e
...
...
@@ -715,6 +715,10 @@ def association_class
Associations
::
HasManyAssociation
end
end
def
association_primary_key
(
klass
=
nil
)
primary_key
(
klass
||
self
.
klass
)
end
end
class
HasOneReflection
<
AssociationReflection
# :nodoc:
...
...
activerecord/test/cases/associations/has_many_associations_test.rb
浏览文件 @
8244a45e
...
...
@@ -63,7 +63,7 @@ def test_custom_primary_key_on_new_record_should_fetch_with_query
assert_equal
2
,
subscriber
.
subscriptions
.
size
end
assert_equal
subscriber
.
subscriptions
,
Subscription
.
where
(
subscriber_id:
"webster132"
)
assert_equal
Subscription
.
where
(
subscriber_id:
"webster132"
),
subscriber
.
subscriptions
end
def
test_association_primary_key_on_new_record_should_fetch_with_query
...
...
@@ -74,12 +74,23 @@ def test_association_primary_key_on_new_record_should_fetch_with_query
assert_equal
1
,
author
.
essays
.
size
end
assert_equal
author
.
essays
,
Essay
.
where
(
writer_id:
"David"
)
assert_equal
Essay
.
where
(
writer_id:
"David"
),
author
.
essays
end
def
test_has_many_custom_primary_key
david
=
authors
(
:david
)
assert_equal
david
.
essays
,
Essay
.
where
(
writer_id:
"David"
)
assert_equal
Essay
.
where
(
writer_id:
"David"
),
david
.
essays
end
def
test_ids_on_unloaded_association_with_custom_primary_key
david
=
people
(
:david
)
assert_equal
Essay
.
where
(
writer_id:
"David"
).
pluck
(
:id
),
david
.
essay_ids
end
def
test_ids_on_loaded_association_with_custom_primary_key
david
=
people
(
:david
)
david
.
essays
.
load
assert_equal
Essay
.
where
(
writer_id:
"David"
).
pluck
(
:id
),
david
.
essay_ids
end
def
test_has_many_assignment_with_custom_primary_key
...
...
activerecord/test/cases/associations/has_many_through_associations_test.rb
浏览文件 @
8244a45e
...
...
@@ -880,13 +880,6 @@ def test_collection_singular_ids_setter_with_string_primary_keys
end
end
def
test_collection_singular_ids_setter_with_changed_primary_key
company
=
companies
(
:first_firm
)
client
=
companies
(
:first_client
)
company
.
clients_using_primary_key_ids
=
[
client
.
name
]
assert_equal
[
client
],
company
.
clients_using_primary_key
end
def
test_collection_singular_ids_setter_raises_exception_when_invalid_ids_set
company
=
companies
(
:rails_core
)
ids
=
[
Developer
.
first
.
id
,
-
9999
]
...
...
@@ -895,13 +888,6 @@ def test_collection_singular_ids_setter_raises_exception_when_invalid_ids_set
assert_equal
(
msg
,
e
.
message
)
end
def
test_collection_singular_ids_setter_raises_exception_when_invalid_ids_set_with_changed_primary_key
company
=
companies
(
:first_firm
)
ids
=
[
Client
.
first
.
name
,
"unknown client"
]
e
=
assert_raises
(
ActiveRecord
::
RecordNotFound
)
{
company
.
clients_using_primary_key_ids
=
ids
}
assert_match
(
/Couldn't find all Clients with 'name'/
,
e
.
message
)
end
def
test_collection_singular_ids_through_setter_raises_exception_when_invalid_ids_set
author
=
authors
(
:david
)
ids
=
[
categories
(
:general
).
name
,
"Unknown"
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录