Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
207f266c
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,发现更多精彩内容 >>
提交
207f266c
编写于
12月 20, 2010
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
define_attr_method must serialize nil correctly
上级
099a210c
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
21 addition
and
3 deletion
+21
-3
activemodel/lib/active_model/attribute_methods.rb
activemodel/lib/active_model/attribute_methods.rb
+1
-1
activerecord/lib/active_record/attribute_methods/primary_key.rb
...record/lib/active_record/attribute_methods/primary_key.rb
+6
-2
activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
...ecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+5
-0
activerecord/test/cases/associations/join_model_test.rb
activerecord/test/cases/associations/join_model_test.rb
+4
-0
activerecord/test/cases/base_test.rb
activerecord/test/cases/base_test.rb
+5
-0
未找到文件。
activemodel/lib/active_model/attribute_methods.rb
浏览文件 @
207f266c
...
...
@@ -109,7 +109,7 @@ def define_attr_method(name, value=nil, &block)
# use eval instead of a block to work around a memory leak in dev
# mode in fcgi
sing
.
class_eval
<<-
eorb
,
__FILE__
,
__LINE__
+
1
def
#{
name
}
;
#{
value
.
to_s
.
inspect
}
; end
def
#{
name
}
;
#{
value
.
nil?
?
'nil'
:
value
.
to_s
.
inspect
}
; end
eorb
end
end
...
...
activerecord/lib/active_record/attribute_methods/primary_key.rb
浏览文件 @
207f266c
...
...
@@ -24,17 +24,21 @@ def reset_primary_key #:nodoc:
end
def
get_primary_key
(
base_name
)
#:nodoc:
return
unless
base_name
return
unless
base_name
&&
!
base_name
.
blank?
case
primary_key_prefix_type
when
:table_name
base_name
.
foreign_key
(
false
)
when
:table_name_with_underscore
base_name
.
foreign_key
else
if
ActiveRecord
::
Base
!=
self
&&
connection
.
table_exists?
(
table_name
)
connection
.
primary_key
(
table_name
)
else
'id'
end
end
end
# Sets the name of the primary key column to use to the given value,
# or (if the value is nil or false) to the value returned by the given
...
...
activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
浏览文件 @
207f266c
...
...
@@ -9,6 +9,11 @@ def setup
:timeout
=>
100
end
def
test_primary_key_returns_nil_for_no_pk
@conn
.
exec_query
(
'create table ex(id int, data string)'
)
assert_nil
@conn
.
primary_key
(
'ex'
)
end
def
test_connection_no_db
assert_raises
(
ArgumentError
)
do
Base
.
sqlite3_connection
{}
...
...
activerecord/test/cases/associations/join_model_test.rb
浏览文件 @
207f266c
...
...
@@ -512,6 +512,10 @@ def test_create_associate_when_adding_to_has_many_through
assert_nothing_raised
{
vertices
(
:vertex_1
).
sinks
<<
vertices
(
:vertex_5
)
}
end
def
test_add_to_join_table_with_no_id
assert_nothing_raised
{
vertices
(
:vertex_1
).
sinks
<<
vertices
(
:vertex_5
)
}
end
def
test_has_many_through_collection_size_doesnt_load_target_if_not_loaded
author
=
authors
(
:david
)
assert_equal
10
,
author
.
comments
.
size
...
...
activerecord/test/cases/base_test.rb
浏览文件 @
207f266c
...
...
@@ -19,6 +19,7 @@
require
'models/warehouse_thing'
require
'models/parrot'
require
'models/loose_person'
require
'models/edge'
require
'rexml/document'
require
'active_support/core_ext/exception'
...
...
@@ -48,6 +49,10 @@ class Boolean < ActiveRecord::Base; end
class
BasicsTest
<
ActiveRecord
::
TestCase
fixtures
:topics
,
:companies
,
:developers
,
:projects
,
:computers
,
:accounts
,
:minimalistics
,
'warehouse-things'
,
:authors
,
:categorizations
,
:categories
,
:posts
def
test_primary_key_with_no_id
assert_nil
Edge
.
primary_key
end
def
test_select_symbol
topic_ids
=
Topic
.
select
(
:id
).
map
(
&
:id
).
sort
assert_equal
Topic
.
find
(
:all
).
map
(
&
:id
).
sort
,
topic_ids
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录