sql-jarvis 2.1.1 → 2.1.2

data/app/models/blazer/query.rb

@@ -1,6 +1,7 @@
 module Blazer
   class Query < Record
     serialize :assignee_ids, Array
+    serialize :team_ids, Array
 
     belongs_to :creator, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s) if Blazer.user_class
     has_many :checks, dependent: :destroy
@@ -8,6 +9,7 @@ module Blazer
     has_many :dashboards, through: :dashboard_queries
     has_many :audits
 
+    before_validation :statement_format
     validates :statement, presence: true
 
     scope :named, -> { where("blazer_queries.name <> ''") }
@@ -42,5 +44,12 @@ module Blazer
     def variables
       Blazer.extract_vars(statement)
     end
+
+    private
+
+    def statement_format
+      self.statement.gsub!(/\n/, '')
+    end
+
   end
 end

data/app/views/blazer/_variables.html.haml

@@ -3,10 +3,8 @@
     #{blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name}
     var now = moment.tz(timeZone)
     var format = "YYYY-MM-DD"
+    function toDate(time) { return moment.tz(time.format(format), timeZone) }
 
-    function toDate(time) {
-      return moment.tz(time.format(format), timeZone)
-    }
   %form#bind.form-inline{:action => action, :method => "get", :style => "margin-bottom: 15px;"}
     - date_vars = ["start_time", "end_time"]
     - if (date_vars - @bind_vars).empty?
@@ -16,7 +14,7 @@
     - @bind_vars.each_with_index do |var, i|
       = label_tag var, var
       - if (data = @smart_vars[var])
