blazer 2.6.4 → 2.6.5

data/app/controllers/blazer/queries_controller.rb

@@ -134,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/queries/show.html.erb

@@ -4,7 +4,7 @@
   <% 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

@@ -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.4"
+  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.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties