Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
5c55aafd
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,发现更多精彩内容 >>
提交
5c55aafd
编写于
12月 09, 2013
作者:
D
Dieter Komendera
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add Enum type to postgresql adapter's oids to prevent unknown OID warnings.
上级
ffcc6172
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
45 addition
and
0 deletion
+45
-0
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+5
-0
activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
...d/lib/active_record/connection_adapters/postgresql/oid.rb
+6
-0
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
...b/active_record/connection_adapters/postgresql_adapter.rb
+6
-0
activerecord/test/cases/adapters/postgresql/enum_test.rb
activerecord/test/cases/adapters/postgresql/enum_test.rb
+28
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
5c55aafd
*
Dynamically register PostgreSQL enum OIDs. This prevents "unknown OID"
warnings on enum columns.
*Dieter Komendera*
*
`includes`
is able to detect the right preloading strategy when string
joins are involved.
...
...
activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
浏览文件 @
5c55aafd
...
...
@@ -229,6 +229,12 @@ def infinity(options = {})
end
end
class
Enum
<
Type
def
type_cast
(
value
)
value
.
to_s
end
end
class
Hstore
<
Type
def
type_cast_for_write
(
value
)
ConnectionAdapters
::
PostgreSQLColumn
.
hstore_to_string
value
...
...
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
浏览文件 @
5c55aafd
...
...
@@ -801,6 +801,12 @@ def initialize_type_map(type_map)
leaves
,
nodes
=
nodes
.
partition
{
|
row
|
row
[
'typelem'
]
==
'0'
}
arrays
,
nodes
=
nodes
.
partition
{
|
row
|
row
[
'typinput'
]
==
'array_in'
}
# populate the enum types
enums
,
leaves
=
leaves
.
partition
{
|
row
|
row
[
'typinput'
]
==
'enum_in'
}
enums
.
each
do
|
row
|
type_map
[
row
[
'oid'
].
to_i
]
=
OID
::
Enum
.
new
end
# populate the base types
leaves
.
find_all
{
|
row
|
OID
.
registered_type?
row
[
'typname'
]
}.
each
do
|
row
|
type_map
[
row
[
'oid'
].
to_i
]
=
OID
::
NAMES
[
row
[
'typname'
]]
...
...
activerecord/test/cases/adapters/postgresql/enum_test.rb
浏览文件 @
5c55aafd
...
...
@@ -23,6 +23,8 @@ def setup
t
.
column
:current_mood
,
:mood
end
end
# reload type map after creating the enum type
@connection
.
send
(
:reload_type_map
)
end
def
test_enum_mapping
...
...
@@ -35,4 +37,30 @@ def test_enum_mapping
assert_equal
"happy"
,
enum
.
reload
.
current_mood
end
def
test_invalid_enum_update
@connection
.
execute
"INSERT INTO postgresql_enums VALUES (1, 'sad');"
enum
=
PostgresqlEnum
.
first
enum
.
current_mood
=
"angry"
assert_raise
ActiveRecord
::
StatementInvalid
do
enum
.
save
end
end
def
test_no_oid_warning
@connection
.
execute
"INSERT INTO postgresql_enums VALUES (1, 'sad');"
stderr_output
=
capture
(
:stderr
)
{
enum
=
PostgresqlEnum
.
first
}
assert
stderr_output
.
blank?
end
def
test_enum_type_cast
enum
=
PostgresqlEnum
.
new
enum
.
current_mood
=
:happy
assert_equal
"happy"
,
enum
.
current_mood
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录