Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ac26573c
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,体验更适合开发者的 AI 搜索 >>
提交
ac26573c
编写于
11月 29, 2015
作者:
S
Santiago Pastorino
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22444 from kamipo/connection_options_is_only_needed_for_mysql_adapter
`connection_options` is only needed for `MysqlAdapter`
上级
127a87cf
81279484
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
3 addition
and
3 deletion
+3
-3
activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
...tive_record/connection_adapters/abstract_mysql_adapter.rb
+1
-1
activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
...d/lib/active_record/connection_adapters/mysql2_adapter.rb
+1
-2
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
...rd/lib/active_record/connection_adapters/mysql_adapter.rb
+1
-0
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
浏览文件 @
ac26573c
...
...
@@ -144,7 +144,7 @@ def attributes_for_hash
# FIXME: Make the first parameter more similar for the two adapters
def
initialize
(
connection
,
logger
,
connection_options
,
config
)
super
(
connection
,
logger
)
@con
nection_options
,
@config
=
connection_options
,
config
@con
fig
=
config
@quoted_column_names
,
@quoted_table_names
=
{},
{}
@visitor
=
Arel
::
Visitors
::
MySQL
.
new
self
...
...
activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
浏览文件 @
ac26573c
...
...
@@ -16,8 +16,7 @@ def mysql2_connection(config)
end
client
=
Mysql2
::
Client
.
new
(
config
)
options
=
[
config
[
:host
],
config
[
:username
],
config
[
:password
],
config
[
:database
],
config
[
:port
],
config
[
:socket
],
0
]
ConnectionAdapters
::
Mysql2Adapter
.
new
(
client
,
logger
,
options
,
config
)
ConnectionAdapters
::
Mysql2Adapter
.
new
(
client
,
logger
,
nil
,
config
)
rescue
Mysql2
::
Error
=>
error
if
error
.
message
.
include?
(
"Unknown database"
)
raise
ActiveRecord
::
NoDatabaseError
...
...
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
浏览文件 @
ac26573c
...
...
@@ -82,6 +82,7 @@ def initialize(connection, logger, connection_options, config)
super
@statements
=
StatementPool
.
new
(
self
.
class
.
type_cast_config_to_integer
(
config
.
fetch
(
:statement_limit
)
{
1000
}))
@client_encoding
=
nil
@connection_options
=
connection_options
connect
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录