blazer 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d30135b6a6bfd6aa1bc940afff2c6e58ba3a4fec00a5e6cf4c34573acadc08ef
-  data.tar.gz: 925787073e4b0f161ab974875ba7df666c3bc6cd99d87f93052a0a54e4b94663
+  metadata.gz: dac159313b83f05cfa2b39da88d889b08e0089a75047a6aff43c24d735b86eb2
+  data.tar.gz: e1d3594c4e957f04ffa575ce1aac36abf29586c275a2c402c2da5b9401356c57
 SHA512:
-  metadata.gz: 245b6001c927c3c592afd6aaed930e11a35bdb56c39c165c5f4b318ce095b17937c25dc71efcf0b0cdca5a1a2c7139ad0f917903d429a228cafd9ab86d24c1d2
-  data.tar.gz: afc5184b13e8ee2537b16b81f75a3ba703d357999dea851c887596b3daaf92a1bd486c1825129f15c93a72e6f23c16f5cc4d306c11346344ba560085e6ec5861
+  metadata.gz: 05a6d614fd96a40526f0ef7bb34cf6207a48e7bcdb6495f7ea925bec919c116918ad721d388e856c388d6746033fd184eadf25ca93a4afb9c541a8ab8758f8e1
+  data.tar.gz: 79e9087b9e4015cd866fe2b382f0bb015c104af05f9c8b1c209ce2aa06713a46436e2aa307a9901bf0d31fec861463f1224b0cc610d76e2dd5c9c12aa40a8807

data/CHANGELOG.md

@@ -1,6 +1,12 @@
+## 2.2.0
+
+- Added schema to table preview for Postgres and Redshift
+- Fixed bug with Slack notifications not sending
+- Dropped support for Rails 4.2
+
 ## 2.1.0
 
-- Fixed XSS vulnerability due to Chartkick - see [#245](https://github.com/ankane/blazer/issues/245)
+- Require latest Chartkick to prevent possible XSS - see [#245](https://github.com/ankane/blazer/issues/245)
 
 ## 2.0.2
 

data/app/controllers/blazer/base_controller.rb

@@ -2,13 +2,9 @@ module Blazer
   class BaseController < ApplicationController
     # skip filters
     filters = _process_action_callbacks.map(&:filter) - [:activate_authlogic]
-    if Rails::VERSION::MAJOR >= 5
-      skip_before_action(*filters, raise: false)
-      skip_after_action(*filters, raise: false)
-      skip_around_action(*filters, raise: false)
-    else
-      skip_action_callback(*filters)
-    end
+    skip_before_action(*filters, raise: false)
+    skip_after_action(*filters, raise: false)
+    skip_around_action(*filters, raise: false)
 
     protect_from_forgery with: :exception
 

data/app/models/blazer/audit.rb

@@ -1,6 +1,6 @@
 module Blazer
   class Audit < Record
-    belongs_to :user, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s)
-    belongs_to :query, Blazer::BELONGS_TO_OPTIONAL
+    belongs_to :user, optional: true, class_name: Blazer.user_class.to_s
+    belongs_to :query, optional: true
   end
 end

data/app/models/blazer/check.rb

@@ -1,6 +1,6 @@
 module Blazer
   class Check < Record
-    belongs_to :creator, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s) if Blazer.user_class
+    belongs_to :creator, optional: true, class_name: Blazer.user_class.to_s if Blazer.user_class
     belongs_to :query
 
     validates :query_id, presence: true
@@ -67,8 +67,8 @@ module Blazer
       end
 
       # do not notify on creation, except when not passing
-      if (state_was != "new" || state != "passing") && state != state_was && emails.present?
-        Blazer::CheckMailer.state_change(self, state, state_was, result.rows.size, message, result.columns, result.rows.first(10).as_json, result.column_types, check_type).deliver_now
+      if (state_was != "new" || state != "passing") && state != state_was
+        Blazer::CheckMailer.state_change(self, state, state_was, result.rows.size, message, result.columns, result.rows.first(10).as_json, result.column_types, check_type).deliver_now if emails.present?
         Blazer::SlackNotifier.state_change(self, state, state_was, result.rows.size, message, check_type)
       end
       save! if changed?

