Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a186663b
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,发现更多精彩内容 >>
提交
a186663b
编写于
5月 20, 2015
作者:
A
Aster Ryan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add an invert method for remove_foreign_key
上级
e2dfa54d
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
51 addition
and
2 deletion
+51
-2
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+5
-0
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
..._record/connection_adapters/abstract/schema_statements.rb
+6
-1
activerecord/lib/active_record/migration/command_recorder.rb
activerecord/lib/active_record/migration/command_recorder.rb
+10
-0
activerecord/test/cases/migration/command_recorder_test.rb
activerecord/test/cases/migration/command_recorder_test.rb
+30
-1
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
a186663b
*
Make remove_foreign_key invertible. Any foreign key options must be
specified, similar to remove_column.
*Aster Ryan*
*
Correctly handle decimal arrays with defaults in the schema dumper.
Fixes #20515.
...
...
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
浏览文件 @
a186663b
...
...
@@ -777,7 +777,10 @@ def add_foreign_key(from_table, to_table, options = {})
execute
schema_creation
.
accept
(
at
)
end
# Removes the given foreign key from the table.
# Removes the given foreign key from the table. Any options parameters provided
# will be used to re-add the foreign key in case of a migration reversion.
# It is recommended that you provide any options used when creating the foreign
# key so that the migration can be reverted properly.
#
# Removes the foreign key on +accounts.branch_id+.
#
...
...
@@ -791,6 +794,8 @@ def add_foreign_key(from_table, to_table, options = {})
#
# remove_foreign_key :accounts, name: :special_fk_name
#
# The +options+ hash can include all keys that can be used in add_foreign_key.
# Please refer to the add_foreign_key documentation for a full list
def
remove_foreign_key
(
from_table
,
options_or_to_table
=
{})
return
unless
supports_foreign_keys?
...
...
activerecord/lib/active_record/migration/command_recorder.rb
浏览文件 @
a186663b
...
...
@@ -184,6 +184,16 @@ def invert_add_foreign_key(args)
[
:remove_foreign_key
,
[
from_table
,
options
]]
end
def
invert_remove_foreign_key
(
args
)
from_table
,
to_table
,
remove_options
=
args
raise
ActiveRecord
::
IrreversibleMigration
,
"remove_foreign_key is only reversible if given a second table"
if
to_table
.
nil?
||
to_table
.
is_a?
(
Hash
)
reversed_args
=
[
from_table
,
to_table
]
reversed_args
<<
remove_options
if
remove_options
[
:add_foreign_key
,
reversed_args
]
end
# Forwards any missing method call to the \target.
def
method_missing
(
method
,
*
args
,
&
block
)
if
@delegate
.
respond_to?
(
method
)
...
...
activerecord/test/cases/migration/command_recorder_test.rb
浏览文件 @
a186663b
...
...
@@ -281,17 +281,42 @@ def test_invert_add_foreign_key
assert_equal
[
:remove_foreign_key
,
[
:dogs
,
:people
]],
enable
end
def
test_invert_remove_foreign_key
enable
=
@recorder
.
inverse_of
:remove_foreign_key
,
[
:dogs
,
:people
]
assert_equal
[
:add_foreign_key
,
[
:dogs
,
:people
]],
enable
end
def
test_invert_add_foreign_key_with_column
enable
=
@recorder
.
inverse_of
:add_foreign_key
,
[
:dogs
,
:people
,
column:
"owner_id"
]
assert_equal
[
:remove_foreign_key
,
[
:dogs
,
column:
"owner_id"
]],
enable
end
def
test_invert_remove_foreign_key_with_column
enable
=
@recorder
.
inverse_of
:remove_foreign_key
,
[
:dogs
,
:people
,
column:
"owner_id"
]
assert_equal
[
:add_foreign_key
,
[
:dogs
,
:people
,
column:
"owner_id"
]],
enable
end
def
test_invert_add_foreign_key_with_column_and_name
enable
=
@recorder
.
inverse_of
:add_foreign_key
,
[
:dogs
,
:people
,
column:
"owner_id"
,
name:
"fk"
]
assert_equal
[
:remove_foreign_key
,
[
:dogs
,
name:
"fk"
]],
enable
end
def
test_remove_foreign_key_is_irreversible
def
test_invert_remove_foreign_key_with_column_and_name
enable
=
@recorder
.
inverse_of
:remove_foreign_key
,
[
:dogs
,
:people
,
column:
"owner_id"
,
name:
"fk"
]
assert_equal
[
:add_foreign_key
,
[
:dogs
,
:people
,
column:
"owner_id"
,
name:
"fk"
]],
enable
end
def
test_invert_remove_foreign_key_with_primary_key
enable
=
@recorder
.
inverse_of
:remove_foreign_key
,
[
:dogs
,
:people
,
primary_key:
"person_id"
]
assert_equal
[
:add_foreign_key
,
[
:dogs
,
:people
,
primary_key:
"person_id"
]],
enable
end
def
test_invert_remove_foreign_key_with_on_delete_on_update
enable
=
@recorder
.
inverse_of
:remove_foreign_key
,
[
:dogs
,
:people
,
on_delete: :nullify
,
on_update: :cascade
]
assert_equal
[
:add_foreign_key
,
[
:dogs
,
:people
,
on_delete: :nullify
,
on_update: :cascade
]],
enable
end
def
test_invert_remove_foreign_key_is_irreversible_without_to_table
assert_raises
ActiveRecord
::
IrreversibleMigration
do
@recorder
.
inverse_of
:remove_foreign_key
,
[
:dogs
,
column:
"owner_id"
]
end
...
...
@@ -299,6 +324,10 @@ def test_remove_foreign_key_is_irreversible
assert_raises
ActiveRecord
::
IrreversibleMigration
do
@recorder
.
inverse_of
:remove_foreign_key
,
[
:dogs
,
name:
"fk"
]
end
assert_raises
ActiveRecord
::
IrreversibleMigration
do
@recorder
.
inverse_of
:remove_foreign_key
,
[
:dogs
]
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录