Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
70f147db
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,发现更多精彩内容 >>
提交
70f147db
编写于
9月 03, 2012
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7515 from senny/custom_inheritance_column_test_refactoring
custom inheritance_column test refactoring
上级
30a8f0d5
9f494a9a
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
66 addition
and
65 deletion
+66
-65
activerecord/test/cases/attribute_methods_test.rb
activerecord/test/cases/attribute_methods_test.rb
+1
-1
activerecord/test/cases/base_test.rb
activerecord/test/cases/base_test.rb
+1
-1
activerecord/test/cases/inheritance_test.rb
activerecord/test/cases/inheritance_test.rb
+39
-49
activerecord/test/cases/schema_dumper_test.rb
activerecord/test/cases/schema_dumper_test.rb
+1
-1
activerecord/test/fixtures/companies.yml
activerecord/test/fixtures/companies.yml
+0
-6
activerecord/test/fixtures/vegetables.yml
activerecord/test/fixtures/vegetables.yml
+12
-1
activerecord/test/models/company.rb
activerecord/test/models/company.rb
+0
-4
activerecord/test/models/vegetables.rb
activerecord/test/models/vegetables.rb
+10
-0
activerecord/test/schema/schema.rb
activerecord/test/schema/schema.rb
+2
-2
未找到文件。
activerecord/test/cases/attribute_methods_test.rb
浏览文件 @
70f147db
...
@@ -395,7 +395,7 @@ def test_query_attribute_boolean
...
@@ -395,7 +395,7 @@ def test_query_attribute_boolean
def
test_query_attribute_with_custom_fields
def
test_query_attribute_with_custom_fields
object
=
Company
.
find_by_sql
(
<<-
SQL
).
first
object
=
Company
.
find_by_sql
(
<<-
SQL
).
first
SELECT c1.*, c2.
ruby_
type as string_value, c2.rating as int_value
SELECT c1.*, c2.type as string_value, c2.rating as int_value
FROM companies c1, companies c2
FROM companies c1, companies c2
WHERE c1.firm_id = c2.id
WHERE c1.firm_id = c2.id
AND c1.id = 2
AND c1.id = 2
...
...
activerecord/test/cases/base_test.rb
浏览文件 @
70f147db
...
@@ -1735,7 +1735,7 @@ def test_marshalling_new_record_round_trip_with_associations
...
@@ -1735,7 +1735,7 @@ def test_marshalling_new_record_round_trip_with_associations
end
end
def
test_attribute_names
def
test_attribute_names
assert_equal
[
"id"
,
"type"
,
"
ruby_type"
,
"
firm_id"
,
"firm_name"
,
"name"
,
"client_of"
,
"rating"
,
"account_id"
,
"description"
],
assert_equal
[
"id"
,
"type"
,
"firm_id"
,
"firm_name"
,
"name"
,
"client_of"
,
"rating"
,
"account_id"
,
"description"
],
Company
.
attribute_names
Company
.
attribute_names
end
end
...
...
activerecord/test/cases/inheritance_test.rb
浏览文件 @
70f147db
...
@@ -123,9 +123,10 @@ def test_inheritance_find
...
@@ -123,9 +123,10 @@ def test_inheritance_find
end
end
def
test_alt_inheritance_find
def
test_alt_inheritance_find
switch_to_alt_inheritance_column
assert_kind_of
Cucumber
,
Vegetable
.
find
(
1
)
test_inheritance_find
assert_kind_of
Cucumber
,
Cucumber
.
find
(
1
)
switch_to_default_inheritance_column
assert_kind_of
Cabbage
,
Vegetable
.
find
(
2
)
assert_kind_of
Cabbage
,
Cabbage
.
find
(
2
)
end
end
def
test_alt_becomes_works_with_sti
def
test_alt_becomes_works_with_sti
...
@@ -142,9 +143,9 @@ def test_inheritance_find_all
...
@@ -142,9 +143,9 @@ def test_inheritance_find_all
end
end
def
test_alt_inheritance_find_all
def
test_alt_inheritance_find_all
switch_to_alt_inheritance_column
companies
=
Vegetable
.
all
.
merge!
(
:order
=>
'id'
).
to_a
test_inheritance_find_all
assert_kind_of
Cucumber
,
companies
[
0
]
switch_to_default_inheritance_column
assert_kind_of
Cabbage
,
companies
[
1
]
end
end
def
test_inheritance_save
def
test_inheritance_save
...
@@ -157,9 +158,11 @@ def test_inheritance_save
...
@@ -157,9 +158,11 @@ def test_inheritance_save
end
end
def
test_alt_inheritance_save
def
test_alt_inheritance_save
switch_to_alt_inheritance_column
cabbage
=
Cabbage
.
new
(
:name
=>
'Savoy'
)
test_inheritance_save
cabbage
.
save!
switch_to_default_inheritance_column
savoy
=
Vegetable
.
find
(
cabbage
.
id
)
assert_kind_of
Cabbage
,
savoy
end
end
def
test_inheritance_condition
def
test_inheritance_condition
...
@@ -169,9 +172,9 @@ def test_inheritance_condition
...
@@ -169,9 +172,9 @@ def test_inheritance_condition
end
end
def
test_alt_inheritance_condition
def
test_alt_inheritance_condition
switch_to_alt_inheritance_column
assert_equal
4
,
Vegetable
.
count
test_inheritance_condition
assert_equal
1
,
Cucumber
.
count
switch_to_default_inheritance_column
assert_equal
3
,
Cabbage
.
count
end
end
def
test_finding_incorrect_type_data
def
test_finding_incorrect_type_data
...
@@ -180,9 +183,8 @@ def test_finding_incorrect_type_data
...
@@ -180,9 +183,8 @@ def test_finding_incorrect_type_data
end
end
def
test_alt_finding_incorrect_type_data
def
test_alt_finding_incorrect_type_data
switch_to_alt_inheritance_column
assert_raise
(
ActiveRecord
::
RecordNotFound
)
{
Cucumber
.
find
(
2
)
}
test_finding_incorrect_type_data
assert_nothing_raised
{
Cucumber
.
find
(
1
)
}
switch_to_default_inheritance_column
end
end
def
test_update_all_within_inheritance
def
test_update_all_within_inheritance
...
@@ -193,9 +195,9 @@ def test_update_all_within_inheritance
...
@@ -193,9 +195,9 @@ def test_update_all_within_inheritance
end
end
def
test_alt_update_all_within_inheritance
def
test_alt_update_all_within_inheritance
switch_to_alt_inheritance_column
Cabbage
.
update_all
"name = 'the cabbage'"
test_update_all_within_inheritanc
e
assert_equal
"the cabbage"
,
Cabbage
.
first
.
nam
e
switch_to_default_inheritance_column
assert_equal
[
"my cucumber"
],
Cucumber
.
all
.
map
(
&
:name
).
uniq
end
end
def
test_destroy_all_within_inheritance
def
test_destroy_all_within_inheritance
...
@@ -205,9 +207,9 @@ def test_destroy_all_within_inheritance
...
@@ -205,9 +207,9 @@ def test_destroy_all_within_inheritance
end
end
def
test_alt_destroy_all_within_inheritance
def
test_alt_destroy_all_within_inheritance
switch_to_alt_inheritance_column
Cabbage
.
destroy_all
test_destroy_all_within_inheritance
assert_equal
0
,
Cabbage
.
count
switch_to_default_inheritance_column
assert_equal
1
,
Cucumber
.
count
end
end
def
test_find_first_within_inheritance
def
test_find_first_within_inheritance
...
@@ -217,9 +219,9 @@ def test_find_first_within_inheritance
...
@@ -217,9 +219,9 @@ def test_find_first_within_inheritance
end
end
def
test_alt_find_first_within_inheritance
def
test_alt_find_first_within_inheritance
switch_to_alt_inheritance_column
assert_kind_of
Cabbage
,
Vegetable
.
all
.
merge!
(
:where
=>
"name = 'his cabbage'"
).
first
test_find_first_within_inheritance
assert_kind_of
Cabbage
,
Cabbage
.
all
.
merge!
(
:where
=>
"name = 'his cabbage'"
).
first
switch_to_default_inheritance_column
assert_nil
Cucumber
.
all
.
merge!
(
:where
=>
"name = 'his cabbage'"
).
first
end
end
def
test_complex_inheritance
def
test_complex_inheritance
...
@@ -233,9 +235,13 @@ def test_complex_inheritance
...
@@ -233,9 +235,13 @@ def test_complex_inheritance
end
end
def
test_alt_complex_inheritance
def
test_alt_complex_inheritance
switch_to_alt_inheritance_column
king_cole
=
KingCole
.
create
(
"name"
=>
"uniform heads"
)
test_complex_inheritance
assert_equal
king_cole
,
KingCole
.
where
(
"name = 'uniform heads'"
).
first
switch_to_default_inheritance_column
assert_equal
king_cole
,
GreenCabbage
.
all
.
merge!
(
:where
=>
"name = 'uniform heads'"
).
first
assert_equal
king_cole
,
Cabbage
.
all
.
merge!
(
:where
=>
"name = 'uniform heads'"
).
first
assert_equal
king_cole
,
Vegetable
.
all
.
merge!
(
:where
=>
"name = 'uniform heads'"
).
first
assert_equal
1
,
Cabbage
.
all
.
merge!
(
:where
=>
"name = 'his cabbage'"
).
to_a
.
size
assert_equal
king_cole
,
Cabbage
.
find
(
king_cole
.
id
)
end
end
def
test_eager_load_belongs_to_something_inherited
def
test_eager_load_belongs_to_something_inherited
...
@@ -243,6 +249,11 @@ def test_eager_load_belongs_to_something_inherited
...
@@ -243,6 +249,11 @@ def test_eager_load_belongs_to_something_inherited
assert
account
.
association_cache
.
key?
(
:firm
),
"nil proves eager load failed"
assert
account
.
association_cache
.
key?
(
:firm
),
"nil proves eager load failed"
end
end
def
test_alt_eager_loading
cabbage
=
RedCabbage
.
all
.
merge!
(
:includes
=>
:seller
).
find
(
4
)
assert
cabbage
.
association_cache
.
key?
(
:seller
),
"nil proves eager load failed"
end
def
test_eager_load_belongs_to_primary_key_quoting
def
test_eager_load_belongs_to_primary_key_quoting
con
=
Account
.
connection
con
=
Account
.
connection
assert_sql
(
/
#{
con
.
quote_table_name
(
'companies'
)
}
.
#{
con
.
quote_column_name
(
'id'
)
}
IN \(1\)/
)
do
assert_sql
(
/
#{
con
.
quote_table_name
(
'companies'
)
}
.
#{
con
.
quote_column_name
(
'id'
)
}
IN \(1\)/
)
do
...
@@ -250,12 +261,6 @@ def test_eager_load_belongs_to_primary_key_quoting
...
@@ -250,12 +261,6 @@ def test_eager_load_belongs_to_primary_key_quoting
end
end
end
end
def
test_alt_eager_loading
switch_to_alt_inheritance_column
test_eager_load_belongs_to_something_inherited
switch_to_default_inheritance_column
end
def
test_inherits_custom_primary_key
def
test_inherits_custom_primary_key
assert_equal
Subscriber
.
primary_key
,
SpecialSubscriber
.
primary_key
assert_equal
Subscriber
.
primary_key
,
SpecialSubscriber
.
primary_key
end
end
...
@@ -264,21 +269,6 @@ def test_inheritance_without_mapping
...
@@ -264,21 +269,6 @@ def test_inheritance_without_mapping
assert_kind_of
SpecialSubscriber
,
SpecialSubscriber
.
find
(
"webster132"
)
assert_kind_of
SpecialSubscriber
,
SpecialSubscriber
.
find
(
"webster132"
)
assert_nothing_raised
{
s
=
SpecialSubscriber
.
new
(
"name"
=>
"And breaaaaathe!"
);
s
.
id
=
'roger'
;
s
.
save
}
assert_nothing_raised
{
s
=
SpecialSubscriber
.
new
(
"name"
=>
"And breaaaaathe!"
);
s
.
id
=
'roger'
;
s
.
save
}
end
end
private
def
switch_to_alt_inheritance_column
# we don't want misleading test results, so get rid of the values in the type column
Company
.
all
.
merge!
(
:order
=>
'id'
).
to_a
.
each
do
|
c
|
c
[
'type'
]
=
nil
c
.
save
end
[
Company
,
Firm
,
Client
].
each
{
|
klass
|
klass
.
reset_column_information
}
Company
.
inheritance_column
=
'ruby_type'
end
def
switch_to_default_inheritance_column
[
Company
,
Firm
,
Client
].
each
{
|
klass
|
klass
.
reset_column_information
}
Company
.
inheritance_column
=
'type'
end
end
end
...
@@ -298,7 +288,7 @@ def teardown
...
@@ -298,7 +288,7 @@ def teardown
def
test_instantiation_doesnt_try_to_require_corresponding_file
def
test_instantiation_doesnt_try_to_require_corresponding_file
ActiveRecord
::
Base
.
store_full_sti_class
=
false
ActiveRecord
::
Base
.
store_full_sti_class
=
false
foo
=
Firm
.
first
.
clone
foo
=
Firm
.
first
.
clone
foo
.
ruby_type
=
foo
.
type
=
'FirmOnTheFly'
foo
.
type
=
'FirmOnTheFly'
foo
.
save!
foo
.
save!
# Should fail without FirmOnTheFly in the type condition.
# Should fail without FirmOnTheFly in the type condition.
...
...
activerecord/test/cases/schema_dumper_test.rb
浏览文件 @
70f147db
...
@@ -182,7 +182,7 @@ def test_schema_dump_illegal_ignored_table_value
...
@@ -182,7 +182,7 @@ def test_schema_dump_illegal_ignored_table_value
def
test_schema_dumps_index_columns_in_right_order
def
test_schema_dumps_index_columns_in_right_order
index_definition
=
standard_dump
.
split
(
/\n/
).
grep
(
/add_index.*companies/
).
first
.
strip
index_definition
=
standard_dump
.
split
(
/\n/
).
grep
(
/add_index.*companies/
).
first
.
strip
assert_equal
'add_index "companies", ["firm_id", "type", "rating"
, "ruby_type"
], :name => "company_index"'
,
index_definition
assert_equal
'add_index "companies", ["firm_id", "type", "rating"], :name => "company_index"'
,
index_definition
end
end
def
test_schema_dumps_partial_indices
def
test_schema_dumps_partial_indices
...
...
activerecord/test/fixtures/companies.yml
浏览文件 @
70f147db
...
@@ -4,14 +4,12 @@ first_client:
...
@@ -4,14 +4,12 @@ first_client:
firm_id
:
1
firm_id
:
1
client_of
:
2
client_of
:
2
name
:
Summit
name
:
Summit
ruby_type
:
Client
firm_name
:
37signals
firm_name
:
37signals
first_firm
:
first_firm
:
id
:
1
id
:
1
type
:
Firm
type
:
Firm
name
:
37signals
name
:
37signals
ruby_type
:
Firm
firm_id
:
1
firm_id
:
1
second_client
:
second_client
:
...
@@ -20,13 +18,11 @@ second_client:
...
@@ -20,13 +18,11 @@ second_client:
firm_id
:
1
firm_id
:
1
client_of
:
1
client_of
:
1
name
:
Microsoft
name
:
Microsoft
ruby_type
:
Client
another_firm
:
another_firm
:
id
:
4
id
:
4
type
:
Firm
type
:
Firm
name
:
Flamboyant Software
name
:
Flamboyant Software
ruby_type
:
Firm
another_client
:
another_client
:
id
:
5
id
:
5
...
@@ -34,7 +30,6 @@ another_client:
...
@@ -34,7 +30,6 @@ another_client:
firm_id
:
4
firm_id
:
4
client_of
:
4
client_of
:
4
name
:
Ex Nihilo
name
:
Ex Nihilo
ruby_type
:
Client
a_third_client
:
a_third_client
:
id
:
10
id
:
10
...
@@ -42,7 +37,6 @@ a_third_client:
...
@@ -42,7 +37,6 @@ a_third_client:
firm_id
:
4
firm_id
:
4
client_of
:
4
client_of
:
4
name
:
Ex Nihilo Part Deux
name
:
Ex Nihilo Part Deux
ruby_type
:
Client
rails_core
:
rails_core
:
id
:
6
id
:
6
...
...
activerecord/test/fixtures/vegetables.yml
浏览文件 @
70f147db
...
@@ -6,4 +6,15 @@ first_cucumber:
...
@@ -6,4 +6,15 @@ first_cucumber:
first_cabbage
:
first_cabbage
:
id
:
2
id
:
2
custom_type
:
Cabbage
custom_type
:
Cabbage
name
:
'
my
cabbage'
name
:
'
my
cabbage'
\ No newline at end of file
second_cabbage
:
id
:
3
custom_type
:
Cabbage
name
:
'
his
cabbage'
red_cabbage
:
id
:
4
custom_type
:
RedCabbage
name
:
'
red
cabbage'
seller_id
:
3
\ No newline at end of file
activerecord/test/models/company.rb
浏览文件 @
70f147db
...
@@ -173,10 +173,6 @@ def self.destroyed_client_ids
...
@@ -173,10 +173,6 @@ def self.destroyed_client_ids
before_destroy
:overwrite_to_raise
before_destroy
:overwrite_to_raise
# Used to test that read and question methods are not generated for these attributes
# Used to test that read and question methods are not generated for these attributes
def
ruby_type
read_attribute
:ruby_type
end
def
rating?
def
rating?
query_attribute
:rating
query_attribute
:rating
end
end
...
...
activerecord/test/models/vegetables.rb
浏览文件 @
70f147db
...
@@ -12,3 +12,13 @@ class Cucumber < Vegetable
...
@@ -12,3 +12,13 @@ class Cucumber < Vegetable
class
Cabbage
<
Vegetable
class
Cabbage
<
Vegetable
end
end
class
GreenCabbage
<
Cabbage
end
class
KingCole
<
GreenCabbage
end
class
RedCabbage
<
Cabbage
belongs_to
:seller
,
:class_name
=>
'Company'
end
activerecord/test/schema/schema.rb
浏览文件 @
70f147db
...
@@ -171,7 +171,6 @@ def create_table(*args, &block)
...
@@ -171,7 +171,6 @@ def create_table(*args, &block)
create_table
:companies
,
:force
=>
true
do
|
t
|
create_table
:companies
,
:force
=>
true
do
|
t
|
t
.
string
:type
t
.
string
:type
t
.
string
:ruby_type
t
.
integer
:firm_id
t
.
integer
:firm_id
t
.
string
:firm_name
t
.
string
:firm_name
t
.
string
:name
t
.
string
:name
...
@@ -181,11 +180,12 @@ def create_table(*args, &block)
...
@@ -181,11 +180,12 @@ def create_table(*args, &block)
t
.
string
:description
,
:default
=>
""
t
.
string
:description
,
:default
=>
""
end
end
add_index
:companies
,
[
:firm_id
,
:type
,
:rating
,
:ruby_type
],
:name
=>
"company_index"
add_index
:companies
,
[
:firm_id
,
:type
,
:rating
],
:name
=>
"company_index"
add_index
:companies
,
[
:firm_id
,
:type
],
:name
=>
"company_partial_index"
,
:where
=>
"rating > 10"
add_index
:companies
,
[
:firm_id
,
:type
],
:name
=>
"company_partial_index"
,
:where
=>
"rating > 10"
create_table
:vegetables
,
:force
=>
true
do
|
t
|
create_table
:vegetables
,
:force
=>
true
do
|
t
|
t
.
string
:name
t
.
string
:name
t
.
integer
:seller_id
t
.
string
:custom_type
t
.
string
:custom_type
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录