data/app/models/blazer/dashboard.rb

@@ -1,6 +1,6 @@
 module Blazer
   class Dashboard < Record
-    belongs_to :creator, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s) if Blazer.user_class
+    belongs_to :creator, optional: true, class_name: Blazer.user_class.to_s if Blazer.user_class
     has_many :dashboard_queries, dependent: :destroy
     has_many :queries, through: :dashboard_queries
 

data/app/models/blazer/query.rb

@@ -1,6 +1,6 @@
 module Blazer
   class Query < Record
-    belongs_to :creator, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s) if Blazer.user_class
+    belongs_to :creator, optional: true, class_name: Blazer.user_class.to_s if Blazer.user_class
     has_many :checks, dependent: :destroy
     has_many :dashboard_queries, dependent: :destroy
     has_many :dashboards, through: :dashboard_queries

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

@@ -132,7 +132,12 @@
         this.tablesXhr = $.getJSON(Routes.tables_queries_path({data_source: this.dataSource}), function(data) {
           var newOptions = []
           for (var i = 0; i < data.length; i++) {
-            newOptions.push({text: data[i], value: data[i]})
+            var table = data[i]
+            if (typeof table === "object") {
+              newOptions.push({text: table.table, value: table.value})
+            } else {
+              newOptions.push({text: table, value: table})
+            }
           }
           selectize.clearOptions()
           selectize.addOption(newOptions)

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

@@ -13,10 +13,7 @@
     <thead>
       <tr>
         <th colspan="2">
-          <%= table[:table] %>
-          <% if table[:schema] != "public" %>
-            <span class="text-muted" style="font-weight: normal;"><%= table[:schema] %></span>
-          <% end %>
+          <% if table[:schema] != "public" %><%= table[:schema] %>.<% end %><%= table[:table] %>
         </th>
       </tr>
     </thead>

data/lib/blazer.rb

@@ -72,8 +72,6 @@ module Blazer
     "system requested abort", # redshift
     "maximum statement execution time exceeded" # mysql
   ]
-  BELONGS_TO_OPTIONAL = {}
-  BELONGS_TO_OPTIONAL[:optional] = true if Rails::VERSION::MAJOR >= 5
 
   def self.time_zone=(time_zone)
     @time_zone = time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone.to_s]

data/lib/blazer/adapters/sql_adapter.rb

@@ -26,9 +26,8 @@ module Blazer
 
             result = select_all("#{statement} /*#{comment}*/")
             columns = result.columns
-            cast_method = Rails::VERSION::MAJOR < 5 ? :type_cast : :cast_value
             result.rows.each do |untyped_row|
-              rows << (result.column_types.empty? ? untyped_row : columns.each_with_index.map { |c, i| untyped_row[i] ? result.column_types[c].send(cast_method, untyped_row[i]) : untyped_row[i] })
+              rows << (result.column_types.empty? ? untyped_row : columns.each_with_index.map { |c, i| untyped_row[i] ? result.column_types[c].send(:cast_value, untyped_row[i]) : untyped_row[i] })
             end
           end
         rescue => e
@@ -41,19 +40,35 @@ module Blazer
       end
 
       def tables
-        result = data_source.run_statement(connection_model.send(:sanitize_sql_array, ["SELECT table_name FROM information_schema.tables WHERE table_schema IN (?) ORDER BY table_name", schemas]), refresh_cache: true)
-        result.rows.map(&:first)
+        sql = add_schemas("SELECT table_schema, table_name FROM information_schema.tables")
+        result = data_source.run_statement(sql, refresh_cache: true)
+        if postgresql? || redshift?
+          result.rows.sort_by { |r| [r[0] == default_schema ? "" : r[0], r[1]] }.map do |row|
+            table =
+              if row[0] == default_schema
+                row[1]
+              else
+                "#{row[0]}.#{row[1]}"
+              end
+
+            {
+              table: table,
+              value: connection_model.connection.quote_table_name(table)
+            }
+          end
+        else
+          result.rows.map(&:second).sort
+        end
       end
 
       def schema
