Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a431df84
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,发现更多精彩内容 >>
提交
a431df84
编写于
11月 01, 2014
作者:
S
Sean Griffin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17463 from mrgilman/remove-index-from-substitute-at
Remove redundant substitute index when constructing bind values
上级
acf31411
08579e40
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
7 deletion
+6
-7
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
...lib/active_record/connection_adapters/abstract_adapter.rb
+1
-1
activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
...ord/connection_adapters/postgresql/database_statements.rb
+1
-1
activerecord/lib/active_record/relation/query_methods.rb
activerecord/lib/active_record/relation/query_methods.rb
+4
-5
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
浏览文件 @
a431df84
...
...
@@ -267,7 +267,7 @@ def index_algorithms
# Returns a bind substitution value given a bind +index+ and +column+
# NOTE: The column param is currently being used by the sqlserver-adapter
def
substitute_at
(
column
,
index
)
def
substitute_at
(
column
,
index
=
0
)
Arel
::
Nodes
::
BindParam
.
new
'?'
end
...
...
activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
浏览文件 @
a431df84
...
...
@@ -156,7 +156,7 @@ def execute(sql, name = nil)
end
end
def
substitute_at
(
column
,
index
)
def
substitute_at
(
column
,
index
=
0
)
Arel
::
Nodes
::
BindParam
.
new
"$
#{
index
+
1
}
"
end
...
...
activerecord/lib/active_record/relation/query_methods.rb
浏览文件 @
a431df84
...
...
@@ -958,8 +958,7 @@ def build_where(opts, other = [])
when
Hash
opts
=
PredicateBuilder
.
resolve_column_aliases
(
klass
,
opts
)
bv_len
=
bind_values
.
length
tmp_opts
,
bind_values
=
create_binds
(
opts
,
bv_len
)
tmp_opts
,
bind_values
=
create_binds
(
opts
)
self
.
bind_values
+=
bind_values
attributes
=
@klass
.
send
(
:expand_hash_conditions_for_aggregates
,
tmp_opts
)
...
...
@@ -971,7 +970,7 @@ def build_where(opts, other = [])
end
end
def
create_binds
(
opts
,
idx
)
def
create_binds
(
opts
)
bindable
,
non_binds
=
opts
.
partition
do
|
column
,
value
|
case
value
when
String
,
Integer
,
ActiveRecord
::
StatementCache
::
Substitute
...
...
@@ -984,9 +983,9 @@ def create_binds(opts, idx)
new_opts
=
{}
binds
=
[]
bindable
.
each
_with_index
do
|
(
column
,
value
),
index
|
bindable
.
each
do
|
(
column
,
value
)
|
binds
.
push
[
@klass
.
columns_hash
[
column
.
to_s
],
value
]
new_opts
[
column
]
=
connection
.
substitute_at
(
column
,
index
+
idx
)
new_opts
[
column
]
=
connection
.
substitute_at
(
column
)
end
non_binds
.
each
{
|
column
,
value
|
new_opts
[
column
]
=
value
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录