Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
c68e45dd
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,发现更多精彩内容 >>
提交
c68e45dd
编写于
5月 27, 2015
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17654 from kamipo/strict_mode_explicitly
If specify `strict: :default` explicitly, do not set sql_mode.
上级
27fdf459
7961f4f7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
2 deletion
+22
-2
activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
...tive_record/connection_adapters/abstract_mysql_adapter.rb
+4
-2
activerecord/test/cases/adapters/mysql/connection_test.rb
activerecord/test/cases/adapters/mysql/connection_test.rb
+9
-0
activerecord/test/cases/adapters/mysql2/connection_test.rb
activerecord/test/cases/adapters/mysql2/connection_test.rb
+9
-0
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
浏览文件 @
c68e45dd
...
...
@@ -959,10 +959,12 @@ def configure_connection
wait_timeout
=
2147483
unless
wait_timeout
.
is_a?
(
Fixnum
)
variables
[
'wait_timeout'
]
=
self
.
class
.
type_cast_config_to_integer
(
wait_timeout
)
defaults
=
[
':default'
,
:default
].
to_set
# Make MySQL reject illegal values rather than truncating or blanking them, see
# http://dev.mysql.com/doc/refman/5.6/en/sql-mode.html#sqlmode_strict_all_tables
# If the user has provided another value for sql_mode, don't replace it.
unless
variables
.
has_key?
(
'sql_mode'
)
unless
variables
.
has_key?
(
'sql_mode'
)
||
defaults
.
include?
(
@config
[
:strict
])
variables
[
'sql_mode'
]
=
strict_mode?
?
'STRICT_ALL_TABLES'
:
''
end
...
...
@@ -977,7 +979,7 @@ def configure_connection
# Gather up all of the SET variables...
variable_assignments
=
variables
.
map
do
|
k
,
v
|
if
v
==
':default'
||
v
==
:default
if
defaults
.
include?
(
v
)
"@@SESSION.
#{
k
}
= DEFAULT"
# Sets the value to the global or compile default
elsif
!
v
.
nil?
"@@SESSION.
#{
k
}
=
#{
quote
(
v
)
}
"
...
...
activerecord/test/cases/adapters/mysql/connection_test.rb
浏览文件 @
c68e45dd
...
...
@@ -145,6 +145,15 @@ def test_mysql_strict_mode_disabled
end
end
def
test_mysql_strict_mode_specified_default
run_without_connection
do
|
orig_connection
|
ActiveRecord
::
Base
.
establish_connection
(
orig_connection
.
merge
({
strict: :default
}))
global_sql_mode
=
ActiveRecord
::
Base
.
connection
.
exec_query
"SELECT @@GLOBAL.sql_mode"
session_sql_mode
=
ActiveRecord
::
Base
.
connection
.
exec_query
"SELECT @@SESSION.sql_mode"
assert_equal
global_sql_mode
.
rows
,
session_sql_mode
.
rows
end
end
def
test_mysql_set_session_variable
run_without_connection
do
|
orig_connection
|
ActiveRecord
::
Base
.
establish_connection
(
orig_connection
.
deep_merge
({
:variables
=>
{
:default_week_format
=>
3
}}))
...
...
activerecord/test/cases/adapters/mysql2/connection_test.rb
浏览文件 @
c68e45dd
...
...
@@ -84,6 +84,15 @@ def test_mysql_strict_mode_disabled
end
end
def
test_mysql_strict_mode_specified_default
run_without_connection
do
|
orig_connection
|
ActiveRecord
::
Base
.
establish_connection
(
orig_connection
.
merge
({
strict: :default
}))
global_sql_mode
=
ActiveRecord
::
Base
.
connection
.
exec_query
"SELECT @@GLOBAL.sql_mode"
session_sql_mode
=
ActiveRecord
::
Base
.
connection
.
exec_query
"SELECT @@SESSION.sql_mode"
assert_equal
global_sql_mode
.
rows
,
session_sql_mode
.
rows
end
end
def
test_mysql_set_session_variable
run_without_connection
do
|
orig_connection
|
ActiveRecord
::
Base
.
establish_connection
(
orig_connection
.
deep_merge
({
:variables
=>
{
:default_week_format
=>
3
}}))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录