blazer 2.6.2 → 2.6.5

data/app/assets/javascripts/blazer/queries.js

@@ -3,6 +3,9 @@ var runningQueries = []
 var maxQueries = 3
 
 function runQuery(data, success, error) {
+  if (!data.data_source) {
+    throw new Error("Data source is required to cancel queries")
+  }
   data.run_id = uuid()
   var query = {
     data: data,
@@ -50,7 +53,11 @@ function runQueryHelper(query) {
       queryComplete(query)
     }
   }).fail( function(jqXHR, textStatus, errorThrown) {
-    if (!query.canceled) {
+    // check jqXHR.status instead of query.canceled
+    // so it works for page navigation with Firefox and Safari
+    if (jqXHR.status === 0) {
+      cancelServerQuery(query)
+    } else {
       var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message
       if (!message) {
         message = "An error occurred"
@@ -83,6 +90,8 @@ function cancelAllQueries() {
   }
 }
 
+// needed for Chrome
+// queries are canceled before unload with Firefox and Safari
 $(window).on("unload", cancelAllQueries)
 
 function cancelQuery(query) {
@@ -90,7 +99,9 @@ function cancelQuery(query) {
   if (query.xhr) {
     query.xhr.abort()
   }
+}
 
+function cancelServerQuery(query) {
   // tell server
   var path = Routes.cancel_queries_path()
   var data = {run_id: query.run_id, data_source: query.data_source}

data/app/controllers/blazer/queries_controller.rb

@@ -92,6 +92,7 @@ module Blazer
       @cohort_analysis = @statement.cohort_analysis?
 
       # fallback for now for users with open tabs
+      # TODO remove fallback in future version
       @var_params = request.request_parameters["variables"] || request.request_parameters
       @success = process_vars(@statement, @var_params)
       @only_chart = params[:only_chart]
@@ -133,11 +134,11 @@ module Blazer
         options = {user: blazer_user, query: @query, refresh_cache: params[:check], run_id: @run_id, async: Blazer.async}
         if Blazer.async && request.format.symbol != :csv
           Blazer::RunStatementJob.perform_later(@data_source.id, @statement.statement, options.merge(values: @statement.values))
-          wait_start = Time.now
+          wait_start = Blazer.monotonic_time
           loop do
             sleep(0.1)
             @result = @data_source.run_results(@run_id)
-            break if @result || Time.now - wait_start > 3
+            break if @result || Blazer.monotonic_time - wait_start > 3
           end
         else
           @result = Blazer::RunStatement.new.perform(@statement, options)

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

@@ -39,7 +39,9 @@
     </div>
   </div>
   <script>
-    <%= blazer_js_var "data", {statement: query.statement, query_id: query.id, variables: variable_params(query), only_chart: true, cohort_period: params[:cohort_period]} %>
+    <% data = {statement: query.statement, query_id: query.id, data_source: query.data_source, variables: variable_params(query), only_chart: true} %>
+    <% data.merge!(cohort_period: params[:cohort_period]) if params[:cohort_period] %>
+    <%= blazer_js_var "data", data %>
 
     runQuery(data, function (data) {
       $("#chart-<%= i %>").html(data)

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

@@ -1,10 +1,10 @@
 <% blazer_title @query.name %>
 
 <% if @success %>
-  <% run_data = {statement: @query.statement, query_id: @query.id, variables: variable_params(@query)} %>
+  <% 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::STRING.to_f == 5.0 %>
+  <% run_data.transform_keys!(&:to_s) if Rails::VERSION::MAJOR < 6 %>
 <% end %>
 
 <div class="topbar">

data/lib/blazer/adapters/sql_adapter.rb

@@ -35,6 +35,9 @@ module Blazer
           error = e.message.sub(/.+ERROR: /, "")
           error = Blazer::TIMEOUT_MESSAGE if Blazer::TIMEOUT_ERRORS.any? { |e| error.include?(e) }
           error = Blazer::VARIABLE_MESSAGE if error.include?("syntax error at or near \"$") || error.include?("Incorrect syntax near '@") || error.include?("your MySQL server version for the right syntax to use near '?")
+          if error.include?("could not determine data type of parameter")
+            error += " - try adding casting to variables and make sure none are inside a string literal"
+          end
           reconnect if error.include?("PG::ConnectionBad")
         end
 

data/lib/blazer/data_source.rb

@@ -145,7 +145,7 @@ module Blazer
     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.sort_by { |k, _| k }.to_json)])
+      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)
@@ -233,14 +233,14 @@ module Blazer
     end
 
     def run_statement_helper(statement, comment, run_id, options)
-      start_time = Time.now
+      start_time = Blazer.monotonic_time
       columns, rows, error =
         if adapter_instance.parameter_binding
           adapter_instance.run_statement(statement.bind_statement, comment, statement.bind_values)
         else
           adapter_instance.run_statement(statement.bind_statement, comment)
         end
-      duration = Time.now - start_time
+      duration = Blazer.monotonic_time - start_time
 
       cache_data = nil
       cache = !error && (cache_mode == "all" || (cache_mode == "slow" && duration >= cache_slow_threshold))

data/lib/blazer/run_statement.rb

@@ -17,9 +17,9 @@ module Blazer
         audit.save!
       end
 
-      start_time = Time.now
+      start_time = Blazer.monotonic_time
       result = data_source.run_statement(statement, options)
-      duration = Time.now - start_time
+      duration = Blazer.monotonic_time - start_time
 
       if Blazer.audit
         audit.duration = duration if audit.respond_to?(:duration=)

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.6.2"
+  VERSION = "2.6.5"
 end

data/lib/blazer.rb

@@ -257,6 +257,11 @@ module Blazer
     viewed_query_ids = Blazer::Audit.where("created_at > ?", 90.days.ago).group(:query_id).count.keys.compact
     Blazer::Query.active.where.not(id: viewed_query_ids).update_all(status: "archived")
   end
+
+  # private
+  def self.monotonic_time
+    Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
 end
 
 Blazer.register_adapter "athena", Blazer::Adapters::AthenaAdapter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties