hiera-mysql-json-backend 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53185036554e275062f16f0fab0556b80b2b1551
-  data.tar.gz: 8dafb494f356fdae2f623204778958987f092769
+  metadata.gz: fbf488a487e7f43f77fe5cc3e65b271357f8873a
+  data.tar.gz: 6f004a40633fb221a64b84e9386b3c1ddd60b56d
 SHA512:
-  metadata.gz: 0e0e476c2d32b10c2240d7fab945bc277ef67a6c2b99b8191c85b6b2fdb9f2f68a58ae0fb2bf8f8e9118f1a787fcdc9e9a396ef9f568be4c6b1f1036fb042d48
-  data.tar.gz: 4fa32e35527dec742eabbf565487d59b2eb4eab2ea170db8550e7acf749822ed15f342e301ba58c73af810d8b52e2e4391392bdfb69c80562f4d9ec848b094eb
+  metadata.gz: f13c4d437856a299310f2cfe73628c0ba36bcf641e391a1944f6191430608a9d38ee08bf753a1e200a86438f687bf832d6f84bc7245bdabed4c85b71781d5471
+  data.tar.gz: 9e9b07cd44462189aca7901898ba82ae12b3dcde7dc35d285baa4cf735d211d65bfb8f75c9073def41af8fc13dc114216f51814a54121923aed37b23d66c6d74

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
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Hostnet