sqlui 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243c37e5c20fb7187bc08c0f811b3c0384179e8f6ee9207ef1b51697a3cca116
-  data.tar.gz: 3616e294572915e8c9dda34a1528e143aaf83b0103afcfe715b7c0dac4ca0ad3
+  metadata.gz: 841f89dc1fb61aa4395aca199aba43cd855e34e9641ea9cf2dc18b356b53cb93
+  data.tar.gz: f34d885b1c9f40e804fde6426bdfd7217ef912b2968b6987861ee6624fd60b27
 SHA512:
-  metadata.gz: fd5b0166b4d75feea13c5cdabacf8a3268d2fd2d268cbfbc49eb977df64fd30a5a4309068261918379c729f7cfbab7be34b8eb922690c28e2d1822621b5c94b6
-  data.tar.gz: 84745ccbb3f383faaa2dae7e3f144c577f0284ea5100a3c989f8f9fe8c111e07bccd59be57be55a58fe09eb4b5b232bc383b9f9364a035619d3e6b1a62db4433
+  metadata.gz: dea76e1239e97123db860d4f7d729c2a8c317e827105f5ef9c690e23001a2dd5070ad594fe9b87036eeeefd545c004a1c64a51a4f6b48fa7e40cd1e43efdc286
+  data.tar.gz: 671cbc3930edda13b041dae163075e64b59e7069abaa299cb14121e9272c91887aea03165d69ffe4abb60ac49b1d5d6acfb8c72aae2c2c34c4e84877b8897220

data/lib/sqlui.rb

@@ -78,7 +78,7 @@ class SQLUI
 
   def load_metadata
     stats_result = @queryer.call(
-      <<~SQL.squish
+      <<~SQL
         select
           table_schema,
           table_name,
@@ -132,7 +132,7 @@ class SQLUI
     end
 
     column_result = @queryer.call(
-      <<~SQL.squish
+      <<~SQL
         select
           table_schema,
           table_name,
@@ -174,13 +174,15 @@ class SQLUI
 
   def execute_query(sql)
     result = @queryer.call(sql)
-    rows = result.rows
-    column_types = result.columns.map { |_| 'string' }
+    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.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Nick Dower