blazer 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9f1befb584a82255a0b18c923fed929e19b7d45
-  data.tar.gz: a29b5d3ad69071040cabe3d55292ea90a424590f
+  metadata.gz: 9d8af782cbd8374eb05295ae7fbd31766198adb1
+  data.tar.gz: f825ed76228ddf5eee748c9f48f252a358b206d3
 SHA512:
-  metadata.gz: bc7d9b22deda363e630490afacfa29f6bc3ca72eb9dc961bc6bcc19a5c73390791f0affd86a356f355da64abde234a8c3dab9bef5dbf5bb6668e816f111cd280
-  data.tar.gz: fee705155f102fce4460a5f92d848ec7ddd2b9146f8888d9673ec1f7aca43feebf50835cf7707a22d35362ff0fec6db4ba7cd55c27dd8e9a5f3243270bf4b65e
+  metadata.gz: 8010c7ef1b87607b5d1c19980358c615fec43e711c1d50fd621b052efaa64c5bba165032f006a4a47b299680431d91ae84b48bd7bdb873de1519ca5827a7b32f
+  data.tar.gz: 84fffc2f2ea73319dc98df13ee7798b8d5411f1b44427a46db58d4a5cba2bf1896f759ef804ee925e253231cc8c1038f71759d16e2db62301bbb8159422d573b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.7.2
+
+- Cancel all queries on page nav
+- Prevent Ace from taking over find command
+- Added ability to use hashes for smart columns
+- Added ability to inherit smart variables and columns from other data sources
+
 ## 1.7.1
 
 - Do not fork when enter key pressed

data/README.md

