sql-jarvis 1.9.6 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1955fca26a63e1f2ffdedb671c1fdf3f151a931
-  data.tar.gz: 5f46942561c29e99cc9406ebf013b3196ea94f6b
+SHA256:
+  metadata.gz: d7b78dfb371370a6d7279bdc520f586298e7702fa3b58c5039f55dc03ad08138
+  data.tar.gz: 6f414f547cb3d5fcbb64f40b72d9c3d186c8f167d1ff078413995d5f4498bb34
 SHA512:
-  metadata.gz: 11f3e01c54004114a906921897a007412be4381d282025103895d359a4dcc0d57f33f98496c2f3d62fe17165ab3648905a8cbefa06a3394ec775f63c07481057
-  data.tar.gz: 51c7cadfdd95d77870a00551cbe70ce6aaef4f0d7b62acceef64c5c0e2bb0728b6391f3e83af8ae0001e01705734acb92d6a4b1d94596f73fae4f50a55f29230
+  metadata.gz: a059f544d8eb06549069fd9c728b39414cabe2061afdbc33e902ef07064bfbfa0df7094165313ecb8247790f66c5a5a564ba7bdf95f81a77d1290507464b7219
+  data.tar.gz: 624ec5b9428319f1b3b72eef61fccd7ef401f78fb63bd25762a80dc5d649a54e936d6755255d36b0248aed2b8c6861d3296e9e6f8ecf519ab0c4fa6904219f1e

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

@@ -77,4 +77,3 @@ function preventBackspaceNav() {
 }
 
 preventBackspaceNav()
-

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

