athens 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02197372c02d45a05efd88997b4cd8c01d66c869eafd6ca867f86da791ffe7b4'
-  data.tar.gz: 1753f4f6986c4fedf82f09d9a6d9ebe0b9fb630d59261011fc3c0667108e4ed0
+  metadata.gz: d1fb8ee7934d4e7019f1f54dbd3b3eb4368536e3974a00b35442898e4e8b267f
+  data.tar.gz: 1685787b3a1c68f850cc7ca01523a0f3a4feaeaae26ed5d9f77e41ffdafe4b15
 SHA512:
-  metadata.gz: facc871951901270b2b61410ae471cd6d62fcb33d2a914da76855e41fbccfb5039ee4e0d086deced77bcf39bf8c07fe865c635d6659093a2acac181291c78c2a
-  data.tar.gz: feca9c73d6145784b74dc4ce5442c2b764efda51719ff58e5fa6896d8dfd89186224d7aaa4f9ae282d58043bf5aa4f0e3576998d40ec0d9983c51d917d6d8022
+  metadata.gz: 7ba436dc94c82c4b6642e8084e76455d3f32a786bc718364c89f2e3769b3786ddcfb65f0e1526d62b56c5d11a6e6e67cab501f3063b8e5e0c59fa2e46a219292
+  data.tar.gz: b6ef5c5bd6e318348fb4bb9fb794c37ff57be2e13bdcaaeef707246a524b3ea6b5d65ba62e0a2d3d7dbfab696ac6fbbfbfad33f943c473d1c2abc8747849658d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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
+* If a NOT_NULL column returns a nil value an InvalidNullError will be raised
+
 ## 0.1.0 / 2019-03-01
 
 * Initial release!

data/Gemfile.lock

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

data/lib/athens/error.rb

@@ -4,5 +4,6 @@ module Athens
   class QueryFailedError < Error; end
   class QueryCancelledError < Error; end
   class InvalidRequestError < Error; end
+  class InvalidNullError < Error; end
 
 end

data/lib/athens/query.rb

@@ -151,29 +151,36 @@ module Athens
 
         metadata.column_info.each_with_index do |col, index|
           data = row.data[index].var_char_value
+          nullable = ["UNKNOWN", "NULLABLE"].include?(col.nullable)
 
-          case col.type
-          when 'tinyint', 'smallint', 'int', 'integer', 'bigint'
-            mapped << data.to_i
-          when 'timestamp'
-            mapped << Time.parse(data)
-          when 'varchar'
+          if nullable && data.nil?
             mapped << data
-          when 'float', 'double'
-            mapped << data.to_f
-          when 'decimal'
-            if @decimal_without_new
-              mapped << BigDecimal(data)
+          elsif !nullable && data.nil?
+            raise InvalidNullError.new("Got null data from a non-null field (#{col.name})")
+          else
+            case col.type
+            when 'tinyint', 'smallint', 'int', 'integer', 'bigint'
+              mapped << data.to_i
+            when 'timestamp'
+              mapped << Time.parse(data)
+            when 'varchar'
+              mapped << data
+            when 'float', 'double'
+              mapped << data.to_f
+            when 'decimal'
+              if @decimal_without_new
+                mapped << BigDecimal(data)
+              else
+                mapped << BigDecimal.new(data)
+              end
+            when 'date'
+              mapped << Date.parse(data)
+            when 'boolean'
+              mapped << (data == "true")
             else
-              mapped << BigDecimal.new(data)
+              puts "WARNING: Unsupported type: #{col.type}, defaulting to string"
+              mapped << data
             end
-          when 'date'
-            mapped << Date.parse(data)
-          when 'boolean'
-            mapped << (data == "true")
-          else
-            puts "WARNING: Unsupported type: #{col.type}, defaulting to string"
-            mapped << data
           end
         end
 

data/lib/athens/version.rb

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

metadata

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