sql-jarvis 2.0.9 → 2.1

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

@@ -0,0 +1,43 @@
+- blazer_title "Schema: #{@data_source.name}"
+%h1
+  Schema: #{@data_source.name}
+%hr/
+#header
+  %input#search.search.form-control{:placeholder => "Start typing a table or column", :style => "width: 300px; display: inline-block;", :type => "text"}/
+- @schema.each do |table|
+  %table.table.schema-table
+    %thead
+      %tr
+        %th{:colspan => "2"}
+          = table[:table]
+          - if table[:schema] != "public"
+            %span.text-muted{:style => "font-weight: normal;"}= table[:schema]
+    %tbody
+      - table[:columns].each do |column|
+        %tr
+          %td{:style => "width: 60%;"}= column[:name]
+          %td.text-muted= column[:data_type]
+:javascript
+  $("#search").on("keyup", function() {
+    var value = $(this).val().toLowerCase()
+    $(".schema-table").filter(function() {
+      // if found in table name, show entire table
+      // if just found in rows, show row
+
+      var found = $(this).find("thead").text().toLowerCase().indexOf(value) > -1
+
+      if (found) {
+        $(this).find("tbody tr").toggle(true)
+      } else {
+        $(this).find("tbody tr").filter(function() {
+          var found2 = $(this).text().toLowerCase().indexOf(value) > -1
+          $(this).toggle(found2)
+          if (found2) {
+            found = true
+          }
+        })
+      }
+
+      $(this).toggle(found)
+    })
+  }).focus()

data/app/views/blazer/queries/show.html.haml

