Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
542cb5c3
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,发现更多精彩内容 >>
提交
542cb5c3
编写于
11月 30, 2010
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix warnings, stop using global variables
上级
10b1887a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
7 deletion
+8
-7
activerecord/lib/active_record/relation/query_methods.rb
activerecord/lib/active_record/relation/query_methods.rb
+2
-4
activerecord/test/cases/nested_attributes_test.rb
activerecord/test/cases/nested_attributes_test.rb
+1
-2
activerecord/test/models/pet.rb
activerecord/test/models/pet.rb
+5
-1
未找到文件。
activerecord/lib/active_record/relation/query_methods.rb
浏览文件 @
542cb5c3
...
...
@@ -243,12 +243,10 @@ def build_where(opts, other = [])
end
def
build_joins
(
relation
,
joins
)
association_joins
=
[]
joins
=
joins
.
map
{
|
j
|
j
.
respond_to?
(
:strip
)
?
j
.
strip
:
j
}.
uniq
joins
.
each
do
|
join
|
association_joins
<<
join
if
[
Hash
,
Array
,
Symbol
].
include?
(
join
.
class
)
&&
!
array_of_strings?
(
join
)
association_joins
=
joins
.
find_all
do
|
join
|
[
Hash
,
Array
,
Symbol
].
include?
(
join
.
class
)
&&
!
array_of_strings?
(
join
)
end
stashed_association_joins
=
joins
.
grep
(
ActiveRecord
::
Associations
::
ClassMethods
::
JoinDependency
::
JoinAssociation
)
...
...
activerecord/test/cases/nested_attributes_test.rb
浏览文件 @
542cb5c3
...
...
@@ -848,13 +848,12 @@ def test_should_update_existing_records_with_non_standard_primary_key
def
test_attr_accessor_of_child_should_be_value_provided_during_update_attributes
@owner
=
owners
(
:ashley
)
@pet1
=
pets
(
:chew
)
assert_equal
nil
,
$current_user
attributes
=
{
:pets_attributes
=>
{
"1"
=>
{
:id
=>
@pet1
.
id
,
:name
=>
"Foo2"
,
:current_user
=>
"John"
,
:_destroy
=>
true
}}}
@owner
.
update_attributes
(
attributes
)
assert_equal
'John'
,
$after_destroy_callback
_output
assert_equal
'John'
,
Pet
.
after_destroy
_output
end
end
...
...
activerecord/test/models/pet.rb
浏览文件 @
542cb5c3
...
...
@@ -6,8 +6,12 @@ class Pet < ActiveRecord::Base
belongs_to
:owner
,
:touch
=>
true
has_many
:toys
class
<<
self
attr_accessor
:after_destroy_output
end
after_destroy
do
|
record
|
$after_destroy_callback
_output
=
record
.
current_user
Pet
.
after_destroy
_output
=
record
.
current_user
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录