Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
85741dd1
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,发现更多精彩内容 >>
提交
85741dd1
编写于
12月 13, 2012
作者:
C
Carlos Antonio da Silva
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8500 from senny/8492_migrations_crash_on_specific_path
Recognize migrations, in folders containing numbers and 'rb'
上级
4737ad32
349d4606
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
1 deletion
+23
-1
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+5
-0
activerecord/lib/active_record/migration.rb
activerecord/lib/active_record/migration.rb
+1
-1
activerecord/test/cases/migrator_test.rb
activerecord/test/cases/migrator_test.rb
+6
-0
activerecord/test/migrations/10_urban/9_add_expressions.rb
activerecord/test/migrations/10_urban/9_add_expressions.rb
+11
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
85741dd1
## Rails 4.0.0 (unreleased) ##
## Rails 4.0.0 (unreleased) ##
*
Recognize migrations placed in directories containing numbers and 'rb'.
Fix #8492
*Yves Senn*
*
Add
`ActiveRecord::Base.cache_timestamp_format`
class attribute to control
*
Add
`ActiveRecord::Base.cache_timestamp_format`
class attribute to control
the format of the timestamp value in the cache key.
the format of the timestamp value in the cache key.
This allows users to improve the precision of the cache key.
This allows users to improve the precision of the cache key.
...
...
activerecord/lib/active_record/migration.rb
浏览文件 @
85741dd1
...
@@ -665,7 +665,7 @@ def migrations(paths)
...
@@ -665,7 +665,7 @@ def migrations(paths)
files
=
Dir
[
*
paths
.
map
{
|
p
|
"
#{
p
}
/**/[0-9]*_*.rb"
}]
files
=
Dir
[
*
paths
.
map
{
|
p
|
"
#{
p
}
/**/[0-9]*_*.rb"
}]
migrations
=
files
.
map
do
|
file
|
migrations
=
files
.
map
do
|
file
|
version
,
name
,
scope
=
file
.
scan
(
/([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?
.rb
/
).
first
version
,
name
,
scope
=
file
.
scan
(
/([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?
\.rb\z
/
).
first
raise
IllegalMigrationNameError
.
new
(
file
)
unless
version
raise
IllegalMigrationNameError
.
new
(
file
)
unless
version
version
=
version
.
to_i
version
=
version
.
to_i
...
...
activerecord/test/cases/migrator_test.rb
浏览文件 @
85741dd1
...
@@ -84,6 +84,12 @@ def test_finds_migrations_from_two_directories
...
@@ -84,6 +84,12 @@ def test_finds_migrations_from_two_directories
end
end
end
end
def
test_finds_migrations_in_numbered_directory
migrations
=
ActiveRecord
::
Migrator
.
migrations
[
MIGRATIONS_ROOT
+
'/10_urban'
]
assert_equal
9
,
migrations
[
0
].
version
assert_equal
'AddExpressions'
,
migrations
[
0
].
name
end
def
test_deprecated_constructor
def
test_deprecated_constructor
assert_deprecated
do
assert_deprecated
do
ActiveRecord
::
Migrator
.
new
(
:up
,
MIGRATIONS_ROOT
+
"/valid"
)
ActiveRecord
::
Migrator
.
new
(
:up
,
MIGRATIONS_ROOT
+
"/valid"
)
...
...
activerecord/test/migrations/10_urban/9_add_expressions.rb
0 → 100644
浏览文件 @
85741dd1
class
AddExpressions
<
ActiveRecord
::
Migration
def
self
.
up
create_table
(
"expressions"
)
do
|
t
|
t
.
column
:expression
,
:string
end
end
def
self
.
down
drop_table
"expressions"
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录