@@ -0,0 +1,50 @@
+- blazer_title @query.name
+.topbar
+  .container
+    .row{:style => "padding-top: 13px;"}
+      .col-sm-8
+        = render partial: "blazer/nav"
+        %h3{:style => "line-height: 34px; display: inline; margin-left: 5px;"}
+          = @query.name
+      .col-sm-4.text-right
+        = link_to "Edit", edit_query_path(@query, variable_params), class: "btn btn-default", disabled: !@query.editable?(blazer_user)
+        = link_to "Fork", new_query_path(variable_params.merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "btn btn-info"
+        - if !@error && @success
+          = button_to "⤓ .csv", run_queries_path(query_id: @query.id, format: "csv", forecast: params[:forecast]), params: {statement: @statement}, class: "btn btn-primary"
+          = button_to "⤓ .xlsx", run_queries_path(query_id: @query.id, format: "xlsx"), params: {statement: @statement}, class: "btn btn-primary"
+%div{:style => "margin-bottom: 60px;"}
+- if @sql_errors.any?
+  .alert.alert-danger
+    %ul
+      - @sql_errors.each do |message|
+        %li= message
+- if @query.description.present?
+  %p= @query.description
+= render partial: "blazer/variables", locals: {action: query_path(@query)}
+%pre#code
+  %code= @statement
+- if @success
+  #results
+    %p.text-muted Loading...
+  :javascript
+    function showRun(data) {
+      $("#results").html(data);
+      $("#results table").stupidtable().stickyTableHeaders({
+        fixedOffset: 60,
+      });
+    }
+
+    function showError(message) {
+      $("#results").addClass("query-error").html(message);
+    }
+
+    #{blazer_js_var "data", variable_params.merge(statement: @statement, query_id: @query.id, data_source: @query.data_source)}
+
+    runQuery(data, showRun, showError)
+- unless %w(mongodb).include?(Blazer.data_sources[@query.data_source].adapter)
+  :javascript
+    // do not highlight really long queries
+    // this can lead to performance issues
+    if ($("code").text().length < 10000) {
+      hljs.highlightBlock(document.getElementById("code"));
+    }

data/app/views/layouts/blazer/application.html.haml

@@ -0,0 +1,19 @@
+!!!
+%html
+  %head
+    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %title= blazer_title ? blazer_title : "Blazer"
+    %meta{:charset => "utf-8"}/
+    = favicon_link_tag "blazer/favicon.png"
+    = stylesheet_link_tag "blazer/application"
+    = javascript_include_tag "blazer/application"
+    :javascript
+      #{blazer_js_var "rootPath", root_path}
+    %script{:crossorigin => "anonymous", :defer => "defer", :integrity => "sha384-DJ25uNYET2XCl5ZF++U8eNxPWqcKohUUBUpKGlNLMchM7q4Wjg2CUpjHLaL8yYPH", :src => "https://use.fontawesome.com/releases/v5.8.2/js/all.js"}
+    - if blazer_maps?
+      = stylesheet_link_tag "https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.css", integrity: "sha384-o8tecBIfqi9yU5yYK2Ne/9A9hlOGFV9MBvCpmemvJH1XxqOe6h8Bl4mLxMi6PgjG", crossorigin: "anonymous"
+      = javascript_include_tag "https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.js", integrity: "sha384-j81LqvtvYigFzGSUgAoFijpvoq4yGoCJSOXI9DFaUEpenR029MBE3E/X5Gr+WdO0", crossorigin: "anonymous"
+    = csrf_meta_tags
+  %body
+    .container
+      = yield

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = '2.0.9'
+  VERSION = '2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: '2.1'
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: haml-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zip-zip
   requirement: !ruby/object:Gem::Requirement
@@ -201,28 +215,28 @@ files:
 - app/models/blazer/dashboard_query.rb
 - app/models/blazer/query.rb
 - app/models/blazer/record.rb
-- app/views/blazer/_nav.html.erb
-- app/views/blazer/_variables.html.erb
-- app/views/blazer/check_mailer/failing_checks.html.erb
-- app/views/blazer/check_mailer/state_change.html.erb
-- app/views/blazer/checks/_form.html.erb
-- app/views/blazer/checks/edit.html.erb
-- app/views/blazer/checks/index.html.erb
-- 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/new.html.erb
-- app/views/blazer/dashboards/show.html.erb
-- app/views/blazer/queries/_form.html.erb
-- app/views/blazer/queries/_tips.html.erb
-- app/views/blazer/queries/docs.html.erb
-- app/views/blazer/queries/edit.html.erb
-- app/views/blazer/queries/home.html.erb
-- app/views/blazer/queries/new.html.erb
-- app/views/blazer/queries/run.html.erb
-- app/views/blazer/queries/schema.html.erb
-- app/views/blazer/queries/show.html.erb
-- app/views/layouts/blazer/application.html.erb
+- app/views/blazer/_nav.html.haml
+- app/views/blazer/_variables.html.haml
+- app/views/blazer/check_mailer/failing_checks.html.haml
+- app/views/blazer/check_mailer/state_change.html.haml
+- app/views/blazer/checks/_form.html.haml
+- app/views/blazer/checks/edit.html.haml
+- app/views/blazer/checks/index.html.haml
+- app/views/blazer/checks/new.html.haml
+- app/views/blazer/dashboards/_form.html.haml
+- app/views/blazer/dashboards/edit.html.haml
+- app/views/blazer/dashboards/new.html.haml
+- app/views/blazer/dashboards/show.html.haml
+- app/views/blazer/queries/_form.html.haml
+- app/views/blazer/queries/_tips.html.haml
+- app/views/blazer/queries/docs.html.haml
+- app/views/blazer/queries/edit.html.haml
+- app/views/blazer/queries/home.html.haml
+- app/views/blazer/queries/new.html.haml
+- app/views/blazer/queries/run.html.haml
+- app/views/blazer/queries/schema.html.haml
+- app/views/blazer/queries/show.html.haml
+- app/views/layouts/blazer/application.html.haml
 - config/routes.rb
 - lib/blazer.rb
 - lib/blazer/adapters/athena_adapter.rb

data/app/views/blazer/_nav.html.erb

@@ -1,15 +0,0 @@
-<div class="btn-group" style="vertical-align: top; margin-right: 5px;">
-  <%= link_to "Home", root_path, class: "btn btn-primary" %>
-  <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-    <span class="caret"></span>
-    <span class="sr-only">Toggle Dropdown</span>
-  </button>
-  <ul class="dropdown-menu">
-    <li><%= link_to "Checks", checks_path %></li>
-    <li role="separator" class="divider"></li>
-    <li><%= link_to "New Query", new_query_path %></li>
-    <li><%= link_to "New Dashboard", new_dashboard_path %></li>
-    <% check_params = @query ? {query_id: @query.id} : {} %>
-    <li><%= link_to "New Check", new_check_path(check_params) %></li>
-  </ul>
-</div>

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

@@ -1,6 +0,0 @@
-<ul>
-  <% @checks.each do |check| %>
-    <li><%= link_to check.query.name, query_url(check.query_id, host: Blazer.host) %> <%= check.state %></li>
-  <% end %>
-</ul>
-<p><%= link_to "Manage checks", checks_url(host: Blazer.host) %></p>

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

@@ -1,47 +0,0 @@
-<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, host: Blazer.host) %></p>
-    <% if @error %>
-      <p><%= @error %></p>
-    <% elsif @rows_count > 0 && @check_type == "bad_data" %>
-      <p>
-        <% if @rows_count <= 10 %>
-          <%= pluralize(@rows_count, "row") %>
-        <% else %>
-          Showing 10 of <%= @rows_count %> rows
-        <% end %>
-      </p>
-      <table style="width: 100%; border-spacing: 0; border-collapse: collapse;">
-        <thead>
-          <tr>
-            <% @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 %>
-          </tr>
-        </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>
-      <% if @columns.size > 5 %>
-        <p style="color: #999;">Only first 5 columns shown</p>
-      <% end %>
-    <% end %>
-  </body>
-</html>

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

