hiera-mysql 0.2.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cbe2732edac5efdfc085c21fbe85932b9577a4cd
+  data.tar.gz: 7ae9728410ab5217383176aea9aefa5dfa86f5a0
+SHA512:
+  metadata.gz: 361de3077a3572eec1cd01d582c71597ad24bee63d93971f64d4c335f555c28c21982352c85c7e022738eac15a170cb252bc268ec329dcf80a4f4e4693d7e311
+  data.tar.gz: 8d2ed4e05b3bfc9b9eb12a9f527cdf3c73ff002afaf04d2f69b43e3e1d1f9e82df31e551f1cec57d1478d0c5f6869eb5312b47088d241ba0f35c6b2eb86e7bb6

data/lib/hiera/backend/mysql_backend.rb

@@ -3,89 +3,128 @@
 # Author: Craig Dunn <craig@craigdunn.org>
 #
 class Hiera
-    module Backend
-        class Mysql_backend
-            def initialize
-                begin
-                  require 'mysql'
-                rescue LoadError
-                  require 'rubygems'
-                  require 'mysql'
-                end
-
-                Hiera.debug("mysql_backend initialized")
-            end
-            def lookup(key, scope, order_override, resolution_type)
-
-                Hiera.debug("mysql_backend invoked lookup")
-                Hiera.debug("resolution type is #{resolution_type}")
-
-                answer = nil
-
-                # Parse the mysql query from the config, we also pass in key
-                # to extra_data so this can be interpreted into the query 
-                # string
-                #
-                queries = [ Config[:mysql][:query] ].flatten
-                queries.map! { |q| Backend.parse_string(q, scope, {"key" => key}) }
-
-                queries.each do |mysql_query|
-
-                  results = query(mysql_query)
-
-                  unless results.empty?
-                    case resolution_type
-                      when :array
-                        answer ||= []
-                        results.each do |ritem|
-                          answer << Backend.parse_answer(ritem, scope)
-                        end
-                      else
-                       answer = Backend.parse_answer(results[0], scope)
-                       break
-                    end
-                  end
-
-                end
-              answer
-            end
+  module Backend
+    class Mysql_backend
+      def initialize
+        @use_jdbc = defined?(JRUBY_VERSION) ? true : false 
+        if @use_jdbc
+          require 'jdbc/mysql'
+          require 'java'
+        else
+          begin
+            require 'mysql'
+          rescue LoadError
+            require 'rubygems'
+            require 'mysql'
+          end
+        end
+
+        Hiera.debug("mysql_backend initialized")
+        Hiera.debug("JDBC mode #{@use_jdbc}")
+      end
 
-            def query (sql)
-                Hiera.debug("Executing SQL Query: #{sql}")
 
-                data=[]
-                mysql_host=Config[:mysql][:host]
-                mysql_user=Config[:mysql][:user]
-                mysql_pass=Config[:mysql][:pass]
-                mysql_database=Config[:mysql][:database]
+      def lookup(key, scope, order_override, resolution_type)
 
-                dbh = Mysql.new(mysql_host, mysql_user, mysql_pass, mysql_database)
-                dbh.reconnect = true
+        Hiera.debug("mysql_backend invoked lookup")
+        Hiera.debug("resolution type is #{resolution_type}")
 
-                res = dbh.query(sql)
-                Hiera.debug("Mysql Query returned #{res.num_rows} rows")
+        answer = nil
 
+        # Parse the mysql query from the config, we also pass in key
+        # to extra_data so this can be interpreted into the query 
+        # string
+        #
+        queries = [ Config[:mysql][:query] ].flatten
+        queries.map! { |q| Backend.parse_string(q, scope, {"key" => key}) }
 
-                # Currently we'll just return the first element of each row, a future
-                # enhancement would be to make this easily support hashes so you can do
-                # select foo,bar from table
-                #
-                if res.num_fields < 2
-                  res.each do |row|
-                    Hiera.debug("Mysql value : #{row[0]}")
-                    data << row[0]
-                  end
+        queries.each do |mysql_query|
 
-                else
-                  res.each_hash do |row|
-                    data << row
-                  end
-                end
+          results = query(mysql_query)
 
-                return data
+          unless results.empty?
+            case resolution_type
+            when :array
+              answer ||= []
+              results.each do |ritem|
+                answer << Backend.parse_answer(ritem, scope)
+              end
+            else
+              answer = Backend.parse_answer(results[0], scope)
+              break
             end
+          end
+
+        end
+        answer
+      end
+
+      def query (sql)
+        Hiera.debug("Executing SQL Query: #{sql}")
+
+        data=[]
+        mysql_host=Config[:mysql][:host]
+        mysql_user=Config[:mysql][:user]
+        mysql_pass=Config[:mysql][:pass]
+        mysql_database=Config[:mysql][:database]
+
+
+        if @use_jdbc
+          #
+          # JDBC connection handling, this will be run under jRuby
+          #
+          Jdbc::MySQL.load_driver
+          url = "jdbc:mysql://#{mysql_host}:3306/#{mysql_database}"
+          props = java.util.Properties.new
+          props.set_property :user, mysql_user
+          props.set_property :password, mysql_pass
+
+          conn = com.mysql.jdbc.Driver.new.connect(url,props)
+          stmt = conn.create_statement
+
+          res = stmt.execute_query(sql)
+          md = res.getMetaData
+          numcols = md.getColumnCount
+
+          Hiera.debug("Mysql Query returned #{numcols} rows")
+
+          while ( res.next ) do
+            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
+            end
+          end
+        else
+          #
+          # Native mysql connection, for calls outside of jRuby
+          #
+          dbh = Mysql.new(mysql_host, mysql_user, mysql_pass, mysql_database)
+          dbh.reconnect = true
+
+          res = dbh.query(sql)
+          Hiera.debug("Mysql Query returned #{res.num_rows} rows")
+
+          if res.num_fields < 2
+            res.each do |row|
+              Hiera.debug("Mysql value : #{row[0]}")
+              data << row[0]
+            end
+          else
+            res.each_hash do |row|
+              data << row
+            end
+          end
         end
-    end
-end
 
+        return data
 
+      end
+    end
+  end
+end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: hiera-mysql
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Hiera back end for retrieving configuration values from MySQL
@@ -36,26 +33,25 @@ files:
 - lib/hiera/backend/mysql_backend.rb
 homepage: http://github.com/crayfishx/hiera-mysql
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MySQL backend for Hiera
 test_files: []