blazer 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dac159313b83f05cfa2b39da88d889b08e0089a75047a6aff43c24d735b86eb2
-  data.tar.gz: e1d3594c4e957f04ffa575ce1aac36abf29586c275a2c402c2da5b9401356c57
+  metadata.gz: eedba409f17c85953be66d2b295f1857fb61de146d5c88288509440f419853e7
+  data.tar.gz: ad0f8f433ad5be3052eb0237f86121c6a59147b2e240fb2a41d68611e69d3022
 SHA512:
-  metadata.gz: 05a6d614fd96a40526f0ef7bb34cf6207a48e7bcdb6495f7ea925bec919c116918ad721d388e856c388d6746033fd184eadf25ca93a4afb9c541a8ab8758f8e1
-  data.tar.gz: 79e9087b9e4015cd866fe2b382f0bb015c104af05f9c8b1c209ce2aa06713a46436e2aa307a9901bf0d31fec861463f1224b0cc610d76e2dd5c9c12aa40a8807
+  metadata.gz: 8e4236c254472fb2bdc9a8cb107306d7263a11ade5b8f223cefc2363431f6f9ffeb7087d373a95823bf53112c9869871d132764232754898f8740c72ea01ceea
+  data.tar.gz: bb12b6473ef4702adea12a9847ef020e0f8277d9714816cbfc511262345bffbbc8aa5530a7310dd4a263f634a493286f446bc8c4db48428f6c396109b2dce474

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.2.1
+
+- Added support for Sprockets 4
+- Improved Snowflake table preview
+- Fixed bug with refresh link not showing
+
 ## 2.2.0
 
 - Added schema to table preview for Postgres and Redshift

data/README.md

@@ -539,9 +539,7 @@ data_sources:
 
 ### Druid
 
