Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0d54a510
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,发现更多精彩内容 >>
提交
0d54a510
编写于
7月 09, 2018
作者:
R
Ryuta Kamizono
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #33280 from nkondratyev/fix/mysql-time-default-values
Fix default value for mysql time types with specified precision
上级
50a9ca66
64078e08
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
4 deletion
+20
-4
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+4
-0
activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb
...ive_record/connection_adapters/mysql/schema_statements.rb
+2
-2
activerecord/test/cases/defaults_test.rb
activerecord/test/cases/defaults_test.rb
+12
-2
activerecord/test/schema/mysql2_specific_schema.rb
activerecord/test/schema/mysql2_specific_schema.rb
+2
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
0d54a510
*
Fix default value for mysql time types with specified precision.
*Nikolay Kondratyev*
*
Fix
`touch`
option to behave consistently with
`Persistence#touch`
method.
*Ryuta Kamizono*
...
...
activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb
浏览文件 @
0d54a510
...
...
@@ -80,8 +80,8 @@ def create_table_definition(*args)
def
new_column_from_field
(
table_name
,
field
)
type_metadata
=
fetch_type_metadata
(
field
[
:Type
],
field
[
:Extra
])
if
type_metadata
.
type
==
:datetime
&&
/\ACURRENT_TIMESTAMP(?:\(\))?\z/i
.
match?
(
field
[
:Default
])
default
,
default_function
=
nil
,
"CURRENT_TIMESTAMP"
if
type_metadata
.
type
==
:datetime
&&
/\ACURRENT_TIMESTAMP(?:\(
[0-6]?
\))?\z/i
.
match?
(
field
[
:Default
])
default
,
default_function
=
nil
,
field
[
:Default
]
else
default
,
default_function
=
field
[
:Default
],
nil
end
...
...
activerecord/test/cases/defaults_test.rb
浏览文件 @
0d54a510
...
...
@@ -109,13 +109,23 @@ class MysqlDefaultExpressionTest < ActiveRecord::TestCase
if
ActiveRecord
::
Base
.
connection
.
version
>=
"5.6.0"
test
"schema dump datetime includes default expression"
do
output
=
dump_table_schema
(
"datetime_defaults"
)
assert_match
%r/t
\.
datetime
\s
+"modified_datetime",
\s
+default: -> { "CURRENT_TIMESTAMP" }/
,
output
assert_match
%r/t
\.
datetime
\s
+"modified_datetime",
\s
+default: -> { "CURRENT_TIMESTAMP(?:
\(\)
)?" }/i
,
output
end
test
"schema dump datetime includes precise default expression"
do
output
=
dump_table_schema
(
"datetime_defaults"
)
assert_match
%r/t
\.
datetime
\s
+"precise_datetime",.+default: -> { "CURRENT_TIMESTAMP
\(
6
\)
" }/i
,
output
end
end
test
"schema dump timestamp includes default expression"
do
output
=
dump_table_schema
(
"timestamp_defaults"
)
assert_match
%r/t
\.
timestamp
\s
+"modified_timestamp",
\s
+default: -> { "CURRENT_TIMESTAMP" }/
,
output
assert_match
%r/t
\.
timestamp
\s
+"modified_timestamp",
\s
+default: -> { "CURRENT_TIMESTAMP(?:
\(\)
)?" }/i
,
output
end
test
"schema dump timestamp includes precise default expression"
do
output
=
dump_table_schema
(
"timestamp_defaults"
)
assert_match
%r/t
\.
timestamp
\s
+"precise_timestamp",.+default: -> { "CURRENT_TIMESTAMP
\(
6
\)
" }/i
,
output
end
test
"schema dump timestamp without default expression"
do
...
...
activerecord/test/schema/mysql2_specific_schema.rb
浏览文件 @
0d54a510
...
...
@@ -5,12 +5,14 @@
if
ActiveRecord
::
Base
.
connection
.
version
>=
"5.6.0"
create_table
:datetime_defaults
,
force:
true
do
|
t
|
t
.
datetime
:modified_datetime
,
default:
->
{
"CURRENT_TIMESTAMP"
}
t
.
datetime
:precise_datetime
,
precision:
6
,
default:
->
{
"CURRENT_TIMESTAMP(6)"
}
end
end
create_table
:timestamp_defaults
,
force:
true
do
|
t
|
t
.
timestamp
:nullable_timestamp
t
.
timestamp
:modified_timestamp
,
default:
->
{
"CURRENT_TIMESTAMP"
}
t
.
timestamp
:precise_timestamp
,
precision:
6
,
default:
->
{
"CURRENT_TIMESTAMP(6)"
}
end
create_table
:binary_fields
,
force:
true
do
|
t
|
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录