Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
4a375a83
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,发现更多精彩内容 >>
提交
4a375a83
编写于
9月 24, 2015
作者:
S
Sean Griffin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #21550 from didacte/unscope-associations
ActiveRecord: use association's `unscope` when preloading
上级
3ae76f55
d25321b3
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
26 addition
and
1 deletion
+26
-1
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+4
-0
activerecord/lib/active_record/associations/preloader/association.rb
...d/lib/active_record/associations/preloader/association.rb
+1
-1
activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
...associations/has_and_belongs_to_many_associations_test.rb
+21
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
4a375a83
*
Correctly apply
`unscope`
when preloading through associations.
*Jimmy Bourassa*
*
Fixed taking precision into count when assigning a value to timestamp attribute
Timestamp column can have less precision than ruby timestamp
...
...
activerecord/lib/active_record/associations/preloader/association.rb
浏览文件 @
4a375a83
...
...
@@ -154,7 +154,7 @@ def build_scope
scope
.
where!
(
klass
.
table_name
=>
{
reflection
.
type
=>
model
.
base_class
.
sti_name
})
end
scope
.
unscope_values
=
Array
(
values
[
:unscope
])
scope
.
unscope_values
=
Array
(
values
[
:unscope
])
+
Array
(
preload_values
[
:unscope
])
klass
.
default_scoped
.
merge
(
scope
)
end
end
...
...
activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
浏览文件 @
4a375a83
...
...
@@ -95,6 +95,15 @@ def category
has_and_belongs_to_many
:projects
,
extend:
NamedExtension
end
class
ProjectUnscopingDavidDefaultScope
<
ActiveRecord
::
Base
self
.
table_name
=
'projects'
has_and_belongs_to_many
:developers
,
->
{
unscope
(
where:
'name'
)
},
class_name:
"LazyBlockDeveloperCalledDavid"
,
join_table:
"developers_projects"
,
foreign_key:
"project_id"
,
association_foreign_key:
"developer_id"
end
class
HasAndBelongsToManyAssociationsTest
<
ActiveRecord
::
TestCase
fixtures
:accounts
,
:companies
,
:categories
,
:posts
,
:categories_posts
,
:developers
,
:projects
,
:developers_projects
,
:parrots
,
:pirates
,
:parrots_pirates
,
:treasures
,
:price_estimates
,
:tags
,
:taggings
,
:computers
...
...
@@ -936,4 +945,16 @@ def test_alternate_database
end
assert_equal
1
,
professor
.
courses
.
count
end
def
test_habtm_scope_can_unscope
project
=
ProjectUnscopingDavidDefaultScope
.
new
project
.
save!
developer
=
LazyBlockDeveloperCalledDavid
.
new
(
name:
"Not David"
)
developer
.
save!
project
.
developers
<<
developer
projects
=
ProjectUnscopingDavidDefaultScope
.
includes
(
:developers
).
where
(
id:
project
.
id
)
assert_equal
1
,
projects
.
first
.
developers
.
size
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录