Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
d6c12055
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,体验更适合开发者的 AI 搜索 >>
提交
d6c12055
编写于
5月 30, 2014
作者:
Y
Yves Senn
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
pg, `default_sequence_name` respects schema. Closes #7516.
上级
6c2b5696
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
10 deletion
+12
-10
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+4
-0
activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
...ecord/connection_adapters/postgresql/schema_statements.rb
+2
-2
activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
...test/cases/adapters/postgresql/postgresql_adapter_test.rb
+6
-8
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
d6c12055
*
PostgreSQL
`default_sequence_name`
respects schema. Fixes #7516.
*Yves Senn*
*
Fixed
`columns_for_distinct`
of postgresql adapter to work correctly
with orders without sort direction modifiers.
...
...
activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
浏览文件 @
d6c12055
...
...
@@ -273,9 +273,9 @@ def client_min_messages=(level)
def
default_sequence_name
(
table_name
,
pk
=
nil
)
#:nodoc:
result
=
serial_sequence
(
table_name
,
pk
||
'id'
)
return
nil
unless
result
result
.
split
(
'.'
).
last
Utils
.
extract_schema_qualified_name
(
result
)
rescue
ActiveRecord
::
StatementInvalid
"
#{
table_name
}
_
#{
pk
||
'id'
}
_seq"
PostgreSQL
::
Name
.
new
(
nil
,
"
#{
table_name
}
_
#{
pk
||
'id'
}
_seq"
)
end
def
serial_sequence
(
table
,
column
)
...
...
activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
浏览文件 @
d6c12055
...
...
@@ -134,18 +134,18 @@ def test_serial_sequence
end
def
test_default_sequence_name
assert_equal
'accounts_id_seq'
,
assert_equal
PostgreSQL
::
Name
.
new
(
'public'
,
'accounts_id_seq'
)
,
@connection
.
default_sequence_name
(
'accounts'
,
'id'
)
assert_equal
'accounts_id_seq'
,
assert_equal
PostgreSQL
::
Name
.
new
(
'public'
,
'accounts_id_seq'
)
,
@connection
.
default_sequence_name
(
'accounts'
)
end
def
test_default_sequence_name_bad_table
assert_equal
'zomg_id_seq'
,
assert_equal
PostgreSQL
::
Name
.
new
(
nil
,
'zomg_id_seq'
)
,
@connection
.
default_sequence_name
(
'zomg'
,
'id'
)
assert_equal
'zomg_id_seq'
,
assert_equal
PostgreSQL
::
Name
.
new
(
nil
,
'zomg_id_seq'
)
,
@connection
.
default_sequence_name
(
'zomg'
)
end
...
...
@@ -153,8 +153,7 @@ def test_pk_and_sequence_for
with_example_table
do
pk
,
seq
=
@connection
.
pk_and_sequence_for
(
'ex'
)
assert_equal
'id'
,
pk
expected
=
PostgreSQL
::
Name
.
new
(
"public"
,
@connection
.
default_sequence_name
(
'ex'
,
'id'
))
assert_equal
expected
,
seq
assert_equal
@connection
.
default_sequence_name
(
'ex'
,
'id'
),
seq
end
end
...
...
@@ -162,8 +161,7 @@ def test_pk_and_sequence_for_with_non_standard_primary_key
with_example_table
'code serial primary key'
do
pk
,
seq
=
@connection
.
pk_and_sequence_for
(
'ex'
)
assert_equal
'code'
,
pk
expected
=
PostgreSQL
::
Name
.
new
(
"public"
,
@connection
.
default_sequence_name
(
'ex'
,
'code'
))
assert_equal
expected
,
seq
assert_equal
@connection
.
default_sequence_name
(
'ex'
,
'code'
),
seq
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录