Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3e643366
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,发现更多精彩内容 >>
提交
3e643366
编写于
12月 22, 2010
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
removing SQL interpolation, please use scoping and attribute conditionals as a replacement
上级
6ca921a9
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
4 addition
and
13 deletion
+4
-13
activerecord/CHANGELOG
activerecord/CHANGELOG
+3
-0
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/association_preload.rb
+1
-6
activerecord/test/cases/associations/eager_test.rb
activerecord/test/cases/associations/eager_test.rb
+0
-4
activerecord/test/models/post.rb
activerecord/test/models/post.rb
+0
-3
未找到文件。
activerecord/CHANGELOG
浏览文件 @
3e643366
*Rails 3.1.0 (unreleased)*
* Removed support for interpolated SQL conditions. Please use scoping
along with attribute conditionals as a replacement.
* Added ActiveRecord::Base#has_secure_password (via ActiveModel::SecurePassword) to encapsulate dead-simple password usage with BCrypt encryption and salting [DHH]. Example:
# Schema: User(name:string, password_digest:string, password_salt:string)
...
...
activerecord/lib/active_record/association_preload.rb
浏览文件 @
3e643366
...
...
@@ -389,14 +389,9 @@ def find_associated_records(ids, reflection, preload_options)
end
end
def
interpolate_sql_for_preload
(
sql
)
instance_eval
(
"%@
#{
sql
.
gsub
(
'@'
,
'\@'
)
}
@"
,
__FILE__
,
__LINE__
)
end
def
append_conditions
(
reflection
,
preload_options
)
sql
=
""
sql
<<
" AND (
#{
interpolate_sql_for_preload
(
reflection
.
sanitized_conditions
)
}
)"
if
reflection
.
sanitized_conditions
sql
<<
" AND (
#{
reflection
.
sanitized_conditions
}
)"
if
reflection
.
sanitized_conditions
sql
<<
" AND (
#{
sanitize_sql
preload_options
[
:conditions
]
}
)"
if
preload_options
[
:conditions
]
sql
end
...
...
activerecord/test/cases/associations/eager_test.rb
浏览文件 @
3e643366
...
...
@@ -658,10 +658,6 @@ def test_limited_eager_with_numeric_in_association
assert_equal
people
(
:david
,
:susan
),
Person
.
find
(
:all
,
:include
=>
[
:readers
,
:primary_contact
,
:number1_fan
],
:conditions
=>
"number1_fans_people.first_name like 'M%'"
,
:order
=>
'people.id'
,
:limit
=>
2
,
:offset
=>
0
)
end
def
test_preload_with_interpolation
assert_equal
[
comments
(
:greetings
)],
Post
.
find
(
posts
(
:welcome
).
id
,
:include
=>
:comments_with_interpolated_conditions
).
comments_with_interpolated_conditions
end
def
test_polymorphic_type_condition
post
=
Post
.
find
(
posts
(
:thinking
).
id
,
:include
=>
:taggings
)
assert
post
.
taggings
.
include?
(
taggings
(
:thinking_general
))
...
...
activerecord/test/models/post.rb
浏览文件 @
3e643366
...
...
@@ -40,9 +40,6 @@ def find_most_recent
has_many
:author_favorites
,
:through
=>
:author
has_many
:author_categorizations
,
:through
=>
:author
,
:source
=>
:categorizations
has_many
:comments_with_interpolated_conditions
,
:class_name
=>
'Comment'
,
:conditions
=>
[
'#{"#{aliased_table_name}." rescue ""}body = ?'
,
'Thank you for the welcome'
]
has_one
:very_special_comment
has_one
:very_special_comment_with_post
,
:class_name
=>
"VerySpecialComment"
,
:include
=>
:post
has_many
:special_comments
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录