Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
6eaf5c92
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,发现更多精彩内容 >>
提交
6eaf5c92
编写于
7月 31, 2016
作者:
R
Ryuta Kamizono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Deprecate `sanitize_conditions`. Use `sanitize_sql` instead
Because `sanitize_conditions` protected method is only used in one place.
上级
f857e1fd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
4 deletion
+8
-4
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+4
-0
activerecord/lib/active_record/querying.rb
activerecord/lib/active_record/querying.rb
+1
-2
activerecord/lib/active_record/sanitization.rb
activerecord/lib/active_record/sanitization.rb
+3
-2
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
6eaf5c92
*
Deprecate
`sanitize_conditions`
. Use
`sanitize_sql`
instead.
*Ryuta Kamizono*
*
Doing count on relations that contain LEFT OUTER JOIN Arel node no longer
force a DISTINCT. This solves issues when using count after a left_joins.
...
...
activerecord/lib/active_record/querying.rb
浏览文件 @
6eaf5c92
...
...
@@ -62,8 +62,7 @@ def find_by_sql(sql, binds = [], preparable: nil)
#
# * +sql+ - An SQL statement which should return a count query from the database, see the example above.
def
count_by_sql
(
sql
)
sql
=
sanitize_conditions
(
sql
)
connection
.
select_value
(
sql
,
"
#{
name
}
Count"
).
to_i
connection
.
select_value
(
sanitize_sql
(
sql
),
"
#{
name
}
Count"
).
to_i
end
end
end
activerecord/lib/active_record/sanitization.rb
浏览文件 @
6eaf5c92
...
...
@@ -29,8 +29,9 @@ def sanitize_sql_for_conditions(condition)
else
condition
end
end
alias_method
:sanitize_sql
,
:sanitize_sql_for_conditions
alias_method
:sanitize_conditions
,
:sanitize_sql
alias
:sanitize_sql
:sanitize_sql_for_conditions
alias
:sanitize_conditions
:sanitize_sql
deprecate
sanitize_conditions: :sanitize_sql
# Accepts an array, hash, or string of SQL conditions and sanitizes
# them into a valid SQL fragment for a SET clause.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录