Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3d25fa04
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,发现更多精彩内容 >>
提交
3d25fa04
编写于
1月 14, 2012
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4466 from carlosantoniodasilva/generated-attributes-refactor
Generated attributes refactor
上级
f4b1dcdb
11cde2bd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
10 deletion
+9
-10
activerecord/lib/active_record/connection_handling.rb
activerecord/lib/active_record/connection_handling.rb
+2
-6
railties/lib/rails/generators/generated_attribute.rb
railties/lib/rails/generators/generated_attribute.rb
+7
-4
未找到文件。
activerecord/lib/active_record/connection_handling.rb
浏览文件 @
3d25fa04
...
...
@@ -90,11 +90,7 @@ def remove_connection(klass = self)
connection_handler
.
remove_connection
(
klass
)
end
def
clear_active_connections!
connection_handler
.
clear_active_connections!
end
delegate
:clear_reloadable_connections!
,
:clear_all_connections!
,
:verify_active_connections!
,
:to
=>
:connection_handler
delegate
:clear_active_connections!
,
:clear_reloadable_connections!
,
:clear_all_connections!
,
:verify_active_connections!
,
:to
=>
:connection_handler
end
end
railties/lib/rails/generators/generated_attribute.rb
浏览文件 @
3d25fa04
...
...
@@ -5,6 +5,9 @@
module
Rails
module
Generators
class
GeneratedAttribute
INDEX_OPTIONS
=
%w(index uniq)
UNIQ_INDEX_OPTIONS
=
%w(uniq)
attr_accessor
:name
,
:type
attr_reader
:attr_options
...
...
@@ -15,7 +18,7 @@ def parse(column_definition)
# if user provided "name:index" instead of "name:string:index"
# type should be set blank so GeneratedAttribute's constructor
# could set it to :string
has_index
,
type
=
type
,
nil
if
%w(index uniq)
.
include?
(
type
)
has_index
,
type
=
type
,
nil
if
UNIQ_INDEX_OPTIONS
.
include?
(
type
)
type
,
attr_options
=
*
parse_type_and_options
(
type
)
new
(
name
,
type
,
has_index
,
attr_options
)
...
...
@@ -40,8 +43,8 @@ def parse_type_and_options(type)
def
initialize
(
name
,
type
=
nil
,
index_type
=
false
,
attr_options
=
{})
@name
=
name
@type
=
(
type
.
presence
||
:string
).
to_sym
@has_index
=
%w(index uniq)
.
include?
(
index_type
)
@has_uniq_index
=
%w(uniq)
.
include?
(
index_type
)
@has_index
=
INDEX_OPTIONS
.
include?
(
index_type
)
@has_uniq_index
=
UNIQ_INDEX_OPTIONS
.
include?
(
index_type
)
@attr_options
=
attr_options
end
...
...
@@ -84,7 +87,7 @@ def index_name
end
def
reference?
self
.
type
.
in?
(
[
:references
,
:belongs_to
]
)
self
.
type
.
in?
(
:references
,
:belongs_to
)
end
def
has_index?
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录