Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
5aa86986
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,发现更多精彩内容 >>
提交
5aa86986
编写于
1月 02, 2014
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #13578 from schneems/schneems/database_url-env-default
Use DATABASE_URL by default
上级
96288e83
f642b18c
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
12 addition
and
19 deletion
+12
-19
railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
...rators/rails/app/templates/config/databases/frontbase.yml
+1
-1
railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
...enerators/rails/app/templates/config/databases/ibm_db.yml
+1
-1
railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
.../generators/rails/app/templates/config/databases/jdbc.yml
+1
-1
railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
...rators/rails/app/templates/config/databases/jdbcmysql.yml
+1
-1
railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
...s/rails/app/templates/config/databases/jdbcpostgresql.yml
+1
-1
railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
...tors/rails/app/templates/config/databases/jdbcsqlite3.yml
+1
-1
railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
...generators/rails/app/templates/config/databases/mysql.yml
+1
-1
railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
...enerators/rails/app/templates/config/databases/oracle.yml
+1
-1
railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
...ators/rails/app/templates/config/databases/postgresql.yml
+1
-1
railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
...nerators/rails/app/templates/config/databases/sqlite3.yml
+1
-1
railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
...rators/rails/app/templates/config/databases/sqlserver.yml
+1
-1
railties/test/application/rake/dbs_test.rb
railties/test/application/rake/dbs_test.rb
+1
-8
未找到文件。
railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
浏览文件 @
5aa86986
...
...
@@ -26,4 +26,4 @@ test:
# Do not keep production credentials in the repository,
# instead read the configuration from the environment.
production
:
url
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
url
:
<%%= ENV["DATABASE_URL"] %>
railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
浏览文件 @
5aa86986
...
...
@@ -64,4 +64,4 @@ test:
# Do not keep production credentials in the repository,
# instead read the configuration from the environment.
production
:
url
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
url
:
<%%= ENV["DATABASE_URL"] %>
railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
浏览文件 @
5aa86986
...
...
@@ -56,4 +56,4 @@ test:
# Do not keep production credentials in the repository,
# instead read the configuration from the environment.
production
:
url
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
url
:
<%%= ENV["DATABASE_URL"] %>
railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
浏览文件 @
5aa86986
...
...
@@ -28,4 +28,4 @@ test:
# Do not keep production credentials in the repository,
# instead read the configuration from the environment.
production
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
production
:
<%%= ENV["DATABASE_URL"] %>
railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
浏览文件 @
5aa86986
...
...
@@ -45,4 +45,4 @@ test:
# Do not keep production credentials in the repository,
# instead read the configuration from the environment.
production
:
url
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
url
:
<%%= ENV["DATABASE_URL"] %>
railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
浏览文件 @
5aa86986
...
...
@@ -21,4 +21,4 @@ test:
# Do not keep production credentials in the repository,
# instead read the configuration from the environment.
production
:
url
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
url
:
<%%= ENV["DATABASE_URL"] %>
railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
浏览文件 @
5aa86986
...
...
@@ -39,4 +39,4 @@ test:
# mysql2://myuser:mypass@localhost/somedatabase
#
production
:
url
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
url
:
<%%= ENV["DATABASE_URL"] %>
railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
浏览文件 @
5aa86986
...
...
@@ -35,4 +35,4 @@ test:
# Do not keep production credentials in the repository,
# instead read the configuration from the environment.
production
:
url
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
url
:
<%%= ENV["DATABASE_URL"] %>
railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
浏览文件 @
5aa86986
...
...
@@ -66,4 +66,4 @@ test:
# postgres://myuser:mypass@localhost/somedatabase
#
production
:
url
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
url
:
<%%= ENV["DATABASE_URL"] %>
railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
浏览文件 @
5aa86986
...
...
@@ -27,4 +27,4 @@ test:
# sqlite3://myuser:mypass@localhost/full/path/to/somedatabase
#
production
:
url
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
url
:
<%%= ENV["DATABASE_URL"] %>
railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
浏览文件 @
5aa86986
...
...
@@ -45,4 +45,4 @@ test:
# Do not keep production credentials in the repository,
# instead read the configuration from the environment.
production
:
url
:
<%%= ENV["
RAILS_
DATABASE_URL"] %>
url
:
<%%= ENV["DATABASE_URL"] %>
railties/test/application/rake/dbs_test.rb
浏览文件 @
5aa86986
...
...
@@ -21,16 +21,9 @@ def database_url_db_name
end
def
set_database_url
ENV
[
'
RAILS_
DATABASE_URL'
]
=
File
.
join
(
"sqlite3://:@localhost"
,
database_url_db_name
)
ENV
[
'DATABASE_URL'
]
=
File
.
join
(
"sqlite3://:@localhost"
,
database_url_db_name
)
# ensure it's using the DATABASE_URL
FileUtils
.
rm_rf
(
"
#{
app_path
}
/config/database.yml"
)
File
.
open
(
"
#{
app_path
}
/config/database.yml"
,
'w'
)
do
|
f
|
yaml
=
<<-
YAML
.
strip_heredoc
#{
ENV
[
'RAILS_ENV'
]
}
:
url: <%= ENV['RAILS_DATABASE_URL'] %>
YAML
f
<<
yaml
end
end
def
expected
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录