Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
9675c7da
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,发现更多精彩内容 >>
提交
9675c7da
编写于
7月 15, 2013
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
reorder bind parameters when merging relations
上级
d345ed40
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
43 addition
and
3 deletion
+43
-3
activerecord/lib/active_record/relation/merger.rb
activerecord/lib/active_record/relation/merger.rb
+18
-2
activerecord/test/cases/relation_test.rb
activerecord/test/cases/relation_test.rb
+8
-1
activerecord/test/cases/relations_test.rb
activerecord/test/cases/relations_test.rb
+17
-0
未找到文件。
activerecord/lib/active_record/relation/merger.rb
浏览文件 @
9675c7da
...
...
@@ -97,13 +97,29 @@ def merge_joins
def
merge_multi_values
lhs_wheres
=
relation
.
where_values
rhs_wheres
=
values
[
:where
]
||
[]
lhs_binds
=
relation
.
bind_values
rhs_binds
=
values
[
:bind
]
||
[]
removed
,
kept
=
partition_overwrites
(
lhs_wheres
,
rhs_wheres
)
relation
.
where_values
=
kept
+
rhs_wheres
relation
.
bind_values
=
filter_binds
(
lhs_binds
,
removed
)
+
rhs_binds
where_values
=
kept
+
rhs_wheres
bind_values
=
filter_binds
(
lhs_binds
,
removed
)
+
rhs_binds
conn
=
relation
.
klass
.
connection
bviter
=
bind_values
.
each
.
with_index
where_values
.
map!
do
|
node
|
if
Arel
::
Nodes
::
Equality
===
node
&&
Arel
::
Nodes
::
BindParam
===
node
.
right
(
column
,
_
),
i
=
bviter
.
next
substitute
=
conn
.
substitute_at
column
,
i
Arel
::
Nodes
::
Equality
.
new
(
node
.
left
,
substitute
)
else
node
end
end
relation
.
where_values
=
where_values
relation
.
bind_values
=
bind_values
if
values
[
:reordering
]
# override any order specified in the original relation
...
...
activerecord/test/cases/relation_test.rb
浏览文件 @
9675c7da
...
...
@@ -9,6 +9,9 @@ class RelationTest < ActiveRecord::TestCase
fixtures
:posts
,
:comments
,
:authors
class
FakeKlass
<
Struct
.
new
(
:table_name
,
:name
)
def
self
.
connection
Post
.
connection
end
end
def
test_construction
...
...
@@ -204,6 +207,10 @@ class FakeKlass < Struct.new(:table_name, :name)
def
arel_table
Post
.
arel_table
end
def
connection
Post
.
connection
end
end
def
relation
...
...
@@ -295,7 +302,7 @@ def relation
assert_equal
({
foo:
'bar'
},
relation
.
create_with_value
)
end
test
'merge!'
do
def
test_merge!
assert
relation
.
merge!
(
where: :foo
).
equal?
(
relation
)
assert_equal
[
:foo
],
relation
.
where_values
end
...
...
activerecord/test/cases/relations_test.rb
浏览文件 @
9675c7da
...
...
@@ -1556,4 +1556,21 @@ def test_merging_keeps_lhs_bind_parameters
merged
=
left
.
merge
(
right
)
assert_equal
binds
,
merged
.
bind_values
end
def
test_merging_reorders_bind_params
post
=
Post
.
first
id_column
=
Post
.
columns_hash
[
'id'
]
title_column
=
Post
.
columns_hash
[
'title'
]
bv
=
Post
.
connection
.
substitute_at
id_column
,
0
right
=
Post
.
where
(
id:
bv
)
right
.
bind_values
+=
[[
id_column
,
post
.
id
]]
left
=
Post
.
where
(
title:
bv
)
left
.
bind_values
+=
[[
title_column
,
post
.
title
]]
merged
=
left
.
merge
(
right
)
assert_equal
post
,
merged
.
first
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录