Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1fa6c9e5
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,发现更多精彩内容 >>
提交
1fa6c9e5
编写于
10月 27, 2015
作者:
R
Ryuta Kamizono
提交者:
Andrew White
11月 02, 2015
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow bigint with default nil for avoiding auto increment primary key
Such as #10404, #18206.
上级
fb6f0d40
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
36 addition
and
3 deletion
+36
-3
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+4
-0
activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb
...ve_record/connection_adapters/mysql/schema_definitions.rb
+1
-1
activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
.../active_record/connection_adapters/mysql/schema_dumper.rb
+5
-2
activerecord/test/cases/primary_keys_test.rb
activerecord/test/cases/primary_keys_test.rb
+26
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
1fa6c9e5
*
Allow bigint with default nil for avoiding auto increment primary key.
*Ryuta Kamizono*
*
Remove
`DEFAULT_CHARSET`
and
`DEFAULT_COLLATION`
in
`MySQLDatabaseTasks`
.
We should omit the collation entirely rather than providing a default.
...
...
activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb
浏览文件 @
1fa6c9e5
...
...
@@ -3,7 +3,7 @@ module ConnectionAdapters
module
MySQL
module
ColumnMethods
def
primary_key
(
name
,
type
=
:primary_key
,
**
options
)
options
[
:auto_increment
]
=
true
if
type
==
:bigint
options
[
:auto_increment
]
=
true
if
type
==
:bigint
&&
!
options
.
key?
(
:default
)
super
end
...
...
activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
浏览文件 @
1fa6c9e5
...
...
@@ -4,8 +4,11 @@ module MySQL
module
ColumnDumper
def
column_spec_for_primary_key
(
column
)
spec
=
{}
if
column
.
auto_increment?
spec
[
:id
]
=
':bigint'
if
column
.
bigint?
if
column
.
bigint?
spec
[
:id
]
=
':bigint'
spec
[
:default
]
=
schema_default
(
column
)
||
'nil'
unless
column
.
auto_increment?
spec
[
:unsigned
]
=
'true'
if
column
.
unsigned?
elsif
column
.
auto_increment?
spec
[
:unsigned
]
=
'true'
if
column
.
unsigned?
return
if
spec
.
empty?
else
...
...
activerecord/test/cases/primary_keys_test.rb
浏览文件 @
1fa6c9e5
...
...
@@ -280,6 +280,32 @@ def test_primary_key_method_with_ansi_quotes
con
.
reconnect!
end
end
class
PrimaryKeyBigintNilDefaultTest
<
ActiveRecord
::
TestCase
include
SchemaDumpingHelper
self
.
use_transactional_tests
=
false
def
setup
@connection
=
ActiveRecord
::
Base
.
connection
@connection
.
create_table
(
:bigint_defaults
,
id: :bigint
,
default:
nil
,
force:
true
)
end
def
teardown
@connection
.
drop_table
:bigint_defaults
,
if_exists:
true
end
test
"primary key with bigint allows default override via nil"
do
column
=
@connection
.
columns
(
:bigint_defaults
).
find
{
|
c
|
c
.
name
==
'id'
}
assert
column
.
bigint?
assert_not
column
.
auto_increment?
end
test
"schema dump primary key with bigint default nil"
do
schema
=
dump_table_schema
"bigint_defaults"
assert_match
%r{create_table "bigint_defaults", id: :bigint, default: nil}
,
schema
end
end
end
if
current_adapter?
(
:PostgreSQLAdapter
,
:MysqlAdapter
,
:Mysql2Adapter
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录