blazer 2.6.1 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9730ca392e0f5bf0d7ff9b186ee554914c12f204c9250ae0f4e8101334a8eb0a
-  data.tar.gz: a82b46348506e422ba96db6ad70755a6f18a70f65d3b44d9bab53c598af9393b
+  metadata.gz: b32d2190afc8df872db60250651c97eae9d202d0b23042a4b853169edbc2d458
+  data.tar.gz: 64cb17476627ce2108e2aaf9619648e4a743774983c29bcb7478a3b4500f4617
 SHA512:
-  metadata.gz: d1dfa10786ea69f0d3603549c572132643162b994bdc78ee8ed06a3b0dfae4e5cb748f02ae2433ccac4962dcf94c67f20a57baec400ed2da6ea9a5bf882a49db
-  data.tar.gz: 4c98700f9adac11025fb337d91e992c3f347b8a61b499938d15505b3e40216029f0edb3faa2c6fa85810375f3d41ba65f2abb8c5e33f0c819cedc95aab0a8c7e
+  metadata.gz: d6eb64793a84ba433e6a68caaa5419dbcbb3f80ae842854b486f552459e77b434bc7d43bacf1d97175fea1857c74e66b440f7de55cc1e591133740f47ea84f18
+  data.tar.gz: 0723a52bb56f41d3526d66799f19a6fa82b91cd51aa3a35b5bede9523012bc0cee291db1f6e71eb74657c8e595ac0dc1b3f20febb1687121c35830456b924c2a

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 2.6.4 (2022-05-24)
+
+- Fixed error with caching
+
+## 2.6.3 (2022-05-11)
+
+- Fixed error with canceling queries
+
+## 2.6.2 (2022-05-06)
+
+- Fixed error with Postgres when prepared statements are disabled with Rails < 6.1
+
 ## 2.6.1 (2022-04-21)
 
 - Added `region` setting to Amazon Athena

data/README.md

@@ -150,8 +150,8 @@ Create a user with read-only permissions:
 
 ```sql
 BEGIN;
-CREATE ROLE blazer LOGIN PASSWORD 'secret123';
-GRANT CONNECT ON DATABASE database_name TO blazer;
+CREATE ROLE blazer LOGIN PASSWORD 'secret';
+GRANT CONNECT ON DATABASE dbname TO blazer;
 GRANT USAGE ON SCHEMA public TO blazer;
 GRANT SELECT ON ALL TABLES IN SCHEMA public TO blazer;
 ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO blazer;
@@ -163,7 +163,8 @@ COMMIT;
 Create a user with read-only permissions:
 
 ```sql
-GRANT SELECT, SHOW VIEW ON database_name.* TO blazer@’127.0.0.1′ IDENTIFIED BY ‘secret123‘;
+CREATE USER 'blazer'@'127.0.0.1' IDENTIFIED BY 'secret';
+GRANT SELECT, SHOW VIEW ON dbname.* TO 'blazer'@'127.0.0.1';
 FLUSH PRIVILEGES;
 ```
 
@@ -171,8 +172,8 @@ FLUSH PRIVILEGES;
 
 Create a user with read-only permissions:
 
-```
-db.createUser({user: "blazer", pwd: "password", roles: ["read"]})
+```javascript
+db.createUser({user: "blazer", pwd: "secret", roles: ["read"]})
 ```
 
 Also, make sure authorization is enabled when you start the server.

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]

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

data/lib/blazer/adapters/sql_adapter.rb

@@ -191,9 +191,12 @@ module Blazer
 
       # Redshift adapter silently ignores binds
       def parameter_binding
-        if postgresql? || sqlite?
+        if postgresql? && (ActiveRecord::VERSION::STRING.to_f >= 6.1 || prepared_statements?)
+          # Active Record < 6.1 silently ignores binds with Postgres when prepared statements are disabled
           :numeric
-        elsif mysql? && connection_model.connection.prepared_statements
+        elsif sqlite?
+          :numeric
+        elsif mysql? && prepared_statements?
           # Active Record silently ignores binds with MySQL when prepared statements are disabled
           :positional
         elsif sqlserver?
@@ -309,6 +312,10 @@ module Blazer
           end
         end
       end
+
+      def prepared_statements?
+        connection_model.connection.prepared_statements
+      end
     end
   end
 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)

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.6.1"
+  VERSION = "2.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties