Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
5e46f4cc
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,发现更多精彩内容 >>
提交
5e46f4cc
编写于
12月 14, 2016
作者:
J
Julia Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #create_fixtures when equal table names in different databases
上级
0dc9eb46
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
28 addition
and
3 deletion
+28
-3
activerecord/lib/active_record/fixtures.rb
activerecord/lib/active_record/fixtures.rb
+3
-3
activerecord/test/cases/fixtures_test.rb
activerecord/test/cases/fixtures_test.rb
+15
-0
activerecord/test/fixtures/other_dogs.yml
activerecord/test/fixtures/other_dogs.yml
+2
-0
activerecord/test/models/other_dog.rb
activerecord/test/models/other_dog.rb
+5
-0
activerecord/test/schema/schema.rb
activerecord/test/schema/schema.rb
+2
-0
activerecord/test/support/connection.rb
activerecord/test/support/connection.rb
+1
-0
未找到文件。
activerecord/lib/active_record/fixtures.rb
浏览文件 @
5e46f4cc
...
...
@@ -536,16 +536,16 @@ def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {}
update_all_loaded_fixtures
fixtures_map
connection
.
transaction
(
requires_new:
true
)
do
deleted_tables
=
Set
.
new
deleted_tables
=
Hash
.
new
{
|
h
,
k
|
h
[
k
]
=
Set
.
new
}
fixture_sets
.
each
do
|
fs
|
conn
=
fs
.
model_class
.
respond_to?
(
:connection
)
?
fs
.
model_class
.
connection
:
connection
table_rows
=
fs
.
table_rows
table_rows
.
each_key
do
|
table
|
unless
deleted_tables
.
include?
table
unless
deleted_tables
[
conn
]
.
include?
table
conn
.
delete
"DELETE FROM
#{
conn
.
quote_table_name
(
table
)
}
"
,
"Fixture Delete"
end
deleted_tables
<<
table
deleted_tables
[
conn
]
<<
table
end
table_rows
.
each
do
|
fixture_set_name
,
rows
|
...
...
activerecord/test/cases/fixtures_test.rb
浏览文件 @
5e46f4cc
...
...
@@ -12,9 +12,11 @@
require
"models/computer"
require
"models/course"
require
"models/developer"
require
"models/dog"
require
"models/doubloon"
require
"models/joke"
require
"models/matey"
require
"models/other_dog"
require
"models/parrot"
require
"models/pirate"
require
"models/post"
...
...
@@ -1021,3 +1023,16 @@ def teardown
assert_nil
fixture_class_names
[
"unregistered_identifier"
]
end
end
class
SameNameDifferentDatabaseFixturesTest
<
ActiveRecord
::
TestCase
fixtures
:dogs
,
:other_dogs
test
"fixtures are properly loaded"
do
# Force loading the fixtures again to reproduce issue
ActiveRecord
::
FixtureSet
.
reset_cache
create_fixtures
(
"dogs"
,
"other_dogs"
)
assert_kind_of
Dog
,
dogs
(
:sophie
)
assert_kind_of
OtherDog
,
other_dogs
(
:lassie
)
end
end
activerecord/test/fixtures/other_dogs.yml
0 → 100644
浏览文件 @
5e46f4cc
lassie
:
id
:
1
activerecord/test/models/other_dog.rb
0 → 100644
浏览文件 @
5e46f4cc
require_dependency
"models/arunit2_model"
class
OtherDog
<
ARUnit2Model
self
.
table_name
=
"dogs"
end
activerecord/test/schema/schema.rb
浏览文件 @
5e46f4cc
...
...
@@ -1050,3 +1050,5 @@
t
.
references
:course
t
.
references
:professor
end
OtherDog
.
connection
.
create_table
:dogs
,
force:
true
activerecord/test/support/connection.rb
浏览文件 @
5e46f4cc
...
...
@@ -2,6 +2,7 @@
require
"models/college"
require
"models/course"
require
"models/professor"
require
"models/other_dog"
module
ARTest
def
self
.
connection_name
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录