Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0c7c6286
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,发现更多精彩内容 >>
提交
0c7c6286
编写于
3月 11, 2015
作者:
Y
Yves Senn
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
pg, `disable_referential_integrity` only catches AR errors.
This change was prompted by
598b8418
.
上级
598b8418
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
3 deletion
+25
-3
activerecord/lib/active_record/connection_adapters/postgresql/referential_integrity.rb
...d/connection_adapters/postgresql/referential_integrity.rb
+2
-2
activerecord/test/cases/adapters/postgresql/referential_integrity_test.rb
...t/cases/adapters/postgresql/referential_integrity_test.rb
+23
-1
未找到文件。
activerecord/lib/active_record/connection_adapters/postgresql/referential_integrity.rb
浏览文件 @
0c7c6286
...
...
@@ -14,7 +14,7 @@ def disable_referential_integrity # :nodoc:
transaction
(
requires_new:
true
)
do
execute
(
tables
.
collect
{
|
name
|
"ALTER TABLE
#{
quote_table_name
(
name
)
}
DISABLE TRIGGER ALL"
}.
join
(
";"
))
end
rescue
=>
e
rescue
ActiveRecord
::
ActiveRecordError
=>
e
original_exception
=
e
end
...
...
@@ -37,7 +37,7 @@ def disable_referential_integrity # :nodoc:
transaction
(
requires_new:
true
)
do
execute
(
tables
.
collect
{
|
name
|
"ALTER TABLE
#{
quote_table_name
(
name
)
}
ENABLE TRIGGER ALL"
}.
join
(
";"
))
end
rescue
rescue
ActiveRecord
::
ActiveRecordError
end
else
yield
...
...
activerecord/test/cases/adapters/postgresql/referential_integrity_test.rb
浏览文件 @
0c7c6286
...
...
@@ -6,9 +6,13 @@ class PostgreSQLReferentialIntegrityTest < ActiveRecord::TestCase
include
ConnectionHelper
IS_REFERENTIAL_INTEGRITY_SQL
=
lambda
do
|
sql
|
sql
.
match
(
/DISABLE TRIGGER ALL/
)
||
sql
.
match
(
/ENABLE TRIGGER ALL/
)
end
module
MissingSuperuserPrivileges
def
execute
(
sql
)
if
sql
.
match
(
/DISABLE TRIGGER ALL/
)
||
sql
.
match
(
/ENABLE TRIGGER ALL/
)
if
IS_REFERENTIAL_INTEGRITY_SQL
.
call
(
sql
)
super
"BROKEN;"
rescue
nil
# put transaction in broken state
raise
ActiveRecord
::
StatementInvalid
,
'PG::InsufficientPrivilege'
else
...
...
@@ -17,6 +21,16 @@ def execute(sql)
end
end
module
ProgrammerMistake
def
execute
(
sql
)
if
IS_REFERENTIAL_INTEGRITY_SQL
.
call
(
sql
)
raise
ArgumentError
,
'something is not right.'
else
super
end
end
end
def
setup
@connection
=
ActiveRecord
::
Base
.
connection
end
...
...
@@ -81,6 +95,14 @@ def test_does_not_break_nested_transactions
end
end
def
test_only_catch_active_record_errors_others_bubble_up
@connection
.
extend
ProgrammerMistake
assert_raises
ArgumentError
do
@connection
.
disable_referential_integrity
{}
end
end
private
def
assert_transaction_is_not_broken
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录