@@ -230,6 +239,9 @@
{{= it.s.stack_trace_snippet }}
+ {{? it.s.cached }}
+ [CACHE]
+ {{?}}
{{? it.s.formatted_command_string}}
{{= it.s.formatted_command_string }}; {{= MiniProfiler.formatParameters(it.s.parameters) }}
{{??}}
diff --git a/lib/html/vendor.js b/lib/html/vendor.js
index 80927fa0..d8c2c3d6 100644
--- a/lib/html/vendor.js
+++ b/lib/html/vendor.js
@@ -7,7 +7,7 @@
MiniProfiler.templates = {};
MiniProfiler.templates["profilerTemplate"] = function anonymous(it
) {
-var out=' ';if(it.has_duplicate_sql_timings){out+='!';}out+=' '+( MiniProfiler.formatDuration(it.duration_milliseconds))+' ms ';if(MiniProfiler.showTotalSqlCount()){out+=' '+( it.sql_count)+' sql ';}out+=' ';if(it.name.length >= 30){out+=' '+( it.name.substring(0,15) + "..." + it.name.slice(-15) )+' ';}else{out+=' '+( it.name)+' ';}out+=' ';if(it.has_sql_timings){out+=' step
time from start
query type
duration
records | call stack
query | ';var arr5=MiniProfiler.getSqlTimings(it.root);if(arr5){var value,index=-1,l5=arr5.length-1;while(indexms ';if(MiniProfiler.showTotalSqlCount()){out+=' '+( it.sql_count)+' sql ';}out+=' ';if(it.name.length >= 30){out+=' '+( it.name.substring(0,15) + "..." + it.name.slice(-15) )+' ';}else{out+=' '+( it.name)+' ';}out+=' ';if(it.has_sql_timings){out+=' step
time from start
query type
duration
records | call stack
query | ';var arr5=MiniProfiler.getSqlTimings(it.root);if(arr5){var value,index=-1,l5=arr5.length-1;while(index '+( it.s.parent_timing_name )+' T+'+( MiniProfiler.formatDuration(it.s.start_milliseconds) )+' ms ';if(it.s.is_duplicate){out+='DUPLICATE';}out+=' '+( MiniProfiler.renderExecuteType(it.s.execute_type) )+' '+( MiniProfiler.formatDuration(it.s.duration_milliseconds) )+' ms ';if(it.s.row_count > 0){out+=' '+( it.s.class_name )+': '+( it.s.row_count )+' ';}out+=' | '+( it.s.stack_trace_snippet )+' ';if(it.s.formatted_command_string){out+=' '+( it.s.formatted_command_string )+'; '+( MiniProfiler.formatParameters(it.s.parameters) )+'
';}else{out+=' Query redacted ';}out+=' | ';return out;
+var out=' | '+( it.s.parent_timing_name )+' T+'+( MiniProfiler.formatDuration(it.s.start_milliseconds) )+' ms ';if(it.s.is_duplicate){out+='DUPLICATE';}out+=' '+( MiniProfiler.renderExecuteType(it.s.execute_type) )+' '+( MiniProfiler.formatDuration(it.s.duration_milliseconds) )+' ms ';if(it.s.row_count > 0){out+=' '+( it.s.class_name )+': '+( it.s.row_count )+' ';}out+=' | '+( it.s.stack_trace_snippet )+' ';if(it.s.cached){out+=' [CACHE] ';}out+=' ';if(it.s.formatted_command_string){out+=' '+( it.s.formatted_command_string )+'; '+( MiniProfiler.formatParameters(it.s.parameters) )+'
';}else{out+=' Query redacted ';}out+=' | ';return out;
}
MiniProfiler.templates["sqlGapTemplate"] = function anonymous(it
) {
diff --git a/lib/mini_profiler/asset_version.rb b/lib/mini_profiler/asset_version.rb
index b1c1eba4..5617a77d 100644
--- a/lib/mini_profiler/asset_version.rb
+++ b/lib/mini_profiler/asset_version.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
module Rack
class MiniProfiler
- ASSET_VERSION = 'f1a9e67b901ae71247f42690c041ea35'
+ ASSET_VERSION = '6b13136c854b67ed12d949d9a599d925'
end
end
diff --git a/lib/mini_profiler/profiling_methods.rb b/lib/mini_profiler/profiling_methods.rb
index 78d0dda0..3fc2dd30 100644
--- a/lib/mini_profiler/profiling_methods.rb
+++ b/lib/mini_profiler/profiling_methods.rb
@@ -4,7 +4,7 @@ module Rack
class MiniProfiler
module ProfilingMethods
- def record_sql(query, elapsed_ms, params = nil)
+ def record_sql(query, elapsed_ms, params = nil, cached = nil)
return unless current && current.current_timer
c = current
c.current_timer.add_sql(
@@ -13,7 +13,8 @@ def record_sql(query, elapsed_ms, params = nil)
c.page_struct,
redact_sql_queries? ? nil : params,
c.skip_backtrace,
- c.full_backtrace
+ c.full_backtrace,
+ cached
)
end
diff --git a/lib/mini_profiler/timer_struct/page.rb b/lib/mini_profiler/timer_struct/page.rb
index d32d28e8..cb613a40 100644
--- a/lib/mini_profiler/timer_struct/page.rb
+++ b/lib/mini_profiler/timer_struct/page.rb
@@ -78,6 +78,7 @@ def initialize(env)
trivial_duration_threshold_milliseconds: 2,
head: nil,
sql_count: 0,
+ cached_sql_count: 0,
duration_milliseconds_in_sql: 0,
has_sql_timings: true,
has_duplicate_sql_timings: false,
diff --git a/lib/mini_profiler/timer_struct/request.rb b/lib/mini_profiler/timer_struct/request.rb
index 940d0b38..20411987 100644
--- a/lib/mini_profiler/timer_struct/request.rb
+++ b/lib/mini_profiler/timer_struct/request.rb
@@ -101,14 +101,15 @@ def move_child(child, destination)
end
end
- def add_sql(query, elapsed_ms, page, params = nil, skip_backtrace = false, full_backtrace = false)
- TimerStruct::Sql.new(query, elapsed_ms, page, self, params, skip_backtrace, full_backtrace).tap do |timer|
+ def add_sql(query, elapsed_ms, page, params = nil, skip_backtrace = false, full_backtrace = false, cached = false)
+ TimerStruct::Sql.new(query, elapsed_ms, page, self, params, skip_backtrace, full_backtrace, cached).tap do |timer|
self[:sql_timings].push(timer)
timer[:parent_timing_id] = self[:id]
self[:has_sql_timings] = true
self[:sql_timings_duration_milliseconds] += elapsed_ms
page[:duration_milliseconds_in_sql] += elapsed_ms
page[:sql_count] += 1
+ page[:cached_sql_count] += 1 if cached
end
end
diff --git a/lib/mini_profiler/timer_struct/sql.rb b/lib/mini_profiler/timer_struct/sql.rb
index 5ba150d4..5a28fa34 100644
--- a/lib/mini_profiler/timer_struct/sql.rb
+++ b/lib/mini_profiler/timer_struct/sql.rb
@@ -10,7 +10,7 @@ module TimerStruct
class Sql < TimerStruct::Base
attr_accessor :parent
- def initialize(query, duration_ms, page, parent, params = nil, skip_backtrace = false, full_backtrace = false)
+ def initialize(query, duration_ms, page, parent, params = nil, skip_backtrace = false, full_backtrace = false, cached = false)
stack_trace = nil
unless skip_backtrace || duration_ms < Rack::MiniProfiler.config.backtrace_threshold_ms
@@ -49,6 +49,7 @@ def initialize(query, duration_ms, page, parent, params = nil, skip_backtrace =
row_count: 0,
class_name: nil,
parent_timing_id: nil,
+ cached: cached,
is_duplicate: false
)
end
diff --git a/lib/mini_profiler_rails/railtie.rb b/lib/mini_profiler_rails/railtie.rb
index 57379962..b3f2c8cb 100644
--- a/lib/mini_profiler_rails/railtie.rb
+++ b/lib/mini_profiler_rails/railtie.rb
@@ -111,7 +111,8 @@ def self.initialize!(app)
Rack::MiniProfiler.record_sql(
payload[:sql],
(finish - start) * 1000,
- Rack::MiniProfiler.binds_to_params(payload[:binds])
+ Rack::MiniProfiler.binds_to_params(payload[:binds]),
+ payload[:cached]
)
end
diff --git a/spec/lib/timer_struct/request_timer_struct_spec.rb b/spec/lib/timer_struct/request_timer_struct_spec.rb
index eb05266f..5e09cbf4 100644
--- a/spec/lib/timer_struct/request_timer_struct_spec.rb
+++ b/spec/lib/timer_struct/request_timer_struct_spec.rb
@@ -60,10 +60,11 @@ def origin_and_destination(req)
end
describe 'add SQL' do
+ let(:params) { ["SELECT 1 FROM users", 77, @page] }
before do
@page = new_page
- @request.add_sql("SELECT 1 FROM users", 77, @page)
+ @request.add_sql(*params)
end
it 'has a true HasSqlTimings attribute' do
@@ -82,10 +83,21 @@ def origin_and_destination(req)
expect(@request[:sql_timings_duration_milliseconds]).to eq(77)
end
- it "increases the page's " do
+ it "increases the page's duration_milliseconds_in_sql" do
expect(@page[:duration_milliseconds_in_sql]).to eq(77)
end
+ it "does not increment the page's cached_sql_count" do
+ expect(@page[:cached_sql_count]).to eq(0)
+ end
+
+ context "with cached sql query" do
+ let(:params) { ["SELECT 1 FROM users", 77, @page, nil, false, false, true] }
+
+ it "increments the page's cached_sql_count" do
+ expect(@page[:cached_sql_count]).to eq(1)
+ end
+ end
end
describe 'add Custom' do
diff --git a/spec/lib/timer_struct/sql_timer_struct_spec.rb b/spec/lib/timer_struct/sql_timer_struct_spec.rb
index f0b98477..442c8a1d 100644
--- a/spec/lib/timer_struct/sql_timer_struct_spec.rb
+++ b/spec/lib/timer_struct/sql_timer_struct_spec.rb
@@ -7,12 +7,12 @@
describe 'valid sql timer' do
before do
- @sql = Rack::MiniProfiler::TimerStruct::Sql.new("SELECT * FROM users", 200, @page, nil)
+ @sql = Rack::MiniProfiler::TimerStruct::Sql.new("SELECT * FROM users", 200, @page, nil, true)
end
[
:execute_type, :formatted_command_string, :stack_trace_snippet, :start_milliseconds, :duration_milliseconds,
- :first_fetch_duration_milliseconds, :is_duplicate
+ :first_fetch_duration_milliseconds, :is_duplicate, :cached
].each do |attr_type|
it "has an #{attr_type}" do
expect(@sql[attr_type]).not_to be_nil
|