Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ec44763f
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,发现更多精彩内容 >>
提交
ec44763f
编写于
5月 26, 2011
作者:
M
Mohammad El-Abid
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Removes the restriction on primary key when joining in a habtm && test that it was properly removed
上级
bf9272b9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
15 deletion
+4
-15
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations.rb
+0
-6
activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
...ve_record/associations/builder/has_and_belongs_to_many.rb
+0
-4
activerecord/test/cases/associations/habtm_join_table_test.rb
...verecord/test/cases/associations/habtm_join_table_test.rb
+4
-5
未找到文件。
activerecord/lib/active_record/associations.rb
浏览文件 @
ec44763f
...
...
@@ -76,12 +76,6 @@ def initialize(owner, reflection)
end
end
class
HasAndBelongsToManyAssociationWithPrimaryKeyError
<
ActiveRecordError
#:nodoc:
def
initialize
(
reflection
)
super
(
"Primary key is not allowed in a has_and_belongs_to_many join table (
#{
reflection
.
options
[
:join_table
]
}
)."
)
end
end
class
HasAndBelongsToManyAssociationForeignKeyNeeded
<
ActiveRecordError
#:nodoc:
def
initialize
(
reflection
)
super
(
"Cannot create self referential has_and_belongs_to_many association on '
#{
reflection
.
class_name
rescue
nil
}
#
#{
reflection
.
name
rescue
nil
}
'. :association_foreign_key cannot be the same as the :foreign_key."
)
...
...
activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
浏览文件 @
ec44763f
...
...
@@ -39,10 +39,6 @@ def check_validity(reflection)
model
.
send
(
:undecorated_table_name
,
model
.
to_s
),
model
.
send
(
:undecorated_table_name
,
reflection
.
class_name
)
)
if
model
.
connection
.
supports_primary_key?
&&
(
model
.
connection
.
primary_key
(
reflection
.
options
[
:join_table
])
rescue
false
)
raise
ActiveRecord
::
HasAndBelongsToManyAssociationWithPrimaryKeyError
.
new
(
reflection
)
end
end
# Generates a join table name from two provided table names.
...
...
activerecord/test/cases/associations/habtm_join_table_test.rb
浏览文件 @
ec44763f
...
...
@@ -33,12 +33,11 @@ def teardown
ActiveRecord
::
Base
.
connection
.
drop_table
:my_books_my_readers
end
uses_transaction
:test_should_raise_exception_when_join_table_has_a_primary_key
def
test_should_raise_exception_when_join_table_has_a_primary_key
uses_transaction
:test_should_
not_
raise_exception_when_join_table_has_a_primary_key
def
test_should_
not_
raise_exception_when_join_table_has_a_primary_key
if
ActiveRecord
::
Base
.
connection
.
supports_primary_key?
assert_raise
ActiveRecord
::
HasAndBelongsToManyAssociationWithPrimaryKeyError
do
MyReader
.
has_and_belongs_to_many
:my_books
end
# This test is to confirm that this feature is now gone
assert
MyReader
.
has_and_belongs_to_many
(
:my_books
).
is_a?
(
ActiveRecord
::
Reflection
::
AssociationReflection
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录