Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
dbc0da42
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,发现更多精彩内容 >>
提交
dbc0da42
编写于
9月 27, 2018
作者:
J
J Smith
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use -X when loading structure.sql via psql
上级
ff1b4eb3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
4 deletion
+4
-4
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
+3
-3
未找到文件。
activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
浏览文件 @
dbc0da42
...
@@ -82,7 +82,7 @@ def structure_dump(filename, extra_flags)
...
@@ -82,7 +82,7 @@ def structure_dump(filename, extra_flags)
def
structure_load
(
filename
,
extra_flags
)
def
structure_load
(
filename
,
extra_flags
)
set_psql_env
set_psql_env
args
=
[
"-v"
,
ON_ERROR_STOP_1
,
"-q"
,
"-f"
,
filename
]
args
=
[
"-v"
,
ON_ERROR_STOP_1
,
"-q"
,
"-
X"
,
"-
f"
,
filename
]
args
.
concat
(
Array
(
extra_flags
))
if
extra_flags
args
.
concat
(
Array
(
extra_flags
))
if
extra_flags
args
<<
configuration
[
"database"
]
args
<<
configuration
[
"database"
]
run_cmd
(
"psql"
,
args
,
"loading"
)
run_cmd
(
"psql"
,
args
,
"loading"
)
...
...
activerecord/test/cases/tasks/postgresql_rake_test.rb
浏览文件 @
dbc0da42
...
@@ -496,7 +496,7 @@ def test_structure_load
...
@@ -496,7 +496,7 @@ def test_structure_load
assert_called_with
(
assert_called_with
(
Kernel
,
Kernel
,
:system
,
:system
,
[
"psql"
,
"-v"
,
"ON_ERROR_STOP=1"
,
"-q"
,
"-f"
,
filename
,
@configuration
[
"database"
]],
[
"psql"
,
"-v"
,
"ON_ERROR_STOP=1"
,
"-q"
,
"-
X"
,
"-
f"
,
filename
,
@configuration
[
"database"
]],
returns:
true
returns:
true
)
do
)
do
ActiveRecord
::
Tasks
::
DatabaseTasks
.
structure_load
(
@configuration
,
filename
)
ActiveRecord
::
Tasks
::
DatabaseTasks
.
structure_load
(
@configuration
,
filename
)
...
@@ -505,7 +505,7 @@ def test_structure_load
...
@@ -505,7 +505,7 @@ def test_structure_load
def
test_structure_load_with_extra_flags
def
test_structure_load_with_extra_flags
filename
=
"awesome-file.sql"
filename
=
"awesome-file.sql"
expected_command
=
[
"psql"
,
"-v"
,
"ON_ERROR_STOP=1"
,
"-q"
,
"-f"
,
filename
,
"--noop"
,
@configuration
[
"database"
]]
expected_command
=
[
"psql"
,
"-v"
,
"ON_ERROR_STOP=1"
,
"-q"
,
"-
X"
,
"-
f"
,
filename
,
"--noop"
,
@configuration
[
"database"
]]
assert_called_with
(
Kernel
,
:system
,
expected_command
,
returns:
true
)
do
assert_called_with
(
Kernel
,
:system
,
expected_command
,
returns:
true
)
do
with_structure_load_flags
([
"--noop"
])
do
with_structure_load_flags
([
"--noop"
])
do
...
@@ -519,7 +519,7 @@ def test_structure_load_accepts_path_with_spaces
...
@@ -519,7 +519,7 @@ def test_structure_load_accepts_path_with_spaces
assert_called_with
(
assert_called_with
(
Kernel
,
Kernel
,
:system
,
:system
,
[
"psql"
,
"-v"
,
"ON_ERROR_STOP=1"
,
"-q"
,
"-f"
,
filename
,
@configuration
[
"database"
]],
[
"psql"
,
"-v"
,
"ON_ERROR_STOP=1"
,
"-q"
,
"-
X"
,
"-
f"
,
filename
,
@configuration
[
"database"
]],
returns:
true
returns:
true
)
do
)
do
ActiveRecord
::
Tasks
::
DatabaseTasks
.
structure_load
(
@configuration
,
filename
)
ActiveRecord
::
Tasks
::
DatabaseTasks
.
structure_load
(
@configuration
,
filename
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录