Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
50823452
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,发现更多精彩内容 >>
提交
50823452
编写于
5月 21, 2013
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove bind values for where clauses that were removed
上级
d2d5f15f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
9 deletion
+18
-9
activerecord/lib/active_record/relation/merger.rb
activerecord/lib/active_record/relation/merger.rb
+8
-9
activerecord/test/cases/relations_test.rb
activerecord/test/cases/relations_test.rb
+10
-0
未找到文件。
activerecord/lib/active_record/relation/merger.rb
浏览文件 @
50823452
...
@@ -99,13 +99,15 @@ def merge_joins
...
@@ -99,13 +99,15 @@ def merge_joins
end
end
def
merge_multi_values
def
merge_multi_values
rhs_wheres
=
values
[
:where
]
||
[]
lhs_wheres
=
relation
.
where_values
lhs_wheres
=
relation
.
where_values
rhs_wheres
=
values
[
:where
]
||
[]
lhs_binds
=
relation
.
bind_values
rhs_binds
=
values
[
:bind
]
||
[]
_
,
kept
=
partition_overwrites
(
lhs_wheres
,
rhs_wheres
)
removed
,
kept
=
partition_overwrites
(
lhs_wheres
,
rhs_wheres
)
relation
.
where_values
=
kept
+
rhs_wheres
relation
.
where_values
=
kept
+
rhs_wheres
relation
.
bind_values
=
merged
_binds
relation
.
bind_values
=
filter_binds
(
lhs_binds
,
removed
)
+
rhs
_binds
if
values
[
:reordering
]
if
values
[
:reordering
]
# override any order specified in the original relation
# override any order specified in the original relation
...
@@ -128,12 +130,9 @@ def merge_single_values
...
@@ -128,12 +130,9 @@ def merge_single_values
end
end
end
end
def
merged_binds
def
filter_binds
(
lhs_binds
,
removed_wheres
)
if
values
[
:bind
]
set
=
Set
.
new
removed_wheres
.
map
{
|
x
|
x
.
left
.
name
}
(
relation
.
bind_values
+
values
[
:bind
]).
uniq
(
&
:first
)
lhs_binds
.
dup
.
delete_if
{
|
col
,
_
|
set
.
include?
col
.
name
}
else
relation
.
bind_values
end
end
end
# Remove equalities from the existing relation with a LHS which is
# Remove equalities from the existing relation with a LHS which is
...
...
activerecord/test/cases/relations_test.rb
浏览文件 @
50823452
...
@@ -1546,4 +1546,14 @@ def __omg__
...
@@ -1546,4 +1546,14 @@ def __omg__
assert
merged
.
to_sql
.
include?
(
"wtf"
)
assert
merged
.
to_sql
.
include?
(
"wtf"
)
assert
merged
.
to_sql
.
include?
(
"bbq"
)
assert
merged
.
to_sql
.
include?
(
"bbq"
)
end
end
def
test_merging_removes_rhs_bind_parameters
left
=
Post
.
where
(
id:
Arel
::
Nodes
::
BindParam
.
new
(
'?'
))
column
=
Post
.
columns_hash
[
'id'
]
left
.
bind_values
+=
[[
column
,
20
]]
right
=
Post
.
where
(
id:
10
)
merged
=
left
.
merge
(
right
)
assert_equal
[],
merged
.
bind_values
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录