blazer 2.6.5 → 3.0.0

data/app/models/blazer/query.rb

@@ -19,19 +19,8 @@ module Blazer
       name.to_s.sub(/\A[#\*]/, "").gsub(/\[.+\]/, "").strip
     end
 
-    def viewable?(user)
-      if Blazer.query_viewable
-        Blazer.query_viewable.call(self, user)
-      else
-        true
-      end
-    end
-
     def editable?(user)
-      editable = !persisted? || (name.present? && name.first != "*" && name.first != "#") || user == try(:creator)
-      editable &&= viewable?(user)
-      editable &&= Blazer.query_editable.call(self, user) if Blazer.query_editable
-      editable
+      !persisted? || (name.present? && name.first != "*" && name.first != "#") || user == try(:creator)
     end
 
     def variables

data/app/views/blazer/checks/index.html.erb

@@ -55,7 +55,7 @@
         </td>
         <td style="text-align: right; padding: 1px;">
           <%= link_to "Edit", edit_check_path(check), class: "btn btn-info" %>
-          <%= link_to "Run Now", query_path(check.query), class: "btn btn-primary" %>
+          <%= button_to "Run Now", refresh_query_path(check.query), class: "btn btn-primary" %>
         </td>
       </tr>
     <% end %>

data/app/views/blazer/dashboards/_form.html.erb

@@ -23,7 +23,7 @@
   </div>
   <p style="padding-bottom: 140px;" v-cloak>
     <% if @dashboard.persisted? %>
-      <%= link_to "Delete", dashboard_path(@dashboard), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger"%>
+      <%= link_to "Delete", dashboard_path(@dashboard), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>
     <% end %>
     <%= f.submit "Save", class: "btn btn-success" %>
     <%= link_to "Back", :back, class: "btn btn-link" %>
@@ -34,10 +34,11 @@
   <%= blazer_js_var "queries", Blazer::Query.active.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} } %>
   <%= blazer_js_var "dashboardQueries", @queries || @dashboard.dashboard_queries.order(:position).map(&:query) %>
 
-  var app = new Vue({
-    el: "#app",
-    data: {
-      queries: dashboardQueries
+  var app = Vue.createApp({
+    data: function() {
+      return {
+        queries: dashboardQueries
+      }
     },
     methods: {
       remove: function(index) {
@@ -45,6 +46,7 @@
       }
     },
     mounted: function() {
+      var app = this
       $("#query_id").selectize({
         options: queries,
         highlight: false,
@@ -68,8 +70,12 @@
       })
     }
   })
+  app.config.compilerOptions.whitespace = "preserve"
+  app.mount("#app")
+
   Sortable.create($("#queries").get(0), {
     onEnd: function(e) {
+      var app = window.app._component.data()
       app.queries.splice(e.newIndex, 0, app.queries.splice(e.oldIndex, 1)[0])
     }
   })

data/app/views/blazer/queries/_form.html.erb

@@ -2,8 +2,10 @@
   <div class="alert alert-danger"><%= @query.errors.full_messages.first %></div>
 <% end %>
 
+<% @variable_params = @query.persisted? ? variable_params(@query) : nested_variable_params(@query) %>
+
 <div id="app" v-cloak>
-  <%= form_for @query, url: (@query.persisted? ? query_path(@query, params: variable_params(@query)) : queries_path(params: variable_params(@query))), html: {autocomplete: "off"} do |f| %>
+  <%= form_for @query, url: (@query.persisted? ? query_path(@query, params: @variable_params) : queries_path(params: @variable_params)), html: {autocomplete: "off"} do |f| %>
     <div class="row">
       <div id="statement-box" class="col-xs-8">
         <div class= "form-group">
@@ -19,7 +21,7 @@
             <a :href="schemaPath" target="_blank" style="margin-left: 40px;">Schema</a>
           </div>
 
-          <%= f.select :data_source, Blazer.data_sources.values.select { |ds| q = @query.dup; q.data_source = ds.id; q.editable?(blazer_user) }.map { |ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size <= 1), style: "width: 140px;" %>
+          <%= f.select :data_source, Blazer.data_sources.map { |_, ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size <= 1), style: "width: 140px;" %>
           <div id="tables" style="display: inline-block; width: 250px; margin-right: 10px;">
             <select id="table_names" style="width: 240px;" placeholder="Preview table"></select>
           </div>
@@ -67,18 +69,19 @@
 </div>
 
 <script>
-  <%= blazer_js_var "variableParams", variable_params(@query) %>
-  <%= blazer_js_var "previewStatement", Hash[Blazer.data_sources.map { |k, v| [k, (v.preview_statement rescue "")] }] %>
-
-  var app = new Vue({
-    el: "#app",
-    data: {
-      running: false,
-      results: "",
-      error: false,
-      dataSource: "",
-      selectize: null,
-      editorHeight: "180px"
+  <%= blazer_js_var "variableParams", @variable_params %>
+  <%= blazer_js_var "previewStatement", Blazer.data_sources.to_h { |k, v| [k, (v.preview_statement rescue "")] } %>
+
+  var app = Vue.createApp({
+    data: function() {
+      return {
+        running: false,
+        results: "",
+        error: false,
+        dataSource: "",
+        selectize: null,
+        editorHeight: "180px"
+      }
     },
     computed: {
       schemaPath: function() {
@@ -247,4 +250,6 @@
       this.showEditor()
     }
   })
+  app.config.compilerOptions.whitespace = "preserve"
+  app.mount("#app")
 </script>

data/app/views/blazer/queries/docs.html.erb

@@ -119,7 +119,17 @@
       <td>Map</td>
       <td>
         Named <code>latitude</code> and <code>longitude</code>, or <code>lat</code> and <code>lon</code>, or <code>lat</code> and <code>lng</code>
-        <% if !blazer_maps? %>
+        <% if !Blazer.maps? %>
+          <br />
+          <strong>Needs configured</strong>
+        <% end %>
+      </td>
+    </tr>
+    <tr>
+      <td>Area Map</td>
+      <td>
+        Named <code>geojson</code>
+        <% if !Blazer.maps? %>
           <br />
           <strong>Needs configured</strong>
         <% end %>

data/app/views/blazer/queries/home.html.erb

@@ -77,12 +77,13 @@
     return str.toLowerCase()
   }
 
-  var app = new Vue({
-    el: "#queries",
-    data: {
-      searchTerm: "",
-      more: more,
-      updateCounter: 0
+  var app = Vue.createApp({
+    data: function() {
+      return {
+        searchTerm: "",
+        more: more,
+        updateCounter: 0
+      }
     },
     created: function() {
       this.listItems = dashboards.concat(queries)
@@ -163,4 +164,6 @@
       }
     }
   })
+  app.config.compilerOptions.whitespace = "preserve"
+  app.mount("#queries")
 </script>

data/app/views/blazer/queries/run.html.erb

@@ -66,54 +66,39 @@
     <% target_index = @columns.index { |k| k.downcase == "target" } %>
     <% if target_index %>
       <% color = "#109618" %>
-      <% series_library[target_index - 1] = {pointStyle: "line", hitRadius: 5, borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color} %>
+      <% series_library[target_index - 1] = {pointStyle: "line", pointBorderWidth: 0, hitRadius: 5, borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color} %>
     <% end %>
     <% if @forecast %>
       <% color = "#54a3ee" %>
       <% series_library[1] = {borderDash: [8], borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color} %>
     <% end %>
-    <% if blazer_maps? && @markers.any? %>
+    <% if @markers.any? %>
       <% map_id = SecureRandom.hex %>
       <%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %>
       <script>
         <%= blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token %>
         <%= blazer_js_var "markers", @markers %>
         <%= blazer_js_var "mapId", map_id %>
-        L.mapbox.accessToken = mapboxAccessToken;
-        var map = L.mapbox.map(mapId)
-          .addLayer(L.mapbox.styleLayer('mapbox://styles/mapbox/streets-v11'));
-        var featureLayer = L.mapbox.featureLayer().addTo(map);
-        var geojson = [];
-        for (var i = 0; i < markers.length; i++) {
-          var marker = markers[i];
-          geojson.push({
-            type: 'Feature',
-            geometry: {
-              type: 'Point',
-              coordinates: [
-                marker.longitude,
-                marker.latitude
-              ]
-            },
-            properties: {
-              description: marker.title,
-              'marker-color': '#f86767',
-              'marker-size': 'medium'
-            }
-          });
-        }
-        featureLayer.setGeoJSON(geojson);
-        map.fitBounds(featureLayer.getBounds());
+        new Mapkick.Map(mapId, markers, {accessToken: mapboxAccessToken, tooltips: {hover: false, html: true}});
+      </script>
+    <% elsif @geojson.any? %>
+      <% map_id = SecureRandom.hex %>
+      <%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %>
+      <script>
+        <%= blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token %>
+        <%= blazer_js_var "geojson", @geojson %>
+        <%= blazer_js_var "mapId", map_id %>
+        new Mapkick.AreaMap(mapId, geojson, {accessToken: mapboxAccessToken, tooltips: {hover: false, html: true}});
       </script>
     <% elsif chart_type == "line" %>
       <% chart_data = @columns[1..-1].each_with_index.map{ |k, i| {name: blazer_series_name(k), data: @rows.map{ |r| [r[0], r[i + 1]] }, library: series_library[i]} } %>
       <%= line_chart chart_data, **chart_options %>
     <% elsif chart_type == "line2" %>
-      <%= line_chart @rows.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} }, **chart_options %>
+      <%= line_chart @rows.group_by { |r| v = r[1]; (@smart_values[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} }, **chart_options %>
     <% elsif chart_type == "pie" %>
-      <%= pie_chart @rows.map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[1]] }, **chart_options %>
+      <%= pie_chart @rows.map { |r| [(@smart_values[@columns[0]] || {})[r[0].to_s] || r[0], r[1]] }, **chart_options %>
     <% elsif chart_type == "bar" %>
-      <%= column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, **chart_options %>
+      <%= column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@smart_values[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, **chart_options %>
     <% elsif chart_type == "bar2" %>
       <% first_20 = @rows.group_by { |r| r[0] }.values.first(20).flatten(1) %>
       <% labels = first_20.map { |r| r[0] }.uniq %>
@@ -123,7 +108,7 @@
           <% first_20 << [l, s, 0] unless first_20.find { |r| r[0] == l && r[1] == s } %>
         <% end %>
       <% end %>
-      <%= column_chart first_20.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(@boom[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, **chart_options %>
+      <%= column_chart first_20.group_by { |r| v = r[1]; (@smart_values[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(@smart_values[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, **chart_options %>
     <% elsif chart_type == "scatter" %>
       <%= scatter_chart @rows, xtitle: @columns[0], ytitle: @columns[1], **chart_options %>
     <% elsif @only_chart %>
@@ -180,7 +165,7 @@
                         <% end %>
                       <% end %>
 
-                      <% if v2 = (@boom[k] || {})[v.nil? ? v : v.to_s] %>
+                      <% if v2 = (@smart_values[k] || {})[v.nil? ? v : v.to_s] %>
                         <div class="text-muted"><%= v2 %></div>
                       <% end %>
                     </td>

data/app/views/blazer/queries/show.html.erb

@@ -1,12 +1,5 @@
 <% blazer_title @query.name %>
 
-<% if @success %>
-  <% run_data = {statement: @query.statement, query_id: @query.id, data_source: @query.data_source, variables: variable_params(@query)} %>
-  <% run_data.merge!(forecast: "t") if params[:forecast] %>
-  <% run_data.merge!(cohort_period: params[:cohort_period]) if params[:cohort_period] %>
-  <% run_data.transform_keys!(&:to_s) if Rails::VERSION::MAJOR < 6 %>
-<% end %>
-
 <div class="topbar">
   <div class="container">
     <div class="row" style="padding-top: 13px;">
@@ -18,10 +11,10 @@
       </div>
       <div class="col-sm-3 text-right">
         <%= link_to "Edit", edit_query_path(@query, params: variable_params(@query)), class: "btn btn-default", disabled: !@query.editable?(blazer_user) %>
-        <%= link_to "Fork", new_query_path(params: variable_params(@query).merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "btn btn-info" %>
+        <%= link_to "Fork", new_query_path(params: {variables: variable_params(@query), fork_query_id: @query.id, data_source: @query.data_source, name: @query.name}), class: "btn btn-info" %>
 
         <% if !@error && @success %>
-          <%= button_to "Download", run_queries_path(format: "csv"), params: run_data, class: "btn btn-primary" %>
+          <%= button_to "Download", run_queries_path(format: "csv"), params: @run_data, class: "btn btn-primary" %>
         <% end %>
       </div>
     </div>
@@ -41,7 +34,7 @@
 <% end %>
 
 <% if @query.description.present? %>
-  <p><%= @query.description %></p>
+  <p style="white-space: pre-line;"><%= @query.description %></p>
 <% end %>
 
 <%= render partial: "blazer/variables", locals: {action: query_path(@query)} %>
@@ -63,18 +56,17 @@
       $("#results").addClass("query-error").html(message)
     }
 
-    <%= blazer_js_var "data", run_data %>
+    <%= blazer_js_var "data", @run_data %>
 
     runQuery(data, showRun, showError)
   </script>
 <% end %>
 
-<% unless %w(mongodb).include?(Blazer.data_sources[@query.data_source].adapter) %>
-  <script>
-    // do not highlight really long queries
-    // this can lead to performance issues
-    if ($("code").text().length < 10000) {
-      hljs.highlightBlock(document.getElementById("code"));
-    }
-  </script>
-<% end %>
+<script>
+  // do not highlight really long queries
+  // this can lead to performance issues
+  var code = $("#code code")
+  if (code.text().length < 10000) {
+    hljs.highlightElement(code.get(0))
+  }
+</script>

data/app/views/layouts/blazer/application.html.erb

@@ -7,7 +7,7 @@
     <%= favicon_link_tag "blazer/favicon.png" %>
     <% if defined?(Propshaft::Railtie) %>
       <%= stylesheet_link_tag "blazer/bootstrap-propshaft", "blazer/bootstrap", "blazer/selectize", "blazer/github", "blazer/daterangepicker", "blazer/application" %>
-      <%= javascript_include_tag "blazer/jquery", "blazer/jquery-ujs", "blazer/stupidtable", "blazer/stupidtable-custom-settings", "blazer/jquery.stickytableheaders", "blazer/selectize", "blazer/highlight.min", "blazer/moment", "blazer/moment-timezone-with-data", "blazer/daterangepicker", "blazer/Chart.js", "blazer/chartkick", "blazer/ace/ace", "blazer/ace/ext-language_tools", "blazer/ace/theme-twilight", "blazer/ace/mode-sql", "blazer/ace/snippets/text", "blazer/ace/snippets/sql", "blazer/Sortable", "blazer/bootstrap", "blazer/vue", "blazer/routes", "blazer/queries", "blazer/fuzzysearch", "blazer/application" %>
+      <%= javascript_include_tag "blazer/jquery", "blazer/rails-ujs", "blazer/stupidtable", "blazer/stupidtable-custom-settings", "blazer/jquery.stickytableheaders", "blazer/selectize", "blazer/highlight.min", "blazer/moment", "blazer/moment-timezone-with-data", "blazer/daterangepicker", "blazer/chart.umd", "blazer/chartjs-adapter-date-fns.bundle", "blazer/chartkick", "blazer/mapkick.bundle", "blazer/ace/ace", "blazer/ace/ext-language_tools", "blazer/ace/theme-twilight", "blazer/ace/mode-sql", "blazer/ace/snippets/text", "blazer/ace/snippets/sql", "blazer/Sortable", "blazer/bootstrap", "blazer/vue.global.prod", "blazer/routes", "blazer/queries", "blazer/fuzzysearch", "blazer/application" %>
     <% else %>
       <%= stylesheet_link_tag "blazer/application" %>
       <%= javascript_include_tag "blazer/application" %>
@@ -15,10 +15,6 @@
     <script>
       <%= blazer_js_var "rootPath", root_path %>
     </script>
-    <% if blazer_maps? %>
-      <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/v3.3.1/mapbox.css", integrity: "sha384-vxzdEt+wZRPNQbhChjmiaFMLWg86IGuq1NGDehJHsD2mphYkxXll/eSs16WWi6Dq", crossorigin: "anonymous" %>
-      <%= javascript_include_tag "https://api.mapbox.com/mapbox.js/v3.3.1/mapbox.js", integrity: "sha384-CTBEiDLiZJ8gkAQ3fYGoeiRp81/ecNiBkGz11jXFALOZ6++rbnqmdo6OImkmr1MO", crossorigin: "anonymous" %>
-    <% end %>
     <%= csrf_meta_tags %>
   </head>
   <body>

data/lib/blazer/adapters/sql_adapter.rb

@@ -233,7 +233,7 @@ module Blazer
       end
 
       def mysql?
-        ["MySQL", "Mysql2", "Mysql2Spatial"].include?(adapter_name)
+        ["MySQL", "Mysql2", "Mysql2Spatial", "Trilogy"].include?(adapter_name)
       end
 
       def sqlite?

data/lib/blazer/adapters.rb

@@ -0,0 +1,17 @@
+Blazer.register_adapter "athena", Blazer::Adapters::AthenaAdapter
+Blazer.register_adapter "bigquery", Blazer::Adapters::BigQueryAdapter
+Blazer.register_adapter "cassandra", Blazer::Adapters::CassandraAdapter
+Blazer.register_adapter "drill", Blazer::Adapters::DrillAdapter
+Blazer.register_adapter "druid", Blazer::Adapters::DruidAdapter
+Blazer.register_adapter "elasticsearch", Blazer::Adapters::ElasticsearchAdapter
+Blazer.register_adapter "hive", Blazer::Adapters::HiveAdapter
+Blazer.register_adapter "ignite", Blazer::Adapters::IgniteAdapter
+Blazer.register_adapter "influxdb", Blazer::Adapters::InfluxdbAdapter
+Blazer.register_adapter "neo4j", Blazer::Adapters::Neo4jAdapter
+Blazer.register_adapter "opensearch", Blazer::Adapters::OpensearchAdapter
+Blazer.register_adapter "presto", Blazer::Adapters::PrestoAdapter
+Blazer.register_adapter "salesforce", Blazer::Adapters::SalesforceAdapter
+Blazer.register_adapter "soda", Blazer::Adapters::SodaAdapter
+Blazer.register_adapter "spark", Blazer::Adapters::SparkAdapter
+Blazer.register_adapter "sql", Blazer::Adapters::SqlAdapter
+Blazer.register_adapter "snowflake", Blazer::Adapters::SnowflakeAdapter

data/lib/blazer/anomaly_detectors.rb

@@ -0,0 +1,22 @@
+Blazer.register_anomaly_detector "anomaly_detection" do |series|
+  anomalies = AnomalyDetection.detect(series.to_h, period: :auto)
+  anomalies.include?(series.last[0])
+end
+
+Blazer.register_anomaly_detector "prophet" do |series|
+  df = Rover::DataFrame.new(series[0..-2].map { |v| {"ds" => v[0], "y" => v[1]} })
+  m = Prophet.new(interval_width: 0.99)
+  m.logger.level = ::Logger::FATAL # no logging
+  m.fit(df)
+  future = Rover::DataFrame.new(series[-1..-1].map { |v| {"ds" => v[0]} })
+  forecast = m.predict(future).to_a[0]
+  lower = forecast["yhat_lower"]
+  upper = forecast["yhat_upper"]
+  value = series.last[1]
+  value < lower || value > upper
+end
+
+Blazer.register_anomaly_detector "trend" do |series|
+  anomalies = Trend.anomalies(series.to_h)
+  anomalies.include?(series.last[0])
+end

data/lib/blazer/data_source.rb

@@ -1,5 +1,3 @@
-require "digest/md5"
-
 module Blazer
   class DataSource
     extend Forwardable
@@ -74,19 +72,16 @@ module Blazer
       @local_time_suffix ||= Array(settings["local_time_suffix"])
     end
 
-    def read_cache(cache_key)
-      value = Blazer.cache.read(cache_key)
-      if value
-        Blazer::Result.new(self, *Marshal.load(value), nil)
-      end
+    def result_cache
+      @result_cache ||= Blazer::ResultCache.new(self)
     end
 
     def run_results(run_id)
-      read_cache(run_cache_key(run_id))
+      result_cache.read_run(run_id)
     end
 
     def delete_results(run_id)
-      Blazer.cache.delete(run_cache_key(run_id))
+      result_cache.delete_run(run_id)
     end
 
     def sub_variables(statement, vars)
@@ -102,13 +97,12 @@ module Blazer
       statement = Statement.new(statement, self) if statement.is_a?(String)
       statement.bind unless statement.bind_statement
 
-      async = options[:async]
       result = nil
       if cache_mode != "off"
         if options[:refresh_cache]
           clear_cache(statement) # for checks
         else
-          result = read_cache(statement_cache_key(statement))
+          result = result_cache.read_statement(statement)
         end
       end
 
@@ -130,26 +124,24 @@ module Blazer
         if options[:run_id]
           comment << ",run_id:#{options[:run_id]}"
         end
-        result = run_statement_helper(statement, comment, async ? options[:run_id] : nil, options)
+        result = run_statement_helper(statement, comment, options)
+      end
+
+      if options[:async] && options[:run_id]
+        run_id = options[:run_id]
+        begin
+          result_cache.write_run(run_id, result)
+        rescue
+          result = Blazer::Result.new(self, [], [], "Error storing the results of this query :(", nil, false)
+          result_cache.write_run(run_id, result)
+        end
       end
 
       result
     end
 
     def clear_cache(statement)
-      Blazer.cache.delete(statement_cache_key(statement))
-    end
-
-    def cache_key(key)
-      (["blazer", "v4"] + key).join("/")
-    end
-
-    def statement_cache_key(statement)
-      cache_key(["statement", id, Digest::MD5.hexdigest(statement.bind_statement.to_s.gsub("\r\n", "\n") + statement.bind_values.to_json)])
-    end
-
-    def run_cache_key(run_id)
-      cache_key(["run", run_id])
+      result_cache.delete_statement(statement)
     end
 
     def quote(value)
@@ -232,7 +224,7 @@ module Blazer
       @parameter_binding ||= adapter_instance.parameter_binding
     end
 
-    def run_statement_helper(statement, comment, run_id, options)
+    def run_statement_helper(statement, comment, options)
       start_time = Blazer.monotonic_time
       columns, rows, error =
         if adapter_instance.parameter_binding
@@ -242,32 +234,29 @@ module Blazer
         end
       duration = Blazer.monotonic_time - start_time
 
-      cache_data = nil
       cache = !error && (cache_mode == "all" || (cache_mode == "slow" && duration >= cache_slow_threshold))
-      if cache || run_id
-        cache_data = Marshal.dump([columns, rows, error, cache ? Time.now : nil]) rescue nil
-      end
 
-      if cache && cache_data && adapter_instance.cachable?(statement.bind_statement)
-        Blazer.cache.write(statement_cache_key(statement), cache_data, expires_in: cache_expires_in.to_f * 60)
-      end
+      result = Blazer::Result.new(self, columns, rows, error, cache ? Time.now : nil, false)
 
-      if run_id
-        unless cache_data
-          error = "Error storing the results of this query :("
-          cache_data = Marshal.dump([[], [], error, nil])
+      if cache && adapter_instance.cachable?(statement.bind_statement)
+        begin
+          result_cache.write_statement(statement, result, expires_in: cache_expires_in.to_f * 60)
+          # set just_cached after caching
+          result.just_cached = true
+        rescue
+          # do nothing
         end
-        Blazer.cache.write(run_cache_key(run_id), cache_data, expires_in: 30.seconds)
       end
 
-      Blazer::Result.new(self, columns, rows, error, nil, cache && !cache_data.nil?)
+      result.cached_at = nil
+      result
     end
 
     # TODO check for adapter with same name, default to sql
     def detect_adapter
       scheme = settings["url"].to_s.split("://").first
       case scheme
-      when "mongodb", "presto", "cassandra", "ignite"
+      when "presto", "cassandra", "ignite"
         scheme
       else
         "sql"

data/lib/blazer/engine.rb

@@ -3,15 +3,17 @@ module Blazer
     isolate_namespace Blazer
 
     initializer "blazer" do |app|
-      if defined?(Sprockets) && Sprockets::VERSION >= "4"
-        app.config.assets.precompile << "blazer/application.js"
-        app.config.assets.precompile << "blazer/application.css"
-        app.config.assets.precompile << "blazer/glyphicons-halflings-regular.eot"
-        app.config.assets.precompile << "blazer/glyphicons-halflings-regular.svg"
-        app.config.assets.precompile << "blazer/glyphicons-halflings-regular.ttf"
-        app.config.assets.precompile << "blazer/glyphicons-halflings-regular.woff"
-        app.config.assets.precompile << "blazer/glyphicons-halflings-regular.woff2"
-        app.config.assets.precompile << "blazer/favicon.png"
+      if defined?(Sprockets) && Sprockets::VERSION.to_i >= 4
+        app.config.assets.precompile += [
+          "blazer/application.js",
+          "blazer/application.css",
+          "blazer/glyphicons-halflings-regular.eot",
+          "blazer/glyphicons-halflings-regular.svg",
+          "blazer/glyphicons-halflings-regular.ttf",
+          "blazer/glyphicons-halflings-regular.woff",
+          "blazer/glyphicons-halflings-regular.woff2",
+          "blazer/favicon.png"
+        ]
       else
         # use a proc instead of a string
         app.config.assets.precompile << proc { |path| path =~ /\Ablazer\/application\.(js|css)\z/ }

data/lib/blazer/forecasters.rb

@@ -0,0 +1,7 @@
+Blazer.register_forecaster "prophet" do |series, count:|
+  Prophet.forecast(series, count: count)
+end
+
+Blazer.register_forecaster "trend" do |series, count:|
+  Trend.forecast(series, count: count)
+end