sqlui 0.1.48 → 0.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddbafc23478bb1d27023d516dda3ef412306c68e3084aa9c7e186c7372ff18ad
-  data.tar.gz: 5638fa4d6a7e30ecce0d89505953e2fc2d9f18e19e928c41f7c1bde4a986aba9
+  metadata.gz: ae60c3a8d2bb051b87f0e10ed67b3c5e5c6360ecd298b5176a17a7a5f66796d8
+  data.tar.gz: 4ee88fae0167dc7dd8958384d7b2492df3944368238453d729244d91232ebf35
 SHA512:
-  metadata.gz: c99d375bf14a2f892b1a7c3e85ec576ebdc749e432e56f7e993c8437c89e8a19af96189a501b7a80e08e3b6f5743eeecd57dbfa94b056570ba1da0274d163121
-  data.tar.gz: 3fab12e8be52afbd23f317b16c48eed4d095f293f4bab02a9c4c515ea91d501fd027fa71b1f008831d86fa00af38fb4376ba6c3f891ba5a4c7aa7f0b39690e2c
+  metadata.gz: b809f370ad688d9b54d50ff1ccf4dd703dea5af4344f61577220da2b3f4d7536265d8b8e03613158b81fdec4d86ca10dde35f89623cb114fde2b345a5df0108b
+  data.tar.gz: 70324412047c434e03c39e3676cd616da4f6a29c0c7767805fe4073d15e59dd1f28d994253921e18457c469154661081a4570cfec63100cfb9dd2d3ae1aec242

data/.version

@@ -1 +1 @@
-0.1.48
+0.1.49

data/app/args.rb

@@ -4,7 +4,7 @@
 class Args
   def self.fetch_non_empty_string(hash, key)
     value = fetch_non_nil(hash, key, String)
-    raise ArgumentError, "required parameter #{key} empty" if value.strip.empty?
+    raise ArgumentError, "parameter #{key} empty" if value.strip.empty?
 
     value
   end
@@ -15,7 +15,7 @@ class Args
 
   def self.fetch_non_empty_hash(hash, key)
     value = fetch_non_nil(hash, key, Hash)
-    raise ArgumentError, "required parameter #{key} empty" if value.empty?
+    raise ArgumentError, "parameter #{key} empty" if value.empty?
 
     value
   end
@@ -29,9 +29,9 @@ class Args
   end
 
   def self.fetch_non_nil(hash, key, *classes)
-    raise ArgumentError, "required parameter #{key} missing" unless hash.key?(key)
+    raise ArgumentError, "parameter #{key} missing" unless hash.key?(key)
 
-    raise ArgumentError, "required parameter #{key} null" if hash[key].nil?
+    raise ArgumentError, "parameter #{key} null" if hash[key].nil?
 
     fetch_optional(hash, key, *classes)
   end
@@ -40,12 +40,12 @@ class Args
     value = hash[key]
     if value && classes.size.positive? && !classes.find { |clazz| value.is_a?(clazz) }
       if classes.size != 1
-        raise ArgumentError, "required parameter #{key} not #{classes.map(&:to_s).map(&:downcase).join(' or ')}"
+        raise ArgumentError, "parameter #{key} not #{classes.map(&:to_s).map(&:downcase).join(' or ')}"
       end
 
       class_name = classes[0].to_s.downcase
       class_name = %w[a e i o u].include?(class_name[0]) ? "an #{class_name}" : "a #{class_name}"
-      raise ArgumentError, "required parameter #{key} not #{class_name}"
+      raise ArgumentError, "parameter #{key} not #{class_name}"
     end
 
     value

data/app/database_config.rb

@@ -18,8 +18,10 @@ class DatabaseConfig
     raise ArgumentError, 'url_path should not end with a /' if @url_path.length > 1 && @url_path.end_with?('/')
 
     @saved_path = Args.fetch_non_empty_string(hash, :saved_path).strip
-    @joins = Args.fetch_optional_array(hash, :joins) || []
-    @joins.map do |join|
+
+    # Make joins an array. It is only a map to allow for YAML extension.
+    @joins = (Args.fetch_optional_hash(hash, :joins) || {}).values
+    @joins.each do |join|
       next if join.is_a?(Hash) &&
               join.keys.size == 2 &&
               join[:label].is_a?(String) && !join[:label].strip.empty? &&
@@ -27,6 +29,7 @@ class DatabaseConfig
 
       raise ArgumentError, "invalid join #{join.to_json}"
     end
+
     @tables = Args.fetch_optional_hash(hash, :tables) || {}
     @tables.each do |table, table_config|
       unless table_config.is_a?(Hash)
@@ -43,16 +46,15 @@ class DatabaseConfig
         raise ArgumentError, "invalid table boost for #{table} (#{table_boost}), expected int"
       end
     end
+
     @columns = Args.fetch_optional_hash(hash, :columns) || {}
     @columns.each do |column, column_config|
       unless column_config.is_a?(Hash)
         raise ArgumentError, "invalid column config for #{column} (#{column_config}), expected hash"
       end
 