@@ -228,6 +228,13 @@ smart_columns:
   city_id: "SELECT id, name FROM cities WHERE id IN {value}"
 ```
 
+You can also use a hash for static data and enums.
+
+```yml
+smart_columns:
+  status: {0: "Active", 1: "Archived"}
+```
+
 ### Caching
 
 Blazer can automatically cache results to improve speed. It can cache slow queries:
@@ -421,7 +428,13 @@ Use [ibm_db](https://github.com/ibmdb/ruby-ibmdb).
 
 ### SQLite
 
-Use [sqlite3](https://github.com/sparklemotion/sqlite3-ruby).
+Add [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) to your Gemfile and set:
+
+```yml
+data_sources:
+  my_source:
+    url: sqlite3:path/to/database.sqlite3
+```
 
 ### Redshift
 

data/app/assets/javascripts/blazer/application.js

@@ -14,131 +14,31 @@
 //= require ./bootstrap
 //= require ./vue
 //= require ./routes
+//= require ./queries
+
+Vue.config.devtools = false
 
 $(document).on('mouseenter', '.dropdown-toggle', function () {
-  $(this).parent().addClass('open');
-});
+  $(this).parent().addClass('open')
+})
 
 $(document).on("change", "#bind input, #bind select", function () {
-  submitIfCompleted($(this).closest("form"));
-});
+  submitIfCompleted($(this).closest("form"))
+})
 
 $(document).on("click", "#code", function () {
-  $(this).addClass("expanded");
-});
-
-function uuid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-    var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
-    return v.toString(16);
-  });
-}
-
-function cancelQuery(runningQuery) {
-  runningQuery.canceled = true;
-  var xhr = runningQuery.xhr;
-  if (xhr) {
-    xhr.abort();
-  }
-  remoteCancelQuery(runningQuery);
-  queryComplete();
-}
-
-function csrfProtect(payload) {
-  var param = $("meta[name=csrf-param]").attr("content");
-  var token = $("meta[name=csrf-token]").attr("content");
-  if (param && token) payload[param] = token;
-  return new Blob([JSON.stringify(payload)], {type : "application/json; charset=utf-8"});
-}
-
-function remoteCancelQuery(runningQuery) {
-  var path = Routes.blazer_cancel_queries_path();
-  var data = {run_id: runningQuery.run_id, data_source: runningQuery.data_source};
-  if (navigator.sendBeacon) {
-    navigator.sendBeacon(path, csrfProtect(data));
-  } else {
-    // TODO make sync
-    $.post(path, data);
-  }
-}
-
-var queriesQueue = [];
-var runningQueries = 0;
-var maxQueries = 3;
-
-function queueQuery(callback) {
-  queriesQueue.push(callback);
-  runNext();
-}
-
-function runNext() {
-  if (runningQueries < maxQueries) {
-    var callback = queriesQueue.shift();
-    if (callback) {
-      runningQueries++;
-      callback();
-      runNext();
-    }
-  }
-}
-
-function queryComplete() {
-  runningQueries--;
-  runNext();
-}
-
-function runQuery(data, success, error, runningQuery) {
-  queueQuery( function () {
-    runningQuery = runningQuery || {};
-    runningQuery.run_id = data.run_id = uuid();
-    runningQuery.data_source = data.data_source;
-    return runQueryHelper(data, success, error, runningQuery);
-  });
-}
-
-function runQueryHelper(data, success, error, runningQuery) {
-  var xhr = $.ajax({
-    url: Routes.blazer_run_queries_path(),
-    method: "POST",
-    data: data,
-    dataType: "html"
-  }).done( function (d) {
-    if (d[0] == "{") {
-      var response = $.parseJSON(d);
-      data.blazer = response;
-      setTimeout( function () {
-        if (!(runningQuery && runningQuery.canceled)) {
-          runQueryHelper(data, success, error, runningQuery);
-        }
-      }, 1000);
-    } else {
-      if (!(runningQuery && runningQuery.canceled)) {
-        success(d);
-      }
-      queryComplete();
-    }
-  }).fail( function(jqXHR, textStatus, errorThrown) {
-    if (!(runningQuery && runningQuery.canceled)) {
-      var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message;
-      error(message);
-    }
-    queryComplete();
-  });
-  if (runningQuery) {
-    runningQuery.xhr = xhr;
-  }
-  return xhr;
-}
+  $(this).addClass("expanded")
+})
 
 function submitIfCompleted($form) {
-  var completed = true;
+  var completed = true
   $form.find("input[name], select").each( function () {
     if ($(this).val() == "") {
-      completed = false;
+      completed = false
     }
-  });
+  })
   if (completed) {
-    $form.submit();
+    $form.submit()
   }
 }
 
@@ -146,140 +46,131 @@ function submitIfCompleted($form) {
 // Adapted from Biff MaGriff: http://stackoverflow.com/a/7895814/1196499
 function preventBackspaceNav() {
   $(document).keydown(function (e) {
-    var preventKeyPress;
+    var preventKeyPress
     if (e.keyCode == 8) {
-      var d = e.srcElement || e.target;
+      var d = e.srcElement || e.target
       switch (d.tagName.toUpperCase()) {
         case 'TEXTAREA':
-          preventKeyPress = d.readOnly || d.disabled;
-          break;
+          preventKeyPress = d.readOnly || d.disabled
+          break
         case 'INPUT':
-          preventKeyPress = d.readOnly || d.disabled || (d.attributes["type"] && $.inArray(d.attributes["type"].value.toLowerCase(), ["radio", "reset", "checkbox", "submit", "button"]) >= 0);
-          break;
+          preventKeyPress = d.readOnly || d.disabled || (d.attributes["type"] && $.inArray(d.attributes["type"].value.toLowerCase(), ["radio", "reset", "checkbox", "submit", "button"]) >= 0)
+          break
         case 'DIV':
-          preventKeyPress = d.readOnly || d.disabled || !(d.attributes["contentEditable"] && d.attributes["contentEditable"].value == "true");
-          break;
+          preventKeyPress = d.readOnly || d.disabled || !(d.attributes["contentEditable"] && d.attributes["contentEditable"].value == "true")
+          break
         default:
-          preventKeyPress = true;
-          break;
+          preventKeyPress = true
+          break
       }
     }
     else {
-      preventKeyPress = false;
+      preventKeyPress = false
     }
 
     if (preventKeyPress) {
-      e.preventDefault();
+      e.preventDefault()
     }
-  });
+  })
 }
 
-var editor;
+var editor
 
 // http://stackoverflow.com/questions/11584061/
 function adjustHeight() {
-  var lines = editor.getSession().getScreenLength();
+  var lines = editor.getSession().getScreenLength()
   if (lines < 9) {
-    lines = 9;
+    lines = 9
   }
 
-  var newHeight = (lines + 1) * 16;
-  $("#editor").height(newHeight.toString() + "px");
-  editor.resize();
-};
+  var newHeight = (lines + 1) * 16
+  $("#editor").height(newHeight.toString() + "px")
+  editor.resize()
+}
 
 function getSQL() {
-  var selectedText = editor.getSelectedText();
-  var text = selectedText.length < 10 ? editor.getValue() : selectedText;
-  return text.replace(/\n/g, "\r\n");
+  var selectedText = editor.getSelectedText()
+  var text = selectedText.length < 10 ? editor.getValue() : selectedText
+  return text.replace(/\n/g, "\r\n")
 }
 
 function getErrorLine() {
-  var error_line = /LINE (\d+)/g.exec($("#results").find('.alert-danger').text());
+  var error_line = /LINE (\d+)/g.exec($("#results").find('.alert-danger').text())
 
   if (error_line) {
-    error_line = parseInt(error_line[1], 10);
+    error_line = parseInt(error_line[1], 10)
     if (editor.getSelectedText().length >= 10) {
-      error_line += editor.getSelectionRange().start.row;
+      error_line += editor.getSelectionRange().start.row
     }
-    return error_line;
+    return error_line
   }
 }
 
-var error_line = null;
-var runningQuery;
-
-function queryDone() {
-  runningQuery = null
-  $("#run").removeClass("hide")
-  $("#cancel").addClass("hide")
-}
+var error_line = null
 
 $(document).on("click", "#cancel", function (e) {
   e.preventDefault()
 
-  cancelQuery(runningQuery)
+  cancelAllQueries()
+
   queryDone()
 
   $("#results").html("")
 })
 
-function cancelQuery2() {
-  if (runningQuery) {
-    remoteCancelQuery(runningQuery)
-  }
+function queryDone() {
+  $("#run").removeClass("hide")
+  $("#cancel").addClass("hide")
 }
 
-$(window).unload(cancelQuery2)
-
 $(document).on("click", "#run", function (e) {
-  e.preventDefault();
+  e.preventDefault()
 
   $(this).addClass("hide")
   $("#cancel").removeClass("hide")
 
   if (error_line) {
-    editor.getSession().removeGutterDecoration(error_line - 1, "error");
-    error_line = null;
+    editor.getSession().removeGutterDecoration(error_line - 1, "error")
+    error_line = null
   }
 
-  $("#results").html('<p class="text-muted">Loading...</p>');
+  $("#results").html('<p class="text-muted">Loading...</p>')
 
-  var data = $.extend({}, params, {statement: getSQL(), data_source: $("#query_data_source").val()});
+  var data = $.extend({}, params, {statement: getSQL(), data_source: $("#query_data_source").val()})
 
-  runningQuery = {};
+  cancelAllQueries()
 
   runQuery(data, function (data) {
     queryDone()
 
-    $("#results").html(data);
+    $("#results").html(data)
 
-    error_line = getErrorLine();
+    error_line = getErrorLine()
     if (error_line) {
-      editor.getSession().addGutterDecoration(error_line - 1, "error");
-      editor.scrollToLine(error_line, true, true, function () {});
-      editor.gotoLine(error_line, 0, true);
-      editor.focus();
+      editor.getSession().addGutterDecoration(error_line - 1, "error")
+      editor.scrollToLine(error_line, true, true, function () {})
+      editor.gotoLine(error_line, 0, true)
+      editor.focus()
     }
   }, function (data) {
     // TODO show error
     queryDone()
-  }, runningQuery);
-});
+  })
+})
 
 $(document).on("change", "#table_names", function () {
-  var val = $(this).val();
+  var val = $(this).val()
   if (val.length > 0) {
-    var dataSource = $("#query_data_source").val();
-    editor.setValue(previewStatement[dataSource].replace("{table}", val), 1);
-    $("#run").click();
+    var dataSource = $("#query_data_source").val()
+    editor.setValue(previewStatement[dataSource].replace("{table}", val), 1)
+    $("#run").click()
   }
-});
+})
 
 function showEditor() {
-  editor = ace.edit("editor");
-  editor.setTheme("ace/theme/twilight");
-  editor.getSession().setMode("ace/mode/sql");
+  editor = ace.edit("editor")
+  editor.setTheme("ace/theme/twilight")
+  editor.getSession().setMode("ace/mode/sql")
   editor.setOptions({
     enableBasicAutocompletion: false,
     enableSnippets: false,
@@ -287,32 +178,32 @@ function showEditor() {
     highlightActiveLine: false,
     fontSize: 12,
     minLines: 10
-  });
-  editor.renderer.setShowGutter(true);
-  editor.renderer.setPrintMarginColumn(false);
-  editor.renderer.setPadding(10);
-  editor.getSession().setUseWrapMode(true);
+  })
+  editor.renderer.setShowGutter(true)
+  editor.renderer.setPrintMarginColumn(false)
+  editor.renderer.setPadding(10)
+  editor.getSession().setUseWrapMode(true)
   editor.commands.addCommand({
     name: 'run',
     bindKey: {win: 'Ctrl-Enter',  mac: 'Command-Enter'},
     exec: function(editor) {
-      $("#run").click();
+      $("#run").click()
     },
     readOnly: false // false if this command should not apply in readOnly mode
-  });
+  })
   // fix command+L
-  editor.commands.removeCommands(["gotoline"]);
+  editor.commands.removeCommands(["gotoline", "find"])
 
   editor.getSession().on("change", function () {
-    $("#query_statement").val(editor.getValue());
-    adjustHeight();
-  });
-  adjustHeight();
-  $("#editor").show();
-  editor.focus();
+    $("#query_statement").val(editor.getValue())
+    adjustHeight()
+  })
+  adjustHeight()
+  $("#editor").show()
+  editor.focus()
 }
 
-preventBackspaceNav();
+preventBackspaceNav()
 
 function updatePreviewSelect() {
   var dataSource = $("#query_data_source").val()

data/app/assets/javascripts/blazer/queries.js

@@ -0,0 +1,107 @@
+var pendingQueries = []
+var runningQueries = []
+var maxQueries = 3
+
+function runQuery(data, success, error) {
+  data.run_id = uuid()
+  var query = {
+    data: data,
+    success: success,
+    error: error,
+    run_id: data.run_id,
+    data_source: data.data_source,
+    canceled: false
+  }
+  pendingQueries.push(query)
+  runNext()
+  return query
+}
+
+function runNext() {
+  if (runningQueries.length < maxQueries) {
+    var query = pendingQueries.shift()
+    if (query) {
+      runningQueries.push(query)
+      runQueryHelper(query)
+      runNext()
+    }
+  }
+}
+
+function runQueryHelper(query) {
+  var xhr = $.ajax({
+    url: Routes.blazer_run_queries_path(),
+    method: "POST",
+    data: query.data,
+    dataType: "html"
+  }).done( function (d) {
+    if (d[0] == "{") {
+      var response = $.parseJSON(d)
+      query.data.blazer = response
+      setTimeout( function () {
+        if (!query.canceled) {
+          runQueryHelper(query)
+        }
+      }, 1000)
+    } else {
+      if (!query.canceled) {
+        query.success(d)
+      }
+      queryComplete(query)
+    }
+  }).fail( function(jqXHR, textStatus, errorThrown) {
+    if (!query.canceled) {
+      var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message
+      query.error(message)
+    }
+    queryComplete(query)
+  })
+  query.xhr = xhr
+  return xhr
+}
+
+function queryComplete(query) {
+  var index = runningQueries.indexOf(query)
+  runningQueries.splice(index, 1)
+  runNext()
+}
+
+function uuid() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+    var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8)
+    return v.toString(16)
+  })
+}
+
+function cancelAllQueries() {
+  pendingQueries = []
+  for (var i = 0; i < runningQueries.length; i++) {
+    cancelQuery(runningQueries[i])
+  }
+}
+
+$(window).unload(cancelAllQueries)
+
+function cancelQuery(query) {
+  query.canceled = true
+  if (query.xhr) {
+    query.xhr.abort()
+  }
+
+  // tell server
+  var path = Routes.blazer_cancel_queries_path()
+  var data = {run_id: query.run_id, data_source: query.data_source}
+  if (navigator.sendBeacon) {
+    navigator.sendBeacon(path, csrfProtect(data))
+  } else {
+    // TODO make sync
+    $.post(path, data)
+  }
+}
+
+function csrfProtect(payload) {
+  var param = $("meta[name=csrf-param]").attr("content")
+  var token = $("meta[name=csrf-token]").attr("content")
+  if (param && token) payload[param] = token
+  return new Blob([JSON.stringify(payload)], {type : "application/json charset=utf-8"})
+}

data/app/controllers/blazer/base_controller.rb

@@ -59,17 +59,24 @@ module Blazer
     end
 
     def parse_smart_variables(var, data_source)
-      query = data_source.smart_variables[var]
-      if query.is_a? Hash
-        smart_var = query.map { |k,v| [v, k] }
-      elsif query.is_a? Array
-        smart_var = query.map { |v| [v, v] }
-      elsif query
-        result = data_source.run_statement(query)
-        smart_var = result.rows.map { |v| v.reverse }
-        error = result.error if result.error
+      smart_var_data_source =
+        ([data_source] + Array(data_source.settings["inherit_smart_settings"]).map { |ds| Blazer.data_sources[ds] }).find { |ds| ds.smart_variables[var] }
+
+      if smart_var_data_source
+        query = smart_var_data_source.smart_variables[var]
+
+        if query.is_a? Hash
+          smart_var = query.map { |k,v| [v, k] }
+        elsif query.is_a? Array
+          smart_var = query.map { |v| [v, v] }
+        elsif query
+          result = smart_var_data_source.run_statement(query)
+          smart_var = result.rows.map { |v| v.reverse }
+          error = result.error if result.error
+        end
       end
-      return smart_var, error
+
+      [smart_var, error]
     end
 
     def extract_vars(statement)

data/app/controllers/blazer/queries_controller.rb

@@ -102,6 +102,7 @@ module Blazer
           render_run
         elsif Time.now > Time.at(@timestamp + (@data_source.timeout || 600).to_i + 5)
           # query lost
+          Rails.logger.info "[blazer lost query] #{@run_id}"
           @error = "We lost your query :("
           @rows = []
           @columns = []

data/app/models/blazer/query.rb

@@ -19,7 +19,9 @@ module Blazer
     end
 
     def editable?(user)
-      !persisted? || (name.present? && name.first != "*" && name.first != "#") || user == creator
+      editable = !persisted? || (name.present? && name.first != "*" && name.first != "#") || user == creator
+      editable &&= Blazer.query_editable.call(self, user) if Blazer.query_editable
+      editable
     end
   end
 end

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

@@ -16,7 +16,7 @@
           <%= link_to "Back", :back %>
         </div>
         <%= link_to "Schema", "#", target: "_blank", id: "view-schema", style: "margin-right: 10px;" %>
-        <%= f.select :data_source, Blazer.data_sources.values.map { |ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size == 1), style: "width: 140px;" %>
+        <%= f.select :data_source, Blazer.data_sources.values.select { |ds| q = @query.dup; q.data_source = ds.id; q.editable?(blazer_user) }.map { |ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size == 1), style: "width: 140px;" %>
         <div id="tables" style="display: inline-block; width: 250px; margin-right: 10px;" class="hide">
           <%= render partial: "tables" %>
         </div>

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

@@ -38,10 +38,10 @@
     <tbody class="list" v-cloak>
       <tr v-for="query in visibleItems">
         <td>
-          <span v-bind:class="{dashboard: query.dashboard}"><a :href="itemPath(query)">{{query.name}}</a></span>
-          <span class="vars">{{query.vars}}</span>
+          <span :class="{dashboard: query.dashboard}"><a :href="itemPath(query)">{{ query.name }}</a></span>
+          <span class="vars">{{ query.vars }}</span>
         </td>
-        <td class="creator">{{query.creator}}</td>
+        <td class="creator">{{ query.creator }}</td>
       </tr>
     </tbody>
   </table>

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

@@ -141,10 +141,10 @@
                         <% else %>
                           <%= blazer_format_value(k, v) %>
                         <% end %>
+                      <% end %>
 
-                        <% if v2 = (@boom[k] || {})[v.to_s] %>
-                          <div class="text-muted"><%= v2 %></div>
-                        <% end %>
+                      <% if v2 = (@boom[k] || {})[v.nil? ? v : v.to_s] %>
+                        <div class="text-muted"><%= v2 %></div>
                       <% end %>
                     </td>
                   <% end %>

data/blazer.gemspec

@@ -8,8 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Blazer::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.summary       = "Share data effortlessly with your team"
-  spec.description   = "Share data effortlessly with your team"
+  spec.summary       = "Explore your data with SQL. Easily create charts and dashboards, and share them with your team."
   spec.homepage      = "https://github.com/ankane/blazer"
   spec.license       = "MIT"
 

data/lib/blazer.rb

@@ -33,6 +33,7 @@ module Blazer
     attr_accessor :anomaly_checks
     attr_accessor :async
     attr_accessor :images
+    attr_accessor :query_editable
   end
   self.audit = true
   self.user_name = :name

data/lib/blazer/adapters/base_adapter.rb

@@ -39,6 +39,10 @@ module Blazer
         # optional
       end
 
+      def cachable?(statement)
+        true # optional
+      end
+
       protected
 
       def settings

data/lib/blazer/adapters/sql_adapter.rb

@@ -41,7 +41,7 @@ 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]))
+        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)
       end
 
@@ -83,6 +83,10 @@ module Blazer
         end
       end
 
+      def cachable?(statement)
+        !%w[CREATE ALTER UPDATE INSERT DELETE].include?(statement.split.first.to_s.upcase)
+      end
+
       protected
 
       def select_all(statement)

data/lib/blazer/data_source.rb

@@ -172,7 +172,7 @@ module Blazer
         cache_data = Marshal.dump([columns, rows, error, cache ? Time.now : nil]) rescue nil
       end
 
-      if cache && cache_data
+      if cache && cache_data && @adapter_instance.cachable?(statement)
         Blazer.cache.write(statement_cache_key(statement), cache_data, expires_in: cache_expires_in.to_f * 60)
       end
 

data/lib/blazer/result.rb

@@ -23,11 +23,21 @@ module Blazer
       @boom ||= begin
         boom = {}
         columns.each_with_index do |key, i|
-          query = data_source.smart_columns[key]
-          if query
-            values = rows.map { |r| r[i] }.compact.uniq
-            result = data_source.run_statement(ActiveRecord::Base.send(:sanitize_sql_array, [query.sub("{value}", "(?)"), values]))
-            boom[key] = Hash[result.rows.map { |k, v| [k.to_s, v] }]
+          smart_columns_data_source =
+            ([data_source] + Array(data_source.settings["inherit_smart_settings"]).map { |ds| Blazer.data_sources[ds] }).find { |ds| ds.smart_columns[key] }
+
+          if smart_columns_data_source
+            query = smart_columns_data_source.smart_columns[key]
+            res =
+              if query.is_a?(Hash)
+                query
+              else
+                values = rows.map { |r| r[i] }.compact.uniq
+                result = smart_columns_data_source.run_statement(ActiveRecord::Base.send(:sanitize_sql_array, [query.sub("{value}", "(?)"), values]))
+                result.rows
+              end
+
+            boom[key] = Hash[res.map { |k, v| [k.nil? ? k : k.to_s, v] }]
           end
         end
         boom

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-30 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Share data effortlessly with your team
+description: 
 email:
 - andrew@chartkick.com
 executables: []
@@ -145,6 +145,7 @@ files:
 - app/assets/javascripts/blazer/jquery_ujs.js
 - app/assets/javascripts/blazer/moment-timezone.js
 - app/assets/javascripts/blazer/moment.js
+- app/assets/javascripts/blazer/queries.js
 - app/assets/javascripts/blazer/routes.js.erb
 - app/assets/javascripts/blazer/selectize.js
 - app/assets/javascripts/blazer/stupidtable.js
@@ -230,5 +231,6 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Share data effortlessly with your team
+summary: Explore your data with SQL. Easily create charts and dashboards, and share
+  them with your team.
 test_files: []