swa 0.7.5 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1db2fa774c68dc5fc72812a3c9962eac1b532bbea246f163fdb705e301d80343
-  data.tar.gz: 3752e1fbb76dcd2fc3eeb84fe7b703420f5d87ad36559b05c178d3bdbe043508
+  metadata.gz: 6d195d1632c4f915a413f9a7b4f40127eff5497a45b6217159147a392ec4089d
+  data.tar.gz: 40720608d5be447d93641459922835fa71d4b698c9d1270eb25d8322db9c87fa
 SHA512:
-  metadata.gz: 82fe2ee12f547a35efa664798fd5d52d6313ad60957c6045e13956de5f31662f728636d541a2661031d1068c4a5d110ad255a56c81b9d3ae280270f224f8be62
-  data.tar.gz: ffdf5f146091814f926b1af310a44c198dba8b64573d1f3e75f92b50fc50979698f433d9611bb3c0097ffa70f987ecf1fb290591ab0dfa562bb5922fbdbcebc5
+  metadata.gz: 0a7a37485d2d422b1cf1625f8359ea33a798b450d55c2c4b539995ce302f305340a6893344db6de7c5a8ffcf26224d30b468fe92a7fc7a3638e55f9f476877b4
+  data.tar.gz: 157497f4a9da0f7361a2db3435855cdd40ed9aed25c2cae91f9648c34c3bb4577dcb745bce30b3f9c3410fa06efe81d44126540f8de85b1ab1653dd080302802

data/lib/swa/cli/athena_command.rb

@@ -91,24 +91,25 @@ module Swa
 
       end
 
-      subcommand ["executions", "query-executions"], "List query executions" do
+      subcommand ["query", "q", "execute", "exec"], "Run a query" do
 
-        include CollectionBehaviour
+        option ["--database", "-D"], "NAME", "Database name"
+        option ["--output-location", "-O"], "S3_URL", "S3 output location for query results"
 
-        private
-
-        def collection
-          query_for(:list_query_executions, :query_execution_ids, Swa::Athena::QueryExecution, work_group: workgroup)
-        end
-
-      end
-
-      subcommand ["query", "q", "run"], "Run a query" do
-
-        parameter "QUERY", "SQL query"
+        parameter "[QUERY]", "SQL query", :default => "STDIN"
 
         def execute
-          start_query_response = athena_client.start_query_execution(query_string: query, work_group: workgroup)
+          start_query_response = athena_client.start_query_execution(
+            query_execution_context: {
+              catalog: catalog,
+              database: database
+            },
+            query_string: query,
+            result_configuration: {
+              output_location: output_location
+            },
+            work_group: workgroup
+          )
           wait_for_query(start_query_response.query_execution_id)
           query_results = athena_client.get_query_results(query_execution_id: start_query_response.query_execution_id)
           output_results_as_csv(query_results.result_set)
@@ -116,6 +117,10 @@ module Swa
 
         private
 
+        def default_query
+          $stdin.read
+        end
+
         def wait_for_query(query_execution_id)
           QueryCompletionWaiter.new(client: athena_client).wait(query_execution_id: query_execution_id)
         rescue Aws::Waiters::Errors::FailureStateError => error

data/lib/swa/cli/s3_command.rb

@@ -120,7 +120,7 @@ module Swa
 
           option "--prefix", "PREFIX", "object prefix"
 
-          self.default_subcommand = "prefixes"
+          self.default_subcommand = "list"
 
           subcommand ["list", "ls"], "One-line summary" do
 

data/lib/swa/s3/object_list_entry.rb

@@ -31,11 +31,11 @@ module Swa
       delegate :prefix
 
       def column1
-        ""
+        "-"
       end
 
       def column2
-        ""
+        "-"
       end
 
       def uri

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.7.5"
+  VERSION = "0.7.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
 platform: ruby
 authors:
 - Mike Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler