blazer 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d8af782cbd8374eb05295ae7fbd31766198adb1
-  data.tar.gz: f825ed76228ddf5eee748c9f48f252a358b206d3
+  metadata.gz: 6bdae12ea224ba2311ce33fdbc05dffbbc938cee
+  data.tar.gz: 635a76501e3608e8a188cdfdc3186b497e6337fd
 SHA512:
-  metadata.gz: 8010c7ef1b87607b5d1c19980358c615fec43e711c1d50fd621b052efaa64c5bba165032f006a4a47b299680431d91ae84b48bd7bdb873de1519ca5827a7b32f
-  data.tar.gz: 84fffc2f2ea73319dc98df13ee7798b8d5411f1b44427a46db58d4a5cba2bf1896f759ef804ee925e253231cc8c1038f71759d16e2db62301bbb8159422d573b
+  metadata.gz: 9e81386804c7030a74a75f959f936e3ff0053c9e8e2a17f78cff84897850942f124a989f7258d429e836b0aeacf8a138f59e47ed5a35ac8686f37ecdfbd77222
+  data.tar.gz: f1c1da1a30477aae06877313f2130b6a6140962a31c29761938b04fad93baad8cb036fcd79a24f91c52212690f0cecd3dde7d563ecde799370fa61aac2a70353

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.7.3
+
+- Fixed JavaScript errors
+- Fixed query cancel error
+- Return search results for "me" or "mine"
+- Include sample data in email when bad data checks fail
+- Fixed deprecation warnings
+
 ## 1.7.2
 
 - Cancel all queries on page nav

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

@@ -15,6 +15,7 @@
 //= require ./vue
 //= require ./routes
 //= require ./queries
+//= require ./fuzzysearch
 
 Vue.config.devtools = false
 
@@ -74,139 +75,5 @@ function preventBackspaceNav() {
   })
 }
 
-var editor
-
-// http://stackoverflow.com/questions/11584061/
-function adjustHeight() {
-  var lines = editor.getSession().getScreenLength()
-  if (lines < 9) {
-    lines = 9
-  }
-
-  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")
-}
-
-function getErrorLine() {
-  var error_line = /LINE (\d+)/g.exec($("#results").find('.alert-danger').text())
-
-  if (error_line) {
-    error_line = parseInt(error_line[1], 10)
-    if (editor.getSelectedText().length >= 10) {
-      error_line += editor.getSelectionRange().start.row
-    }
-    return error_line
-  }
-}
-
-var error_line = null
-
-$(document).on("click", "#cancel", function (e) {
-  e.preventDefault()
-
-  cancelAllQueries()
-
-  queryDone()
-
-  $("#results").html("")
-})
-
-function queryDone() {
-  $("#run").removeClass("hide")
-  $("#cancel").addClass("hide")
-}
-
-$(document).on("click", "#run", function (e) {
-  e.preventDefault()
-
-  $(this).addClass("hide")
-  $("#cancel").removeClass("hide")
-
-  if (error_line) {
-    editor.getSession().removeGutterDecoration(error_line - 1, "error")
-    error_line = null
-  }
-
-  $("#results").html('<p class="text-muted">Loading...</p>')
-
-  var data = $.extend({}, params, {statement: getSQL(), data_source: $("#query_data_source").val()})
-
-  cancelAllQueries()
-
-  runQuery(data, function (data) {
-    queryDone()
-
-    $("#results").html(data)
-
-    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()
-    }
-  }, function (data) {
-    // TODO show error
-    queryDone()
-  })
-})
-
-$(document).on("change", "#table_names", function () {
-  var val = $(this).val()
-  if (val.length > 0) {
-    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.setOptions({
-    enableBasicAutocompletion: false,
-    enableSnippets: false,
-    enableLiveAutocompletion: false,
-    highlightActiveLine: false,
-    fontSize: 12,
-    minLines: 10
-  })
-  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()
-    },
-    readOnly: false // false if this command should not apply in readOnly mode
-  })
-  // fix command+L
-  editor.commands.removeCommands(["gotoline", "find"])
-
-  editor.getSession().on("change", function () {
-    $("#query_statement").val(editor.getValue())
-    adjustHeight()
-  })
-  adjustHeight()
-  $("#editor").show()
-  editor.focus()
-}
-
 preventBackspaceNav()
 
-function updatePreviewSelect() {
-  var dataSource = $("#query_data_source").val()
-  $("#tables").load(Routes.blazer_tables_queries_path({data_source: dataSource}))
-  $("#view-schema").attr("href", Routes.blazer_schema_queries_path({data_source: dataSource}))
-}

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

@@ -0,0 +1,24 @@
+// https://github.com/bevacqua/fuzzysearch
+// Copyright 2015 Nicolas Bevacqua
+// MIT License
+
+function fuzzysearch (needle, haystack) {
+  var hlen = haystack.length;
+  var nlen = needle.length;
+  if (nlen > hlen) {
+    return false;
+  }
+  if (nlen === hlen) {
+    return needle === haystack;
+  }
+  outer: for (var i = 0, j = 0; i < nlen; i++) {
+    var nch = needle.charCodeAt(i);
+    while (j < hlen) {
+      if (haystack.charCodeAt(j++) === nch) {
+        continue outer;
+      }
+    }
+    return false;
+  }
+  return true;
+}

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

@@ -30,7 +30,7 @@ function runNext() {
 
 function runQueryHelper(query) {
   var xhr = $.ajax({
-    url: Routes.blazer_run_queries_path(),
+    url: Routes.run_queries_path(),
     method: "POST",
     data: query.data,
     dataType: "html"
@@ -89,7 +89,7 @@ function cancelQuery(query) {
   }
 
   // tell server
-  var path = Routes.blazer_cancel_queries_path()
+  var path = Routes.cancel_queries_path()
   var data = {run_id: query.run_id, data_source: query.data_source}
   if (navigator.sendBeacon) {
     navigator.sendBeacon(path, csrfProtect(data))
@@ -103,5 +103,5 @@ 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"})
+  return new Blob([JSON.stringify(payload)], {type : "application/json; charset=utf-8"})
 }

data/app/assets/javascripts/blazer/routes.js.erb

@@ -1 +1,26 @@
-<%= JsRoutes.generate(include: /blazer/) %>
+<%#= JsRoutes.generate(engine: Blazer::Engine, prefix: Blazer::Engine.app.url_helpers.root_path) %>
+
+// temp fix
+var Routes = {
+  run_queries_path: function() {
+    return gon.root_path + "queries/run"
+  },
+  cancel_queries_path: function() {
+    return gon.root_path + "queries/cancel"
+  },
+  schema_queries_path: function(params) {
+    return gon.root_path + "queries/schema?data_source=" + params.data_source
+  },
+  tables_queries_path: function(params) {
+    return gon.root_path + "queries/tables?data_source=" + params.data_source
+  },
+  queries_path: function() {
+    return gon.root_path + "queries"
+  },
+  query_path: function(id) {
+    return gon.root_path + "queries/" + id
+  },
+  dashboard_path: function(id) {
+    return gon.root_path + "dashboards/" + id
+  }
+}

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

@@ -66,7 +66,6 @@ input.search:focus {
 }
 
 #editor {
-  display: none;
   height: 160px;
 }
 
@@ -93,7 +92,7 @@ input.search:focus {
   text-align: left;
 }
 
-.dashboard a {
+.dashboard {
   font-weight: bold;
 }
 
@@ -178,3 +177,16 @@ input.search:focus {
 [v-cloak] {
   display: none;
 }
+
+.chart-container {
+  padding-top: 10px;
+  clear: both;
+}
+
+.chart-container h4 {
+  text-align: center;
+}
+
+.chart-container h4 a {
+  color: inherit;
+}

data/app/controllers/blazer/base_controller.rb

@@ -19,6 +19,7 @@ module Blazer
     if Blazer.before_action
       before_action Blazer.before_action.to_sym
     end
+    before_action :set_js_routes
 
     layout "blazer/application"
 
@@ -101,5 +102,11 @@ module Blazer
       action = resource.persisted? ? :edit : :new
       render action, status: :unprocessable_entity
     end
+
+    def set_js_routes
+      gon.push(
+        root_path: root_path
+      )
+    end
   end
 end

data/app/controllers/blazer/dashboards_controller.rb

@@ -3,7 +3,7 @@ module Blazer
     before_action :set_dashboard, only: [:show, :edit, :update, :destroy, :refresh]
 
     def index
-      @dashboards = Blazer::Dashboard.order(:name)
+      redirect_to root_path(filter: "dashboards")
     end
 
     def new

data/app/controllers/blazer/queries_controller.rb

@@ -3,9 +3,13 @@ module Blazer
     before_action :set_query, only: [:show, :edit, :update, :destroy, :refresh]
 
     def home
-      set_queries(1000)
+      if params[:filter] == "dashboards"
+        @queries = []
+      else
+        set_queries(1000)
+      end
 
-      if params[:filter]
+      if params[:filter] && params[:filter] != "dashboards"
         @dashboards = [] # TODO show my dashboards
       else
         @dashboards = Blazer::Dashboard.order(:name)
@@ -176,8 +180,7 @@ module Blazer
     end
 
     def tables
-      @tables = Blazer.data_sources[params[:data_source]].tables
-      render partial: "tables", layout: false
+      render json: Blazer.data_sources[params[:data_source]].tables
     end
 
     def schema

data/app/mailers/blazer/check_mailer.rb

@@ -3,13 +3,18 @@ module Blazer
     include ActionView::Helpers::TextHelper
 
     default from: Blazer.from_email if Blazer.from_email
+    layout false
 
-    def state_change(check, state, state_was, rows_count, error)
+    def state_change(check, state, state_was, rows_count, error, columns, rows, column_types, check_type)
       @check = check
       @state = state
       @state_was = state_was
       @rows_count = rows_count
       @error = error
+      @columns = columns
+      @rows = rows
+      @column_types = column_types
+      @check_type = check_type
       mail to: check.emails, reply_to: check.emails, subject: "Check #{state.titleize}: #{check.query.name}"
     end
 

data/app/models/blazer/check.rb

@@ -58,7 +58,7 @@ module Blazer
 
       # 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).deliver_later
+        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_later
       end
       save! if changed?
     end

data/app/views/blazer/check_mailer/state_change.html.erb

@@ -1,6 +1,37 @@
-<p><%= link_to "View", query_url(@check.query_id) %></p>
-<% if @error %>
-  <p><%= @error %></p>
-<% elsif @rows_count > 0 %>
-  <p><%= pluralize(@rows_count, "row") %></p>
-<% end %>
+<html>
+  <head>
+  </head>
+  <body style="font-family: 'Helvetica Neue', Arial, Helvetica; font-size: 14px; color: #333;">
+    <p><%= link_to "View", query_url(@check.query_id) %></p>
+    <% if @error %>
+      <p><%= @error %></p>
+    <% elsif @rows_count > 0 && @check_type == "bad_data" %>
+      <p><%= pluralize(@rows_count, "row") %></p>
+      <p><strong>Sample</strong></p>
+      <table style="width: 100%; border-spacing: 0; border-collapse: collapse;">
+        <thead>
+          <% @columns.first(5).each do |column| %>
+            <th style="padding: 8px; line-height: 1.4; text-align: left; vertical-align: bottom; border-bottom: 2px solid #ddd; width: <%= (100 / @columns.size).round(2) %>%;">
+              <%= column %>
+            </th>
+          <% end %>
+        </thead>
+        <tbody>
+          <% @rows.first(10).each do |row| %>
+            <tr>
+              <% @columns.first(5).each_with_index do |column, i| %>
+                <td style="padding: 8px; line-height: 1.4; vertical-align: top; border-top: 1px solid #ddd;">
+                  <% value = row[i] %>
+                  <% if @column_types[i] == "time" && value.to_s.length > 10 %>
+                    <% value = Time.parse(value).in_time_zone(Blazer.time_zone) rescue value %>
+                  <% end %>
+                  <%= value %>
+                </td>
+              <% end %>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    <% end %>
+  </body>
+</html>

data/app/views/blazer/dashboards/show.html.erb

@@ -28,8 +28,8 @@
 <%= render partial: "blazer/variables", locals: {action: dashboard_path(@dashboard)} %>
 
 <% @queries.each_with_index do |query, i| %>
-  <div style="padding-top: 10px; clear: both;">
-    <h4 style="text-align: center;"><%= link_to query.friendly_name, query_path(query, variable_params), target: "_blank", style: "color: inherit;" %></h4>
+  <div class="chart-container">
+    <h4><%= link_to query.friendly_name, query_path(query, variable_params), target: "_blank" %></h4>
     <div id="chart-<%= i %>" class="chart">
       <p class="text-muted">Loading...</p>
     </div>

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

@@ -2,69 +2,232 @@
   <div class="alert alert-danger"><%= @query.errors.full_messages.first %></div>
 <% end %>
 
-<%= form_for @query, url: (@query.persisted? ? query_path(@query, variable_params) : queries_path(variable_params)), html: {class: "the_form", autocomplete: "off"} do |f| %>
-  <div class="row">
-    <div id="statement-box" class="col-xs-8">
-      <div class= "form-group">
-        <%= f.hidden_field :statement %>
-        <div id="editor-container">
-          <div id="editor"><%= @query.statement %></div>
+<div id="app" v-cloak>
+  <%= form_for @query, url: (@query.persisted? ? query_path(@query, variable_params) : queries_path(variable_params)), html: {class: "the_form", autocomplete: "off"} do |f| %>
+    <div class="row">
+      <div id="statement-box" class="col-xs-8">
+        <div class= "form-group">
+          <%= f.hidden_field :statement %>
+          <div id="editor-container">
+            <div id="editor" :style="{ height: editorHeight }"><%= @query.statement %></div>
+          </div>
+        </div>
+        <div class="form-group text-right">
+          <div class="pull-left" style="margin-top: 9px;">
+            <%= link_to "Back", :back %>
+          </div>
+          <a :href="dataSourcePath" target="_blank" style="margin-right: 10px;">Schema</a>
+          <%= 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;">
+            <select id="table_names" style="width: 240px;" placeholder="Preview table"></select>
+          </div>
+          <a v-on:click="run" v-if="!running" class="btn btn-info" style="vertical-align: top; width: 70px;">Run</a>
+          <a v-on:click="cancel" v-if="running" class="btn btn-danger" style="vertical-align: top; width: 70px;">Cancel</a>
         </div>
       </div>
-      <div class="form-group text-right">
-        <div class="pull-left" style="margin-top: 9px;">
-          <%= link_to "Back", :back %>
+      <div class="col-xs-4">
+        <div class="form-group">
+          <%= f.label :name %>
+          <%= f.text_field :name, class: "form-control" %>
         </div>
-        <%= link_to "Schema", "#", target: "_blank", id: "view-schema", style: "margin-right: 10px;" %>
-        <%= 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 class="form-group">
+          <%= f.label :description %>
+          <%= f.text_area :description, placeholder: "Optional", style: "height: 80px;", class: "form-control" %>
+        </div>
+        <div class="text-right">
+          <%= f.submit "For Enter Press", class: "hide" %>
+          <% if @query.persisted? %>
+            <%= link_to "Delete", query_path(@query), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>
+            <%= f.submit "Fork", class: "btn btn-info" %>
+          <% end %>
+          <%= f.submit @query.persisted? ? "Update" : "Create", class: "btn btn-success" %>
         </div>
-        <script>
-          updatePreviewSelect();
-          $("#query_data_source").selectize().change(updatePreviewSelect);
-        </script>
-        <%= link_to "Run", "#", class: "btn btn-info", id: "run", style: "vertical-align: top; width: 70px;" %>
-        <%= link_to "Cancel", "#", class: "btn btn-danger hide", id: "cancel", style: "vertical-align: top; width: 70px;" %>
-      </div>
-    </div>
-    <div class="col-xs-4">
-      <div class="form-group">
-        <%= f.label :name %>
-        <%= f.text_field :name, class: "form-control" %>
-      </div>
-      <div class="form-group">
-        <%= f.label :description %>
-        <%= f.text_area :description, placeholder: "Optional", style: "height: 80px;", class: "form-control" %>
-      </div>
-      <div class="text-right">
-        <%= f.submit "For Enter Press", class: "hide" %>
         <% if @query.persisted? %>
-          <%= link_to "Delete", query_path(@query), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>
-          <%= f.submit "Fork", class: "btn btn-info" %>
+          <% dashboards_count = @query.dashboards.count %>
+          <% checks_count = @query.checks.count %>
+          <% words = [] %>
+          <% 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-top: 10px; padding: 8px 12px;">
+              Part of <%= words.to_sentence %>. Be careful when editing.
+            </div>
+          <% end %>
         <% end %>
-        <%= f.submit @query.persisted? ? "Update" : "Create", class: "btn btn-success" %>
       </div>
-      <% if @query.persisted? %>
-        <% dashboards_count = @query.dashboards.count %>
-        <% checks_count = @query.checks.count %>
-        <% words = [] %>
-        <% 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-top: 10px; padding: 8px 12px;">
-            Part of <%= words.to_sentence %>. Be careful when editing.
-          </div>
-        <% end %>
-      <% end %>
     </div>
-  </div>
-<% end %>
+  <% end %>
 
-<div id="results"></div>
+  <div id="results">
+    <p class="text-muted" v-if="running">Loading...</p>
+    <div id="results-html" v-if="!running"></div>
+  </div>
+</div>
 
 <script>
   var params = <%= raw blazer_json_escape(variable_params.to_json) %>;
   var previewStatement = <%= raw blazer_json_escape(Hash[Blazer.data_sources.map { |k, v| [k, v.preview_statement] }].to_json) %>;
-  showEditor();
+
+  var app = new Vue({
+    el: "#app",
+    data: {
+      running: false,
+      results: "",
+      dataSource: "",
+      selectize: null,
+      editorHeight: "180px"
+    },
+    computed: {
+      dataSourcePath: function() {
+        return Routes.schema_queries_path({data_source: this.dataSource})
+      }
+    },
+    methods: {
+      run: function(e) {
+        this.running = true
+        this.results = ""
+        cancelAllQueries()
+
+        var data = $.extend({}, params, {statement: this.getSQL(), data_source: $("#query_data_source").val()})
+
+        var _this = this
+
+        runQuery(data, function (data) {
+          _this.running = false
+          _this.showResults(data)
+
+          errorLine = _this.getErrorLine()
+          if (errorLine) {
+            editor.getSession().addGutterDecoration(errorLine - 1, "error")
+            editor.scrollToLine(errorLine, true, true, function () {})
+            editor.gotoLine(errorLine, 0, true)
+            editor.focus()
+          }
+        }, function (data) {
+          _this.running = false
+          _this.showResults(data)
+        })
+      },
+      cancel: function(e) {
+        this.running = false
+        cancelAllQueries()
+      },
+      updateDataSource: function(dataSource) {
+        this.dataSource = dataSource
+        var _this = this
+
+        $.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 selectize = _this.selectize
+          selectize.clearOptions()
+          selectize.addOption(newOptions)
+          selectize.refreshOptions(false)
+        })
+      },
+      showEditor: function() {
+        var _this = this
+
+        editor = ace.edit("editor")
+        editor.setTheme("ace/theme/twilight")
+        editor.getSession().setMode("ace/mode/sql")
+        editor.setOptions({
+          enableBasicAutocompletion: false,
+          enableSnippets: false,
+          enableLiveAutocompletion: false,
+          highlightActiveLine: false,
+          fontSize: 12,
+          minLines: 10
+        })
+        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) {
+            _this.run()
+          },
+          readOnly: false // false if this command should not apply in readOnly mode
+        })
+        // fix command+L
+        editor.commands.removeCommands(["gotoline", "find"])
+
+        this.editor = editor
+
+        editor.getSession().on("change", function () {
+          $("#query_statement").val(editor.getValue())
+          _this.adjustHeight()
+        })
+        this.adjustHeight()
+        editor.focus()
+      },
+      adjustHeight: function() {
+        // http://stackoverflow.com/questions/11584061/
+        var editor = this.editor
+        var lines = editor.getSession().getScreenLength()
+        if (lines < 9) {
+          lines = 9
+        }
+
+        this.editorHeight = ((lines + 1) * 16).toString() + "px"
+
+        Vue.nextTick(function () {
+          editor.resize()
+        })
+      },
+      getSQL: function() {
+        var selectedText = editor.getSelectedText()
+        var text = selectedText.length < 10 ? editor.getValue() : selectedText
+        return text.replace(/\n/g, "\r\n")
+      },
+      getErrorLine: function() {
+        var editor = this.editor
+        var errorLine = this.results.substring(0, 100).includes("alert-danger") && /LINE (\d+)/g.exec(this.results)
+
+        if (errorLine) {
+          errorLine = parseInt(errorLine[1], 10)
+          if (editor.getSelectedText().length >= 10) {
+            errorLine += editor.getSelectionRange().start.row
+          }
+          return errorLine
+        }
+      },
+      showResults(data) {
+        // can't do it the Vue way due to script tags in results
+        // this.results = data
+
+        Vue.nextTick(function () {
+          $("#results-html").html(data)
+        })
+      }
+    },
+    mounted: function() {
+      var _this = this
+
+      var $select = $("#table_names").selectize({})
+      var selectize = $select[0].selectize
+      selectize.on("change", function(val) {
+        editor.setValue(previewStatement[_this.dataSource].replace("{table}", val), 1)
+        _this.run()
+        selectize.clear(true)
+        selectize.blur()
+      })
+      this.selectize = selectize
+
+      this.updateDataSource($("#query_data_source").val())
+
+      var $dsSelect = $("#query_data_source").selectize({})
+      var dsSelectize = $dsSelect[0].selectize
+      dsSelectize.on("change", function(val) {
+        _this.updateDataSource(val)
+        dsSelectize.blur()
+      })
+
+      this.showEditor()
+    }
+  })
 </script>

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

