Skip to content

Business intelligence made simple

Moved explain logic out of view [skip ci]

Andrew Kane71796532bdcc
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rb
index 49113d02..b78c2702 100644
--- a/app/controllers/blazer/queries_controller.rb
+++ b/app/controllers/blazer/queries_controller.rb
@@ -125,6 +125,7 @@ module Blazer
@columns = @result.columns
@rows = @result.rows
@error = @result.error
+ @explain = @result.explain
@just_cached = [email protected] && @result.cached_at.present?
@cached_at = nil
params[:data_source] = nil
@@ -163,6 +164,7 @@ module Blazer
@columns = @result.columns
@rows = @result.rows
@error = @result.error
+ @explain = @result.explain
@cached_at = @result.cached_at
@just_cached = @result.just_cached
diff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erb
index 2d1ad41b..46ba23f8 100644
--- a/app/views/blazer/queries/run.html.erb
+++ b/app/views/blazer/queries/run.html.erb
@@ -127,10 +127,8 @@
<% unless @only_chart && !@no_chart %>
<% header_width = 100 / @columns.size.to_f %>
<div class="results-container">
- <% if @columns == ["QUERY PLAN"] %>
- <pre><code><%= @rows.map { |r| r[0] }.join("\n") %></code></pre>
- <% elsif @columns == ["PLAN"] && @data_source.adapter == "druid" %>
- <pre><code><%= @rows[0][0] %></code></pre>
+ <% if @explain %>
+ <pre><code><%= @explain %></code></pre>
<% else %>
<table class="table results-table">
<thead>
diff --git a/lib/blazer/result.rb b/lib/blazer/result.rb
index 03d96c3c..ee2a7738 100644
--- a/lib/blazer/result.rb
+++ b/lib/blazer/result.rb
@@ -20,6 +20,15 @@ module Blazer
cached_at.present?
end
+ # TODO move to data source adapters
+ def explain
+ if @columns == ["QUERY PLAN"]
+ @rows.map { |r| r[0] }.join("\n")
+ elsif @columns == ["PLAN"] && @data_source.adapter == "druid"
+ @rows[0][0]
+ end
+ end
+
def smart_values
@smart_values ||= begin
smart_values = {}