Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
55133a0e
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
55133a0e
编写于
8月 29, 2018
作者:
E
Eileen M. Uchitelle
提交者:
GitHub
8月 29, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #33748 from eileencodes/fix-erb-loading-issue-with-db-yaml
Drop load_database_yaml and fix test
上级
068fe7dc
6b5df90f
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
8 addition
and
16 deletion
+8
-16
activerecord/lib/active_record/tasks/database_tasks.rb
activerecord/lib/active_record/tasks/database_tasks.rb
+1
-1
railties/lib/rails/application/configuration.rb
railties/lib/rails/application/configuration.rb
+0
-12
railties/test/application/rake/dbs_test.rb
railties/test/application/rake/dbs_test.rb
+7
-3
未找到文件。
activerecord/lib/active_record/tasks/database_tasks.rb
浏览文件 @
55133a0e
...
...
@@ -135,7 +135,7 @@ def create_all
end
def
for_each
databases
=
Rails
.
application
.
config
.
load_database_yaml
databases
=
Rails
.
application
.
config
.
database_configuration
database_configs
=
ActiveRecord
::
DatabaseConfigurations
.
configs_for
(
Rails
.
env
,
databases
)
# if this is a single database application we don't want tasks for each primary database
...
...
railties/lib/rails/application/configuration.rb
浏览文件 @
55133a0e
...
...
@@ -168,18 +168,6 @@ def paths
end
end
# Loads the database YAML without evaluating ERB. People seem to
# write ERB that makes the database configuration depend on
# Rails configuration. But we want Rails configuration (specifically
# `rake` and `rails` tasks) to be generated based on information in
# the database yaml, so we need a method that loads the database
# yaml *without* the context of the Rails application.
def
load_database_yaml
# :nodoc:
path
=
paths
[
"config/database"
].
existent
.
first
return
{}
unless
path
YAML
.
load_file
(
path
.
to_s
)
end
# Loads and returns the entire raw configuration of database from
# values stored in <tt>config/database.yml</tt>.
def
database_configuration
...
...
railties/test/application/rake/dbs_test.rb
浏览文件 @
55133a0e
...
...
@@ -52,17 +52,21 @@ def db_create_and_drop(expected_database, environment_loaded: true)
test
"db:create and db:drop respect environment setting"
do
app_file
"config/database.yml"
,
<<-
YAML
development:
database:
<%= Rails.application.config.database %>
database:
db/development.sqlite3
adapter: sqlite3
YAML
app_file
"config/environments/development.rb"
,
<<-
RUBY
Rails.application.configure do
config.
database = "db/development.sqlite3"
config.
read_encrypted_secrets = true
end
RUBY
db_create_and_drop
"db/development.sqlite3"
,
environment_loaded:
false
app
"development"
assert_equal
true
,
Rails
.
application
.
config
.
read_encrypted_secrets
db_create_and_drop
"db/development.sqlite3"
end
def
with_database_existing
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录