db-gui 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa4ce5de9be304c9f5638048111e9571854f2dfc66feecfd0e37f8ba4261ae82
-  data.tar.gz: 5806bf4a1514e28cee22c5ea2b5716f8c1e0fa0ffec32ca0072f62daef06cc1a
+  metadata.gz: e8036df4dccc81646a039ae1f596d9337146eb11d8c797db665baec7720af497
+  data.tar.gz: d3b32fe1f26b471a278c0c120f1bd4ddf1e48d8d3c914454527df3814eb34ad5
 SHA512:
-  metadata.gz: 4d1b50280d1e23630beb85e7c6fae71716b51b8024cce27f38b2ea1c2cf137cd5d1fa619cadf07fc76ec465faabe587abece721ec0643cee84450c21a53cc4f2
-  data.tar.gz: a70bb46bf0016aec98b5bea7cb702161987aefa79914e4eafd4f89978536943e3c530bc22a548a6625ebd3c16639f9cbbea0f5d8037b2c286cf7d7cdd407f4ba
+  metadata.gz: d74eb9ca5bcd71c75e0588f5f94f80277402066ebf26a2e49619c1f22fcc831c76fdf7c1f8707ea776ee9b7f88aee94550b3aa197d58823cc431c1bfbdb2e66b
+  data.tar.gz: f1154b733b50e78dcb388ffdfc3415562ba07a1541cc40e527560ac1e44f3d2c1b9ffabad22484acdf3fa18f8486bb9ff0f526c80d8d0eb6303f8adb17e88a98

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 0.0.4
+
+- Make SQL command entry a non_wrapping_multiline_entry
+
+## 0.0.3
+
+- Show count of rows produced by a DB command result
+- Terminate DB commands (SQL statements) with a semi-colon for convenience if they did not have a semi-colon already (to avoid having them fail)
+- Increase max timeout to 60*60*1000 (1 hour)
+
 ## 0.0.2
 
 - Support displaying DB command results in a table instead of a non_wrapping_multiline_entry

data/README.md

@@ -1,9 +1,9 @@
-# DB GUI (Database Graphical User Interface) 0.0.2
+# DB GUI (Database Graphical User Interface) 0.0.4
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer DSL for LibUI Application](https://github.com/AndyObtiva/glimmer-dsl-libui)
 [![Gem Version](https://badge.fury.io/rb/db-gui.svg)](http://badge.fury.io/rb/db-gui)
 
 
-This is a database graphical user interface that enables interaction with relational SQL database data.
+This is an early alpha database graphical user interface that enables interaction with a relational SQL database.
 
 It currently supports PostgreSQL as a start, with the potential of supporting many other databases in the future.
 
@@ -13,7 +13,7 @@ It currently supports PostgreSQL as a start, with the potential of supporting ma
 
 Run:
 ```
-gem install db-gui -v0.0.2
+gem install db-gui -v0.0.4
 ```
 
 ## Usage
@@ -23,20 +23,9 @@ Run:
 dbui
 ```
 
-Or run alias:
-```
-db-ui
-```
+Or, run one of the aliases: `db-ui` / `dbgui` / `db-gui`
 
-Or run alias:
-```
-dbgui
-```
-
-Or run alias:
-```
-db-gui
-```
+Note that it stores the last connection details under `~/.db_gui`, and will auto-connect using that configuration on startup for extra convenience (in the future, there is the potential to support multiple connection configurations).
 
 ## Change Log
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/app/db_gui/model/db_config.rb

@@ -45,6 +45,8 @@ class DbGui
       end
       
       def run_io_command(command)
+        command = command.strip
+        command = "#{command};" unless command.end_with?(';')
         @io_command_try ||= 0
         @io_command_try += 1
         io.puts(command)
@@ -58,6 +60,18 @@ class DbGui
         run_io_command(db_command)
       end
       
+      def db_command_result_count
+        db_command_result_count_headers_rows[0]
+      end
+      
+      def db_command_result_headers
+        db_command_result_count_headers_rows[1]
+      end
+      
+      def db_command_result_rows
+        db_command_result_count_headers_rows[2]
+      end
+      
       private
       
       def read_io_into_db_command_result
@@ -93,6 +107,31 @@ class DbGui
         @io = nil
         nil
       end
+      
+      def db_command_result_count_headers_rows
+        if @db_command_result_count_headers_rows.nil? || db_command_result != @last_db_command_result
+          @db_command_result_count_headers_rows = compute_db_command_result_count_headers_rows
+          @last_db_command_result = db_command_result
+        end
+        @db_command_result_count_headers_rows
+      end
+      
+      def compute_db_command_result_count_headers_rows
+        count = 0
+        headers = rows = []
+        db_command_result_lines = db_command_result.lines
+        db_command_result_lines.pop if db_command_result_lines.last == "\n"
+        if db_command_result_lines.any?
+          headers = db_command_result_lines.first.split('|').map(&:strip)
+          count_footer = db_command_result_lines.last
+          count_match = count_footer.match(/^\((\d+) row/)
+          if count_match
+            count = count_match[1].to_i
+            rows = db_command_result_lines[2..-2].map {|row| row.split('|').map(&:strip) }
+          end
+        end
+        [count, headers, rows]
+      end
     end
   end
 end

data/app/db_gui/view/db_command_form.rb

@@ -5,11 +5,13 @@ class DbGui
     class DbCommandForm
       include Glimmer::LibUI::CustomControl
       
+      TIMEOUT_MAX_IN_MILLISECONDS = (ENV['TIMEOUT_MAX_IN_MILLISECONDS'] || 60*60*1000).to_i
+      
       option :db_config
       
       body {
         vertical_box {
-          entry {
+          non_wrapping_multiline_entry {
             text <=> [db_config, :db_command]
           }
           
@@ -25,10 +27,18 @@ class DbGui
             label('Timeout (msec): ') {
               stretchy false
             }
-            spinbox(0, 60000) {
+            spinbox(0, TIMEOUT_MAX_IN_MILLISECONDS) {
               stretchy false
               value <=> [db_config, :db_command_timeout]
             }
+            
+            label('Row(s): ') {
+              stretchy false
+            }
+            label {
+              stretchy false
+              text <= [db_config, :db_command_result_count, computed_by: :db_command_result, on_read: :to_s]
+            }
           }
         }
       }

data/app/db_gui/view/db_command_result_table.rb

@@ -10,24 +10,14 @@ class DbGui
       body {
         vertical_box {
           content(db_config, :db_command_result) {
-            db_command_result_lines = db_config.db_command_result.lines
-            db_command_result_lines.pop if db_command_result_lines.last == "\n"
-            if db_command_result_lines.any?
-              headers = db_command_result_lines.first.split('|').map(&:strip)
-              count_footer = db_command_result_lines.last
-              count_footer_match = count_footer.match(/^\((\d+) row/)
-              if count_footer_match
-                rows = db_command_result_lines[2..-2].map {|row| row.split('|').map(&:strip) }
-                table {
-                  headers.each do |header|
-                    text_column(header)
-                  end
-                  
-                  cell_rows rows
-                }
-              else
-                label('No data')
-              end
+            if db_config.db_command_result_count > 0
+              table {
+                db_config.db_command_result_headers.each do |header|
+                  text_column(header)
+                end
+                
+                cell_rows db_config.db_command_result_rows
+              }
             else
               label('No data')
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-gui
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: DB GUI