sneaql 0.0.19-java → 0.0.20-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c36b484ebefc8fb9d9d8a27138bb331ac84990c7ca3a22abe10c6a2fd54e92bc
-  data.tar.gz: 497baa4c078fea035b1a76cd74d86891ab6fbdad310af55639695e63a9c9e7d7
+  metadata.gz: 8e5f3a3178b52ab661d45c5987378fef1c50a5bf1c4b21b23909b4ea14d73a0d
+  data.tar.gz: 0c139bb80dc24cdbfe816ae4e7cd3f4d64eff2151c88e0c785e904dc9a69b55c
 SHA512:
-  metadata.gz: 175b6fc7cacefe1eaa25ceb0b5a58055f2574774f2968efba4c6974ff4416a6b70702ee4c770dc1ec297ed33aed9bdbb0a4da750262decae80d31e044bf11e02
-  data.tar.gz: 3f99053a1b7fc6dbf102b12ad217d7a88b10440808faafd6f3173424e5b66e4f8f4182684781b38d7bfe60e97395adf3d01627fed0aad5913c49261f14cbd407
+  metadata.gz: a0085e97d956acb92bc56c64ecfeb45f18b62d451f959e219cb1e5ec0c1c49f2ea27bccca7189516d6b5ec4e4afa6886b8543438561494e33d2a1614880f25bf
+  data.tar.gz: d946b6a4e64583bb1aad32fb504deac107c829d8478c104b8e85e16c2809fdb38c7cdd5b77575180eebb895fe80e18547a7d3d353084cbb09abf2e6f600266d8

data/lib/sneaql.rb

@@ -244,9 +244,19 @@ module Sneaql
           end
 
           begin
+            # find the class assciated with this command
+            k = Sneaql::Core.find_class(:command, this_cmd[:command])
+            
+            # if there is an error... check to see if this is the error handler
+            if @exception_manager.pending_error != nil
+              unless k == Sneaql::Core::Commands::SneaqlOnError
+                raise @exception_manager.pending_error
+              end
+            end
+            
             # instantiate a new instance of the command class
             # and call it's action method with arguments
-            c = Sneaql::Core.find_class(:command, this_cmd[:command]).new(
+            c = k.new(
               @jdbc_connection,
               @expression_handler,
               @exception_manager,
@@ -255,12 +265,7 @@ module Sneaql
               @logger
             )
             
-            if @exception_manager.pending_error != nil
-              unless c.class == Sneaql::Core::Commands::SneaqlOnError
-                raise @exception_manager.pending_error
-              end
-            end
-            
+            # performs the work of the current command
             c.action(*this_cmd[:arguments])
 
             # check if there was an error from the action

data/lib/sneaql_lib/core.rb

@@ -231,7 +231,7 @@ module Sneaql
         # @param [String] recordset_name name of the recordset in which to store the results
         def action(recordset_name)
           r = query_results
-          @logger.debug "adding #{r.length} recs as #{recordset_name}"
+          @logger.info "adding #{r.length} recs as #{recordset_name}"
           @recordset_manager.store_recordset(recordset_name, r)
         rescue => e
           @exception_manager.pending_error = e
@@ -252,6 +252,28 @@ module Sneaql
         end
       end
 
+      # runs the query then stores the array of hashes into the recordset hash
+      class SneaqlRemoveRecordset < Sneaql::Core::SneaqlCommand
+        Sneaql::Core::RegisterMappedClass.new(
+          :command,
+          'remove_recordset',
+          Sneaql::Core::Commands::SneaqlRemoveRecordset
+        )
+
+        # @param [String] recordset_name name of the recordset in which to store the results
+        def action(recordset_name)
+          @logger.info "removing recordset #{recordset_name}"
+          @recordset_manager.remove_recordset(recordset_name)
+        rescue => e
+          @exception_manager.pending_error = e
+        end
+
+        # argument types
+        def arg_definition
+          [:recordset]
+        end
+      end
+      
       # iterates a recordset and runs the sql statement for each record
       class SneaqlIterateRecordset < Sneaql::Core::SneaqlCommand
         Sneaql::Core::RegisterMappedClass.new(
@@ -299,6 +321,7 @@ module Sneaql
 
         # @param [String] recordset recordset to iterate
         def iterate_all_records(recordset)
+          raise Sneaql::Exceptions::RecordsetDoesNotExistError unless @recordset_manager.recordset.has_key?(recordset)
           @logger.info "iterating recordset #{recordset}..."
           @recordset_manager.recordset[recordset].each_with_index do |i, n|
             @logger.debug("#{n + 1} of #{recordset}: #{i}")

data/lib/sneaql_lib/exceptions.rb

@@ -60,6 +60,13 @@ module Sneaql
       end
     end
 
+    # Recordset check failure indicator
+    class RecordsetDoesNotExistError < BaseError
+      def initialize(msg = 'Specified ecordset does not exist')
+        super
+      end
+    end
+    
     # General error evaluating expression.
     class ExpressionEvaluationError < BaseError
       def initialize(msg = 'Error evaluating expression')

data/lib/sneaql_lib/recordset.rb

@@ -21,10 +21,20 @@ module Sneaql
         recordset[name] = rs
       end
 
+      # Deletes a recordset if it exists
+      # @param [String] name name for recordset to delete
+      def remove_recordset(name)
+        if @recordset.has_key?(name)
+          @recordset.delete(name)
+        end
+      end
+      
       # Validates recordset.  Must be an array of hashes with identical keys.
       # @param [Array<Hash>] rs recordset to validate
       def recordset_valid?(rs)
         return false unless rs.class == Array
+        # empty recordset is valid
+        return true if rs == []
         r1 = rs[0].keys
 
         rs.each do |record|
@@ -68,7 +78,7 @@ module Sneaql
         # takes in argument array as an argument
         # returns array of expressions to be checked at run time
         args.delete_at(0) # get rid of the first element, recordset ref
-        args.each_slice(4).to_a.map{ |x| { condition: x[0].downcase, field: x[1], operator: x[2], expression: x[3]}}
+        args.each_slice(4).to_a.map{ |x| { condition: x[0].downcase, field: x[1], operator: x[2], expression: x[3]} }
       end
 
       # applies a conditional expression set against a record.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sneaql
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: java
 authors:
 - jeremy winters
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement