Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
5e36c505
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,发现更多精彩内容 >>
提交
5e36c505
编写于
11月 17, 2015
作者:
A
Andrew White
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22257 from yui-knk/fix_merge_to_not_call_to_proc_for_hash
Make `AR::SpawnMethods#merge!` to check an arg is a Proc
上级
788d7bce
a98475c2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
3 deletion
+9
-3
activerecord/lib/active_record/relation/spawn_methods.rb
activerecord/lib/active_record/relation/spawn_methods.rb
+5
-3
activerecord/test/cases/relation_test.rb
activerecord/test/cases/relation_test.rb
+4
-0
未找到文件。
activerecord/lib/active_record/relation/spawn_methods.rb
浏览文件 @
5e36c505
...
@@ -12,6 +12,7 @@ def spawn #:nodoc:
...
@@ -12,6 +12,7 @@ def spawn #:nodoc:
# Merges in the conditions from <tt>other</tt>, if <tt>other</tt> is an ActiveRecord::Relation.
# Merges in the conditions from <tt>other</tt>, if <tt>other</tt> is an ActiveRecord::Relation.
# Returns an array representing the intersection of the resulting records with <tt>other</tt>, if <tt>other</tt> is an array.
# Returns an array representing the intersection of the resulting records with <tt>other</tt>, if <tt>other</tt> is an array.
#
# Post.where(published: true).joins(:comments).merge( Comment.where(spam: false) )
# Post.where(published: true).joins(:comments).merge( Comment.where(spam: false) )
# # Performs a single join query with both where conditions.
# # Performs a single join query with both where conditions.
#
#
...
@@ -37,11 +38,12 @@ def merge(other)
...
@@ -37,11 +38,12 @@ def merge(other)
end
end
def
merge!
(
other
)
# :nodoc:
def
merge!
(
other
)
# :nodoc:
if
!
other
.
is_a?
(
Relation
)
&&
other
.
respond_to?
(
:to_proc
)
if
other
.
is_a?
(
Hash
)
Relation
::
HashMerger
.
new
(
self
,
other
).
merge
elsif
other
.
respond_to?
(
:to_proc
)
instance_exec
(
&
other
)
instance_exec
(
&
other
)
else
else
klass
=
other
.
is_a?
(
Hash
)
?
Relation
::
HashMerger
:
Relation
::
Merger
Relation
::
Merger
.
new
(
self
,
other
).
merge
klass
.
new
(
self
,
other
).
merge
end
end
end
end
...
...
activerecord/test/cases/relation_test.rb
浏览文件 @
5e36c505
...
@@ -24,6 +24,10 @@ def self.table_name
...
@@ -24,6 +24,10 @@ def self.table_name
def
self
.
sanitize_sql_for_order
(
sql
)
def
self
.
sanitize_sql_for_order
(
sql
)
sql
sql
end
end
def
self
.
arel_table
Post
.
arel_table
end
end
end
def
test_construction
def
test_construction
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录