blazer 2.4.3 → 2.4.7

data/app/controllers/blazer/queries_controller.rb

@@ -71,7 +71,7 @@ module Blazer
         @sql_errors << error if error
       end
 
-      @query.update!(status: "active") if @query.try(:status) == "archived"
+      @query.update!(status: "active") if @query.respond_to?(:status) && @query.status.in?(["archived", nil])
 
       Blazer.transform_statement.call(data_source, @statement) if Blazer.transform_statement
 
@@ -180,6 +180,7 @@ module Blazer
         @query = Blazer::Query.new
         @query.creator = blazer_user if @query.respond_to?(:creator)
       end
+      @query.status = "active" if @query.respond_to?(:status)
       unless @query.editable?(blazer_user)
         @query.errors.add(:base, "Sorry, permission denied")
       end

data/app/models/blazer/query.rb

@@ -8,7 +8,7 @@ module Blazer
 
     validates :statement, presence: true
 
-    scope :active, -> { column_names.include?("status") ? where(status: "active") : all }
+    scope :active, -> { column_names.include?("status") ? where(status: ["active", nil]) : all }
     scope :named, -> { where.not(name: "") }
 
     def to_param

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

@@ -73,12 +73,14 @@
       <% series_library[1] = {borderDash: [8], borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color} %>
     <% end %>
     <% if blazer_maps? && @markers.any? %>
-      <div id="map" style="height: <%= @only_chart ? 300 : 500 %>px;"></div>
+      <% 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('map')
+        var map = L.mapbox.map(mapId)
           .addLayer(L.mapbox.styleLayer('mapbox://styles/mapbox/streets-v11'));
         var featureLayer = L.mapbox.featureLayer().addTo(map);
         var geojson = [];

data/lib/blazer/adapters/athena_adapter.rb

@@ -8,19 +8,25 @@ module Blazer
         rows = []
         error = nil
 
+        query_options = {
+          query_string: statement,
+          # use token so we fetch cached results after query is run
+          client_request_token: Digest::MD5.hexdigest([statement, data_source.id, settings["workgroup"]].compact.join("/")),
+          query_execution_context: {
+            database: database,
+          }
+        }
+
+        if settings["output_location"]
+          query_options[:result_configuration] = {output_location: settings["output_location"]}
+        end
+
+        if settings["workgroup"]
+          query_options[:work_group] = settings["workgroup"]
+        end
+
         begin
-          resp =
-            client.start_query_execution(
-              query_string: statement,
-              # use token so we fetch cached results after query is run
-              client_request_token: Digest::MD5.hexdigest([statement,data_source.id].join("/")),
-              query_execution_context: {
-                database: database,
-              },
-              result_configuration: {
-                output_location: settings["output_location"]
-              }
-            )
+          resp = client.start_query_execution(**query_options)
           query_execution_id = resp.query_execution_id
 
           timeout = data_source.timeout || 300
@@ -60,21 +66,21 @@ module Blazer
             column_types.each_with_index do |ct, i|
               # TODO more column_types
               case ct
-              when "timestamp"
+              when "timestamp", "timestamp with time zone"
                 rows.each do |row|
-                  row[i] = utc.parse(row[i])
+                  row[i] &&= utc.parse(row[i])
                 end
               when "date"
                 rows.each do |row|
-                  row[i] = Date.parse(row[i])
+                  row[i] &&= Date.parse(row[i])
                 end
               when "bigint"
                 rows.each do |row|
-                  row[i] = row[i].to_i
+                  row[i] &&= row[i].to_i
                 end
               when "double"
                 rows.each do |row|
-                  row[i] = row[i].to_f
+                  row[i] &&= row[i].to_f
                 end
               end
             end
@@ -118,11 +124,21 @@ module Blazer
       end
 
       def client
-        @client ||= Aws::Athena::Client.new
+        @client ||= Aws::Athena::Client.new(**client_options)
       end
 
       def glue
-        @glue ||= Aws::Glue::Client.new
+        @glue ||= Aws::Glue::Client.new(**client_options)
+      end
+
+      def client_options
+        @client_options ||= begin
+          if settings["access_key_id"] || settings["secret_access_key"]
+            {credentials: Aws::Credentials.new(settings["access_key_id"], settings["secret_access_key"])}
+          else
+            {}
+          end
+        end
       end
     end
   end

data/lib/blazer/adapters/bigquery_adapter.rb

@@ -13,7 +13,7 @@ module Blazer
           # code is for backward compatibility
           if !results.respond_to?(:complete?) || results.complete?
             columns = results.first.keys.map(&:to_s) if results.size > 0
-            rows = results.map(&:values)
+            rows = results.all.map(&:values)
           else
             error = Blazer::TIMEOUT_MESSAGE
           end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.4.3"
+  VERSION = "2.4.7"
 end

data/lib/blazer.rb

@@ -38,6 +38,11 @@ module Blazer
   class UploadError < Error; end
   class TimeoutNotSupported < Error; end
 
+  # actionmailer optional
+  autoload :CheckMailer, "blazer/check_mailer"
+  # net/http optional
+  autoload :SlackNotifier, "blazer/slack_notifier"
+
   class << self
     attr_accessor :audit
     attr_reader :time_zone

data/licenses/LICENSE-bootstrap.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2016 Twitter, Inc.
+Copyright (c) 2011-2019 Twitter, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.7
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -119,8 +119,6 @@ files:
 - app/controllers/blazer/queries_controller.rb
 - app/controllers/blazer/uploads_controller.rb
 - app/helpers/blazer/base_helper.rb
-- app/mailers/blazer/check_mailer.rb
-- app/mailers/blazer/slack_notifier.rb
 - app/models/blazer/audit.rb
 - app/models/blazer/check.rb
 - app/models/blazer/connection.rb
@@ -177,12 +175,14 @@ files:
 - lib/blazer/adapters/soda_adapter.rb
 - lib/blazer/adapters/spark_adapter.rb
 - lib/blazer/adapters/sql_adapter.rb
+- lib/blazer/check_mailer.rb
 - lib/blazer/data_source.rb
 - lib/blazer/detect_anomalies.R
 - lib/blazer/engine.rb
 - lib/blazer/result.rb
 - lib/blazer/run_statement.rb
 - lib/blazer/run_statement_job.rb
+- lib/blazer/slack_notifier.rb
 - lib/blazer/version.rb
 - lib/generators/blazer/install_generator.rb
 - lib/generators/blazer/templates/config.yml.tt