sqlui 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 428bf7cc27927c4639b1f03f645a10b7885c0413574ca09e405233573f20214a
-  data.tar.gz: 74c6979b878bf52f5bd524960bba24a37c6e586421c991614df1496383717a28
+  metadata.gz: 419351d0941030d9b1ab17842fd289a7550a6b78a45d59213e2143b29442e363
+  data.tar.gz: 7c66542a8e6503c7a38f05f5fc02fc17e022c08cf0303f411053968d4138e683
 SHA512:
-  metadata.gz: 99407ce252d89559853785e6e7ee70b93d0661d6005cf04465640936d3b4fcec455bc1806d18dd17e8d133bf1859c04072e8ffbd19ca9f6bc01c03a30163b928
-  data.tar.gz: 33fd47d3d88fddcc38b3b252e7341dbd4f99d93b4fd52665ba3f2c4a58acabbf5c7052d0430cfd71c92053755f85e44be80d2e15d7a33879c19e00d2c89cf9ea
+  metadata.gz: 1fd9196bda8b7ba45082d03a8a0bc2606875cc0ca0b38371b4c3e924b612eb4d6d148452bfde1ba6a06ca75c4132f48312defe447dd64aaa4e94a19bdf0189fb
+  data.tar.gz: de9b1c4ceb3caaf8a364a1964214002cd73161911aedd194fda78a72d24ea843e09982c86234e5265ee2dc55cabd396f6b209bf0a11689175e0da04b04fffeda

data/lib/sqlui.rb

@@ -5,11 +5,11 @@ require 'set'
 class SQLUI
   MAX_ROWS = 1_000
 
-  def initialize(name:, saved_path:, max_rows: MAX_ROWS, &block)
+  def initialize(client:, name:, saved_path:, max_rows: MAX_ROWS)
+    @client = client
     @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 +77,7 @@ class SQLUI
   end
 
   def load_metadata
-    stats_result = @queryer.call(
+    stats_result = @client.query(
       <<~SQL
         select
           table_schema,
@@ -131,7 +131,7 @@ class SQLUI
       column[:column_name] = row['column_name']
     end
 
-    column_result = @queryer.call(
+    column_result = @client.query(
       <<~SQL
         select
           table_schema,
@@ -173,14 +173,16 @@ class SQLUI
   end
 
   def execute_query(sql)
-    result = @queryer.call(sql)
-    rows = result.rows
-    column_types = result.columns.map { |_| 'string' }
+    result = @client.query(sql)
+    rows = result.map { |row| row.values }
+    columns = result.first&.keys || []
+    column_types = columns.map { |_| 'string' }
     unless rows.empty?
-      maybe_non_null_column_value_exemplars = result.columns.each_with_index.map do |_, index|
-        rows.find do |row|
+      maybe_non_null_column_value_exemplars = columns.each_with_index.map do |_, index|
+        row = rows.find do |row|
           !row[index].nil?
-        end.try(:[], index)
+        end
+        row.nil? ? nil : row[index]
       end
       column_types = maybe_non_null_column_value_exemplars.map do |value|
         case value
@@ -197,7 +199,7 @@ class SQLUI
     end
     {
       query:        sql,
-      columns:      result.columns,
+      columns:      columns,
       column_types: column_types,
       total_rows:   rows.size,
       rows:         rows.take(@max_rows)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlui
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Nick Dower