@@ -11,6 +11,9 @@ var Routes = {
   tables_queries_path: function(params) {
     return rootPath + "queries/tables?" + $.param(params)
   },
+  columns_queries_path: function(params) {
+    return rootPath + "queries/columns?" + $.param(params)
+  },
   queries_path: function() {
     return rootPath + "queries"
   },

data/app/controllers/blazer/queries_controller.rb

@@ -1,7 +1,8 @@
 module Blazer
   class QueriesController < BaseController
     before_action :set_query, only: [:show, :edit, :update, :destroy, :refresh]
-    before_action :set_data_source, only: [:tables, :schema, :cancel]
+    before_action :set_data_source, only: [:tables, :schema, :cancel, :columns]
+    before_action :set_assignees, only: [:new, :create, :show, :edit, :update, :destroy, :refresh]
 
     def home
       if params[:filter] == "dashboards"
@@ -183,6 +184,16 @@ module Blazer
       render json: @data_source.tables
     end
 
+    def columns
+      column_names = []
+      @data_source.schema.map do |t|
+        if params[:tables].include?(t[:table])
+          column_names += t[:columns].map { |c| c[:name] }
+        end
+      end
+      render json: column_names
+    end
+
     def schema
       @schema = @data_source.schema
     end
@@ -306,6 +317,19 @@ module Blazer
         end
       end
 
+      def set_assignees
+        if Blazer.settings.key?('assignees')
+          source = params[:data_source] || 'main'
+          data_source = Blazer.data_sources[source]
+          statement = Blazer.settings['assignees']
+          @assignees = Rails.cache.fetch 'jarvis_assignees' do
+            (Blazer::RunStatement.new.perform(data_source, statement, {}).rows rescue [])
+          end
+        else
+          @assignees = []
+        end
+      end
+
       def render_forbidden
         render plain: "Access denied", status: :forbidden
       end

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

@@ -34,10 +34,10 @@
           <%= f.label :description %>
           <%= f.text_area :description, placeholder: "Optional", style: "height: 80px;", class: "form-control" %>
         </div>
-        <%- if Blazer.assignees.any? -%>
+        <%- if @assignees.any? -%>
           <div class="form-group">
             <%= f.label :assignees %>
-            <%= f.collection_select :assignee_ids, Blazer.assignees, :first, :last, {}, { placeholder: "Assignees", style: "height: 80px;", class: "form-control", multiple: true } %>
+            <%= f.collection_select :assignee_ids, @assignees, :first, :last, {}, { placeholder: "Assignees", style: "height: 80px;", class: "form-control", multiple: true } %>
           </div>
         <%- end -%>
         <div class="text-right">
@@ -147,12 +147,12 @@
         editor.setTheme("ace/theme/twilight")
         editor.getSession().setMode("ace/mode/sql")
         editor.setOptions({
-          enableBasicAutocompletion: false,
+          fontSize: 12,
+          minLines: 10,
           enableSnippets: false,
-          enableLiveAutocompletion: false,
           highlightActiveLine: false,
-          fontSize: 12,
-          minLines: 10
+          enableLiveAutocompletion: true,
+          enableBasicAutocompletion: true
         })
         editor.renderer.setShowGutter(true)
         editor.renderer.setPrintMarginColumn(false)
@@ -169,6 +169,62 @@
         // fix command+L
         editor.commands.removeCommands(["gotoline", "find"])
 
+        var langTools = ace.require("ace/ext/language_tools");
+
+        var addSuggestItems = function(callback) {
+          if (window.tableNames === undefined) return;
+          callback(null, window.tableNames.map(function(table) {
+            return { name: table, value: table, score: 100, meta: "table" };
+          }));
+        }
+
+        // Load tables
+        langTools.addCompleter({
+          getCompletions: function(editor, session, pos, prefix, callback) {
+            if (prefix.length === 0) { callback(null, []); return }
+            if (window.tableNames !== undefined) {
+              addSuggestItems(callback);
+            } else {
+              $.getJSON(
+                Routes.tables_queries_path({data_source: this.dataSource})
+                , function(tables) {
+                  window.tableNames = tables;
+                  // wordList like [{"word":"flow","freq":24,"score":300,"flags":"bc","syllables":"1"}]
+                  addSuggestItems(callback);
+                }
+              )
+            }
+          }
+        });
+
+        // Load columns
+        langTools.addCompleter({
+          getCompletions: function(editor, session, pos, prefix, callback) {
+            if (prefix.length === 0) { callback(null, []); return }
+            var sql = $('#query_statement').val();
+            tables = sql.toLowerCase().match(/(join|from) ([a-z_]{2,50})/g);
+            if (tables === null) { callback(null, []); return }
+            tables = tables.map(function(table) { return table.split(' ')[1] });
+            key = tables.join('-');
+            if (window[key]) {
+              callback(null, window[key].map(function(col) {
+                return { name: col, value: col, score: 100, meta: "column" };
+              }));
+            } else {
+              $.getJSON(
+                Routes.columns_queries_path({data_source: this.dataSource, tables: tables})
+                , function(columns) {
+                  window[key] = Array.from(new Set(columns));
+                  // wordList like [{"word":"flow","freq":24,"score":300,"flags":"bc","syllables":"1"}]
+                  callback(null, window[key].map(function(col) {
+                    return { name: col, value: col, score: 100, meta: "column" };
+                  }));
+                }
+              )
+            }
+          }
+        });
+
         this.editor = editor
 
         editor.getSession().on("change", function () {
@@ -247,4 +303,5 @@
   $(document).ready(function() {
     $('#query_assignee_ids').select2();
   });
+
 </script>

data/config/routes.rb

@@ -4,6 +4,7 @@ Blazer::Engine.routes.draw do
     post :cancel, on: :collection
     post :refresh, on: :member
     get :tables, on: :collection
+    get :columns, on: :collection
     get :schema, on: :collection
   end
   resources :checks, except: [:show] do

data/lib/blazer/engine.rb

@@ -20,14 +20,6 @@ module Blazer
         Blazer.mapbox_access_token = ENV["MAPBOX_ACCESS_TOKEN"]
       end
 
-      if Blazer.settings.key?('assignees')
-        data_source = Blazer.data_sources['main']
-        statement = Blazer.settings['assignees']
-        Blazer.assignees = (Blazer::RunStatement.new.perform(data_source, statement, {}).rows rescue [])
-      else
-        Blazer.assignees = []
-      end
-
       if Blazer.user_class
         options = Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s)
         Blazer::Query.belongs_to :creator, options

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.9.6"
+  VERSION = "1.9.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.7
 platform: ruby
 authors:
 - ThanhKhoaIT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -205,8 +205,7 @@ files:
 - lib/generators/blazer/templates/config.yml.tt
 - lib/generators/blazer/templates/install.rb.tt
 - lib/tasks/blazer.rake
-- sql-jarvis-1.9.4.gem
-- sql-jarvis-1.9.5.gem
+- sql-jarvis-1.9.6.gem
 homepage: https://github.com/ThanhKhoaIT/blazer
 licenses:
 - MIT
@@ -227,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Fork from ankane! Explore your data with SQL. Easily create charts and dashboards,