Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ec6dfdc8
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,发现更多精彩内容 >>
提交
ec6dfdc8
编写于
5月 02, 2019
作者:
R
Ryuta Kamizono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix eager loading associations with string joins not to raise NoMethodError
Fixes #34456.
上级
4511d4bf
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
23 addition
and
2 deletion
+23
-2
activerecord/lib/active_record/associations/join_dependency/join_association.rb
...e_record/associations/join_dependency/join_association.rb
+11
-2
activerecord/test/cases/associations/eager_test.rb
activerecord/test/cases/associations/eager_test.rb
+11
-0
activerecord/test/models/rating.rb
activerecord/test/models/rating.rb
+1
-0
未找到文件。
activerecord/lib/active_record/associations/join_dependency/join_association.rb
浏览文件 @
ec6dfdc8
...
...
@@ -44,8 +44,7 @@ def join_constraints(foreign_table, foreign_klass, join_type, alias_tracker)
unless
others
.
empty?
joins
.
concat
arel
.
join_sources
right
=
joins
.
last
.
right
right
.
expr
.
children
.
concat
(
others
)
append_constraints
(
joins
.
last
,
others
)
end
# The current table in this iteration becomes the foreign table in the next
...
...
@@ -65,6 +64,16 @@ def readonly?
@readonly
=
reflection
.
scope
&&
reflection
.
scope_for
(
base_klass
.
unscoped
).
readonly_value
end
private
def
append_constraints
(
join
,
constraints
)
if
join
.
is_a?
(
Arel
::
Nodes
::
StringJoin
)
join_string
=
table
.
create_and
(
constraints
.
unshift
(
join
.
left
))
join
.
left
=
Arel
.
sql
(
base_klass
.
connection
.
visitor
.
compile
(
join_string
))
else
join
.
right
.
expr
.
children
.
concat
(
constraints
)
end
end
end
end
end
...
...
activerecord/test/cases/associations/eager_test.rb
浏览文件 @
ec6dfdc8
...
...
@@ -101,6 +101,17 @@ def test_loading_polymorphic_association_with_mixed_table_conditions
assert_equal
[
taggings
(
:normal_comment_rating
)],
rating
.
taggings_without_tag
end
def
test_loading_association_with_string_joins
rating
=
Rating
.
first
assert_equal
[
taggings
(
:normal_comment_rating
)],
rating
.
taggings_with_no_tag
rating
=
Rating
.
preload
(
:taggings_with_no_tag
).
first
assert_equal
[
taggings
(
:normal_comment_rating
)],
rating
.
taggings_with_no_tag
rating
=
Rating
.
eager_load
(
:taggings_with_no_tag
).
first
assert_equal
[
taggings
(
:normal_comment_rating
)],
rating
.
taggings_with_no_tag
end
def
test_loading_with_scope_including_joins
member
=
Member
.
first
assert_equal
members
(
:groucho
),
member
...
...
activerecord/test/models/rating.rb
浏览文件 @
ec6dfdc8
...
...
@@ -4,4 +4,5 @@ class Rating < ActiveRecord::Base
belongs_to
:comment
has_many
:taggings
,
as: :taggable
has_many
:taggings_without_tag
,
->
{
left_joins
(
:tag
).
where
(
"tags.id"
:
nil
)
},
as: :taggable
,
class_name:
"Tagging"
has_many
:taggings_with_no_tag
,
->
{
joins
(
"LEFT OUTER JOIN tags ON tags.id = taggings.tag_id"
).
where
(
"tags.id"
:
nil
)
},
as: :taggable
,
class_name:
"Tagging"
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录