Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
2c30c9fe
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,发现更多精彩内容 >>
提交
2c30c9fe
编写于
7月 30, 2009
作者:
J
Joshua Peek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Undefine id and let it automatically be generated
上级
f8d2c77c
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
6 addition
and
24 deletion
+6
-24
activerecord/lib/active_record/attribute_methods.rb
activerecord/lib/active_record/attribute_methods.rb
+4
-4
activerecord/lib/active_record/attribute_methods/read.rb
activerecord/lib/active_record/attribute_methods/read.rb
+2
-11
activerecord/test/cases/attribute_methods_test.rb
activerecord/test/cases/attribute_methods_test.rb
+0
-4
activerecord/test/cases/base_test.rb
activerecord/test/cases/base_test.rb
+0
-5
未找到文件。
activerecord/lib/active_record/attribute_methods.rb
浏览文件 @
2c30c9fe
...
...
@@ -77,6 +77,9 @@ def define_attribute_methods
end
end
end
unless
generated_methods
.
include?
(
"id"
)
define_read_method
(
:id
,
primary_key
,
columns_hash
[
primary_key
.
to_s
])
end
end
def
undefine_attribute_methods
...
...
@@ -89,7 +92,6 @@ def undefine_attribute_methods
# method is defined by Active Record though.
def
instance_method_already_implemented?
(
method_name
)
method_name
=
method_name
.
to_s
return
true
if
method_name
==
"id"
@_defined_class_methods
||=
ancestors
.
first
(
ancestors
.
index
(
ActiveRecord
::
Base
)).
sum
([])
{
|
m
|
m
.
public_instance_methods
(
false
)
|
m
.
private_instance_methods
(
false
)
|
m
.
protected_instance_methods
(
false
)
}.
map
{
|
m
|
m
.
to_s
}.
to_set
@@_defined_activerecord_methods
||=
(
ActiveRecord
::
Base
.
public_instance_methods
(
false
)
|
ActiveRecord
::
Base
.
private_instance_methods
(
false
)
|
ActiveRecord
::
Base
.
protected_instance_methods
(
false
)).
map
{
|
m
|
m
.
to_s
}.
to_set
raise
DangerousAttributeError
,
"
#{
method_name
}
is defined by ActiveRecord"
if
@@_defined_activerecord_methods
.
include?
(
method_name
)
...
...
@@ -109,9 +111,7 @@ def attribute_method_suffixes
# Evaluate the definition for an attribute related method
def
evaluate_attribute_method
(
attr_name
,
method_definition
,
method_name
)
unless
method_name
.
to_s
==
primary_key
.
to_s
generated_methods
<<
method_name
end
begin
class_eval
(
method_definition
,
__FILE__
,
__LINE__
)
...
...
activerecord/lib/active_record/attribute_methods/read.rb
浏览文件 @
2c30c9fe
...
...
@@ -5,6 +5,7 @@ module Read
included
do
attribute_method_suffix
""
undef_method
:id
end
module
ClassMethods
...
...
@@ -54,7 +55,7 @@ def define_read_method(symbol, attr_name, column)
if
cache_attribute?
(
attr_name
)
access_code
=
"@attributes_cache['
#{
attr_name
}
'] ||= (
#{
access_code
}
)"
end
evaluate_attribute_method
attr_name
,
"def
#{
symbol
}
;
#{
access_code
}
; end"
,
attr_name
evaluate_attribute_method
attr_name
,
"def
#{
symbol
}
;
#{
access_code
}
; end"
,
symbol
end
end
...
...
@@ -78,16 +79,6 @@ def read_attribute(attr_name)
end
end
# A model instance's primary key is always available as model.id
# whether you name it the default 'id' or set it to something else.
def
id
attr_name
=
self
.
class
.
primary_key
column
=
column_for_attribute
(
attr_name
)
self
.
class
.
send
(
:define_read_method
,
:id
,
attr_name
,
column
)
id
end
# Returns true if the attribute is of a text column and marked for serialization.
def
unserializable_attribute?
(
attr_name
,
column
)
column
.
text?
&&
self
.
class
.
serialized_attributes
[
attr_name
]
...
...
activerecord/test/cases/attribute_methods_test.rb
浏览文件 @
2c30c9fe
...
...
@@ -74,10 +74,6 @@ def test_kernel_methods_not_implemented_in_activerecord
end
end
def
test_primary_key_implemented
assert
Class
.
new
(
ActiveRecord
::
Base
).
instance_method_already_implemented?
(
'id'
)
end
def
test_defined_kernel_methods_implemented_in_model
%w(test name display y)
.
each
do
|
method
|
klass
=
Class
.
new
ActiveRecord
::
Base
...
...
activerecord/test/cases/base_test.rb
浏览文件 @
2c30c9fe
...
...
@@ -422,11 +422,6 @@ def test_query_attribute_with_custom_fields
end
def
test_reader_for_invalid_column_names
Topic
.
send
(
:define_read_method
,
"mumub-jumbo"
.
to_sym
,
"mumub-jumbo"
,
nil
)
assert
!
Topic
.
generated_methods
.
include?
(
"mumub-jumbo"
)
end
def
test_non_attribute_access_and_assignment
topic
=
Topic
.
new
assert
!
topic
.
respond_to?
(
"mumbo"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录