Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f3741506
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,体验更适合开发者的 AI 搜索 >>
提交
f3741506
编写于
12月 27, 2009
作者:
P
Pratik Naik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure Model.scoped adds type conditions for STI models
上级
c6258ee3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
12 deletion
+16
-12
activerecord/lib/active_record/named_scope.rb
activerecord/lib/active_record/named_scope.rb
+1
-0
activerecord/lib/active_record/relation.rb
activerecord/lib/active_record/relation.rb
+14
-11
activerecord/test/cases/finder_test.rb
activerecord/test/cases/finder_test.rb
+1
-1
未找到文件。
activerecord/lib/active_record/named_scope.rb
浏览文件 @
f3741506
...
...
@@ -28,6 +28,7 @@ def scoped(options = {}, &block)
else
if
!
scoped?
(
:find
)
relation
=
arel_table
relation
=
relation
.
where
(
type_condition
)
if
finder_needs_type_condition?
else
relation
=
construct_finder_arel
include_associations
=
scope
(
:find
,
:include
)
...
...
activerecord/lib/active_record/relation.rb
浏览文件 @
f3741506
...
...
@@ -49,19 +49,22 @@ def on(join)
end
def
joins
(
join
,
join_type
=
nil
)
join
=
case
join
when
String
@relation
.
join
(
join
)
when
Hash
,
Array
,
Symbol
if
@klass
.
send
(
:array_of_strings?
,
join
)
@relation
.
join
(
join
.
join
(
' '
))
else
@relation
.
join
(
@klass
.
send
(
:build_association_joins
,
join
))
end
return
self
if
join
.
blank?
join_relation
=
case
join
when
String
@relation
.
join
(
join
)
when
Hash
,
Array
,
Symbol
if
@klass
.
send
(
:array_of_strings?
,
join
)
@relation
.
join
(
join
.
join
(
' '
))
else
@relation
.
join
(
join
,
join_type
)
@relation
.
join
(
@klass
.
send
(
:build_association_joins
,
join
))
end
else
@relation
.
join
(
join
,
join_type
)
end
create_new_relation
(
join
)
create_new_relation
(
join_relation
)
end
def
where
(
*
args
)
...
...
activerecord/test/cases/finder_test.rb
浏览文件 @
f3741506
...
...
@@ -291,7 +291,7 @@ def test_find_on_hash_conditions_with_hashed_table_name
end
def
test_find_with_hash_conditions_on_joined_table
firms
=
Firm
.
all
:joins
=>
:account
,
:conditions
=>
{
:accounts
=>
{
:credit_limit
=>
50
}}
firms
=
Firm
.
joins
(
:account
).
where
(
:accounts
=>
{
:credit_limit
=>
50
})
assert_equal
1
,
firms
.
size
assert_equal
companies
(
:first_firm
),
firms
.
first
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录