Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e5299c1e
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,发现更多精彩内容 >>
提交
e5299c1e
编写于
9月 23, 2013
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
hm:t preloading will respect order set on the RHS association
上级
6f9ea581
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
68 addition
and
8 deletion
+68
-8
activerecord/lib/active_record/associations/preloader.rb
activerecord/lib/active_record/associations/preloader.rb
+1
-1
activerecord/lib/active_record/associations/preloader/association.rb
...d/lib/active_record/associations/preloader/association.rb
+22
-2
activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
..._record/associations/preloader/has_and_belongs_to_many.rb
+2
-2
activerecord/lib/active_record/associations/preloader/has_many_through.rb
.../active_record/associations/preloader/has_many_through.rb
+3
-1
activerecord/lib/active_record/associations/preloader/through_association.rb
...tive_record/associations/preloader/through_association.rb
+25
-2
activerecord/test/cases/associations/has_many_through_associations_test.rb
.../cases/associations/has_many_through_associations_test.rb
+15
-0
未找到文件。
activerecord/lib/active_record/associations/preloader.rb
浏览文件 @
e5299c1e
...
@@ -127,7 +127,7 @@ def preloaders_for_hash(association, records)
...
@@ -127,7 +127,7 @@ def preloaders_for_hash(association, records)
loaders
=
preloaders_for_one
parent
,
records
loaders
=
preloaders_for_one
parent
,
records
recs
=
loaders
.
flat_map
(
&
:
target
_records
).
uniq
recs
=
loaders
.
flat_map
(
&
:
preloaded
_records
).
uniq
loaders
.
concat
Array
.
wrap
(
child
).
flat_map
{
|
assoc
|
loaders
.
concat
Array
.
wrap
(
child
).
flat_map
{
|
assoc
|
preloaders_on
assoc
,
recs
preloaders_on
assoc
,
recs
}
}
...
...
activerecord/lib/active_record/associations/preloader/association.rb
浏览文件 @
e5299c1e
...
@@ -17,6 +17,7 @@ def initialize(klass, owners, reflection, preload_scope)
...
@@ -17,6 +17,7 @@ def initialize(klass, owners, reflection, preload_scope)
@owners_by_key
=
nil
@owners_by_key
=
nil
@type_caster
=
IDENTITY_CASTER
@type_caster
=
IDENTITY_CASTER
@associated_records_by_owner
=
nil
@associated_records_by_owner
=
nil
@loaded
=
false
end
end
def
run
def
run
...
@@ -71,20 +72,36 @@ def options
...
@@ -71,20 +72,36 @@ def options
reflection
.
options
reflection
.
options
end
end
def
target_records
def
preloaded_records1
associated_records_by_owner
.
values
.
flatten
associated_records_by_owner
.
values
.
flatten
end
end
def
preloaded_records
if
owners
.
first
.
association
(
reflection
.
name
).
loaded?
[]
else
associated_records_by_owner
.
values
.
flatten
end
end
def
loaded?
@loaded
end
private
private
def
associated_records_by_owner
def
associated_records_by_owner
@loaded
=
true
return
@associated_records_by_owner
if
@associated_records_by_owner
return
@associated_records_by_owner
if
@associated_records_by_owner
owners_map
=
owners_by_key
owners_map
=
owners_by_key
owner_keys
=
owners_map
.
keys
.
compact
owner_keys
=
owners_map
.
keys
.
compact
# Each record may have multiple owners, and vice-versa
# Each record may have multiple owners, and vice-versa
records_by_owner
=
Hash
[
owners
.
map
{
|
owner
|
[
owner
,
[]]
}]
records_by_owner
=
Hash
.
new
do
|
h
,
owner
|
h
[
owner
]
=
[]
end
if
klass
&&
owner_keys
.
any?
if
klass
&&
owner_keys
.
any?
# Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
# Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
...
@@ -104,6 +121,9 @@ def associated_records_by_owner
...
@@ -104,6 +121,9 @@ def associated_records_by_owner
end
end
end
end
end
end
owners
.
each_with_object
(
records_by_owner
)
do
|
owner
,
h
|
h
[
owner
]
||=
[]
end
@associated_records_by_owner
=
records_by_owner
@associated_records_by_owner
=
records_by_owner
end
end
...
...
activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
浏览文件 @
e5299c1e
...
@@ -35,10 +35,10 @@ def association_key
...
@@ -35,10 +35,10 @@ def association_key
# actual records, ensuring that we don't create more than one instances of the same
# actual records, ensuring that we don't create more than one instances of the same
# record
# record
def
associated_records_by_owner
def
associated_records_by_owner
return
@
records_by_owner
if
@
records_by_owner
return
@
associated_records_by_owner
if
@associated_
records_by_owner
records
=
{}
records
=
{}
@records_by_owner
=
super
.
each_value
do
|
rows
|
@
associated_
records_by_owner
=
super
.
each_value
do
|
rows
|
rows
.
map!
{
|
row
|
records
[
row
[
klass
.
primary_key
]]
||=
klass
.
instantiate
(
row
)
}
rows
.
map!
{
|
row
|
records
[
row
[
klass
.
primary_key
]]
||=
klass
.
instantiate
(
row
)
}
end
end
end
end
...
...
activerecord/lib/active_record/associations/preloader/has_many_through.rb
浏览文件 @
e5299c1e
...
@@ -5,13 +5,15 @@ class HasManyThrough < CollectionAssociation #:nodoc:
...
@@ -5,13 +5,15 @@ class HasManyThrough < CollectionAssociation #:nodoc:
include
ThroughAssociation
include
ThroughAssociation
def
associated_records_by_owner
def
associated_records_by_owner
return
@associated_records_by_owner
if
@associated_records_by_owner
records_by_owner
=
super
records_by_owner
=
super
if
reflection_scope
.
distinct_value
if
reflection_scope
.
distinct_value
records_by_owner
.
each_value
{
|
records
|
records
.
uniq!
}
records_by_owner
.
each_value
{
|
records
|
records
.
uniq!
}
end
end
records_by_owner
@associated_records_by_owner
=
records_by_owner
end
end
end
end
end
end
...
...
activerecord/lib/active_record/associations/preloader/through_association.rb
浏览文件 @
e5299c1e
...
@@ -12,6 +12,10 @@ def source_reflection
...
@@ -12,6 +12,10 @@ def source_reflection
end
end
def
associated_records_by_owner
def
associated_records_by_owner
@loaded
=
true
return
@associated_records_by_owner
if
@associated_records_by_owner
left_loader
=
Preloader
.
new
(
owners
,
left_loader
=
Preloader
.
new
(
owners
,
through_reflection
.
name
,
through_reflection
.
name
,
through_scope
)
through_scope
)
...
@@ -36,12 +40,31 @@ def associated_records_by_owner
...
@@ -36,12 +40,31 @@ def associated_records_by_owner
preloader
=
Preloader
.
new
(
middle_records
,
preloader
=
Preloader
.
new
(
middle_records
,
source_reflection
.
name
,
source_reflection
.
name
,
reflection_scope
)
reflection_scope
)
preloader
.
run
preloader
.
run
through_records
.
each_with_object
({})
{
|
(
lhs
,
middles
,
assoc
),
h
|
middle_to_pl
=
preloader
.
preloaders
.
each_with_object
({})
do
|
pl
,
h
|
h
[
lhs
]
=
middles
.
flat_map
{
|
r
|
pl
.
owners
.
each
{
|
middle
|
h
[
middle
]
=
pl
}
end
@associated_records_by_owner
=
through_records
.
each_with_object
({})
{
|
(
lhs
,
middles
,
assoc
),
h
|
x
=
middle_to_pl
[
middles
.
first
]
rhs_records
=
middles
.
flat_map
{
|
r
|
r
.
send
(
source_reflection
.
name
)
r
.
send
(
source_reflection
.
name
)
}.
compact
}.
compact
if
x
&&
x
.
loaded?
rs
=
rhs_records
.
sort_by
{
|
rhs
|
x
.
preloaded_records1
.
index
(
rhs
)
}
else
rs
=
rhs_records
end
h
[
lhs
]
=
rs
}
}
end
end
...
...
activerecord/test/cases/associations/has_many_through_associations_test.rb
浏览文件 @
e5299c1e
...
@@ -41,6 +41,21 @@ def make_model(name)
...
@@ -41,6 +41,21 @@ def make_model(name)
Class
.
new
(
ActiveRecord
::
Base
)
{
define_singleton_method
(
:name
)
{
name
}
}
Class
.
new
(
ActiveRecord
::
Base
)
{
define_singleton_method
(
:name
)
{
name
}
}
end
end
def
test_ordered_habtm
person_prime
=
Class
.
new
(
ActiveRecord
::
Base
)
do
def
self
.
name
;
'Person'
;
end
has_many
:readers
has_many
:posts
,
->
{
order
(
'posts.id DESC'
)
},
:through
=>
:readers
end
posts
=
person_prime
.
includes
(
:posts
).
first
.
posts
assert_operator
posts
.
length
,
:
>
,
1
posts
.
each_cons
(
2
)
do
|
left
,
right
|
assert_operator
left
.
id
,
:
>
,
right
.
id
end
end
def
test_singleton_has_many_through
def
test_singleton_has_many_through
book
=
make_model
"Book"
book
=
make_model
"Book"
subscription
=
make_model
"Subscription"
subscription
=
make_model
"Subscription"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录