Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
94c87156
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,发现更多精彩内容 >>
提交
94c87156
编写于
1月 03, 2015
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Return an array of pools from `connection_pools`
上级
634ecdbf
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
13 deletion
+6
-13
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+4
-0
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
...ve_record/connection_adapters/abstract/connection_pool.rb
+1
-10
activerecord/test/cases/connection_adapters/connection_handler_test.rb
...test/cases/connection_adapters/connection_handler_test.rb
+1
-3
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
94c87156
*
Return an array of pools from
`connection_pools`
.
*Rafael Mendonça França*
*
Return a null column from
`column_for_attribute`
when no column exists.
*Rafael Mendonça França*
...
...
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
浏览文件 @
94c87156
...
...
@@ -2,7 +2,6 @@
require
'thread_safe'
require
'monitor'
require
'set'
require
'active_support/core_ext/string/filters'
module
ActiveRecord
# Raised when a connection could not be obtained within the connection
...
...
@@ -517,15 +516,7 @@ def initialize
def
connection_pool_list
owner_to_pool
.
values
.
compact
end
def
connection_pools
ActiveSupport
::
Deprecation
.
warn
(
<<-
MSG
.
squish
)
In the next release, this will return the same as `#connection_pool_list`.
(An array of pools, rather than a hash mapping specs to pools.)
MSG
Hash
[
connection_pool_list
.
map
{
|
pool
|
[
pool
.
spec
,
pool
]
}]
end
alias
:connection_pools
:connection_pool_list
def
establish_connection
(
owner
,
spec
)
@class_to_pool
.
clear
...
...
activerecord/test/cases/connection_adapters/connection_handler_test.rb
浏览文件 @
94c87156
...
...
@@ -44,9 +44,7 @@ def test_retrieve_connection_pool_uses_superclass_pool_after_subclass_establish_
end
def
test_connection_pools
assert_deprecated
do
assert_equal
({
Base
.
connection_pool
.
spec
=>
@pool
},
@handler
.
connection_pools
)
end
assert_equal
([
@pool
],
@handler
.
connection_pools
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录