Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0a99fddc
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,发现更多精彩内容 >>
提交
0a99fddc
编写于
4月 03, 2014
作者:
M
Matthew Draper
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Complete change of `
sqlite3:///`
path handling
That which was now relative is now absolute.
上级
f846828d
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
11 addition
and
17 deletion
+11
-17
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+8
-0
activerecord/lib/active_record/connection_adapters/connection_specification.rb
...ve_record/connection_adapters/connection_specification.rb
+1
-15
activerecord/test/cases/connection_specification/resolver_test.rb
...cord/test/cases/connection_specification/resolver_test.rb
+2
-2
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
0a99fddc
*
As promised, switch
`sqlite3:///`
URLs (which were temporarily
deprecated in 4.1) from relative to absolute.
If you still want the previous interpretation, you should replace
`sqlite3:///my/path` with `sqlite3:my/path`.
*Matthew Draper*
*
(Temporarily) deprecate SQLite database URLs containing an
authority.
...
...
activerecord/lib/active_record/connection_adapters/connection_specification.rb
浏览文件 @
0a99fddc
...
...
@@ -41,7 +41,6 @@ def initialize(url)
else
@query
=
@uri
.
query
end
@authority
=
url
=~
%r{
\A
[^:]*://}
end
# Converts the given URL to a full connection hash.
...
...
@@ -91,21 +90,8 @@ def raw_config
end
# Returns name of the database.
# Sqlite3's handling of a leading slash is in transition as of
# Rails 4.1.
def
database_from_path
if
@authority
&&
@adapter
==
'sqlite3'
# 'sqlite3:///foo' is relative, for backwards compatibility.
database_name
=
uri
.
path
.
sub
(
%r{^/}
,
""
)
msg
=
"Paths in SQLite3 database URLs of the form `sqlite3:///path` will be treated as absolute in Rails 4.2. "
\
"Please switch to `sqlite3:
#{
database_name
}
`."
ActiveSupport
::
Deprecation
.
warn
(
msg
)
database_name
elsif
@adapter
==
'sqlite3'
if
@adapter
==
'sqlite3'
# 'sqlite3:/foo' is absolute, because that makes sense. The
# corresponding relative version, 'sqlite3:foo', is handled
# elsewhere, as an "opaque".
...
...
activerecord/test/cases/connection_specification/resolver_test.rb
浏览文件 @
0a99fddc
...
...
@@ -83,8 +83,8 @@ def test_encoded_password
end
def
test_url_with_authority_for_sqlite3
spec
=
assert_deprecated
{
resolve
'sqlite3:///foo_test'
}
assert_equal
(
'foo_test'
,
spec
[
"database"
])
spec
=
resolve
'sqlite3:///foo_test'
assert_equal
(
'
/
foo_test'
,
spec
[
"database"
])
end
def
test_url_absolute_path_for_sqlite3
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录