athens 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1fb8ee7934d4e7019f1f54dbd3b3eb4368536e3974a00b35442898e4e8b267f
-  data.tar.gz: 1685787b3a1c68f850cc7ca01523a0f3a4feaeaae26ed5d9f77e41ffdafe4b15
+  metadata.gz: 901ae482186b3f1eeb424ee6bc4c09f5122aa7ba20028e7bc88015f0f8eff840
+  data.tar.gz: a42a0b004300dd61da4d1bf3fc96aace76c94fa0ba7760a8ca81a4a736cb77e2
 SHA512:
-  metadata.gz: 7ba436dc94c82c4b6642e8084e76455d3f32a786bc718364c89f2e3769b3786ddcfb65f0e1526d62b56c5d11a6e6e67cab501f3063b8e5e0c59fa2e46a219292
-  data.tar.gz: b6ef5c5bd6e318348fb4bb9fb794c37ff57be2e13bdcaaeef707246a524b3ea6b5d65ba62e0a2d3d7dbfab696ac6fbbfbfad33f943c473d1c2abc8747849658d
+  metadata.gz: e89fc662abb5ee87ab4612ddc90cadfb2259f0e33e6e3d59a73f0b759dbf675239630ef9f8835d88746ad72726404eb9db5d451eb5d84ad0bdcb4c1ceffd23c5
+  data.tar.gz: c15ce346a50f27fd2f684928bf1761145b848b1d80b9503faad4b5ffcd3cf35b49aa8d3fe719bd6da0210e2a5094cc0ff3e7a38026e1361521f8404738d09fca

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0 / 2019-07-02
+
+* Added enumerator-based result access methods: `#rows` and `#records`
+* Fixed bug dropping headers from memoized rows across `#to_h` and `#to_a(header_row: true)`
+
 ## 0.2.0 / 2019-03-20
 
 * Added support for NULL values.  Columns with a nullable status of "NULLABLE" or "UNKNOWN" will return nil for NULL values

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    athens (0.2.0)
+    athens (0.3.0)
       aws-sdk-athena (~> 1)
 
 GEM

data/README.md

@@ -61,6 +61,23 @@ results = query.to_h
 # ]
 ```
 
+Results are also available as unbuffered enumerators of row arrays:
+```ruby
+query.rows.each {|row| ...}
+# ['column_1', 'column_2', 'column_3']
+# [15, 'data', true]
+# [20, 'foo', false],
+# ...
+```
+
+Or hashes:
+```ruby
+query.records.each {|record| ...}
+# {'column_1': 15, 'column_2': 'data', 'column_3': true}
+# {'column_1': 20, 'column_2': 'foo', 'column_3': false}
+# ...
+```
+
 Athens attempts to parse the sql data types into their ruby equivalents, although there's currently no support for the more complex Array/Map types.
 
 ### Configuration

data/lib/athens/query.rb

@@ -69,12 +69,10 @@ module Athens
       end
     end
 
-    def to_a(header_row: true)
+    def rows
       raise InvalidRequestError.new("Query must be in SUCCEEDED state to return results") unless @state == 'SUCCEEDED'
 
-      if @results.nil?
-        # Need to load and map all of the rows from the original result
-        @results = []
+      Enumerator.new do |y|
         result = @connection.client.get_query_results({query_execution_id: @query_execution_id})
 
         metadata = result.result_set.result_set_metadata
@@ -85,53 +83,43 @@ module Athens
           break if rows.empty?
 
           if first
-            @results << rows.shift.data.map {|col| col.var_char_value}
+            y << rows.shift.data.map {|col| col.var_char_value}
             first = false
           end
 
-          rows.each do |row|
-            @results << map_types(metadata, row)
-          end
+          rows.each {|row| y << map_types(metadata, row)}
 
-          if result.next_token
-            result = @connection.client.get_query_results({
-              query_execution_id: @query_execution_id,
-              next_token: result.next_token
-            })
-          else
-            # No more rows, break out and return our mapped data
-            break
-          end
-        end
-      end
+          break unless result.next_token
 
-      if header_row
-        return @results
-      else
-        return @results[1, @results.size]
+          result = @connection.client.get_query_results({
+            query_execution_id: @query_execution_id,
+            next_token: result.next_token
+          })
+        end
       end
     end
 
-    def to_h
-      if @hash_results.nil?
-        all_rows = self.to_a(header_row: true)
-
-        headers = all_rows.shift
-
-        @hash_results = []
+    def records
+      Enumerator.new do |y|
+        headers = nil
 
-        unless headers.nil?
-          all_rows.each do |row|
-            map = {}
-            headers.each_with_index do |header, index|
-              map[header] = row[index]
-            end
-            @hash_results << map
+        rows.each_with_index do |row|
+          if headers.nil?
+            headers = row
+            next
           end
+
+          y << Hash[headers.zip(row)]
         end
       end
+    end
 
-      return @hash_results
+    def to_a(header_row: true)
+      (@results ||= rows.to_a).drop(header_row ? 0 : 1)
+    end
+
+    def to_h
+      @hash_results ||= records.to_a
     end
 
     private

data/lib/athens/version.rb

@@ -1,3 +1,3 @@
 module Athens
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: athens
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Schulte
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-athena