Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1729d3b4
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,发现更多精彩内容 >>
提交
1729d3b4
编写于
7月 04, 2017
作者:
R
Rafael França
提交者:
GitHub
7月 04, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #29653 from kamipo/fix_test_copying_migrations_preserving_magic_comments
Fix `test_copying_migrations_preserving_magic_comments`
上级
b115dd17
0ba55d2e
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
9 addition
and
6 deletion
+9
-6
activerecord/lib/active_record/migration.rb
activerecord/lib/active_record/migration.rb
+6
-4
activerecord/test/cases/migration_test.rb
activerecord/test/cases/migration_test.rb
+2
-2
activerecord/test/migrations/magic/1_currencies_have_symbols.rb
...record/test/migrations/magic/1_currencies_have_symbols.rb
+1
-0
未找到文件。
activerecord/lib/active_record/migration.rb
浏览文件 @
1729d3b4
...
...
@@ -863,15 +863,17 @@ def copy(destination, sources, options = {})
source_migrations
.
each
do
|
migration
|
source
=
File
.
binread
(
migration
.
filename
)
inserted_comment
=
"# This migration comes from
#{
scope
}
(originally
#{
migration
.
version
}
)
\n
"
if
/\A#.*\b(?:en)?coding:\s*\S+/
=~
source
magic_comments
=
""
.
dup
loop
do
# If we have a magic comment in the original migration,
# insert our comment after the first newline(end of the magic comment line)
# so the magic keep working.
# Note that magic comments must be at the first line(except sh-bang).
source
[
/\n/
]
=
"
\n
#{
inserted_comment
}
"
else
source
=
"
#{
inserted_comment
}#{
source
}
"
source
.
sub!
(
/\A(?:#.*\b(?:en)?coding:\s*\S+|#\s*frozen_string_literal:\s*(?:true|false)).*\n/
)
do
|
magic_comment
|
magic_comments
<<
magic_comment
;
""
end
||
break
end
source
=
"
#{
magic_comments
}#{
inserted_comment
}#{
source
}
"
if
duplicate
=
destination_migrations
.
detect
{
|
m
|
m
.
name
==
migration
.
name
}
if
options
[
:on_skip
]
&&
duplicate
.
scope
!=
scope
.
to_s
...
...
activerecord/test/cases/migration_test.rb
浏览文件 @
1729d3b4
...
...
@@ -1015,8 +1015,8 @@ def test_copying_migrations_preserving_magic_comments
assert
File
.
exist?
(
@migrations_path
+
"/4_currencies_have_symbols.bukkits.rb"
)
assert_equal
[
@migrations_path
+
"/4_currencies_have_symbols.bukkits.rb"
],
copied
.
map
(
&
:filename
)
expected
=
"# coding: ISO-8859-15
\n
# This migration comes from bukkits (originally 1)"
assert_equal
expected
,
IO
.
readlines
(
@migrations_path
+
"/4_currencies_have_symbols.bukkits.rb"
)[
0
..
1
].
join
.
chomp
expected
=
"#
frozen_string_literal: true
\n
#
coding: ISO-8859-15
\n
# This migration comes from bukkits (originally 1)"
assert_equal
expected
,
IO
.
readlines
(
@migrations_path
+
"/4_currencies_have_symbols.bukkits.rb"
)[
0
..
2
].
join
.
chomp
files_count
=
Dir
[
@migrations_path
+
"/*.rb"
].
length
copied
=
ActiveRecord
::
Migration
.
copy
(
@migrations_path
,
bukkits:
MIGRATIONS_ROOT
+
"/magic"
)
...
...
activerecord/test/migrations/magic/1_currencies_have_symbols.rb
浏览文件 @
1729d3b4
# frozen_string_literal: true
# coding: ISO-8859-15
class
CurrenciesHaveSymbols
<
ActiveRecord
::
Migration
::
Current
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录