@@ -1,79 +0,0 @@
-<%= form_for @check, html: {class: "small-form"} do |f| %>
-  <% unless @check.respond_to?(:check_type) || @check.respond_to?(:invert) %>
-    <p class="text-muted">Checks are designed to identify bad data. A check fails if there are any results.</p>
-  <% end %>
-
-  <% if @check.errors.any? %>
-    <div class="alert alert-danger"><%= @check.errors.full_messages.first %></div>
-  <% end %>
-
-  <div class="form-group">
-    <%= f.label :query_id, "Query" %>
-    <div class="hide">
-      <%= f.select :query_id, [], {include_blank: true} %>
-    </div>
-    <script>
-      <%= blazer_js_var "queries", Blazer::Query.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} } %>
-      <%= blazer_js_var "items", [@check.query_id].compact %>
-
-      $("#check_query_id").selectize({options: queries, items: items, highlight: false, maxOptions: 100}).parents(".hide").removeClass("hide");
-    </script>
-  </div>
-
-  <% if @check.respond_to?(:check_type) %>
-    <div class="form-group">
-      <%= f.label :check_type, "Alert if" %>
-      <div class="hide">
-        <% check_options = [["Any results (bad data)", "bad_data"], ["No results (missing data)", "missing_data"]] %>
-        <% check_options << ["Anomaly (most recent data point)", "anomaly"] if Blazer.anomaly_checks %>
-        <%= f.select :check_type, check_options %>
-      </div>
-      <script>
-        $("#check_check_type").selectize({}).parent().removeClass("hide");
-      </script>
-    </div>
-  <% elsif @check.respond_to?(:invert) %>
-    <div class="form-group">
-      <%= f.label :invert, "Fails if" %>
-      <div class="hide">
-        <%= f.select :invert, [["Any results (bad data)", false], ["No results (missing data)", true]] %>
-      </div>
-      <script>
-        $("#check_invert").selectize({}).parent().removeClass("hide");
-      </script>
-    </div>
-  <% end %>
-
-  <% if @check.respond_to?(:schedule) && Blazer.check_schedules %>
-    <div class="form-group">
-      <%= f.label :schedule, "Run every" %>
-      <div class="hide">
-        <%= f.select :schedule, Blazer.check_schedules.map { |v| [v, v] } %>
-      </div>
-      <script>
-        $("#check_schedule").selectize({}).parent().removeClass("hide");
-      </script>
-    </div>
-  <% end %>
-
-  <div class="form-group">
-    <%= f.label :emails %>
-    <%= f.text_field :emails, placeholder: "Optional, comma separated", class: "form-control" %>
-  </div>
-
-  <% if Blazer.slack? %>
-    <div class="form-group">
-      <%= f.label :slack_channels %>
-      <%= f.text_field :slack_channels, placeholder: "Optional, comma separated", class: "form-control" %>
-    </div>
-  <% end %>
-
-  <p class="text-muted">Emails <%= Blazer.slack? ? "and Slack notifications " : nil %>are sent when a check starts failing, and when it starts passing again.
-  <p>
-    <% if @check.persisted? %>
-      <%= link_to "Delete", check_path(@check), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>
-    <% end %>
-    <%= f.submit "Save", class: "btn btn-success" %>
-    <%= link_to "Back", :back, class: "btn btn-link" %>
-  </p>
-<% end %>

data/app/views/blazer/checks/edit.html.erb

@@ -1,3 +0,0 @@
-<% blazer_title "Edit Check" %>
-
-<%= render partial: "form" %>

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

