Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ff1b4eb3
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,发现更多精彩内容 >>
未验证
提交
ff1b4eb3
编写于
9月 27, 2018
作者:
R
Ryuta Kamizono
提交者:
GitHub
9月 27, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #33997 from MatthiasWinkelmann/pg_dump
Removed invalid -X flag for pg_dump, fixes #33996
上级
8541394e
0d6325cf
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
8 deletion
+8
-8
activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
...cord/lib/active_record/tasks/postgresql_database_tasks.rb
+1
-1
activerecord/test/cases/tasks/postgresql_rake_test.rb
activerecord/test/cases/tasks/postgresql_rake_test.rb
+7
-7
未找到文件。
activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
浏览文件 @
ff1b4eb3
...
@@ -61,7 +61,7 @@ def structure_dump(filename, extra_flags)
...
@@ -61,7 +61,7 @@ def structure_dump(filename, extra_flags)
ActiveRecord
::
Base
.
dump_schemas
ActiveRecord
::
Base
.
dump_schemas
end
end
args
=
[
"-s"
,
"-
X"
,
"-
x"
,
"-O"
,
"-f"
,
filename
]
args
=
[
"-s"
,
"-x"
,
"-O"
,
"-f"
,
filename
]
args
.
concat
(
Array
(
extra_flags
))
if
extra_flags
args
.
concat
(
Array
(
extra_flags
))
if
extra_flags
unless
search_path
.
blank?
unless
search_path
.
blank?
args
+=
search_path
.
split
(
","
).
map
do
|
part
|
args
+=
search_path
.
split
(
","
).
map
do
|
part
|
...
...
activerecord/test/cases/tasks/postgresql_rake_test.rb
浏览文件 @
ff1b4eb3
...
@@ -366,7 +366,7 @@ def test_structure_dump
...
@@ -366,7 +366,7 @@ def test_structure_dump
assert_called_with
(
assert_called_with
(
Kernel
,
Kernel
,
:system
,
:system
,
[
"pg_dump"
,
"-s"
,
"-
X"
,
"-
x"
,
"-O"
,
"-f"
,
@filename
,
"my-app-db"
],
[
"pg_dump"
,
"-s"
,
"-x"
,
"-O"
,
"-f"
,
@filename
,
"my-app-db"
],
returns:
true
returns:
true
)
do
)
do
ActiveRecord
::
Tasks
::
DatabaseTasks
.
structure_dump
(
@configuration
,
@filename
)
ActiveRecord
::
Tasks
::
DatabaseTasks
.
structure_dump
(
@configuration
,
@filename
)
...
@@ -383,7 +383,7 @@ def test_structure_dump_header_comments_removed
...
@@ -383,7 +383,7 @@ def test_structure_dump_header_comments_removed
end
end
def
test_structure_dump_with_extra_flags
def
test_structure_dump_with_extra_flags
expected_command
=
[
"pg_dump"
,
"-s"
,
"-
X"
,
"-
x"
,
"-O"
,
"-f"
,
@filename
,
"--noop"
,
"my-app-db"
]
expected_command
=
[
"pg_dump"
,
"-s"
,
"-x"
,
"-O"
,
"-f"
,
@filename
,
"--noop"
,
"my-app-db"
]
assert_called_with
(
Kernel
,
:system
,
expected_command
,
returns:
true
)
do
assert_called_with
(
Kernel
,
:system
,
expected_command
,
returns:
true
)
do
with_structure_dump_flags
([
"--noop"
])
do
with_structure_dump_flags
([
"--noop"
])
do
...
@@ -401,7 +401,7 @@ def test_structure_dump_with_ignore_tables
...
@@ -401,7 +401,7 @@ def test_structure_dump_with_ignore_tables
assert_called_with
(
assert_called_with
(
Kernel
,
Kernel
,
:system
,
:system
,
[
"pg_dump"
,
"-s"
,
"-
X"
,
"-
x"
,
"-O"
,
"-f"
,
@filename
,
"-T"
,
"foo"
,
"-T"
,
"bar"
,
"my-app-db"
],
[
"pg_dump"
,
"-s"
,
"-x"
,
"-O"
,
"-f"
,
@filename
,
"-T"
,
"foo"
,
"-T"
,
"bar"
,
"my-app-db"
],
returns:
true
returns:
true
)
do
)
do
ActiveRecord
::
Tasks
::
DatabaseTasks
.
structure_dump
(
@configuration
,
@filename
)
ActiveRecord
::
Tasks
::
DatabaseTasks
.
structure_dump
(
@configuration
,
@filename
)
...
@@ -415,7 +415,7 @@ def test_structure_dump_with_schema_search_path
...
@@ -415,7 +415,7 @@ def test_structure_dump_with_schema_search_path
assert_called_with
(
assert_called_with
(
Kernel
,
Kernel
,
:system
,
:system
,
[
"pg_dump"
,
"-s"
,
"-
X"
,
"-
x"
,
"-O"
,
"-f"
,
@filename
,
"--schema=foo"
,
"--schema=bar"
,
"my-app-db"
],
[
"pg_dump"
,
"-s"
,
"-x"
,
"-O"
,
"-f"
,
@filename
,
"--schema=foo"
,
"--schema=bar"
,
"my-app-db"
],
returns:
true
returns:
true
)
do
)
do
ActiveRecord
::
Tasks
::
DatabaseTasks
.
structure_dump
(
@configuration
,
@filename
)
ActiveRecord
::
Tasks
::
DatabaseTasks
.
structure_dump
(
@configuration
,
@filename
)
...
@@ -428,7 +428,7 @@ def test_structure_dump_with_schema_search_path_and_dump_schemas_all
...
@@ -428,7 +428,7 @@ def test_structure_dump_with_schema_search_path_and_dump_schemas_all
assert_called_with
(
assert_called_with
(
Kernel
,
Kernel
,
:system
,
:system
,
[
"pg_dump"
,
"-s"
,
"-
X"
,
"-
x"
,
"-O"
,
"-f"
,
@filename
,
"my-app-db"
],
[
"pg_dump"
,
"-s"
,
"-x"
,
"-O"
,
"-f"
,
@filename
,
"my-app-db"
],
returns:
true
returns:
true
)
do
)
do
with_dump_schemas
(
:all
)
do
with_dump_schemas
(
:all
)
do
...
@@ -441,7 +441,7 @@ def test_structure_dump_with_dump_schemas_string
...
@@ -441,7 +441,7 @@ def test_structure_dump_with_dump_schemas_string
assert_called_with
(
assert_called_with
(
Kernel
,
Kernel
,
:system
,
:system
,
[
"pg_dump"
,
"-s"
,
"-
X"
,
"-
x"
,
"-O"
,
"-f"
,
@filename
,
"--schema=foo"
,
"--schema=bar"
,
"my-app-db"
],
[
"pg_dump"
,
"-s"
,
"-x"
,
"-O"
,
"-f"
,
@filename
,
"--schema=foo"
,
"--schema=bar"
,
"my-app-db"
],
returns:
true
returns:
true
)
do
)
do
with_dump_schemas
(
"foo,bar"
)
do
with_dump_schemas
(
"foo,bar"
)
do
...
@@ -455,7 +455,7 @@ def test_structure_dump_execution_fails
...
@@ -455,7 +455,7 @@ def test_structure_dump_execution_fails
assert_called_with
(
assert_called_with
(
Kernel
,
Kernel
,
:system
,
:system
,
[
"pg_dump"
,
"-s"
,
"-
X"
,
"-
x"
,
"-O"
,
"-f"
,
filename
,
"my-app-db"
],
[
"pg_dump"
,
"-s"
,
"-x"
,
"-O"
,
"-f"
,
filename
,
"my-app-db"
],
returns:
nil
returns:
nil
)
do
)
do
e
=
assert_raise
(
RuntimeError
)
do
e
=
assert_raise
(
RuntimeError
)
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录