Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
fa464681
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,发现更多精彩内容 >>
提交
fa464681
编写于
2月 09, 2012
作者:
R
Raghunadh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactored code
上级
e6c98b83
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
3 addition
and
3 deletion
+3
-3
activerecord/lib/active_record/railties/databases.rake
activerecord/lib/active_record/railties/databases.rake
+1
-1
activerecord/lib/active_record/relation/calculations.rb
activerecord/lib/active_record/relation/calculations.rb
+1
-1
activerecord/test/cases/nested_attributes_test.rb
activerecord/test/cases/nested_attributes_test.rb
+1
-1
未找到文件。
activerecord/lib/active_record/railties/databases.rake
浏览文件 @
fa464681
...
@@ -542,7 +542,7 @@ namespace :railties do
...
@@ -542,7 +542,7 @@ namespace :railties do
# desc "Copies missing migrations from Railties (e.g. engines). You can specify Railties to use with FROM=railtie1,railtie2"
# desc "Copies missing migrations from Railties (e.g. engines). You can specify Railties to use with FROM=railtie1,railtie2"
task
:migrations
=>
:'db:load_config'
do
task
:migrations
=>
:'db:load_config'
do
to_load
=
ENV
[
'FROM'
].
blank?
?
:all
:
ENV
[
'FROM'
].
split
(
","
).
map
{
|
n
|
n
.
strip
}
to_load
=
ENV
[
'FROM'
].
blank?
?
:all
:
ENV
[
'FROM'
].
split
(
","
).
map
{
|
n
|
n
.
strip
}
railties
=
ActiveSupport
::
OrderedHash
.
new
railties
=
{}
Rails
.
application
.
railties
.
all
do
|
railtie
|
Rails
.
application
.
railties
.
all
do
|
railtie
|
next
unless
to_load
==
:all
||
to_load
.
include?
(
railtie
.
railtie_name
)
next
unless
to_load
==
:all
||
to_load
.
include?
(
railtie
.
railtie_name
)
...
...
activerecord/lib/active_record/relation/calculations.rb
浏览文件 @
fa464681
...
@@ -286,7 +286,7 @@ def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
...
@@ -286,7 +286,7 @@ def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
key_records
=
Hash
[
key_records
.
map
{
|
r
|
[
r
.
id
,
r
]
}]
key_records
=
Hash
[
key_records
.
map
{
|
r
|
[
r
.
id
,
r
]
}]
end
end
ActiveSupport
::
Ordered
Hash
[
calculated_data
.
map
do
|
row
|
Hash
[
calculated_data
.
map
do
|
row
|
key
=
group_columns
.
map
{
|
aliaz
,
column
|
key
=
group_columns
.
map
{
|
aliaz
,
column
|
type_cast_calculated_value
(
row
[
aliaz
],
column
)
type_cast_calculated_value
(
row
[
aliaz
],
column
)
}
}
...
...
activerecord/test/cases/nested_attributes_test.rb
浏览文件 @
fa464681
...
@@ -663,7 +663,7 @@ def test_should_ignore_new_associated_records_if_a_reject_if_proc_returns_false
...
@@ -663,7 +663,7 @@ def test_should_ignore_new_associated_records_if_a_reject_if_proc_returns_false
end
end
def
test_should_sort_the_hash_by_the_keys_before_building_new_associated_models
def
test_should_sort_the_hash_by_the_keys_before_building_new_associated_models
attributes
=
ActiveSupport
::
OrderedHash
.
new
attributes
=
{}
attributes
[
'123726353'
]
=
{
:name
=>
'Grace OMalley'
}
attributes
[
'123726353'
]
=
{
:name
=>
'Grace OMalley'
}
attributes
[
'2'
]
=
{
:name
=>
'Privateers Greed'
}
# 2 is lower then 123726353
attributes
[
'2'
]
=
{
:name
=>
'Privateers Greed'
}
# 2 is lower then 123726353
@pirate
.
send
(
association_setter
,
attributes
)
@pirate
.
send
(
association_setter
,
attributes
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录