Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0709b60f
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,发现更多精彩内容 >>
提交
0709b60f
编写于
3月 22, 2017
作者:
R
Rafael França
提交者:
GitHub
3月 22, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #28526 from kamipo/fix_log_subscriber_to_allow_legacy_binds
Fix `LogSubscriber` to allow legacy `binds`
上级
ce2bfd87
53f8716c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
77 addition
and
77 deletion
+77
-77
activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
...lib/active_record/connection_adapters/abstract/quoting.rb
+7
-8
activerecord/lib/active_record/log_subscriber.rb
activerecord/lib/active_record/log_subscriber.rb
+7
-11
activerecord/test/cases/bind_parameter_test.rb
activerecord/test/cases/bind_parameter_test.rb
+63
-58
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
浏览文件 @
0709b60f
...
...
@@ -152,16 +152,15 @@ def quoted_binary(value) # :nodoc:
"'
#{
quote_string
(
value
.
to_s
)
}
'"
end
private
def
type_casted_binds
(
binds
)
if
binds
.
first
.
is_a?
(
Array
)
binds
.
map
{
|
column
,
value
|
type_cast
(
value
,
column
)
}
else
binds
.
map
{
|
attr
|
type_cast
(
attr
.
value_for_database
)
}
end
def
type_casted_binds
(
binds
)
# :nodoc:
if
binds
.
first
.
is_a?
(
Array
)
binds
.
map
{
|
column
,
value
|
type_cast
(
value
,
column
)
}
else
binds
.
map
{
|
attr
|
type_cast
(
attr
.
value_for_database
)
}
end
end
private
def
id_value_for_database
(
value
)
if
primary_key
=
value
.
class
.
primary_key
value
.
instance_variable_get
(
:@attributes
)[
primary_key
].
value_for_database
...
...
activerecord/lib/active_record/log_subscriber.rb
浏览文件 @
0709b60f
...
...
@@ -44,17 +44,17 @@ def sql(event)
private
def
type_casted_binds
(
binds
,
casted_binds
)
casted_binds
||
binds
.
map
{
|
attr
|
type_cast
attr
.
value_for_database
}
casted_binds
||
ActiveRecord
::
Base
.
connection
.
type_casted_binds
(
binds
)
end
def
render_bind
(
attr
,
type_casted_
value
)
value
=
if
attr
.
type
.
binary?
&&
attr
.
value
"<
#{
attr
.
value_for_database
.
to_s
.
bytesize
}
bytes of binary data>"
else
type_casted_value
def
render_bind
(
attr
,
value
)
if
attr
.
is_a?
(
Array
)
attr
=
attr
.
first
els
if
attr
.
type
.
binary?
&&
attr
.
valu
e
value
=
"<
#{
attr
.
value_for_database
.
to_s
.
bytesize
}
bytes of binary data>"
end
[
attr
.
name
,
value
]
[
attr
&&
attr
.
name
,
value
]
end
def
colorize_payload_name
(
name
,
payload_name
)
...
...
@@ -89,10 +89,6 @@ def sql_color(sql)
def
logger
ActiveRecord
::
Base
.
logger
end
def
type_cast
(
value
)
ActiveRecord
::
Base
.
connection
.
type_cast
(
value
)
end
end
end
...
...
activerecord/test/cases/bind_parameter_test.rb
浏览文件 @
0709b60f
...
...
@@ -3,36 +3,36 @@
require
"models/author"
require
"models/post"
module
ActiveRecord
class
BindParameterTest
<
ActiveRecord
::
TestCase
fixtures
:topics
,
:authors
,
:posts
class
LogListener
attr_accessor
:calls
def
initialize
@calls
=
[]
if
ActiveRecord
::
Base
.
connection
.
supports_statement_cache?
&&
ActiveRecord
::
Base
.
connection
.
prepared_statements
module
ActiveRecord
class
BindParameterTest
<
ActiveRecord
::
TestCase
fixtures
:topics
,
:authors
,
:posts
class
LogListener
attr_accessor
:calls
def
initialize
@calls
=
[]
end
def
call
(
*
args
)
calls
<<
args
end
end
def
call
(
*
args
)
calls
<<
args
def
setup
super
@connection
=
ActiveRecord
::
Base
.
connection
@subscriber
=
LogListener
.
new
@pk
=
Topic
.
columns_hash
[
Topic
.
primary_key
]
@subscription
=
ActiveSupport
::
Notifications
.
subscribe
(
"sql.active_record"
,
@subscriber
)
end
end
def
setup
super
@connection
=
ActiveRecord
::
Base
.
connection
@subscriber
=
LogListener
.
new
@pk
=
Topic
.
columns_hash
[
Topic
.
primary_key
]
@subscription
=
ActiveSupport
::
Notifications
.
subscribe
(
"sql.active_record"
,
@subscriber
)
end
teardown
do
ActiveSupport
::
Notifications
.
unsubscribe
(
@subscription
)
end
def
teardown
ActiveSupport
::
Notifications
.
unsubscribe
(
@subscription
)
end
if
ActiveRecord
::
Base
.
connection
.
supports_statement_cache?
&&
ActiveRecord
::
Base
.
connection
.
prepared_statements
def
test_bind_from_join_in_subquery
subquery
=
Author
.
joins
(
:thinking_posts
).
where
(
name:
"David"
)
scope
=
Author
.
from
(
subquery
,
"authors"
).
where
(
id:
1
)
...
...
@@ -56,43 +56,48 @@ def test_find_one_uses_binds
assert
message
,
"expected a message with binds"
end
def
test_logs_bind
_var
s_after_type_cast
def
test_logs_binds_after_type_cast
binds
=
[
Relation
::
QueryAttribute
.
new
(
"id"
,
"10"
,
Type
::
Integer
.
new
)]
type_casted_binds
=
binds
.
map
{
|
attr
|
type_cast
(
attr
.
value_for_database
)
}
payload
=
{
name:
"SQL"
,
sql:
"select * from topics where id = ?"
,
binds:
binds
,
type_casted_binds:
type_casted_binds
}
event
=
ActiveSupport
::
Notifications
::
Event
.
new
(
"foo"
,
Time
.
now
,
Time
.
now
,
123
,
payload
)
logger
=
Class
.
new
(
ActiveRecord
::
LogSubscriber
)
{
attr_reader
:debugs
def
initialize
super
@debugs
=
[]
end
def
debug
(
str
)
@debugs
<<
str
end
}.
new
logger
.
sql
event
assert_match
([[
@pk
.
name
,
10
]].
inspect
,
logger
.
debugs
.
first
)
assert_logs_binds
(
binds
)
end
private
def
type_cast
(
value
)
ActiveRecord
::
Base
.
connection
.
type_cast
(
value
)
def
test_logs_legacy_binds_after_type_cast
binds
=
[[
@pk
,
"10"
]]
assert_logs_binds
(
binds
)
end
private
def
assert_logs_binds
(
binds
)
payload
=
{
name:
"SQL"
,
sql:
"select * from topics where id = ?"
,
binds:
binds
,
type_casted_binds:
@connection
.
type_casted_binds
(
binds
)
}
event
=
ActiveSupport
::
Notifications
::
Event
.
new
(
"foo"
,
Time
.
now
,
Time
.
now
,
123
,
payload
)
logger
=
Class
.
new
(
ActiveRecord
::
LogSubscriber
)
{
attr_reader
:debugs
def
initialize
super
@debugs
=
[]
end
def
debug
(
str
)
@debugs
<<
str
end
}.
new
logger
.
sql
(
event
)
assert_match
([[
@pk
.
name
,
10
]].
inspect
,
logger
.
debugs
.
first
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录