Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
83215b86
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,发现更多精彩内容 >>
提交
83215b86
编写于
1月 11, 2016
作者:
R
Richard Schneeman
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #23015 from schneems/schneems/manual-environment-set
Allow manually setting environment value
上级
179df9df
eafa43e8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
6 deletion
+17
-6
activerecord/lib/active_record/migration.rb
activerecord/lib/active_record/migration.rb
+11
-6
activerecord/lib/active_record/railties/databases.rake
activerecord/lib/active_record/railties/databases.rake
+6
-0
未找到文件。
activerecord/lib/active_record/migration.rb
浏览文件 @
83215b86
...
...
@@ -145,7 +145,7 @@ def initialize(message = DEFAULT_MESSAGE)
class
NoEnvironmentInSchemaError
<
MigrationError
#:nodoc:
def
initialize
msg
=
"Environment data not found in the schema. To resolve this issue, run:
\n\n\t
bin/rake db:
migrate
"
msg
=
"Environment data not found in the schema. To resolve this issue, run:
\n\n\t
bin/rake db:
environment:set
"
if
defined?
(
Rails
.
env
)
super
(
"
#{
msg
}
RAILS_ENV=
#{
::
Rails
.
env
}
"
)
else
...
...
@@ -157,7 +157,7 @@ def initialize
class
ProtectedEnvironmentError
<
ActiveRecordError
#:nodoc:
def
initialize
(
env
=
"production"
)
msg
=
"You are attempting to run a destructive action against your '
#{
env
}
' database
\n
"
msg
<<
"
i
f you are sure you want to continue, run the same command with the environment variable
\n
"
msg
<<
"
I
f you are sure you want to continue, run the same command with the environment variable
\n
"
msg
<<
"DISABLE_DATABASE_ENVIRONMENT_CHECK=1"
super
(
msg
)
end
...
...
@@ -165,10 +165,15 @@ def initialize(env = "production")
class
EnvironmentMismatchError
<
ActiveRecordError
def
initialize
(
current:
nil
,
stored:
nil
)
msg
=
"You are attempting to modify a database that was last run in
#{
stored
}
environment.
\n
"
msg
<<
"You are running in
#{
current
}
environment."
msg
<<
"if you are sure you want to continue, run the same command with the environment variable
\n
"
msg
<<
"DISABLE_DATABASE_ENVIRONMENT_CHECK=1"
msg
=
"You are attempting to modify a database that was last run in `
#{
stored
}
` environment.
\n
"
msg
<<
"You are running in `
#{
current
}
` environment."
msg
<<
"If you are sure you want to continue, first set the environment using:
\n\n
"
msg
<<
"
\t
bin/rake db:environment:set"
if
defined?
(
Rails
.
env
)
super
(
"
#{
msg
}
RAILS_ENV=
#{
::
Rails
.
env
}
"
)
else
super
(
msg
)
end
end
end
...
...
activerecord/lib/active_record/railties/databases.rake
浏览文件 @
83215b86
require
'active_record'
db_namespace
=
namespace
:db
do
desc
"Set the environment value for the database"
task
"environment:set"
=>
[
:environment
,
:load_config
]
do
ActiveRecord
::
InternalMetadata
.
create_table
ActiveRecord
::
InternalMetadata
[
:environment
]
=
ActiveRecord
::
Migrator
.
current_environment
end
task
:check_protected_environments
=>
[
:environment
,
:load_config
]
do
ActiveRecord
::
Tasks
::
DatabaseTasks
.
check_protected_environments!
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录