Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a98de931
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,发现更多精彩内容 >>
提交
a98de931
编写于
6月 01, 2017
作者:
M
Matthew Draper
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge pull request #29293 from kamipo/fix_sti_with_default_scope
Fix `default_scoped` with defined `default_scope` on STI model
上级
3fdf64a3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
2 deletion
+11
-2
activerecord/lib/active_record/scoping/default.rb
activerecord/lib/active_record/scoping/default.rb
+5
-1
activerecord/test/cases/inheritance_test.rb
activerecord/test/cases/inheritance_test.rb
+6
-1
未找到文件。
activerecord/lib/active_record/scoping/default.rb
浏览文件 @
a98de931
...
...
@@ -110,7 +110,11 @@ def build_default_scope(base_rel = nil)
if
default_scope_override
# The user has defined their own default scope method, so call that
evaluate_default_scope
{
default_scope
}
evaluate_default_scope
do
if
scope
=
default_scope
(
base_rel
||=
relation
).
merge
(
scope
)
end
end
elsif
default_scopes
.
any?
base_rel
||=
relation
evaluate_default_scope
do
...
...
activerecord/test/cases/inheritance_test.rb
浏览文件 @
a98de931
require
"cases/helper"
require
"models/author"
require
"models/company"
require
"models/membership"
require
"models/person"
require
"models/post"
require
"models/project"
...
...
@@ -29,7 +30,7 @@ def assign_store_full_sti_class(flag)
class
InheritanceTest
<
ActiveRecord
::
TestCase
include
InheritanceTestHelper
fixtures
:companies
,
:projects
,
:subscribers
,
:accounts
,
:vegetables
fixtures
:companies
,
:projects
,
:subscribers
,
:accounts
,
:vegetables
,
:memberships
def
test_class_with_store_full_sti_class_returns_full_name
with_store_full_sti_class
do
...
...
@@ -435,6 +436,10 @@ def test_scope_inherited_properly
assert_nothing_raised
{
Company
.
of_first_firm
}
assert_nothing_raised
{
Client
.
of_first_firm
}
end
def
test_inheritance_with_default_scope
assert_equal
1
,
SelectedMembership
.
count
(
:all
)
end
end
class
InheritanceComputeTypeTest
<
ActiveRecord
::
TestCase
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录