Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
15fa2821
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,发现更多精彩内容 >>
提交
15fa2821
编写于
10月 10, 2016
作者:
R
Rafael França
提交者:
GitHub
10月 10, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #26747 from kamipo/name_is_not_column_option
`name` is not a column option
上级
4d93d381
24a1a6a8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
12 deletion
+8
-12
activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
...tive_record/connection_adapters/abstract/schema_dumper.rb
+1
-2
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
..._record/connection_adapters/abstract/schema_statements.rb
+1
-1
activerecord/lib/active_record/schema_dumper.rb
activerecord/lib/active_record/schema_dumper.rb
+6
-9
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
浏览文件 @
15fa2821
...
...
@@ -8,7 +8,6 @@ module ConnectionAdapters # :nodoc:
module
ColumnDumper
def
column_spec
(
column
)
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
...
...
@@ -53,7 +52,7 @@ def prepare_column_options(column)
# Lists the valid migration options
def
migration_keys
[
:
name
,
:
limit
,
:precision
,
:scale
,
:default
,
:null
,
:collation
,
:comment
]
[
:limit
,
:precision
,
:scale
,
:default
,
:null
,
:collation
,
:comment
]
end
private
...
...
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
浏览文件 @
15fa2821
...
...
@@ -120,7 +120,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
-
[
:name
])
.
each
do
|
attr
|
migration_keys
.
each
do
|
attr
|
checks
<<
lambda
{
|
c
|
c
.
send
(
attr
)
==
options
[
attr
]
}
if
options
.
key?
(
attr
)
end
...
...
activerecord/lib/active_record/schema_dumper.rb
浏览文件 @
15fa2821
...
...
@@ -133,18 +133,15 @@ def table(table, stream)
tbl
.
puts
" do |t|"
# then dump all non-primary key columns
column_specs
=
columns
.
map
do
|
column
|
raise
StandardError
,
"Unknown type '
#{
column
.
sql_type
}
' for column '
#{
column
.
name
}
'"
unless
@connection
.
valid_type?
(
column
.
type
)
next
if
column
.
name
==
pk
@connection
.
column_spec
(
column
)
end
.
compact
# find all migration keys used in this table
keys
=
@connection
.
migration_keys
column_specs
.
each
do
|
colspec
|
values
=
keys
.
map
{
|
key
|
colspec
[
key
]
}.
compact
# then dump all non-primary key columns
columns
.
each
do
|
column
|
raise
StandardError
,
"Unknown type '
#{
column
.
sql_type
}
' for column '
#{
column
.
name
}
'"
unless
@connection
.
valid_type?
(
column
.
type
)
next
if
column
.
name
==
pk
colspec
=
@connection
.
column_spec
(
column
)
values
=
[
column
.
name
.
inspect
]
+
keys
.
map
{
|
key
|
colspec
[
key
]
}.
compact
tbl
.
puts
" t.
#{
colspec
[
:type
]
}
#{
values
.
join
(
", "
)
}
"
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录