Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0bc8d0fb
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,发现更多精彩内容 >>
提交
0bc8d0fb
编写于
1月 15, 2017
作者:
K
Kasper Timm Hansen
提交者:
GitHub
1月 15, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #27618 from kamipo/fix_uuid_default_nil
Fix UUID primary key with default nil in legacy migration
上级
7c3a99ee
c352f12c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
20 deletion
+37
-20
activerecord/lib/active_record/migration/compatibility.rb
activerecord/lib/active_record/migration/compatibility.rb
+1
-1
activerecord/test/cases/adapters/postgresql/uuid_test.rb
activerecord/test/cases/adapters/postgresql/uuid_test.rb
+36
-19
未找到文件。
activerecord/lib/active_record/migration/compatibility.rb
浏览文件 @
0bc8d0fb
...
...
@@ -16,7 +16,7 @@ def self.find(version)
class
V5_0
<
V5_1
def
create_table
(
table_name
,
options
=
{})
if
adapter_name
==
"PostgreSQL"
if
options
[
:id
]
==
:uuid
&&
!
options
[
:default
]
if
options
[
:id
]
==
:uuid
&&
!
options
.
key?
(
:default
)
options
[
:default
]
=
"uuid_generate_v4()"
end
end
...
...
activerecord/test/cases/adapters/postgresql/uuid_test.rb
浏览文件 @
0bc8d0fb
...
...
@@ -234,25 +234,23 @@ def test_schema_dumper_for_uuid_primary_key_default
end
end
if
ActiveRecord
::
Base
.
connection
.
supports_pgcrypto_uuid?
def
test_schema_dumper_for_uuid_primary_key_default_in_legacy_migration
@verbose_was
=
ActiveRecord
::
Migration
.
verbose
ActiveRecord
::
Migration
.
verbose
=
false
migration
=
Class
.
new
(
ActiveRecord
::
Migration
[
4.2
])
do
def
version
;
101
end
def
migrate
(
x
)
create_table
(
"pg_uuids_4"
,
id: :uuid
)
end
end
.
new
ActiveRecord
::
Migrator
.
new
(
:up
,
[
migration
]).
migrate
schema
=
dump_table_schema
"pg_uuids_4"
assert_match
(
/\bcreate_table "pg_uuids_4", id: :uuid, default: -> { "uuid_generate_v4\(\)" }/
,
schema
)
ensure
drop_table
"pg_uuids_4"
ActiveRecord
::
Migration
.
verbose
=
@verbose_was
end
def
test_schema_dumper_for_uuid_primary_key_default_in_legacy_migration
@verbose_was
=
ActiveRecord
::
Migration
.
verbose
ActiveRecord
::
Migration
.
verbose
=
false
migration
=
Class
.
new
(
ActiveRecord
::
Migration
[
5.0
])
do
def
version
;
101
end
def
migrate
(
x
)
create_table
(
"pg_uuids_4"
,
id: :uuid
)
end
end
.
new
ActiveRecord
::
Migrator
.
new
(
:up
,
[
migration
]).
migrate
schema
=
dump_table_schema
"pg_uuids_4"
assert_match
(
/\bcreate_table "pg_uuids_4", id: :uuid, default: -> { "uuid_generate_v4\(\)" }/
,
schema
)
ensure
drop_table
"pg_uuids_4"
ActiveRecord
::
Migration
.
verbose
=
@verbose_was
end
end
end
...
...
@@ -285,6 +283,25 @@ def test_schema_dumper_for_uuid_primary_key_with_default_override_via_nil
schema
=
dump_table_schema
"pg_uuids"
assert_match
(
/\bcreate_table "pg_uuids", id: :uuid, default: nil/
,
schema
)
end
def
test_schema_dumper_for_uuid_primary_key_with_default_nil_in_legacy_migration
@verbose_was
=
ActiveRecord
::
Migration
.
verbose
ActiveRecord
::
Migration
.
verbose
=
false
migration
=
Class
.
new
(
ActiveRecord
::
Migration
[
5.0
])
do
def
version
;
101
end
def
migrate
(
x
)
create_table
(
"pg_uuids_4"
,
id: :uuid
,
default:
nil
)
end
end
.
new
ActiveRecord
::
Migrator
.
new
(
:up
,
[
migration
]).
migrate
schema
=
dump_table_schema
"pg_uuids_4"
assert_match
(
/\bcreate_table "pg_uuids_4", id: :uuid, default: nil/
,
schema
)
ensure
drop_table
"pg_uuids_4"
ActiveRecord
::
Migration
.
verbose
=
@verbose_was
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录