Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
332f9d1a
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(gitcode.net)2024年7月9日维护升级公告
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
332f9d1a
编写于
5月 07, 2016
作者:
A
Arthur Nogueira Neves
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #24897 from maclover7/jm-fix-24844
Followup to #24844
上级
017c7f46
a8258e2b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
3 deletion
+4
-3
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
...ve_record/connection_adapters/abstract/connection_pool.rb
+2
-0
activerecord/lib/active_record/connection_handling.rb
activerecord/lib/active_record/connection_handling.rb
+2
-3
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
浏览文件 @
332f9d1a
...
...
@@ -909,6 +909,8 @@ def remove_connection(spec_name)
# to optimise for.
def
retrieve_connection_pool
(
spec_name
)
owner_to_pool
.
fetch
(
spec_name
)
do
# Check if a connection was previously established in an ancestor process,
# which may have been forked.
if
ancestor_pool
=
pool_from_any_process_for
(
spec_name
)
# A connection was established in an ancestor process that must have
# subsequently forked. We can't reuse the connection, but we can copy
...
...
activerecord/lib/active_record/connection_handling.rb
浏览文件 @
332f9d1a
...
...
@@ -45,7 +45,7 @@ module ConnectionHandling
# The exceptions AdapterNotSpecified, AdapterNotFound and +ArgumentError+
# may be returned on an error.
def
establish_connection
(
spec
=
nil
)
raise
RuntimeError
,
"Anonymous class is not allowed."
unless
name
raise
"Anonymous class is not allowed."
unless
name
spec
||=
DEFAULT_ENV
.
call
.
to_sym
resolver
=
ConnectionAdapters
::
ConnectionSpecification
::
Resolver
.
new
configurations
...
...
@@ -93,8 +93,7 @@ def connection
attr_writer
:connection_specification_name
# Return the specification id from this class otherwise look it up
# in the parent.
# Return the specification name from the current class or its parent.
def
connection_specification_name
unless
defined?
(
@connection_specification_name
)
@connection_specification_name
=
self
==
Base
?
"primary"
:
superclass
.
connection_specification_name
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录