@@ -38,7 +38,7 @@
     <tbody class="list" v-cloak>
       <tr v-for="query in visibleItems">
         <td>
-          <span :class="{dashboard: query.dashboard}"><a :href="itemPath(query)">{{ query.name }}</a></span>
+          <a :href="itemPath(query)" :class="{dashboard: query.dashboard}">{{ query.name }}</a>
           <span class="vars">{{ query.vars }}</span>
         </td>
         <td class="creator">{{ query.creator }}</td>
@@ -51,10 +51,14 @@
 
 <script>
   var prepareSearch = function (list) {
-    var i, q
+    var i, q, searchStr
     for (i = 0; i < list.length; i++) {
       q = list[i]
-      q.searchStr = prepareQuery(q.name + q.creator)
+      searchStr = q.name + q.creator
+      if (q.creator === "You") {
+        searchStr += "mine me"
+      }
+      q.searchStr = prepareQuery(searchStr)
     }
   }
 
@@ -82,7 +86,7 @@
       if (this.more) {
         var _this = this
 
-        $.getJSON(Routes.blazer_queries_path(), function (data) {
+        $.getJSON(Routes.queries_path(), function (data) {
           var i, j, newValues, val, size = 500;
 
           var newValues = []
@@ -113,6 +117,7 @@
         if (this.searchTerm.length > 0) {
           var term = prepareQuery(this.searchTerm)
           var items = []
+          var fuzzyItems = []
           for (i = 0; i < this.listItems.length; i++) {
             q = this.listItems[i]
             if (q.searchStr.indexOf(term) !== -1) {
@@ -120,9 +125,11 @@
               if (items.length == pageSize) {
                 break
               }
+            } else if (fuzzysearch(term, q.searchStr)) {
+              fuzzyItems.push(q)
             }
           }
-          return items
+          return items.concat(fuzzyItems).slice(0, pageSize)
         } else {
           return this.listItems.slice(0, pageSize)
         }
@@ -131,9 +138,9 @@
     methods: {
       itemPath: function (item) {
         if (item.dashboard) {
-          return Routes.blazer_dashboard_path(item.to_param)
+          return Routes.dashboard_path(item.to_param)
         } else {
-          return Routes.blazer_query_path(item.to_param)
+          return Routes.query_path(item.to_param)
         }
       }
     }

data/lib/blazer/adapters/sql_adapter.rb

@@ -116,7 +116,7 @@ module Blazer
 
       def set_timeout(timeout)
         if postgresql? || redshift?
-          select_all("SET statement_timeout = #{timeout.to_i * 1000}")
+          select_all("SET #{use_transaction? ? "LOCAL " : ""}statement_timeout = #{timeout.to_i * 1000}")
         elsif mysql?
           select_all("SET max_execution_time = #{timeout.to_i * 1000}")
         else

data/lib/blazer/version.rb

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

data/lib/generators/blazer/templates/install.rb

@@ -6,7 +6,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       t.text :description
       t.text :statement
       t.string :data_source
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :blazer_audits do |t|
@@ -20,14 +20,14 @@ class <%= migration_class_name %> < ActiveRecord::Migration
     create_table :blazer_dashboards do |t|
       t.references :creator
       t.text :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :blazer_dashboard_queries do |t|
       t.references :dashboard
       t.references :query
       t.integer :position
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :blazer_checks do |t|
@@ -39,7 +39,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       t.string :check_type
       t.text :message
       t.timestamp :last_run_at
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,6 +139,7 @@ files:
 - app/assets/javascripts/blazer/bootstrap.js
 - app/assets/javascripts/blazer/chartkick.js
 - app/assets/javascripts/blazer/daterangepicker.js
+- app/assets/javascripts/blazer/fuzzysearch.js
 - app/assets/javascripts/blazer/highlight.pack.js
 - app/assets/javascripts/blazer/jquery.js
 - app/assets/javascripts/blazer/jquery.stickytableheaders.js
@@ -177,11 +178,9 @@ files:
 - app/views/blazer/checks/new.html.erb
 - app/views/blazer/dashboards/_form.html.erb
 - app/views/blazer/dashboards/edit.html.erb
-- app/views/blazer/dashboards/index.html.erb
 - app/views/blazer/dashboards/new.html.erb
 - app/views/blazer/dashboards/show.html.erb
 - app/views/blazer/queries/_form.html.erb
-- app/views/blazer/queries/_tables.html.erb
 - app/views/blazer/queries/edit.html.erb
 - app/views/blazer/queries/home.html.erb
 - app/views/blazer/queries/new.html.erb

data/app/views/blazer/dashboards/index.html.erb

@@ -1,19 +0,0 @@
-<% blazer_title "Dashboards" %>
-
-<p style="float: right;"><%= link_to "New Dashboard", new_dashboard_path, class: "btn btn-info" %></p>
-<%= render partial: "blazer/nav" %>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Dashboard</th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @dashboards.each do |dashboard| %>
-      <tr>
-        <td><%= link_to dashboard.name, dashboard %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>

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

@@ -1,5 +0,0 @@
-<%= select_tag :table_names, options_for_select([["Preview table", nil]] + (@tables || [])), style: "width: 240px;" %>
-
-<script>
-  $("#table_names").selectize({}).parent().removeClass("hide");
-</script>