Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
438fce75
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,发现更多精彩内容 >>
提交
438fce75
编写于
1月 14, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into set_binds
* master: rm dup code Conflicts: activerecord/test/cases/relations_test.rb
上级
07a9f476
8d146c8b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
15 deletion
+2
-15
activerecord/test/cases/relation/merging_test.rb
activerecord/test/cases/relation/merging_test.rb
+2
-2
activerecord/test/cases/relations_test.rb
activerecord/test/cases/relations_test.rb
+0
-13
未找到文件。
activerecord/test/cases/relation/merging_test.rb
浏览文件 @
438fce75
...
...
@@ -81,10 +81,10 @@ def test_relation_merging_with_association
left
=
Post
.
where
(
title:
"omg"
).
where
(
comments_count:
1
)
right
=
Post
.
where
(
title:
"wtf"
).
where
(
title:
"bbq"
)
expected
=
[
left
.
where_values
[
1
]]
+
right
.
where
_values
expected
=
[
left
.
bind_values
[
1
]]
+
right
.
bind
_values
merged
=
left
.
merge
(
right
)
assert_equal
expected
,
merged
.
where
_values
assert_equal
expected
,
merged
.
bind
_values
assert
!
merged
.
to_sql
.
include?
(
"omg"
)
assert
merged
.
to_sql
.
include?
(
"wtf"
)
assert
merged
.
to_sql
.
include?
(
"bbq"
)
...
...
activerecord/test/cases/relations_test.rb
浏览文件 @
438fce75
...
...
@@ -1511,19 +1511,6 @@ def test_presence
assert
!
Post
.
all
.
respond_to?
(
:by_lifo
)
end
test
"merge collapses wheres from the LHS only"
do
left
=
Post
.
where
(
title:
"omg"
).
where
(
comments_count:
1
)
right
=
Post
.
where
(
title:
"wtf"
).
where
(
title:
"bbq"
)
expected
=
[
left
.
bind_values
[
1
]]
+
right
.
bind_values
merged
=
left
.
merge
(
right
)
assert_equal
expected
,
merged
.
bind_values
assert
!
merged
.
to_sql
.
include?
(
"omg"
)
assert
merged
.
to_sql
.
include?
(
"wtf"
)
assert
merged
.
to_sql
.
include?
(
"bbq"
)
end
def
test_unscope_removes_binds
left
=
Post
.
where
(
id:
Arel
::
Nodes
::
BindParam
.
new
(
'?'
))
column
=
Post
.
columns_hash
[
'id'
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录