-        = select_tag var, options_for_select([[nil, nil]] + data, selected: params[var]), style: "margin-right: 20px; width: 200px; display: none;", multiple: true
+        = select_tag var, options_for_select(data, selected: params[var]), style: "margin-right: 20px; width: 200px; display: none;", multiple: true
         :javascript
           $("##{var}").selectize({
             create: true
@@ -100,3 +98,4 @@
           submitIfCompleted($("#start_time").closest("form"))
         }
     %input.btn.btn-success{:style => "vertical-align: top;", :type => "submit", :value => "Run"}/
+  %hr

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

@@ -0,0 +1,52 @@
+- values = rows.first
+- chart_id = SecureRandom.hex
+- column_types = result.column_types
+- chart_type = result.chart_type
+- chart_options = { id: chart_id, height: '80vh' }
+
+- if ["line", "line2"].include?(chart_type)
+  - chart_options.merge!(min: nil)
+- if chart_type == "scatter"
+  - chart_options.merge!(library: {tooltips: {intersect: false}})
+- elsif ["bar", "bar2"].include?(chart_type)
+  - chart_options.merge!(library: {tooltips: {intersect: false, axis: 'x'}})
+- elsif chart_type != "pie"
+  - if column_types.size == 2 || forecast
+    - chart_options.merge!(library: {tooltips: {intersect: false, axis: 'x'}})
+  - else
+    - chart_options.merge!(library: {tooltips: {intersect: false}})
+- 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"}
+- if forecast
+  - color = "#54a3ee"
+  - series_library[1] = {borderDash: [8], borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color}
+- elsif chart_type == "line"
+  - chart_data = columns[1..-1].each_with_index.map{ |k, i| {name: blazer_series_name(k), data: rows.map{ |r| [r[0], r[i + 1]] }, library: series_library[i]} }
+  = line_chart chart_data, chart_options
+- elsif chart_type == "line2"
+  = line_chart rows.group_by { |r| v = r[1]; (boom[columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} }, chart_options
+- elsif chart_type == "pie"
+  = pie_chart rows.map { |r| [(boom[columns[0]] || {})[r[0].to_s] || r[0], r[1]] }, chart_options
+- elsif chart_type == "bar"
+  = column_chart (values.size - 1).times.map { |i| name = columns[i + 1]; {name: blazer_series_name(name), data: rows.first(20).map { |r| [(boom[columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, chart_options
+- elsif chart_type == "bar2"
+  - first_20 = rows.group_by { |r| r[0] }.values.first(20).flatten(1)
+  - labels = first_20.map { |r| r[0] }.uniq
+  - series = first_20.map { |r| r[1] }.uniq
+  - labels.each do |l|
+    - series.each do |s|
+      - first_20 << [l, s, 0] unless first_20.find { |r| r[0] == l && r[1] == s }
+  = column_chart first_20.group_by { |r| v = r[1]; (boom[columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(boom[columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, chart_options
+- elsif chart_type == "scatter"
+  = scatter_chart rows, xtitle: columns[0], ytitle: columns[1], **chart_options
+- elsif only_chart
+  - if rows.size == 1 && rows.first.size == 1
+    - v = rows.first.first
+    - if v.is_a?(String) && v == ""
+      .text-muted empty string
+    - else
+      %p{style: "font-size: 160px;"}= blazer_format_value(columns.first, v)
+- else
+  - @no_chart = true

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

@@ -7,17 +7,24 @@
         .form-group
           = f.hidden_field :statement
           #editor-container
-            #editor{":style" => "{ height: editorHeight }"}= @query.statement
-        .form-group.text-right{:style => "margin-bottom: 8px;"}
-          .pull-left{:style => "margin-top: 8px;"}
+            #editor{style: "{ height: editorHeight }"}= @query.statement.to_s.gsub("\n", '')
+        .form-group.text-right{style: "margin-bottom: 8px;"}
+          .pull-left{style: "margin-top: 8px;"}
             = link_to "Back", :back
-            %a{":href" => "schemaPath", :style => "margin-left: 40px;", :target => "_blank"} Schema
+            = link_to 'Schema', 'schemaPath', style: 'margin-left: 40px;', target: :blank
+            - if Blazer.integration
+              = link_to 'Integration', '#integration-session', style: 'margin-left: 40px;', data: { toggle: :collapse }
           = 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;"
-          #tables{:style => "display: inline-block; width: 250px; margin-right: 10px;"}
-            %select#table_names{:placeholder => "Preview table", :style => "width: 240px;"}
-          %a.btn.btn-info{:style => "vertical-align: top; width: 70px;", "v-if" => "!running", "v-on:click" => "run"} Run
-          %a.btn.btn-danger{:style => "vertical-align: top; width: 70px;", "v-if" => "running", "v-on:click" => "cancel"} Cancel
-        %hr/
+          #tables{style: "display: inline-block; width: 250px; margin-right: 10px;"}
+            %select#table_names{placeholder: "Preview table", style: "width: 240px;"}
+          %a.btn.btn-info{style: "vertical-align: top; width: 70px;", "v-if" => "!running", "v-on:click" => "run"} Run
+          %a.btn.btn-danger{style: "vertical-align: top; width: 70px;", "v-if" => "running", "v-on:click" => "cancel"} Cancel
+        - if Blazer.integration
+          #integration-session.collapse
+            %hr
+            = f.hidden_field :integration
+            #integration-editor{style: 'height: 200px'}
+        %hr
         = render partial: "tips"
       .col-xs-4
         .form-group
@@ -30,6 +37,10 @@
           .form-group
             = f.label :assignees
             = f.collection_select :assignee_ids, @assignees, :first, :last, {}, { placeholder: "Assignees", style: "height: 80px;", class: "form-control", multiple: true }
+        - if @teams.any?
+          .form-group
+            = f.label :teams
+            = f.collection_select :team_ids, @teams, :first, :last, {}, { placeholder: "Teams", style: "height: 80px;", class: "form-control", multiple: true }
         .form-group.text-right
           = f.submit "For Enter Press", class: "hide"
           - if @query.persisted?
@@ -48,6 +59,7 @@
   #results
     %p.text-muted{"v-if" => "running"} Loading...
     #results-html{":class" => "{ 'query-error': error }", "v-if" => "!running"}
+
 :javascript
   #{blazer_js_var "params", variable_params}
   #{blazer_js_var "previewStatement", Hash[Blazer.data_sources.map { |k, v| [k, (v.preview_statement rescue "")] }]}
@@ -77,7 +89,11 @@
         this.error = false
         cancelAllQueries()
 
-        var data = $.extend({}, params, {statement: this.getSQL(), data_source: $("#query_data_source").val()})
+        var data = $.extend({}, params, {
+          statement: this.getSQL(),
+          integration: $('#integration').val(),
+          data_source: $("#query_data_source").val()
+        })
 
         var _this = this
 
@@ -121,9 +137,25 @@
           selectize.refreshOptions(false)
         })
       },
+      showIntegrationEditor: function() {
+        integrationEditor = ace.edit("integration-editor")
+        integrationEditor.setTheme("ace/theme/twilight")
+        integrationEditor.getSession().setMode("ace/mode/ruby")
+        integrationEditor.setOptions({
+          fontSize: 12,
+          minLines: 10,
+          enableSnippets: false,
+          highlightActiveLine: false,
+          enableLiveAutocompletion: true,
+          enableBasicAutocompletion: true
+        })
+        integrationEditor.renderer.setShowGutter(true)
+        integrationEditor.renderer.setPrintMarginColumn(false)
+        integrationEditor.renderer.setPadding(10)
+        integrationEditor.getSession().setUseWrapMode(true)
+      },
       showEditor: function() {
         var _this = this
-
         editor = ace.edit("editor")
         editor.setTheme("ace/theme/twilight")
         editor.getSession().setMode("ace/mode/sql")
@@ -278,6 +310,7 @@
       })
 
       this.showEditor()
+      this.showIntegrationEditor()
     }
   })
 
@@ -292,7 +325,7 @@
   }
 
   $(document).ready(function() {
-    $('#query_assignee_ids').select2();
+    $('#query_assignee_ids, #query_team_ids').select2();
     setInterval(function() {
       var lastVersion = $('#query_statement').val();
       if (localStorage.getItem('lastVersion') !== lastVersion) {

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

@@ -20,32 +20,12 @@
   - if @forecast_error
     .alert.alert-danger= @forecast_error
   - if @rows.any?
-    - values = @rows.first
-    - chart_id = SecureRandom.hex
-    - column_types = @result.column_types
-    - chart_type = @result.chart_type
-    - chart_options = {id: chart_id}
-    - if ["line", "line2"].include?(chart_type)
-      - chart_options.merge!(min: nil)
-    - if chart_type == "scatter"
-      - chart_options.merge!(library: {tooltips: {intersect: false}})
-    - elsif ["bar", "bar2"].include?(chart_type)
-      - chart_options.merge!(library: {tooltips: {intersect: false, axis: 'x'}})
-    - elsif chart_type != "pie"
-      - if column_types.size == 2 || @forecast
-        - chart_options.merge!(library: {tooltips: {intersect: false, axis: 'x'}})
-      - else
-        - chart_options.merge!(library: {tooltips: {intersect: false}})
-    - 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"}
-    - if @forecast
-      - color = "#54a3ee"
-      - series_library[1] = {borderDash: [8], borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color}
+    #main-chart
+      = render 'chart', rows: @rows, columns: @columns, result: @result, forecast: @forecast, only_chart: @only_chart, boom: @boom
     - if blazer_maps? && @markers.any?
-      #map{style: "height: #{@only_chart ? 300 : 500}px;"}
+      #map{style: "height: 500px; width: 100%"}
       :javascript
+        $('#map').html('');
         L.mapbox.accessToken = '#{Blazer.mapbox_access_token}';
         var map = L.mapbox.map('map', 'ankane.ioo8nki0');
         #{blazer_js_var "markers", @markers}
@@ -71,34 +51,12 @@
         }
         featureLayer.setGeoJSON(geojson);
         map.fitBounds(featureLayer.getBounds());
-    - elsif chart_type == "line"
-      - chart_data = @columns[1..-1].each_with_index.map{ |k, i| {name: blazer_series_name(k), data: @rows.map{ |r| [r[0], r[i + 1]] }, library: series_library[i]} }
-      = line_chart chart_data, chart_options
-    - elsif chart_type == "line2"
-      = line_chart @rows.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} }, chart_options
-    - elsif chart_type == "pie"
-      = pie_chart @rows.map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[1]] }, chart_options
-    - elsif chart_type == "bar"
-      = column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, chart_options
-    - elsif chart_type == "bar2"
-      - first_20 = @rows.group_by { |r| r[0] }.values.first(20).flatten(1)
-      - labels = first_20.map { |r| r[0] }.uniq
-      - series = first_20.map { |r| r[1] }.uniq
-      - labels.each do |l|
-        - series.each do |s|
-          - first_20 << [l, s, 0] unless first_20.find { |r| r[0] == l && r[1] == s }
-      = column_chart first_20.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(@boom[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, chart_options
-    - elsif chart_type == "scatter"
-      = scatter_chart @rows, xtitle: @columns[0], ytitle: @columns[1], **chart_options
-    - elsif @only_chart
-      - if @rows.size == 1 && @rows.first.size == 1
-        - v = @rows.first.first
-        - if v.is_a?(String) && v == ""
-          .text-muted empty string
-        - else
-          %p{style: "font-size: 160px;"}= blazer_format_value(@columns.first, v)
-      - else
-        - @no_chart = true
+        map.setZoom(5)._onResize();
+    - elsif @no_chart
+      :javascript
+        $('#chart-tab').hide();
+        $('#table-tab').click();
+
     - unless @only_chart && !@no_chart
       - header_width = 100 / @columns.size.to_f
       .results-container
@@ -110,7 +68,7 @@
             %code= @rows[0][0]
         - else
           %p.text-muted{style: "margin-bottom: 10px; margin-top: 15px"}
-            = pluralize(@rows.size, "row")
+            = "#{@rows.size} rows" if @rows.size > 1
             - @checks.select(&:state).each do |check|
               ·
               %small{:class => "check-state #{check.state.parameterize.gsub("-", "_")}"}= link_to check.state.upcase, edit_check_path(check)
@@ -157,3 +115,7 @@
                           .text-muted= v2
   - else
     %p.text-muted.text-center{style: "margin-top: 15px"} No rows
+
+:javascript
+  $('#main-chart').appendTo('#chart');
+  $('#map').appendTo('#chart');

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

@@ -4,7 +4,7 @@
     .row{:style => "padding-top: 13px;"}
       .col-sm-8
         = render partial: "blazer/nav"
-        %h3{:style => "line-height: 34px; display: inline; margin-left: 5px;"}
+        %h4{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)
@@ -20,31 +20,54 @@
         %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);
-    }
+%ul.nav.nav-tabs
+  %li#chart-tab.active= link_to 'Chart', '#chart', data: { toggle: :tab }
+  %li= link_to 'Table', '#table', data: { toggle: :tab }, id: 'table-tab'
+  %li= link_to 'Query', '#query', data: { toggle: :tab }
+  - if @query.integration.present?
+    %li= link_to 'Integration', '#integration', data: { toggle: :tab }
+
+.tab-content
+  #chart.tab-pane.fade.in.active
+  #query.tab-pane.fade
+    %pre#code
+      %code= @statement.gsub("\r", "\n")
+  - if @query.integration.present?
+    #integration.tab-pane.fade
+      = @query.integration
+  #table.tab-pane.fade
+    - 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)}
 
-    #{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"));
+        }
 
-    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"));
-    }
+:javascript
+  $('ul.nav.nav-tabs li a').click(function(event) {
+    localStorage.setItem('currentQueryTab', $(event.currentTarget).attr('href'));
+  });
+  var currentQueryTab = localStorage.getItem('currentQueryTab');
+  $("ul.nav.nav-tabs li a[href='" + currentQueryTab + "']").click();

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

@@ -15,5 +15,5 @@
       = 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
+    .container-fluid
       = yield

data/lib/blazer.rb

@@ -12,6 +12,7 @@ require "blazer/data_source"
 require "blazer/result"
 require "blazer/excel_parser"
 require "blazer/run_statement"
+require "blazer/run_integration"
 
 # adapters
 require "blazer/adapters/base_adapter"
@@ -49,9 +50,11 @@ module Blazer
     attr_accessor :check_schedules
     attr_accessor :mapbox_access_token
     attr_accessor :assignees
+    attr_accessor :teams
     attr_accessor :anomaly_checks
     attr_accessor :forecasting
     attr_accessor :async
+    attr_accessor :integration
     attr_accessor :images
     attr_accessor :query_viewable
     attr_accessor :query_editable
@@ -65,6 +68,7 @@ module Blazer
   self.check_schedules = ["5 minutes", "1 hour", "1 day"]
   self.mapbox_access_token = nil
   self.assignees = []
+  self.teams = []
   self.host = nil
   self.preview_rows_number = 365
   self.anomaly_checks = false
@@ -89,6 +93,11 @@ module Blazer
     @time_zone = time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone.to_s]
   end
 
+  def self.integration
+    return @integration if defined?(@integration)
+    @integration = settings.key?("integration") ? settings["integration"] : false
+  end
+
   def self.user_class
     if !defined?(@user_class)
       @user_class = settings.key?("user_class") ? settings["user_class"] : (User.name rescue nil)

data/lib/blazer/adapters/sql_adapter.rb

@@ -52,11 +52,11 @@ module Blazer
 
       def preview_statement
         if postgresql?
-          "SELECT * FROM \"{table}\" LIMIT 10"
+          "SELECT * FROM \"{table}\" LIMIT 30"
         elsif sqlserver?
-          "SELECT TOP (10) * FROM {table}"
+          "SELECT TOP (30) * FROM {table}"
         else
-          "SELECT *\nFROM {table}\nORDER BY id DESC\nLIMIT 10"
+          "SELECT *\nFROM {table}\nORDER BY id DESC\nLIMIT 30"
         end
       end