-First, [enable SQL support](http://druid.io/docs/latest/querying/sql.html#configuration) on the broker.
-
-Set:
+Enable [SQL support](http://druid.io/docs/latest/querying/sql.html#configuration) on the broker and set:
 
 ```yml
 data_sources:
@@ -657,13 +655,34 @@ Supports [SOQL](https://developer.salesforce.com/docs/atlas.en-us.soql_sosl.meta
 
 ### Snowflake
 
-First, install the [ODBC driver](https://docs.snowflake.net/manuals/user-guide/odbc.html). Add [odbc_adapter](https://github.com/localytics/odbc_adapter) to your Gemfile and set:
+First, install ODBC. For Homebrew, use:
+
+```sh
+brew install unixodbc
+```
+
+For Ubuntu, use:
+
+```sh
+sudo apt-get install unixodbc-dev
+```
+
+For Heroku, use the [Apt buildpack](https://github.com/heroku/heroku-buildpack-apt) and create an `Aptfile` with:
+
+```text
+unixodbc-dev
+https://sfc-repo.snowflakecomputing.com/odbc/linux/2.19.16/snowflake-odbc-2.19.16.x86_64.deb
+```
+
+> This installs the driver at `/app/.apt/usr/lib/snowflake/odbc/lib/libSnowflake.so`
+
+Then, download the [Snowflake ODBC driver](https://docs.snowflake.net/manuals/user-guide/odbc-download.html). Add [odbc_adapter](https://github.com/localytics/odbc_adapter) to your Gemfile and set:
 
 ```yml
 data_sources:
   my_source:
     adapter: snowflake
-    dsn: ProductionSnowflake
+    conn_str: Driver=/path/to/libSnowflake.so;uid=user;pwd=password;server=host.snowflakecomputing.com
 ```
 
 ### SQLite
@@ -719,8 +738,8 @@ Blazer supports a basic permissions model.
 
 Have team members who want to learn SQL? Here are a few great, free resources.
 
-- [Khan Academy](https://www.khanacademy.org/computing/computer-programming/sql)
-- [Codecademy](https://www.codecademy.com/learn/learn-sql)
+- [The Data School](https://dataschool.com/learn-sql/)
+- [SQLBolt](https://sqlbolt.com/)
 
 ## Useful Tools
 

data/app/assets/stylesheets/blazer/application.css

@@ -1,6 +1,6 @@
 /*
  *= require ./bootstrap
- *= require ./selectize.default
+ *= require ./selectize
  *= require ./github
  *= require ./daterangepicker
  *= require_self

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

@@ -51,7 +51,7 @@
           <% words << pluralize(dashboards_count, "dashboard") if dashboards_count > 0 %>
           <% words << pluralize(checks_count, "check") if checks_count > 0 %>
           <% if words.any? %>
-            <div class="alert alert-info" style="margin-bottom: 0;">
+            <div class="alert alert-info">
               Part of <%= words.to_sentence %>. Be careful when editing.
             </div>
           <% end %>

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

@@ -12,14 +12,14 @@
       <p class="text-muted" style="float: right;">
         <% if @cached_at %>
           Cached <%= time_ago_in_words(@cached_at, include_seconds: true) %> ago
-        <% elsif !params[:data_source] %>
+        <% elsif params[:query_id] %>
           Cached just now
           <% if @data_source.cache_mode == "slow" %>
             (over <%= "%g" % @data_source.cache_slow_threshold %>s)
           <% end %>
         <% end %>
 
-        <% if @query && !params[:data_source] %>
+        <% if @query && params[:query_id] %>
           <%= link_to "Refresh", refresh_query_path(@query, variable_params), method: :post %>
         <% end %>
       </p>
@@ -67,7 +67,8 @@
     <% series_library = {} %>
     <% target_index = @columns.index { |k| k.downcase == "target" } %>
     <% if target_index %>
-      <% series_library[target_index - 1] = {pointStyle: "line", hitRadius: 5, borderColor: "#109618", pointBackgroundColor: "#109618", backgroundColor: "#109618"} %>
+      <% color = "#109618" %>
+      <% series_library[target_index - 1] = {pointStyle: "line", hitRadius: 5, borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color} %>
     <% end %>
     <% if @forecast %>
       <% color = "#54a3ee" %>

data/lib/blazer/adapters/athena_adapter.rb

@@ -32,7 +32,7 @@ module Blazer
               query_execution_id: query_execution_id
             )
           rescue Aws::Athena::Errors::InvalidRequestException => e
-            if e.message != "Query has not yet finished. Current state: RUNNING"
+            unless e.message.start_with?("Query has not yet finished.")
               raise e
             end
             if Time.now < stop_at
@@ -56,6 +56,7 @@ module Blazer
             utc = ActiveSupport::TimeZone['Etc/UTC']
 
             rows = untyped_rows[1..-1] || []
+            rows = untyped_rows[0..-1] unless column_info.present?
             column_types.each_with_index do |ct, i|
               # TODO more column_types
               case ct

data/lib/blazer/adapters/sql_adapter.rb

@@ -42,7 +42,7 @@ module Blazer
       def tables
         sql = add_schemas("SELECT table_schema, table_name FROM information_schema.tables")
         result = data_source.run_statement(sql, refresh_cache: true)
-        if postgresql? || redshift?
+        if postgresql? || redshift? || snowflake?
           result.rows.sort_by { |r| [r[0] == default_schema ? "" : r[0], r[1]] }.map do |row|
             table =
               if row[0] == default_schema
@@ -51,6 +51,8 @@ module Blazer
                 "#{row[0]}.#{row[1]}"
               end
 
+            table = table.downcase if snowflake?
+
             {
               table: table,
               value: connection_model.connection.quote_table_name(table)
@@ -148,6 +150,10 @@ module Blazer
         ["SQLServer", "tinytds", "mssql"].include?(adapter_name)
       end
 
+      def snowflake?
+        data_source.adapter == "snowflake"
+      end
+
       def adapter_name
         # prevent bad data source from taking down queries/new
         connection_model.connection.adapter_name rescue nil
@@ -172,6 +178,7 @@ module Blazer
         else
           where = "table_schema NOT IN (?)"
           schemas = ["information_schema"]
+          schemas.map!(&:upcase) if snowflake?
           schemas << "pg_catalog" if postgresql? || redshift?
         end
         connection_model.send(:sanitize_sql_array, ["#{query} WHERE #{where}", schemas])

data/lib/blazer/engine.rb

@@ -3,10 +3,21 @@ module Blazer
     isolate_namespace Blazer
 
     initializer "blazer" do |app|
-      # use a proc instead of a string
-      app.config.assets.precompile << proc { |path| path =~ /\Ablazer\/application\.(js|css)\z/ }
-      app.config.assets.precompile << proc { |path| path =~ /\Ablazer\/.+\.(eot|svg|ttf|woff)\z/ }
-      app.config.assets.precompile << proc { |path| path == "blazer/favicon.png" }
+      if defined?(Sprockets) && Sprockets::VERSION >= "4"
+        app.config.assets.precompile << "blazer/application.js"
+        app.config.assets.precompile << "blazer/application.css"
+        app.config.assets.precompile << "blazer/glyphicons-halflings-regular.eot"
+        app.config.assets.precompile << "blazer/glyphicons-halflings-regular.svg"
+        app.config.assets.precompile << "blazer/glyphicons-halflings-regular.ttf"
+        app.config.assets.precompile << "blazer/glyphicons-halflings-regular.woff"
+        app.config.assets.precompile << "blazer/glyphicons-halflings-regular.woff2"
+        app.config.assets.precompile << "blazer/favicon.png"
+      else
+        # use a proc instead of a string
+        app.config.assets.precompile << proc { |path| path =~ /\Ablazer\/application\.(js|css)\z/ }
+        app.config.assets.precompile << proc { |path| path =~ /\Ablazer\/.+\.(eot|svg|ttf|woff|woff2)\z/ }
+        app.config.assets.precompile << proc { |path| path == "blazer/favicon.png" }
+      end
 
       Blazer.time_zone ||= Blazer.settings["time_zone"] || Time.zone
       Blazer.audit = Blazer.settings.key?("audit") ? Blazer.settings["audit"] : true

data/lib/blazer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -140,7 +140,7 @@ files:
 - app/assets/stylesheets/blazer/bootstrap.css.erb
 - app/assets/stylesheets/blazer/daterangepicker.css
 - app/assets/stylesheets/blazer/github.css
-- app/assets/stylesheets/blazer/selectize.default.css
+- app/assets/stylesheets/blazer/selectize.css
 - app/controllers/blazer/base_controller.rb
 - app/controllers/blazer/checks_controller.rb
 - app/controllers/blazer/dashboards_controller.rb
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Explore your data with SQL. Easily create charts and dashboards, and share