sqlui 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 841f89dc1fb61aa4395aca199aba43cd855e34e9641ea9cf2dc18b356b53cb93
-  data.tar.gz: f34d885b1c9f40e804fde6426bdfd7217ef912b2968b6987861ee6624fd60b27
+  metadata.gz: 43388f7bb405a390a4ae0e49650475dcc64c7a649df8d7333a0a7f278974817e
+  data.tar.gz: 43104948aec2eba3df960657cfc242092ef2587ce5bca6223102351462c56c17
 SHA512:
-  metadata.gz: dea76e1239e97123db860d4f7d729c2a8c317e827105f5ef9c690e23001a2dd5070ad594fe9b87036eeeefd545c004a1c64a51a4f6b48fa7e40cd1e43efdc286
-  data.tar.gz: 671cbc3930edda13b041dae163075e64b59e7069abaa299cb14121e9272c91887aea03165d69ffe4abb60ac49b1d5d6acfb8c72aae2c2c34c4e84877b8897220
+  metadata.gz: d9752cbb037aaececfb4d1025bdbd3a4f1da1da35815321570ff64955589876c9f73c8a5605d7c4e8b43fc705b2d124b82d8249a35908acc1b191282f370f60e
+  data.tar.gz: 75897a760e3f24f21b2853ca6a368a5375f364731de82bdc65e17f87af67385b03c1fa6970d80b861f1f2f5b2efd0279d430522faf743ac86433a23dea3ba219

data/lib/sqlui.rb

@@ -5,11 +5,12 @@ require 'set'
 class SQLUI
   MAX_ROWS = 1_000
 
-  def initialize(name:, saved_path:, max_rows: MAX_ROWS, &block)
+  def initialize(client:, table_schema: nil, name:, saved_path:, max_rows: MAX_ROWS)
+    @client = client
+    @table_schema = table_schema
     @name = name
     @saved_path = saved_path
     @max_rows = max_rows
-    @queryer = block
     @resources_dir = File.join(File.expand_path('..', File.dirname(__FILE__)), 'resources')
   end
 
@@ -77,7 +78,12 @@ class SQLUI
   end
 
   def load_metadata
-    stats_result = @queryer.call(
+    if @table_schema
+      where_clause = "where table_schema = '#{@table_schema}'"
+    else
+      where_clause = "where table_schema not in('mysql', 'sys')"
+    end
+    stats_result = @client.query(
       <<~SQL
         select
           table_schema,
@@ -87,7 +93,7 @@ class SQLUI
           non_unique,
           column_name
         from information_schema.statistics
-        where table_schema not in('mysql', 'sys')
+        #{where_clause}
         order by table_schema, table_name, if(index_name = "PRIMARY", 0, index_name), seq_in_index;
       SQL
     )
@@ -131,7 +137,12 @@ class SQLUI
       column[:column_name] = row['column_name']
     end
 
-    column_result = @queryer.call(
+    if @table_schema
+      where_clause = "where table_schema = '#{@table_schema}'"
+    else
+      where_clause = "where table_schema not in('information_schema' 'mysql', 'performance_schema', 'sys')"
+    end
+    column_result = @client.query(
       <<~SQL
         select
           table_schema,
@@ -173,7 +184,7 @@ class SQLUI
   end
 
   def execute_query(sql)
-    result = @queryer.call(sql)
+    result = @client.query(sql)
     rows = result.map { |row| row.values }
     columns = result.first&.keys || []
     column_types = columns.map { |_| 'string' }

data/resources/sqlui.js

@@ -23951,19 +23951,18 @@ var sqlui = (function (exports) {
      }
 
      const schemasElement = document.getElementById("schemas");
-     const schemaNames = Object.keys(window.metadata["schemas"]);
-     schemaNames.forEach(function(schemaName) {
-       const optionElement = document.createElement("option");
-       optionElement.value = schemaName;
-       optionElement.innerText = schemaName;
-       schemasElement.appendChild(optionElement);
-     });
      const tablesElement = document.getElementById("tables");
-     schemasElement.addEventListener("change", function() {
+     const columnsElement = document.getElementById("columns");
+     const indexesElement = document.getElementById("indexes");
+
+     const schemaNames = Object.keys(window.metadata["schemas"]);
+     if (schemaNames.length == 1) {
+       schemasElement.style.display = 'none';
+       // TODO: duplicate code
        while(tablesElement.firstChild) {
          tablesElement.removeChild(tablesElement.firstChild);
        }
-       const schemaName = schemasElement.value;
+       const schemaName = schemaNames[0];
        const schema = window.metadata["schemas"][schemaName];
        const tableNames = Object.keys(schema["tables"]);
        tableNames.forEach(function(tableName) {
@@ -23972,9 +23971,29 @@ var sqlui = (function (exports) {
          optionElement.innerText = tableName;
          tablesElement.appendChild(optionElement);
        });
-     });
-     const columnsElement = document.getElementById("columns");
-     const indexesElement = document.getElementById("indexes");
+     } else {
+       schemasElement.style.display = 'flex';
+       schemaNames.forEach(function(schemaName) {
+         const optionElement = document.createElement("option");
+         optionElement.value = schemaName;
+         optionElement.innerText = schemaName;
+         schemasElement.appendChild(optionElement);
+       });
+       schemasElement.addEventListener("change", function() {
+         while(tablesElement.firstChild) {
+           tablesElement.removeChild(tablesElement.firstChild);
+         }
+         const schemaName = schemasElement.value;
+         const schema = window.metadata["schemas"][schemaName];
+         const tableNames = Object.keys(schema["tables"]);
+         tableNames.forEach(function(tableName) {
+           const optionElement = document.createElement("option");
+           optionElement.value = tableName;
+           optionElement.innerText = tableName;
+           tablesElement.appendChild(optionElement);
+         });
+       });
+     }
      tablesElement.addEventListener("change", function() {
        while(columnsElement.firstChild) {
          columnsElement.removeChild(columnsElement.firstChild);
@@ -23982,7 +24001,7 @@ var sqlui = (function (exports) {
        while(indexesElement.firstChild) {
          indexesElement.removeChild(indexesElement.firstChild);
        }
-       const schemaName = schemasElement.value;
+       const schemaName = schemaNames.length == 1 ? schemaNames[0] : schemasElement.value;
        const tableName = tablesElement.value;
        const table = window.metadata["schemas"][schemaName]["tables"][tableName];
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlui
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core