Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
33051202
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,发现更多精彩内容 >>
提交
33051202
编写于
2月 29, 2016
作者:
R
Ryuta Kamizono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Exclude `:name` and `:type` from `prepare_column_options`
Actually `:name` and `:type` are not column options.
上级
b884ee6f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
8 deletion
+8
-8
activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
...tive_record/connection_adapters/abstract/schema_dumper.rb
+6
-6
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/abstract/schema_dumper.rb
浏览文件 @
33051202
...
...
@@ -7,15 +7,16 @@ module ConnectionAdapters # :nodoc:
# Adapter level by over-writing this code inside the database specific adapters
module
ColumnDumper
def
column_spec
(
column
)
spec
=
prepare_column_options
(
column
)
(
spec
.
keys
-
[
:name
,
:type
]).
each
{
|
k
|
spec
[
k
].
insert
(
0
,
"
#{
k
}
: "
)}
spec
=
Hash
[
prepare_column_options
(
column
).
map
{
|
k
,
v
|
[
k
,
"
#{
k
}
:
#{
v
}
"
]
}]
spec
[
:name
]
=
column
.
name
.
inspect
spec
[
:type
]
=
schema_type
(
column
).
to_s
spec
end
def
column_spec_for_primary_key
(
column
)
return
if
column
.
type
==
:integer
spec
=
{
id:
schema_type
(
column
).
inspect
}
spec
.
merge!
(
prepare_column_options
(
column
)
.
delete_if
{
|
key
,
_
|
[
:name
,
:type
].
include?
(
key
)
}
)
spec
.
merge!
(
prepare_column_options
(
column
))
end
# This can be overridden on an Adapter level basis to support other
...
...
@@ -23,9 +24,6 @@ def column_spec_for_primary_key(column)
# PostgreSQL::ColumnDumper)
def
prepare_column_options
(
column
)
spec
=
{}
spec
[
:name
]
=
column
.
name
.
inspect
spec
[
:type
]
=
schema_type
(
column
).
to_s
spec
[
:null
]
=
'false'
unless
column
.
null
if
limit
=
schema_limit
(
column
)
spec
[
:limit
]
=
limit
...
...
@@ -42,6 +40,8 @@ def prepare_column_options(column)
default
=
schema_default
(
column
)
if
column
.
has_default?
spec
[
:default
]
=
default
unless
default
.
nil?
spec
[
:null
]
=
'false'
unless
column
.
null
if
collation
=
schema_collation
(
column
)
spec
[
:collation
]
=
collation
end
...
...
activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
浏览文件 @
33051202
...
...
@@ -13,7 +13,7 @@ def column_spec_for_primary_key(column)
return
if
spec
.
empty?
else
spec
[
:id
]
=
schema_type
(
column
).
inspect
spec
.
merge!
(
prepare_column_options
(
column
).
delete_if
{
|
key
,
_
|
[
:name
,
:type
,
:null
].
include?
(
key
)
})
spec
.
merge!
(
prepare_column_options
(
column
).
delete_if
{
|
key
,
_
|
key
==
:null
})
end
spec
end
...
...
activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
浏览文件 @
33051202
...
...
@@ -12,7 +12,7 @@ def column_spec_for_primary_key(column)
spec
[
:default
]
=
schema_default
(
column
)
||
'nil'
else
spec
[
:id
]
=
schema_type
(
column
).
inspect
spec
.
merge!
(
prepare_column_options
(
column
).
delete_if
{
|
key
,
_
|
[
:name
,
:type
,
:null
].
include?
(
key
)
})
spec
.
merge!
(
prepare_column_options
(
column
).
delete_if
{
|
key
,
_
|
key
==
:null
})
end
spec
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录