athens 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce70371a1505fb7f63bfbcd872ba136b998b146b005e084ae7d4f3bf5394c7b
-  data.tar.gz: 69e24000860943707e5b52f24dbb2289e76e0dd35c970ca9f50a59aab07289cd
+  metadata.gz: cb4922b50ef935d722a54d54d4f3d9a9e47b587b67592454b806bf11e00f7be1
+  data.tar.gz: 2fc14349880958e3212444e8285a0005c76f9e1bcb219ac8423cb1f1cdacfb57
 SHA512:
-  metadata.gz: e7b59f65553704094baf50bb4d609bacb2ec698f788ff89f27a679e9663418aa3c08282dbcd9a5a65c42a9b15065a74a2b35af111900b0965af103ef5538e29c
-  data.tar.gz: 62c44387712ce5bdc94da5f4091b676d7ef6e4a330ddd90732bc92f6e64cfb61a8078f93e3aaf930be04fc1e952a0c827cb4177c3c6226c37eedcbfee21b7aca
+  metadata.gz: 6c8dc6d78814f5b947d08434b8f2ccf13998439fca59465495401cc9e73f7e7e30efe3899679d545fe17184704b81fab33ddf5ffc5d2eb833e6ea2ef67dc6f2e
+  data.tar.gz: 4e7d3d6f0cd1bdd5da7644c16b8802bc810d8f15f12e05fcd746acb743d48fe5c0ff740928ae117047aa2d6c2417daf33b86cab630cfbe0f42e87650c58e7909

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+## 0.4.0 / 2021-12-03
+
+* Added automatic parsing of JSON columns (thanks [darkside](https://github.com/darkside))
+
+#### Potentially breaking change
+
+If you were previously querying JSON type data and parsing it from a string in your own code, you'll want to remove that before upgrading.
+
+For example, with previous versions you could do this (even though it would generate a warning):
+
+```ruby
+> query = conn.execute("SELECT JSON_PARSE('{\"a\": 1, \"b\": 2}');")
+> query.wait
+> JSON.parse(query.to_a(header_row: false).first[0])
+WARNING: Unsupported type: json, defaulting to string
+ => {"a"=>1, "b"=>2}
+```
+
+After upgrading, that same code will give you an error:
+```ruby
+> JSON.parse(query.to_a(header_row: false).first[0])
+Traceback (most recent call last):
+        5: from bin/console:14:in `<main>'
+        4: from (irb):12:in `<main>'
+        3: from /home/vagrant/.rvm/rubies/ruby-3.0.0/lib/ruby/3.0.0/json/common.rb:216:in `parse'
+        2: from /home/vagrant/.rvm/rubies/ruby-3.0.0/lib/ruby/3.0.0/json/common.rb:216:in `new'
+        1: from /home/vagrant/.rvm/rubies/ruby-3.0.0/lib/ruby/3.0.0/json/common.rb:216:in `initialize'
+TypeError (no implicit conversion of Hash into String)
+```
+
+Instead just remove your json parsing since Athens handles it now:
+```ruby
+> query = conn.execute("SELECT JSON_PARSE('{\"a\": 1, \"b\": 2}');")
+> query.wait
+> query.to_a(header_row: false).first[0]
+ => {:a=>1, :b=>2}
+```
+
+
 ## 0.3.6 / 2021-11-16
 
 * Addition of :result_encryption as a configuration option to change encryption options for query results (https://github.com/getletterpress/athens/issues/12)

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    athens (0.3.6)
+    athens (0.4.0)
       aws-sdk-athena (~> 1)
+      multi_json (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.2.0)
-    aws-partitions (1.530.0)
-    aws-sdk-athena (1.43.0)
+    aws-partitions (1.539.0)
+    aws-sdk-athena (1.44.0)
       aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.122.1)
+    aws-sdk-core (3.124.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -20,6 +21,7 @@ GEM
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     jmespath (1.4.0)
+    multi_json (1.15.0)
     rake (13.0.6)
     rexml (3.2.5)
 

data/Vagrantfile

@@ -4,13 +4,11 @@
 # Provisioning script
 $script = <<SCRIPT
   echo "*** Updating packages"
-
-  sudo DEBIAN_FRONTEND=noninteractive apt-get install -y aptitude
-  sudo DEBIAN_FRONTEND=noninteractive aptitude update
-  sudo DEBIAN_FRONTEND=noninteractive aptitude -y safe-upgrade
+  sudo DEBIAN_FRONTEND=noninteractive apt-get update
+  sudo DEBIAN_FRONTEND=noninteractive apt-get upgrade
 
   echo "*** Installing new packages"
-  sudo DEBIAN_FRONTEND=noninteractive aptitude install -y curl git-core vim
+  sudo DEBIAN_FRONTEND=noninteractive apt-get install -y curl git-core vim
 
   if rvm -v 2>/dev/null; then
     echo "*** rvm already installed, skipping"
@@ -30,7 +28,7 @@ SCRIPT
 
 
 Vagrant.configure('2') do |config|
-  config.vm.box      = "ubuntu/xenial64"
+  config.vm.box      = "ubuntu/focal64"
   config.vm.hostname = 'athens-dev'
 
   # Provision the machine with the shell script above

data/athens.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.4'
 
   spec.add_dependency "aws-sdk-athena", "~> 1"
+  spec.add_dependency 'multi_json', '~> 1.0'
 
   spec.add_development_dependency "bundler", ">= 1.17"
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/athens/query.rb

@@ -141,7 +141,7 @@ module Athens
         metadata.column_info.each_with_index do |col, index|
           data = row.data[index].var_char_value
           nullable = ["UNKNOWN", "NULLABLE"].include?(col.nullable)
-
+          
           if nullable && data.nil?
             mapped << data
           elsif !nullable && data.nil?
@@ -166,6 +166,8 @@ module Athens
               mapped << Date.parse(data)
             when 'boolean'
               mapped << (data == "true")
+            when 'json'
+              mapped << MultiJson.load(data, symbolize_keys: true)
             else
               puts "WARNING: Unsupported type: #{col.type}, defaulting to string"
               mapped << data

data/lib/athens/version.rb

@@ -1,3 +1,3 @@
 module Athens
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/lib/athens.rb

@@ -5,6 +5,7 @@ require "athens/connection"
 require "athens/query"
 
 require 'aws-sdk-athena'
+require 'multi_json'
 
 module Athens
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: athens
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Schulte
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-athena
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement