Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
2fb2913b
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,发现更多精彩内容 >>
提交
2fb2913b
编写于
5月 21, 2014
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15237 from sgrif/sg-move-extract-scale
Move extract_scale to decimal type
上级
62bcf814
e45e4f44
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
8 deletion
+7
-8
activerecord/lib/active_record/connection_adapters/type.rb
activerecord/lib/active_record/connection_adapters/type.rb
+2
-2
activerecord/lib/active_record/connection_adapters/type/decimal.rb
...ord/lib/active_record/connection_adapters/type/decimal.rb
+2
-0
activerecord/lib/active_record/connection_adapters/type/value.rb
...ecord/lib/active_record/connection_adapters/type/value.rb
+1
-4
activerecord/test/cases/schema_dumper_test.rb
activerecord/test/cases/schema_dumper_test.rb
+2
-2
未找到文件。
activerecord/lib/active_record/connection_adapters/type.rb
浏览文件 @
2fb2913b
...
@@ -22,8 +22,8 @@ module Type # :nodoc:
...
@@ -22,8 +22,8 @@ module Type # :nodoc:
class
<<
self
class
<<
self
def
extract_scale
(
sql_type
)
def
extract_scale
(
sql_type
)
case
sql_type
case
sql_type
when
/
^(numeric|decimal|number)\((\d+)\)/i
then
0
when
/
\((\d+)\)/
then
0
when
/
^(numeric|decimal|number)\((\d+)(,(\d+))\)/i
then
$4
.
to_i
when
/
\((\d+)(,(\d+))\)/
then
$3
.
to_i
end
end
end
end
end
end
...
...
activerecord/lib/active_record/connection_adapters/type/decimal.rb
浏览文件 @
2fb2913b
...
@@ -4,6 +4,8 @@ module Type
...
@@ -4,6 +4,8 @@ module Type
class
Decimal
<
Value
# :nodoc:
class
Decimal
<
Value
# :nodoc:
include
Numeric
include
Numeric
delegate
:extract_scale
,
to:
Type
def
type
def
type
:decimal
:decimal
end
end
...
...
activerecord/lib/active_record/connection_adapters/type/value.rb
浏览文件 @
2fb2913b
...
@@ -3,10 +3,7 @@ module ConnectionAdapters
...
@@ -3,10 +3,7 @@ module ConnectionAdapters
module
Type
module
Type
class
Value
# :nodoc:
class
Value
# :nodoc:
def
type
;
end
def
type
;
end
def
extract_scale
(
sql_type
);
end
def
extract_scale
(
sql_type
)
Type
.
extract_scale
(
sql_type
)
end
def
type_cast
(
value
)
def
type_cast
(
value
)
cast_value
(
value
)
unless
value
.
nil?
cast_value
(
value
)
unless
value
.
nil?
...
...
activerecord/test/cases/schema_dumper_test.rb
浏览文件 @
2fb2913b
...
@@ -353,9 +353,9 @@ def test_schema_dump_keeps_large_precision_integer_columns_as_decimal
...
@@ -353,9 +353,9 @@ def test_schema_dump_keeps_large_precision_integer_columns_as_decimal
output
=
standard_dump
output
=
standard_dump
# Oracle supports precision up to 38 and it identifies decimals with scale 0 as integers
# Oracle supports precision up to 38 and it identifies decimals with scale 0 as integers
if
current_adapter?
(
:OracleAdapter
)
if
current_adapter?
(
:OracleAdapter
)
assert_match
%r{t.integer
\s
+"atoms_in_universe",
\s
+precision: 38
,
\s
+scale: 0
}
,
output
assert_match
%r{t.integer
\s
+"atoms_in_universe",
\s
+precision: 38}
,
output
else
else
assert_match
%r{t.decimal
\s
+"atoms_in_universe",
\s
+precision: 55
,
\s
+scale: 0
}
,
output
assert_match
%r{t.decimal
\s
+"atoms_in_universe",
\s
+precision: 55}
,
output
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录