hiera-mysql-json-backend-jruby 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 022754036cab6f330dad8e5147e2b514c3e92b2b
-  data.tar.gz: a8ad4a2cdf2b31800e64555a0a70506062f2ddb0
+  metadata.gz: eb11facf052d04d437f3581fd57567c65d5a43c4
+  data.tar.gz: 12469fcb7ae7efaafabab674a0cce399b6e5b911
 SHA512:
-  metadata.gz: ded7f5e128f280f194f2daf8a8ddc8ed7a99aa32ca90539fd89ceaa88a8e906a68f7451f88150542cc41a6116a7d09de8aabee7eb700dcb2ea1f4f177f3980aa
-  data.tar.gz: 75230f6daeecc58948453df6946b888ccdc3399fb9c0376836d2a306163f24a68aa6af5b46bec77c178dc50674f314203e5d3cad5a3e3fe707bfeba917a2cf10
+  metadata.gz: bb789c536cb19f5a19b8ef0a883ff32768103f5540301250b43cab9ca71d3982d690e0616a8f4aa6db67a3762064c448e06dd330189fd556af1d579aec6c6a6c
+  data.tar.gz: 2624b89efbe176b7e45953776630e6cb66f7dea19f6347c1a8fe9cadf3ca65724702dd87c33e7c3ff23bbdcf21b94cd1bc3a22b08ed525a8a855ee3d432e5e67

data/hiera-mysql-json-backend-puppetserver.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-mysql-json-backend-jruby"
-  gem.version       = "1.1.1"
+  gem.version       = "1.1.2"
   gem.authors       = ["Hostnet"]
   gem.email         = ["opensource@hostnet.nl"]
   gem.description   = %q{Alternative MySQL backend with json support for hiera}

data/hiera-mysql-json-backend.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-mysql-json-backend"
-  gem.version       = "1.1.1"
+  gem.version       = "1.1.2"
   gem.authors       = ["Hostnet"]
   gem.email         = ["opensource@hostnet.nl"]
   gem.description   = %q{Alternative MySQL backend with json support for hiera}

data/lib/hiera/backend/mysql_json_backend.rb

@@ -90,7 +90,7 @@ class Hiera
           begin
             new_answer = JSON.parse(sql_results[0]['value'])
           rescue
-            raise Exception, "JSON parse error for key '#{key}'." unless Config[:mysql_json][:ignore_json_parse_errors]
+            raise Exception, "JSON parse error for key '#{key}'. Offending data: #{sql_results[0]['value']}." unless Config[:mysql_json][:ignore_json_parse_errors]
             Hiera.debug("Miserable failure while looking for #{key}.")
             next
           end
@@ -139,16 +139,11 @@ class Hiera
           Hiera.debug("Mysql Query returned #{numcols} rows")
 
           while res.next
-            if numcols < 2
-              Hiera.debug("Mysql value : #{res.getString(1)}")
-              data << res.getString(1)
-            else
-              row = {}
-              (1..numcols).each do |c|
-                row[md.getColumnName(c)] = res.getString(c)
-              end
-              data << row
+            row = {}
+            (1..numcols).each do |c|
+              row[md.getColumnName(c)] = res.getString(c)
             end
+            data << row
           end
 
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-mysql-json-backend-jruby
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Hostnet