Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
2ae9166d
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,发现更多精彩内容 >>
提交
2ae9166d
编写于
10月 04, 2013
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
log the statement name along with the SQL
上级
98e00164
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
6 deletion
+20
-6
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
...lib/active_record/connection_adapters/abstract_adapter.rb
+6
-5
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
...b/active_record/connection_adapters/postgresql_adapter.rb
+1
-1
activerecord/test/cases/adapters/postgresql/connection_test.rb
...erecord/test/cases/adapters/postgresql/connection_test.rb
+10
-0
activerecord/test/cases/helper.rb
activerecord/test/cases/helper.rb
+3
-0
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
浏览文件 @
2ae9166d
...
...
@@ -424,13 +424,14 @@ def close
protected
def
log
(
sql
,
name
=
"SQL"
,
binds
=
[])
def
log
(
sql
,
name
=
"SQL"
,
binds
=
[]
,
statement_name
=
nil
)
@instrumenter
.
instrument
(
"sql.active_record"
,
:sql
=>
sql
,
:name
=>
name
,
:connection_id
=>
object_id
,
:binds
=>
binds
)
{
yield
}
:sql
=>
sql
,
:name
=>
name
,
:connection_id
=>
object_id
,
:statement_name
=>
statement_name
,
:binds
=>
binds
)
{
yield
}
rescue
=>
e
message
=
"
#{
e
.
class
.
name
}
:
#{
e
.
message
}
:
#{
sql
}
"
@logger
.
error
message
if
@logger
...
...
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
浏览文件 @
2ae9166d
...
...
@@ -774,7 +774,7 @@ def exec_no_cache(sql, name, binds)
def
exec_cache
(
sql
,
name
,
binds
)
stmt_key
=
prepare_statement
(
sql
)
log
(
sql
,
name
,
binds
)
do
log
(
sql
,
name
,
binds
,
stmt_key
)
do
@connection
.
send_query_prepared
(
stmt_key
,
binds
.
map
{
|
col
,
val
|
type_cast
(
val
,
col
)
})
...
...
activerecord/test/cases/adapters/postgresql/connection_test.rb
浏览文件 @
2ae9166d
...
...
@@ -81,6 +81,16 @@ def test_schema_names_logs_name
assert_equal
'SCHEMA'
,
@subscriber
.
logged
[
0
][
1
]
end
def
test_statement_key_is_logged
bindval
=
1
@connection
.
exec_query
(
'SELECT $1::integer'
,
'SQL'
,
[[
nil
,
bindval
]])
name
=
@subscriber
.
payloads
.
last
[
:statement_name
]
assert
name
res
=
@connection
.
exec_query
(
"EXPLAIN (FORMAT JSON) EXECUTE
#{
name
}
(
#{
bindval
}
)"
)
plan
=
res
.
column_types
[
'QUERY PLAN'
].
type_cast
res
.
rows
.
first
.
first
assert_operator
plan
.
length
,
:
>
,
0
end
# Must have with_manual_interventions set to true for this
# test to run.
# When prompted, restart the PostgreSQL server with the
...
...
activerecord/test/cases/helper.rb
浏览文件 @
2ae9166d
...
...
@@ -121,12 +121,15 @@ def travel_to(time, &block)
class
SQLSubscriber
attr_reader
:logged
attr_reader
:payloads
def
initialize
@logged
=
[]
@payloads
=
[]
end
def
start
(
name
,
id
,
payload
)
@payloads
<<
payload
@logged
<<
[
payload
[
:sql
],
payload
[
:name
],
payload
[
:binds
]]
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录