gloo 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f6ff45003e1085695e3f4f479a5074eb75902162053d061a399e44f0f95cc7
-  data.tar.gz: 35e13941b2d2ff8dbdf49d3ad5e3b0b7f6fdcc71549c80c9728b90bb88d4896a
+  metadata.gz: 3124373b42fd41dfb3b813d6004ed4a28999179b2d000077a6270aa2c83da134
+  data.tar.gz: 568083d68bde0f76560b7810dbdd22f8ec0a026524ad2bcb82d6bd855d39ddf9
 SHA512:
-  metadata.gz: d68575d6bc2b06f7586c66eaad6098901d95de2e0ed4af97f390af7d5669435e79f318a2bb111d722514cf48c1d7834488e67d2c3283b34beb6ae7b8b6066a97
-  data.tar.gz: 0b3435a6928b3cf42932f22ad6802107110e6524b9dbb79240b730cf02608f14648bc71448082a517dac638633c5fabd4d923d4915d6214cd49d7c5a3538b84f
+  metadata.gz: 3bdacb3fcb17db84284e6692498521cff369f7ef0dec2d622259b52d1f47e0fa3f9881344ffc85f15ed239d7f3ebee31579c100d1f9e2d5e804c9bcbe8bd0a85
+  data.tar.gz: a79832408b08efa9f8591cf766d5d3c35fa74743c404014bf73a190bbc7a5b51ee1f559a9240027699b38626e47eebf23770148e40be8d8b038874cac83848c4

data/gloo.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   # spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency "rake", '~> 13.0', '>= 13.0.1'
 
-  spec.add_dependency "gloo-lang", '~> 1.2', ">= 1.2.4"
+  spec.add_dependency "gloo-lang", '~> 1.2', ">= 1.2.5"
 
   spec.add_dependency "activesupport", '~> 6.1', ">= 6.1.5"
   # spec.add_dependency "activesupport", '~> 6.1', ">= 6.1.4.6"

data/lib/VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5

data/lib/gloo/objs/data/mysql.rb

@@ -121,12 +121,14 @@ module Gloo
           end
         else
           rs = client.query( sql, :as => :array ) 
-          rs.each do |row|
-            data << row
+          if rs
+            rs.each do |row|
+              data << row
+            end
           end
         end
 
-        heads = rs.fields 
+        heads = rs.fields if rs
         return [ heads, data ]
       end
 

data/lib/gloo/objs/data/query.rb

@@ -0,0 +1,155 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
+#
+# A SQL database query.
+# Relies on a database connection object.
+#
+
+module Gloo
+  module Objs
+    class Query < GlooLang::Core::Obj
+
+      KEYWORD = 'query'.freeze
+      KEYWORD_SHORT = 'sql'.freeze
+
+      DB = 'database'.freeze
+      SQL = 'sql'.freeze
+      RESULT = 'result'.freeze
+      PARAMS = 'params'.freeze
+
+      DB_MISSING_ERR = 'The database connection is missing!'.freeze
+
+      #
+      # The name of the object type.
+      #
+      def self.typename
+        return KEYWORD
+      end
+
+      #
+      # The short name of the object type.
+      #
+      def self.short_typename
+        return KEYWORD_SHORT
+      end
+
+      # ---------------------------------------------------------------------
+      #    Children
+      # ---------------------------------------------------------------------
+
+      #
+      # Does this object have children to add when an object
+      # is created in interactive mode?
+      # This does not apply during obj load, etc.
+      #
+      def add_children_on_create?
+        return true
+      end
+
+      #
+      # Add children to this object.
+      # This is used by containers to add children needed
+      # for default configurations.
+      #
+      def add_default_children
+        fac = @engine.factory
+        fac.create_alias DB, nil, self
+        fac.create_string SQL, nil, self
+        fac.create_can RESULT, self
+      end
+
+      # ---------------------------------------------------------------------
+      #    Messages
+      # ---------------------------------------------------------------------
+
+      #
+      # Get a list of message names that this object receives.
+      #
+      def self.messages
+        return super + [ 'run' ]
+      end
+
+      #
+      # SSH to the host and execute the command, then update result.
+      #
+      def msg_run
+        db = db_obj
+        unless db
+          @engine.err DB_MISSING_ERR
+          return
+        end
+
+        result = db.query( sql_value, param_array )
+        process_result result
+      end
+
+      # ---------------------------------------------------------------------
+      #    Private functions
+      # ---------------------------------------------------------------------
+
+      private
+
+      #
+      # Get the database connection.
+      #
+      def db_obj
+        o = find_child DB
+        return GlooLang::Objs::Alias.resolve_alias( @engine, o )
+      end
+
+      #
+      # Get the SQL from the child object.
+      # Returns nil if there is none.
+      #
+      def sql_value
+        o = find_child SQL
+        return nil unless o
+
+        return o.value
+      end
+
+      #
+      # Do something with the result of the SQL Query call.
+      # If there's a result container, we'll create objects in it.
+      # If not, we'll just show the output in the console.
+      #
+      def process_result( result )
+        return if result.nil?
+
+        heads = result[0]
+        data = result[1]
+        qr = QueryResult.new heads, data
+
+        result_can = find_child RESULT
+        result_can = GlooLang::Objs::Alias.resolve_alias( @engine, result_can )
+
+        if result_can
+          qr.update_result_container result_can
+        else
+          qr.show
+        end
+      end
+
+      #
+      # Get the array of parameters.
+      # If there is no PARAM container of if it is empty,
+      # we'll return a nil value.
+      #
+      def param_array
+        o = find_child PARAMS
+        return nil unless o
+
+        return nil if o.child_count.zero?
+
+        params = []
+        o.children.each do |p|
+          params << p.value
+        end
+
+        return params
+      end
+
+
+    end
+  end
+end

