Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
8cfdcdb3
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 搜索 >>
提交
8cfdcdb3
编写于
8月 16, 2008
作者:
N
Nathan Witmer
提交者:
Pratik Naik
8月 16, 2008
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated has_and_belongs_to_many association to fix :finder_sql interpolation. [#848 state:resolved]
Signed-off-by:
N
Pratik Naik
<
pratiknaik@gmail.com
>
上级
2b69a636
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
7 deletion
+8
-7
activerecord/lib/active_record/associations/association_proxy.rb
...ecord/lib/active_record/associations/association_proxy.rb
+0
-4
activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
...ecord/associations/has_and_belongs_to_many_association.rb
+1
-3
activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
...associations/has_and_belongs_to_many_associations_test.rb
+7
-0
未找到文件。
activerecord/lib/active_record/associations/association_proxy.rb
浏览文件 @
8cfdcdb3
...
...
@@ -131,10 +131,6 @@ def quoted_record_ids(records)
records
.
map
{
|
record
|
record
.
quoted_id
}.
join
(
','
)
end
def
interpolate_sql_options!
(
options
,
*
keys
)
keys
.
each
{
|
key
|
options
[
key
]
&&=
interpolate_sql
(
options
[
key
])
}
end
def
interpolate_sql
(
sql
,
record
=
nil
)
@owner
.
send
(
:interpolate_sql
,
sql
,
record
)
end
...
...
activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
浏览文件 @
8cfdcdb3
...
...
@@ -70,10 +70,8 @@ def delete_records(records)
end
def
construct_sql
interpolate_sql_options!
(
@reflection
.
options
,
:finder_sql
)
if
@reflection
.
options
[
:finder_sql
]
@finder_sql
=
@reflection
.
options
[
:finder_sql
]
@finder_sql
=
interpolate_sql
(
@reflection
.
options
[
:finder_sql
])
else
@finder_sql
=
"
#{
@owner
.
connection
.
quote_table_name
@reflection
.
options
[
:join_table
]
}
.
#{
@reflection
.
primary_key_name
}
=
#{
owner_quoted_id
}
"
@finder_sql
<<
" AND (
#{
conditions
}
)"
if
conditions
...
...
activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
浏览文件 @
8cfdcdb3
...
...
@@ -450,6 +450,13 @@ def test_find_in_association_with_custom_finder_sql
assert_equal
developers
(
:david
),
active_record
.
developers_with_finder_sql
.
find
(
developers
(
:david
).
id
),
"Ruby find"
end
def
test_find_in_association_with_custom_finder_sql_and_multiple_interpolations
# interpolate once:
assert_equal
[
developers
(
:david
),
developers
(
:poor_jamis
),
developers
(
:jamis
)],
projects
(
:active_record
).
developers_with_finder_sql
,
"first interpolation"
# interpolate again, for a different project id
assert_equal
[
developers
(
:david
)],
projects
(
:action_controller
).
developers_with_finder_sql
,
"second interpolation"
end
def
test_find_in_association_with_custom_finder_sql_and_string_id
assert_equal
developers
(
:david
),
projects
(
:active_record
).
developers_with_finder_sql
.
find
(
developers
(
:david
).
id
.
to_s
),
"SQL find"
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录