Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1dbf1c80
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,发现更多精彩内容 >>
提交
1dbf1c80
编写于
8月 19, 2012
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7392 from ernie/real-fix-for-last-equality-wins-in-merge
Fix "last equality wins" logic in relation merge
上级
f9fc26e8
bf80522b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
14 deletion
+12
-14
activerecord/lib/active_record/relation/merger.rb
activerecord/lib/active_record/relation/merger.rb
+5
-10
activerecord/test/cases/relations_test.rb
activerecord/test/cases/relations_test.rb
+7
-4
未找到文件。
activerecord/lib/active_record/relation/merger.rb
浏览文件 @
1dbf1c80
...
...
@@ -97,18 +97,13 @@ def merged_wheres
merged_wheres
=
relation
.
where_values
+
values
[
:where
]
unless
relation
.
where_values
.
empty?
# Remove
duplicate ARel attributes
. Last one wins.
seen
=
Hash
.
new
{
|
h
,
table
|
h
[
table
]
=
{}
}
# Remove
equalities with duplicated left-hand
. Last one wins.
seen
=
{
}
merged_wheres
=
merged_wheres
.
reverse
.
reject
{
|
w
|
nuke
=
false
# We might have non-attributes on the left side of equality nodes,
# so we need to make sure they quack like an attribute.
if
w
.
respond_to?
(
:operator
)
&&
w
.
operator
==
:==
&&
w
.
left
.
respond_to?
(
:relation
)
name
=
w
.
left
.
name
table
=
w
.
left
.
relation
.
name
nuke
=
seen
[
table
][
name
]
seen
[
table
][
name
]
=
true
if
w
.
respond_to?
(
:operator
)
&&
w
.
operator
==
:==
nuke
=
seen
[
w
.
left
]
seen
[
w
.
left
]
=
true
end
nuke
}.
reverse
...
...
activerecord/test/cases/relations_test.rb
浏览文件 @
1dbf1c80
...
...
@@ -675,11 +675,14 @@ def test_relation_merging_with_arel_equalities_keeps_last_equality
assert_equal
[
developers
(
:poor_jamis
)],
devs
.
to_a
end
def
test_relation_merging_with_arel_equalities_
with_a_non_attribute_left_hand_ignores_non_attributes_when_discarding_equalities
def
test_relation_merging_with_arel_equalities_
keeps_last_equality_with_non_attribute_left_hand
salary_attr
=
Developer
.
arel_table
[
:salary
]
devs
=
Developer
.
where
(
salary_attr
.
eq
(
80000
)).
merge
(
Developer
.
where
(
salary_attr
.
eq
(
9000
)).
where
(
Arel
::
Nodes
::
NamedFunction
.
new
(
'abs'
,
[
salary_attr
]).
eq
(
9000
))
devs
=
Developer
.
where
(
Arel
::
Nodes
::
NamedFunction
.
new
(
'abs'
,
[
salary_attr
]).
eq
(
80000
)
).
merge
(
Developer
.
where
(
Arel
::
Nodes
::
NamedFunction
.
new
(
'abs'
,
[
salary_attr
]).
eq
(
9000
)
)
)
assert_equal
[
developers
(
:poor_jamis
)],
devs
.
to_a
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录