-        result = data_source.run_statement(connection_model.send(:sanitize_sql_array, ["SELECT table_schema, table_name, column_name, data_type, ordinal_position FROM information_schema.columns WHERE table_schema IN (?) ORDER BY 1, 2", schemas]))
-        result.rows.group_by { |r| [r[0], r[1]] }.map { |k, vs| {schema: k[0], table: k[1], columns: vs.sort_by { |v| v[2] }.map { |v| {name: v[2], data_type: v[3]} }} }
+        sql = add_schemas("SELECT table_schema, table_name, column_name, data_type, ordinal_position FROM information_schema.columns")
+        result = data_source.run_statement(sql)
+        result.rows.group_by { |r| [r[0], r[1]] }.map { |k, vs| {schema: k[0], table: k[1], columns: vs.sort_by { |v| v[2] }.map { |v| {name: v[2], data_type: v[3]} }} }.sort_by { |t| [t[:schema] == default_schema ? "" : t[:schema], t[:table]] }
       end
 
       def preview_statement
-        if postgresql?
-          "SELECT * FROM \"{table}\" LIMIT 10"
-        elsif sqlserver?
+        if sqlserver?
           "SELECT TOP (10) * FROM {table}"
         else
           "SELECT * FROM {table} LIMIT 10"
@@ -92,9 +107,9 @@ module Blazer
 
       def cancel(run_id)
         if postgresql?
-          select_all("SELECT pg_cancel_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND query LIKE '%,run_id:#{run_id}%'")
+          select_all("SELECT pg_cancel_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND query LIKE ?", ["%,run_id:#{run_id}%"])
         elsif redshift?
-          first_row = select_all("SELECT pid FROM stv_recents WHERE status = 'Running' AND query LIKE '%,run_id:#{run_id}%'").first
+          first_row = select_all("SELECT pid FROM stv_recents WHERE status = 'Running' AND query LIKE ?", ["%,run_id:#{run_id}%"]).first
           if first_row
             select_all("CANCEL #{first_row["pid"].to_i}")
           end
@@ -107,7 +122,8 @@ module Blazer
 
       protected
 
-      def select_all(statement)
+      def select_all(statement, params = [])
+        statement = connection_model.send(:sanitize_sql_array, [statement] + params) if params.any?
         connection_model.connection.select_all(statement)
       end
 
@@ -137,18 +153,28 @@ module Blazer
         connection_model.connection.adapter_name rescue nil
       end
 
-      def schemas
-        settings["schemas"] || [connection_model.connection_config[:schema] || default_schema]
+      def default_schema
+        @default_schema ||= begin
+          if postgresql? || redshift?
+            "public"
+          elsif sqlserver?
+            "dbo"
+          else
+            connection_model.connection_config[:database]
+          end
+        end
       end
 
-      def default_schema
-        if postgresql? || redshift?
-          "public"
-        elsif sqlserver?
-          "dbo"
+      def add_schemas(query)
+        if settings["schemas"]
+          where = "table_schema IN (?)"
+          schemas = settings["schemas"]
         else
-          connection_model.connection_config[:database]
+          where = "table_schema NOT IN (?)"
+          schemas = ["information_schema"]
+          schemas << "pg_catalog" if postgresql? || redshift?
         end
+        connection_model.send(:sanitize_sql_array, ["#{query} WHERE #{where}", schemas])
       end
 
       def set_timeout(timeout)

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/lib/generators/blazer/install_generator.rb

@@ -1,25 +1,10 @@
-# taken from https://github.com/collectiveidea/audited/blob/master/lib/generators/audited/install_generator.rb
-require "rails/generators"
-require "rails/generators/migration"
-require "active_record"
 require "rails/generators/active_record"
 
 module Blazer
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-
-      source_root File.expand_path("../templates", __FILE__)
-
-      # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        if ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
-        end
-      end
+      include ActiveRecord::Generators::Migration
+      source_root File.join(__dir__, "templates")
 
       def copy_migration
         migration_template "install.rb", "db/migrate/install_blazer.rb", migration_version: migration_version
@@ -30,9 +15,7 @@ module Blazer
       end
 
       def migration_version
-        if ActiveRecord::VERSION::MAJOR >= 5
-          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
-        end
+        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: chartkick
   requirement: !ruby/object:Gem::Requirement
@@ -214,14 +214,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Explore your data with SQL. Easily create charts and dashboards, and share