Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e0e20d62
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,发现更多精彩内容 >>
提交
e0e20d62
编写于
2月 06, 2017
作者:
J
Jeremy Daer
提交者:
GitHub
2月 06, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #27884 from kamipo/deprecate_migration_keys
Deprecate `ColumnDumper#migration_keys`
上级
abfd0919
2aa9fd07
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
18 addition
and
6 deletion
+18
-6
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+4
-0
activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
...tive_record/connection_adapters/abstract/schema_dumper.rb
+3
-2
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
..._record/connection_adapters/abstract/schema_statements.rb
+4
-1
activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
.../active_record/connection_adapters/mysql/schema_dumper.rb
+1
-1
activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
...ve_record/connection_adapters/postgresql/schema_dumper.rb
+1
-1
activerecord/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb
...ctive_record/connection_adapters/sqlite3/schema_dumper.rb
+1
-1
activerecord/test/cases/migration_test.rb
activerecord/test/cases/migration_test.rb
+4
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
e0e20d62
*
Deprecate
`ColumnDumper#migration_keys`
.
*Ryuta Kamizono*
*
Fix
`association_primary_key_type`
for reflections with symbol primary key
Fixes #27864
...
...
activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
浏览文件 @
e0e20d62
...
...
@@ -49,9 +49,10 @@ def prepare_column_options(column)
end
# Lists the valid migration options
def
migration_keys
[
:limit
,
:precision
,
:scale
,
:default
,
:null
,
:collation
,
:comment
]
def
migration_keys
# :nodoc:
column_options_keys
end
deprecate
:migration_keys
private
...
...
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
浏览文件 @
e0e20d62
...
...
@@ -122,7 +122,7 @@ def column_exists?(table_name, column_name, type = nil, options = {})
checks
=
[]
checks
<<
lambda
{
|
c
|
c
.
name
==
column_name
}
checks
<<
lambda
{
|
c
|
c
.
type
==
type
}
if
type
migration
_keys
.
each
do
|
attr
|
column_options
_keys
.
each
do
|
attr
|
checks
<<
lambda
{
|
c
|
c
.
send
(
attr
)
==
options
[
attr
]
}
if
options
.
key?
(
attr
)
end
...
...
@@ -1172,6 +1172,9 @@ def change_column_comment(table_name, column_name, comment) #:nodoc:
end
private
def
column_options_keys
[
:limit
,
:precision
,
:scale
,
:default
,
:null
,
:collation
,
:comment
]
end
def
add_index_sort_order
(
quoted_columns
,
**
options
)
if
order
=
options
[
:order
]
...
...
activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
浏览文件 @
e0e20d62
module
ActiveRecord
module
ConnectionAdapters
module
MySQL
module
ColumnDumper
module
ColumnDumper
# :nodoc:
def
column_spec_for_primary_key
(
column
)
spec
=
super
if
[
:integer
,
:bigint
].
include?
(
schema_type
(
column
))
&&
!
column
.
auto_increment?
...
...
activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
浏览文件 @
e0e20d62
module
ActiveRecord
module
ConnectionAdapters
module
PostgreSQL
module
ColumnDumper
module
ColumnDumper
# :nodoc:
def
column_spec_for_primary_key
(
column
)
spec
=
super
if
schema_type
(
column
)
==
:uuid
...
...
activerecord/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb
浏览文件 @
e0e20d62
module
ActiveRecord
module
ConnectionAdapters
module
SQLite3
module
ColumnDumper
module
ColumnDumper
# :nodoc:
private
def
default_primary_key?
(
column
)
...
...
activerecord/test/cases/migration_test.rb
浏览文件 @
e0e20d62
...
...
@@ -1138,4 +1138,8 @@ def test_deprecate_initialize_internal_tables
assert_deprecated
{
ActiveRecord
::
Base
.
connection
.
initialize_schema_migrations_table
}
assert_deprecated
{
ActiveRecord
::
Base
.
connection
.
initialize_internal_metadata_table
}
end
def
test_deprecate_migration_keys
assert_deprecated
{
ActiveRecord
::
Base
.
connection
.
migration_keys
}
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录