Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
843b8c0b
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,发现更多精彩内容 >>
提交
843b8c0b
编写于
7月 18, 2014
作者:
M
Matthew Draper
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15762 from arthurnn/better_error_on_bad_alias_method
Dont swallow errors when bad alias_method
上级
ba9fe6cf
c965de39
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
10 deletion
+27
-10
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+5
-0
activerecord/lib/active_record/inheritance.rb
activerecord/lib/active_record/inheritance.rb
+2
-8
activerecord/test/cases/base_test.rb
activerecord/test/cases/base_test.rb
+20
-2
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
843b8c0b
*
Dont swallow errors on compute_type when having a bad alias_method on
a class.
*arthurnn*
*
PostgreSQL invalid
`uuid`
are convert to nil.
*
PostgreSQL invalid
`uuid`
are convert to nil.
*Abdelkader Boudih*
*Abdelkader Boudih*
...
...
activerecord/lib/active_record/inheritance.rb
浏览文件 @
843b8c0b
...
@@ -151,14 +151,8 @@ def compute_type(type_name)
...
@@ -151,14 +151,8 @@ def compute_type(type_name)
candidates
<<
type_name
candidates
<<
type_name
candidates
.
each
do
|
candidate
|
candidates
.
each
do
|
candidate
|
begin
constant
=
ActiveSupport
::
Dependencies
.
safe_constantize
(
candidate
)
constant
=
ActiveSupport
::
Dependencies
.
constantize
(
candidate
)
return
constant
if
candidate
==
constant
.
to_s
return
constant
if
candidate
==
constant
.
to_s
# We don't want to swallow NoMethodError < NameError errors
rescue
NoMethodError
raise
rescue
NameError
end
end
end
raise
NameError
.
new
(
"uninitialized constant
#{
candidates
.
first
}
"
,
candidates
.
first
)
raise
NameError
.
new
(
"uninitialized constant
#{
candidates
.
first
}
"
,
candidates
.
first
)
...
...
activerecord/test/cases/base_test.rb
浏览文件 @
843b8c0b
...
@@ -1347,14 +1347,32 @@ def test_compute_type_nonexistent_constant
...
@@ -1347,14 +1347,32 @@ def test_compute_type_nonexistent_constant
end
end
def
test_compute_type_no_method_error
def
test_compute_type_no_method_error
ActiveSupport
::
Dependencies
.
stubs
(
:constantize
).
raises
(
NoMethodError
)
ActiveSupport
::
Dependencies
.
stubs
(
:
safe_
constantize
).
raises
(
NoMethodError
)
assert_raises
NoMethodError
do
assert_raises
NoMethodError
do
ActiveRecord
::
Base
.
send
:compute_type
,
'InvalidModel'
ActiveRecord
::
Base
.
send
:compute_type
,
'InvalidModel'
end
end
end
end
def
test_compute_type_on_undefined_method
error
=
nil
begin
Class
.
new
(
Author
)
do
alias_method
:foo
,
:bar
end
rescue
=>
e
error
=
e
end
ActiveSupport
::
Dependencies
.
stubs
(
:safe_constantize
).
raises
(
e
)
exception
=
assert_raises
NameError
do
ActiveRecord
::
Base
.
send
:compute_type
,
'InvalidModel'
end
assert_equal
error
.
message
,
exception
.
message
end
def
test_compute_type_argument_error
def
test_compute_type_argument_error
ActiveSupport
::
Dependencies
.
stubs
(
:constantize
).
raises
(
ArgumentError
)
ActiveSupport
::
Dependencies
.
stubs
(
:
safe_
constantize
).
raises
(
ArgumentError
)
assert_raises
ArgumentError
do
assert_raises
ArgumentError
do
ActiveRecord
::
Base
.
send
:compute_type
,
'InvalidModel'
ActiveRecord
::
Base
.
send
:compute_type
,
'InvalidModel'
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录