-      links = column_config[:links]
-      raise ArgumentError, "invalid links for #{column} (#{links}), expected array" if links && !links.is_a?(Array)
-
-      links.each do |link_config|
+      links = Args.fetch_optional_hash(column_config, :links) || {}
+      links.each_value do |link_config|
         unless link_config.is_a?(Hash)
           raise ArgumentError, "invalid link config for #{column} (#{link_config}), expected hash"
         end
@@ -65,9 +67,11 @@ class DatabaseConfig
           raise ArgumentError, "invalid link long_name for #{column} link (#{link_config[:long_name]}), expected string"
         end
         unless link_config[:template].is_a?(String)
-          raise ArgumentError, "invalid template for #{column} link (#{link_config[:template]}), expected string"
+          raise ArgumentError, "invalid link template for #{column} link (#{link_config[:template]}), expected string"
         end
       end
+      # Make links an array. It is only a map to allow for YAML extension
+      column_config[:links] = links.values
     end
     aliases = @tables.map { |_table, table_config| table_config[:alias] }.compact
     if aliases.to_set.size < aliases.size

data/client/resources/sqlui.css

@@ -258,15 +258,13 @@ p {
 }
 
 #result-table tbody tr td abbr {
-    margin: 0 0 0 5px;
+    margin: 0 5px 0 0;
     text-decoration: none;
-    display: inline-block;
     position: relative;
-    top: -2px;
 }
 
-#result-table tbody tr td abbr:first-child {
-    margin: 0 0 0 10px;
+#result-table tbody tr td abbr:last-child {
+    margin: 0;
 }
 
 .fetch-sql-box {

data/client/resources/sqlui.js

@@ -24152,7 +24152,7 @@
      return match ? match[1] : identifier
    }
 
-   function createTable (columns, rows, id, cellRenderer) {
+   function createTable (columns, rows, id, headerRenderer, cellRenderer) {
      const tableElement = document.createElement('table');
      if (id) tableElement.id = id;
      const theadElement = document.createElement('thead');
@@ -24163,9 +24163,13 @@
      tableElement.appendChild(tbodyElement);
 
      columns.forEach(function (columnName) {
-       const headerElement = document.createElement('th');
-       headerElement.innerText = columnName;
-       headerTrElement.appendChild(headerElement);
+       if (headerRenderer) {
+         headerRenderer(headerTrElement, columnName);
+       } else {
+         const headerElement = document.createElement('th');
+         headerElement.innerText = columnName;
+         headerTrElement.appendChild(headerElement);
+       }
      });
      if (columns.length > 0) {
        headerTrElement.appendChild(document.createElement('th'));
@@ -24179,14 +24183,13 @@
        highlight = !highlight;
        tbodyElement.appendChild(rowElement);
        row.forEach(function (value, i) {
-         let cellElement;
          if (cellRenderer) {
-           cellElement = cellRenderer(columns[i], value);
+           cellRenderer(rowElement, columns[i], value);
          } else {
-           cellElement = document.createElement('td');
+           const cellElement = document.createElement('td');
            cellElement.innerText = value;
+           rowElement.appendChild(cellElement);
          }
-         rowElement.appendChild(cellElement);
        });
        rowElement.appendChild(document.createElement('td'));
      });
@@ -24936,20 +24939,34 @@
 
        return abbrElement
      };
-     const cellRenderer = function (column, value) {
-       const cellElement = document.createElement('td');
+
+     const headerRenderer = function (rowElement, column) {
+       const headerElement = document.createElement('th');
+       headerElement.innerText = column;
+       if (window.metadata.columns[column]) {
+         headerElement.colSpan = 2;
+       }
+       rowElement.appendChild(headerElement);
+     };
+
+     const cellRenderer = function (rowElement, column, value) {
        if (window.metadata.columns[column]?.links?.length > 0) {
-         cellElement.appendChild(document.createTextNode(value));
+         const linksColumnElement = document.createElement('td');
          window.metadata.columns[column].links.forEach((link) => {
-           cellElement.appendChild(createLink(link, value));
+           linksColumnElement.appendChild(createLink(link, value));
          });
+         rowElement.appendChild(linksColumnElement);
+         const textColumnElement = document.createElement('td');
+         textColumnElement.innerText = value;
+         rowElement.appendChild(textColumnElement);
        } else {
+         const cellElement = document.createElement('td');
          cellElement.innerText = value;
+         rowElement.appendChild(cellElement);
        }
-       return cellElement
      };
      document.getElementById('result-box')
-       .appendChild(createTable(fetch.result.columns, fetch.result.rows, 'result-table', cellRenderer));
+       .appendChild(createTable(fetch.result.columns, fetch.result.rows, 'result-table', headerRenderer, cellRenderer));
    }
 
    function disableDownloadButtons () {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlui
 version: !ruby/object:Gem::Version
-  version: 0.1.48
+  version: 0.1.49
 platform: ruby
 authors:
 - Nick Dower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-27 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2