Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f3f65282
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,发现更多精彩内容 >>
提交
f3f65282
编写于
5月 23, 2017
作者:
R
Ryuta Kamizono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix crashing on circular left join references with scoping
Follow up of #25702.
上级
3a628b93
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
3 deletion
+10
-3
activerecord/lib/active_record/reflection.rb
activerecord/lib/active_record/reflection.rb
+1
-1
activerecord/test/cases/scoping/relation_scoping_test.rb
activerecord/test/cases/scoping/relation_scoping_test.rb
+9
-2
未找到文件。
activerecord/lib/active_record/reflection.rb
浏览文件 @
f3f65282
...
@@ -199,7 +199,7 @@ def join_scopes(table, predicate_builder) # :nodoc:
...
@@ -199,7 +199,7 @@ def join_scopes(table, predicate_builder) # :nodoc:
def
klass_join_scope
(
table
,
predicate_builder
)
# :nodoc:
def
klass_join_scope
(
table
,
predicate_builder
)
# :nodoc:
if
klass
.
current_scope
if
klass
.
current_scope
klass
.
current_scope
.
clone
.
tap
{
|
scope
|
klass
.
current_scope
.
clone
.
tap
{
|
scope
|
scope
.
joins_values
=
[]
scope
.
joins_values
=
scope
.
left_outer_joins_values
=
[].
freeze
}
}
else
else
relation
=
ActiveRecord
::
Relation
.
create
(
relation
=
ActiveRecord
::
Relation
.
create
(
...
...
activerecord/test/cases/scoping/relation_scoping_test.rb
浏览文件 @
f3f65282
...
@@ -229,12 +229,19 @@ def test_current_scope_does_not_pollute_sibling_subclasses
...
@@ -229,12 +229,19 @@ def test_current_scope_does_not_pollute_sibling_subclasses
end
end
end
end
def
test_circular_joins_with_
current_scope
_does_not_crash
def
test_circular_joins_with_
scoping
_does_not_crash
posts
=
Post
.
joins
(
comments: :post
).
scoping
do
posts
=
Post
.
joins
(
comments: :post
).
scoping
do
Post
.
current_scope
.
first
(
10
)
Post
.
first
(
10
)
end
end
assert_equal
posts
,
Post
.
joins
(
comments: :post
).
first
(
10
)
assert_equal
posts
,
Post
.
joins
(
comments: :post
).
first
(
10
)
end
end
def
test_circular_left_joins_with_scoping_does_not_crash
posts
=
Post
.
left_joins
(
comments: :post
).
scoping
do
Post
.
first
(
10
)
end
assert_equal
posts
,
Post
.
left_joins
(
comments: :post
).
first
(
10
)
end
end
end
class
NestedRelationScopingTest
<
ActiveRecord
::
TestCase
class
NestedRelationScopingTest
<
ActiveRecord
::
TestCase
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录