Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
efdc20f3
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,发现更多精彩内容 >>
提交
efdc20f3
编写于
1月 04, 2015
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove deprecated access to connection specification using a string acessor.
Now all strings will be handled as a URL.
上级
a939506f
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
7 addition
and
58 deletion
+7
-58
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+6
-0
activerecord/lib/active_record/connection_adapters/connection_specification.rb
...ve_record/connection_adapters/connection_specification.rb
+1
-20
activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb
...ion_adapters/merge_and_resolve_default_url_config_test.rb
+0
-38
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
efdc20f3
*
Remove deprecated access to connection specification using a string acessor.
Now all strings will be handled as a URL.
*Rafael Mendonça França*
*
Change the default
`null`
value for
`timestamps`
to
`false`
.
*Rafael Mendonça França*
...
...
activerecord/lib/active_record/connection_adapters/connection_specification.rb
浏览文件 @
efdc20f3
require
'uri'
require
'active_support/core_ext/string/filters'
module
ActiveRecord
module
ConnectionAdapters
...
...
@@ -210,30 +209,12 @@ def resolve_connection(spec)
when
Symbol
resolve_symbol_connection
spec
when
String
resolve_
string
_connection
spec
resolve_
url
_connection
spec
when
Hash
resolve_hash_connection
spec
end
end
def
resolve_string_connection
(
spec
)
# Rails has historically accepted a string to mean either
# an environment key or a URL spec, so we have deprecated
# this ambiguous behaviour and in the future this function
# can be removed in favor of resolve_url_connection.
if
configurations
.
key?
(
spec
)
||
spec
!~
/:/
ActiveSupport
::
Deprecation
.
warn
(
<<-
MSG
.
squish
)
Passing a string to ActiveRecord::Base.establish_connection for a
configuration lookup is deprecated, please pass a symbol
(
#{
spec
.
to_sym
.
inspect
}
) instead.
MSG
resolve_symbol_connection
(
spec
)
else
resolve_url_connection
(
spec
)
end
end
# Takes the environment such as +:production+ or +:development+.
# This requires that the @configurations was initialized with a key that
# matches.
...
...
activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb
浏览文件 @
efdc20f3
...
...
@@ -51,34 +51,6 @@ def test_resolver_with_database_uri_and_current_env_symbol_key_and_rack_env
assert_equal
expected
,
actual
end
def
test_resolver_with_database_uri_and_and_current_env_string_key
ENV
[
'DATABASE_URL'
]
=
"postgres://localhost/foo"
config
=
{
"default_env"
=>
{
"adapter"
=>
"not_postgres"
,
"database"
=>
"not_foo"
}
}
actual
=
assert_deprecated
{
resolve_spec
(
"default_env"
,
config
)
}
expected
=
{
"adapter"
=>
"postgresql"
,
"database"
=>
"foo"
,
"host"
=>
"localhost"
}
assert_equal
expected
,
actual
end
def
test_resolver_with_database_uri_and_and_current_env_string_key_and_rails_env
ENV
[
'DATABASE_URL'
]
=
"postgres://localhost/foo"
ENV
[
'RAILS_ENV'
]
=
"foo"
config
=
{
"not_production"
=>
{
"adapter"
=>
"not_postgres"
,
"database"
=>
"not_foo"
}
}
actual
=
assert_deprecated
{
resolve_spec
(
"foo"
,
config
)
}
expected
=
{
"adapter"
=>
"postgresql"
,
"database"
=>
"foo"
,
"host"
=>
"localhost"
}
assert_equal
expected
,
actual
end
def
test_resolver_with_database_uri_and_and_current_env_string_key_and_rack_env
ENV
[
'DATABASE_URL'
]
=
"postgres://localhost/foo"
ENV
[
'RACK_ENV'
]
=
"foo"
config
=
{
"not_production"
=>
{
"adapter"
=>
"not_postgres"
,
"database"
=>
"not_foo"
}
}
actual
=
assert_deprecated
{
resolve_spec
(
"foo"
,
config
)
}
expected
=
{
"adapter"
=>
"postgresql"
,
"database"
=>
"foo"
,
"host"
=>
"localhost"
}
assert_equal
expected
,
actual
end
def
test_resolver_with_database_uri_and_known_key
ENV
[
'DATABASE_URL'
]
=
"postgres://localhost/foo"
config
=
{
"production"
=>
{
"adapter"
=>
"not_postgres"
,
"database"
=>
"not_foo"
,
"host"
=>
"localhost"
}
}
...
...
@@ -95,16 +67,6 @@ def test_resolver_with_database_uri_and_unknown_symbol_key
end
end
def
test_resolver_with_database_uri_and_unknown_string_key
ENV
[
'DATABASE_URL'
]
=
"postgres://localhost/foo"
config
=
{
"not_production"
=>
{
"adapter"
=>
"not_postgres"
,
"database"
=>
"not_foo"
}
}
assert_deprecated
do
assert_raises
AdapterNotSpecified
do
resolve_spec
(
"production"
,
config
)
end
end
end
def
test_resolver_with_database_uri_and_supplied_url
ENV
[
'DATABASE_URL'
]
=
"not-postgres://not-localhost/not_foo"
config
=
{
"production"
=>
{
"adapter"
=>
"also_not_postgres"
,
"database"
=>
"also_not_foo"
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录