Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
bed328c8
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,发现更多精彩内容 >>
提交
bed328c8
编写于
7月 09, 2017
作者:
K
Kasper Timm Hansen
提交者:
GitHub
7月 09, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #29725 from y-yagi/fix_29717
Load environment file in `dbconsole` command
上级
551f8836
e12715bf
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
73 addition
and
0 deletion
+73
-0
railties/CHANGELOG.md
railties/CHANGELOG.md
+6
-0
railties/lib/rails/commands/dbconsole/dbconsole_command.rb
railties/lib/rails/commands/dbconsole/dbconsole_command.rb
+1
-0
railties/test/application/dbconsole_test.rb
railties/test/application/dbconsole_test.rb
+66
-0
未找到文件。
railties/CHANGELOG.md
浏览文件 @
bed328c8
*
Load environment file in
`dbconsole`
command.
Fixes #29717
*Yuji Yaginuma*
*
Add
`rails secrets:show`
command.
*Yuji Yaginuma*
...
...
railties/lib/rails/commands/dbconsole/dbconsole_command.rb
浏览文件 @
bed328c8
...
...
@@ -148,6 +148,7 @@ class DbconsoleCommand < Base # :nodoc:
def
perform
extract_environment_option_from_argument
require_application_and_environment!
Rails
::
DBConsole
.
start
(
options
)
end
end
...
...
railties/test/application/dbconsole_test.rb
0 → 100644
浏览文件 @
bed328c8
require
"isolation/abstract_unit"
begin
require
"pty"
rescue
LoadError
end
module
ApplicationTests
class
DBConsoleTest
<
ActiveSupport
::
TestCase
include
ActiveSupport
::
Testing
::
Isolation
def
setup
build_app
end
def
teardown
teardown_app
end
def
test_use_value_defined_in_environment_file_in_database_yml
skip
"PTY unavailable"
unless
available_pty?
Dir
.
chdir
(
app_path
)
do
app_file
"config/database.yml"
,
<<-
YAML
development:
database: <%= Rails.application.config.database %>
adapter: sqlite3
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
timeout: 5000
YAML
app_file
"config/environments/development.rb"
,
<<-
RUBY
Rails.application.configure do
config.database = "db/development.sqlite3"
end
RUBY
end
master
,
slave
=
PTY
.
open
spawn_dbconsole
(
slave
)
assert_output
(
"sqlite>"
,
master
)
ensure
master
.
puts
".exit"
end
private
def
spawn_dbconsole
(
fd
)
Process
.
spawn
(
"
#{
app_path
}
/bin/rails dbconsole"
,
in:
fd
,
out:
fd
,
err:
fd
)
end
def
assert_output
(
expected
,
io
,
timeout
=
5
)
timeout
=
Time
.
now
+
timeout
output
=
""
until
output
.
include?
(
expected
)
||
Time
.
now
>
timeout
if
IO
.
select
([
io
],
[],
[],
0.1
)
output
<<
io
.
read
(
1
)
end
end
assert_includes
output
,
expected
,
"
#{
expected
.
inspect
}
expected, but got:
\n\n
#{
output
}
"
end
def
available_pty?
defined?
(
PTY
)
&&
PTY
.
respond_to?
(
:open
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录