data/lib/gloo/objs/data/query_result.rb

@@ -0,0 +1,122 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2022 Eric Crane.  All rights reserved.
+#
+# The result of a SQL database query.
+#
+
+module Gloo
+  module Objs
+    class QueryResult
+
+      DB = 'database'.freeze
+      SQL = 'sql'.freeze
+      RESULT = 'result'.freeze
+      PARAMS = 'params'.freeze
+
+
+
+      # ---------------------------------------------------------------------
+      #    Set up the Result
+      # ---------------------------------------------------------------------
+
+      # 
+      # Create the Result object
+      def initialize( heads, data )
+        @heads = heads
+        @data = data
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Helper Functions
+      # ---------------------------------------------------------------------
+
+      # 
+      # Does the data contain a single row?
+      # 
+      def single_row_result?
+        return @data.count == 1
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Show Results
+      # ---------------------------------------------------------------------
+
+      # 
+      # Show the result of the query
+      # 
+      def show
+        single_row_result? ? show_single_row : show_rows
+      end
+
+      # 
+      # Show a single row in a vertical, form style view.
+      # 
+      def show_single_row
+        row = @data[0]
+        @heads.each_with_index do |h, i|
+          puts "#{h}: \t #{row[i]}"
+        end
+      end
+
+      # 
+      # Show multiple rows in a table view.
+      # 
+      def show_rows
+        puts @heads.map { |o| o }.join( " \t " ).white
+        
+        @data.each do |row|
+          # Show the row data
+          puts row.map { |v| v }.join( " \t " )
+        end
+      end
+
+      # ---------------------------------------------------------------------
+      #    Update results in object(s)
+      # ---------------------------------------------------------------------
+
+      #
+      # Update the result container with the data from the query.
+      #
+      def update_result_container( in_can )
+        @result_can = in_can
+        single_row_result? ? update_single_row : update_rows
+      end
+
+      # 
+      # The result has a single row.
+      # Map values from the result set to objects that are present.
+      # 
+      def update_single_row
+        row = @data[0]
+        @heads.each_with_index do |h, i|
+          child = @result_can.find_child h          
+          child.set_value row[i] if child
+        end
+      end
+
+      # 
+      # Put all rows in the result object.
+      # 
+      def update_rows
+        @data.each_with_index do |row, i|
+          can = @result_can.find_add_child( i.to_s, 'can' )
+          row.each_with_index do |v, i|
+            o = can.find_add_child( @heads[i], 'untyped' )
+            o.set_value v
+          end
+        end
+      end
+      
+      # ---------------------------------------------------------------------
+      #    Private functions
+      # ---------------------------------------------------------------------
+
+      private
+
+
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -305,6 +305,8 @@ files:
 - lib/gloo/objs/cli/prompt.rb
 - lib/gloo/objs/cli/select.rb
 - lib/gloo/objs/data/mysql.rb
+- lib/gloo/objs/data/query.rb
+- lib/gloo/objs/data/query_result.rb
 - lib/gloo/objs/data/sqlite.rb
 - lib/gloo/objs/dev/git.rb
 - lib/gloo/objs/dev/stats.rb