Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
35f2a096
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,发现更多精彩内容 >>
提交
35f2a096
编写于
10月 26, 2012
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7593 from veader/patch-1
Decode attributes pulled from URI.parse
上级
f078f913
f96b410b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
1 deletion
+15
-1
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+5
-1
activerecord/lib/active_record/connection_adapters/connection_specification.rb
...ve_record/connection_adapters/connection_specification.rb
+2
-0
activerecord/test/cases/connection_specification/resolver_test.rb
...cord/test/cases/connection_specification/resolver_test.rb
+8
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
35f2a096
## Rails 4.0.0 (unreleased) ##
*
Decode URI encoded attributes on database connection URLs.
*Shawn Veader*
*
Add
`find_or_create_by`
,
`find_or_create_by!`
and
`find_or_initialize_by`
methods to
`Relation`
.
...
...
@@ -38,7 +42,7 @@
*Jon Leighton*
*
Fix bug with presence validation of associations. Would incorrectly add duplicated errors
*
Fix bug with presence validation of associations. Would incorrectly add duplicated errors
when the association was blank. Bug introduced in 1fab518c6a75dac5773654646eb724a59741bc13.
*Scott Willson*
...
...
activerecord/lib/active_record/connection_adapters/connection_specification.rb
浏览文件 @
35f2a096
...
...
@@ -73,6 +73,8 @@ def connection_url_to_hash(url) # :nodoc:
:database
=>
config
.
path
.
sub
(
%r{^/}
,
""
),
:host
=>
config
.
host
}
spec
.
reject!
{
|
_
,
value
|
value
.
blank?
}
uri_parser
=
URI
::
Parser
.
new
spec
.
map
{
|
key
,
value
|
spec
[
key
]
=
uri_parser
.
unescape
(
value
)
if
value
.
is_a?
(
String
)
}
if
config
.
query
options
=
Hash
[
config
.
query
.
split
(
"&"
).
map
{
|
pair
|
pair
.
split
(
"="
)
}].
symbolize_keys
spec
.
merge!
(
options
)
...
...
activerecord/test/cases/connection_specification/resolver_test.rb
浏览文件 @
35f2a096
...
...
@@ -36,6 +36,14 @@ def test_url_port
:host
=>
"foo"
,
:encoding
=>
"utf8"
},
spec
)
end
def
test_encoded_password
skip
"only if mysql is available"
unless
defined?
(
MysqlAdapter
)
password
=
'am@z1ng_p@ssw0rd#!'
encoded_password
=
URI
.
encode_www_form_component
(
password
)
spec
=
resolve
"mysql://foo:
#{
encoded_password
}
@localhost/bar"
assert_equal
password
,
spec
[
:password
]
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录