@@ -1,69 +0,0 @@
-<% blazer_title "Checks" %>
-
-<div id="header">
-  <div class="pull-right" style="line-height: 34px;">
-    <div class="btn-group">
-      <%= link_to "New Check", new_check_path, class: "btn btn-info" %>
-      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span>
-        <span class="sr-only">Toggle Dropdown</span>
-      </button>
-      <ul class="dropdown-menu">
-        <li><%= link_to "Home", root_path %></li>
-        <li role="separator" class="divider"></li>
-        <li><%= link_to "New Query", new_query_path %></li>
-        <li><%= link_to "New Dashboard", new_dashboard_path %></li>
-      </ul>
-    </div>
-  </div>
-
-  <input id="search" type="text" placeholder="Start typing a query or state" style="width: 300px; display: inline-block;" class="search form-control" />
-</div>
-
-<table id="checks" class="table">
-  <thead>
-    <tr>
-      <th>Query</th>
-      <th style="width: 10%;">State</th>
-      <th style="width: 10%;">Run</th>
-      <th style="width: 20%;">Notify</th>
-      <th style="width: 15%;"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @checks.each do |check| %>
-      <tr>
-        <td><%= link_to check.query.name, check.query %> <span class="text-muted"><%= check.try(:check_type).to_s.gsub("_", " ") %></span></td>
-        <td>
-          <% if check.state %>
-            <small class="check-state <%= check.state.parameterize.gsub("-", "_") %>"><%= check.state.upcase %></small>
-          <% end %>
-        </td>
-        <td><%= check.schedule if check.respond_to?(:schedule) %></td>
-        <td>
-          <ul class="list-unstyled" style="margin-bottom: 0; word-break: break-all;">
-            <% check.split_emails.each do |email| %>
-              <li><%= email %></li>
-            <% end %>
-            <% check.split_slack_channels.each do |channel| %>
-              <li><%= channel %></li>
-            <% end %>
-          </ul>
-        </td>
-        <td style="text-align: right; padding: 1px;">
-          <%= link_to "Edit", edit_check_path(check), class: "btn btn-info" %>
-          <%= link_to "Run Now", query_path(check.query), class: "btn btn-primary" %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<script>
-  $("#search").on("keyup", function() {
-    var value = $(this).val().toLowerCase()
-    $("#checks tbody tr").filter( function() {
-      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
-    })
-  }).focus()
-</script>

data/app/views/blazer/checks/new.html.erb

@@ -1,3 +0,0 @@
-<% blazer_title "New Check" %>
-
-<%= render partial: "form" %>

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

@@ -1,76 +0,0 @@
-<%= form_for @dashboard, url: (@dashboard.persisted? ? dashboard_path(@dashboard, variable_params) : dashboards_path(variable_params)), html: {id: "app", class: "small-form"} do |f| %>
-  <% if @dashboard.errors.any? %>
-    <div class="alert alert-danger"><%= @dashboard.errors.full_messages.first %></div>
-  <% end %>
-
-  <div class="form-group">
-    <%= f.label :name %>
-    <%= f.text_field :name, class: "form-control" %>
-  </div>
-  <div class="form-group" v-show="queries.length">
-    <%= f.label :charts %>
-    <ul id="queries" class="list-group">
-      <li class="list-group-item" v-for="(query, index) in queries" :key="query.id" v-cloak>
-        <span class="glyphicon glyphicon-remove" aria-hidden="true" v-on:click="remove(index)"></span>
-        {{ query.name }}
-        <input type="hidden" name="query_ids[]" :value="query.id">
-      </li>
-    </ul>
-  </div>
-  <div class="form-group" v-cloak>
-    <%= f.label :query_id, "Add Chart" %>
-    <%= select_tag :query_id, nil, {include_blank: true, placeholder: "Select chart"} %>
-  </div>
-  <p style="padding-bottom: 140px;" v-cloak>
-    <% if @dashboard.persisted? %>
-      <%= link_to "Delete", dashboard_path(@dashboard), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger"%>
-    <% end %>
-    <%= f.submit "Save", class: "btn btn-success" %>
-    <%= link_to "Back", :back, class: "btn btn-link" %>
-  </p>
-<% end %>
-
-<script>
-  <%= blazer_js_var "queries", Blazer::Query.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} } %>
-  <%= blazer_js_var "dashboardQueries", @queries || @dashboard.dashboard_queries.order(:position).map(&:query) %>
-
-  var app = new Vue({
-    el: "#app",
-    data: {
-      queries: dashboardQueries
-    },
-    methods: {
-      remove: function(index) {
-        this.queries.splice(index, 1)
-      }
-    },
-    mounted: function() {
-      $("#query_id").selectize({
-        options: queries,
-        highlight: false,
-        maxOptions: 100,
-        onChange: function(val) {
-          if (val) {
-            var item = this.getItem(val)
-
-            // if duplicate query is added, remove the first one
-            for (var i = 0; i < app.queries.length; i++) {
-              if (app.queries[i].id == val) {
-                app.queries.splice(i, 1)
-                break
-              }
-            }
-
-            app.queries.push({id: val, name: item.text()})
-            this.setValue("")
-          }
-        }
-      })
-    }
-  })
-  Sortable.create($("#queries").get(0), {
-    onEnd: function(e) {
-      app.queries.splice(e.newIndex, 0, app.queries.splice(e.oldIndex, 1)[0])
-    }
-  })
-</script>