Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3a661794
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,发现更多精彩内容 >>
提交
3a661794
编写于
3月 15, 2014
作者:
C
chrisfinne
提交者:
Rafael Mendonça França
3月 27, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
AR .persisted? throws SystemStackError for an unsaved model with a
custom primary_key that didn't save due to validation error
上级
eddcdb0f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
1 deletion
+16
-1
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+7
-0
activerecord/lib/active_record/transactions.rb
activerecord/lib/active_record/transactions.rb
+1
-1
activerecord/test/cases/transactions_test.rb
activerecord/test/cases/transactions_test.rb
+6
-0
activerecord/test/models/movie.rb
activerecord/test/models/movie.rb
+2
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
3a661794
*
Fixed error where .persisted? throws SystemStackError for an unsaved model with a
custom primary key that didn't save due to validation error.
Fixes #14393.
*Chris Finne*
*
Introduce
`validate`
as an alias for
`valid?`
.
This is more intuitive when you want to run validations but don't care about the return value.
...
...
activerecord/lib/active_record/transactions.rb
浏览文件 @
3a661794
...
...
@@ -369,7 +369,7 @@ def restore_transaction_record_state(force = false) #:nodoc:
@new_record
=
restore_state
[
:new_record
]
@destroyed
=
restore_state
[
:destroyed
]
if
restore_state
.
has_key?
(
:id
)
self
.
id
=
restore_state
[
:id
]
write_attribute
(
self
.
class
.
primary_key
,
restore_state
[
:id
])
else
@attributes
.
delete
(
self
.
class
.
primary_key
)
@attributes_cache
.
delete
(
self
.
class
.
primary_key
)
...
...
activerecord/test/cases/transactions_test.rb
浏览文件 @
3a661794
...
...
@@ -5,6 +5,7 @@
require
'models/book'
require
'models/author'
require
'models/post'
require
'models/movie'
class
TransactionTest
<
ActiveRecord
::
TestCase
self
.
use_transactional_fixtures
=
false
...
...
@@ -14,6 +15,11 @@ def setup
@first
,
@second
=
Topic
.
find
(
1
,
2
).
sort_by
{
|
t
|
t
.
id
}
end
def
test_persisted_in_a_model_with_custom_primary_key_after_failed_save
movie
=
Movie
.
create
assert
!
movie
.
persisted?
end
def
test_raise_after_destroy
assert_not
@first
.
frozen?
...
...
activerecord/test/models/movie.rb
浏览文件 @
3a661794
class
Movie
<
ActiveRecord
::
Base
self
.
primary_key
=
"movieid"
validates_presence_of
:name
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录