Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3a39de67
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,发现更多精彩内容 >>
提交
3a39de67
编写于
1月 03, 2013
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8734 from jstirk/master-column_writer_to_i_errors
Fix undefined method `to_i' introduced in 3.2.9
上级
a664686e
8d98c83b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
37 addition
and
8 deletion
+37
-8
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+6
-1
activerecord/lib/active_record/connection_adapters/column.rb
activerecord/lib/active_record/connection_adapters/column.rb
+5
-1
activerecord/test/cases/associations/belongs_to_associations_test.rb
...d/test/cases/associations/belongs_to_associations_test.rb
+12
-0
activerecord/test/cases/column_test.rb
activerecord/test/cases/column_test.rb
+14
-6
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
3a39de67
## Rails 4.0.0 (unreleased) ##
*
Rename
`update_attributes`
to
`update`
, keep
`update_attributes`
as an alias for
`update`
method.
*
Fix undefined method
`to_i`
when calling
`new`
on a scope that uses an Array.
Fixes #8718, #8734.
*Jason Stirk*
*
Rename
`update_attributes`
to
`update`
, keep
`update_attributes`
as an alias for
`update`
method.
This is a soft-deprecation for
`update_attributes`
, although it will still work without any
deprecation message in 4.0 is recommended to start using
`update`
since
`update_attributes`
will be
deprecated and removed in future versions of Rails.
...
...
activerecord/lib/active_record/connection_adapters/column.rb
浏览文件 @
3a39de67
...
...
@@ -206,7 +206,11 @@ def value_to_integer(value)
when
TrueClass
,
FalseClass
value
?
1
:
0
else
value
.
to_i
if
value
.
respond_to?
(
:to_i
)
value
.
to_i
else
nil
end
end
end
...
...
activerecord/test/cases/associations/belongs_to_associations_test.rb
浏览文件 @
3a39de67
...
...
@@ -63,6 +63,13 @@ def test_natural_assignment
assert_equal
apple
.
id
,
citibank
.
firm_id
end
def
test_id_assignment
apple
=
Firm
.
create
(
"name"
=>
"Apple"
)
citibank
=
Account
.
create
(
"credit_limit"
=>
10
)
citibank
.
firm_id
=
apple
assert_nil
citibank
.
firm_id
end
def
test_natural_assignment_with_primary_key
apple
=
Firm
.
create
(
"name"
=>
"Apple"
)
citibank
=
Client
.
create
(
"name"
=>
"Primary key client"
)
...
...
@@ -567,6 +574,11 @@ def test_attributes_are_being_set_when_initialized_from_belongs_to_association_w
assert_equal
new_firm
.
name
,
"Apple"
end
def
test_attributes_are_set_without_error_when_initialized_from_belongs_to_association_with_array_in_where_clause
new_account
=
Account
.
where
(
:credit_limit
=>
[
50
,
60
]).
new
assert_nil
new_account
.
credit_limit
end
def
test_reassigning_the_parent_id_updates_the_object
client
=
companies
(
:second_client
)
...
...
activerecord/test/cases/column_test.rb
浏览文件 @
3a39de67
require
"cases/helper"
require
'models/company'
module
ActiveRecord
module
ConnectionAdapters
...
...
@@ -40,13 +41,20 @@ def test_type_cast_integer
def
test_type_cast_non_integer_to_integer
column
=
Column
.
new
(
"field"
,
nil
,
"integer"
)
assert_raises
(
NoMethodError
)
do
column
.
type_cast
([])
end
assert_nil
column
.
type_cast
([
1
,
2
])
assert_nil
column
.
type_cast
({
1
=>
2
})
assert_nil
column
.
type_cast
((
1
..
2
))
end
assert_raises
(
NoMethodError
)
do
column
.
type_cast
(
Object
.
new
)
end
def
test_type_cast_activerecord_to_integer
column
=
Column
.
new
(
"field"
,
nil
,
"integer"
)
firm
=
Firm
.
create
(
:name
=>
'Apple'
)
assert_nil
column
.
type_cast
(
firm
)
end
def
test_type_cast_object_without_to_i_to_integer
column
=
Column
.
new
(
"field"
,
nil
,
"integer"
)
assert_nil
column
.
type_cast
(
Object
.
new
)
end
def
test_type_cast_time
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录