hiera-mysql 0.1.1 → 0.2.0

data/lib/hiera/backend/mysql_backend.rb

@@ -1,7 +1,7 @@
 # Class Mysql_backend
 # Description: MySQL back end to Hiera.
 # Author: Craig Dunn <craig@craigdunn.org>
-# 
+#
 class Hiera
     module Backend
         class Mysql_backend
@@ -12,42 +12,45 @@ class Hiera
                   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
                 #
-                mysql_query = Backend.parse_string(Config[:mysql][:query], scope, { "key" => key })
+                queries = [ Config[:mysql][:query] ].flatten
+                queries.map! { |q| Backend.parse_string(q, scope, {"key" => key}) }
 
+                queries.each do |mysql_query|
 
-                answer = Backend.empty_answer(resolution_type)
-                Hiera.debug("resolution type is #{resolution_type}")
+                  results = query(mysql_query)
 
-                results = query(mysql_query)
-                unless results.empty?
+                  unless results.empty?
                     case resolution_type
-                        when :array
-                            results.each do |ritem|
-                                answer << Backend.parse_answer(ritem, scope)
-                            end
-                        else
-                            answer = Backend.parse_answer(results[0], scope)
+                      when :array
+                        answer ||= []
+                        results.each do |ritem|
+                          answer << Backend.parse_answer(ritem, scope)
                         end
-                end
-
-                    return answer
+                      else
+                       answer = Backend.parse_answer(results[0], scope)
+                       break
+                    end
+                  end
 
+                end
+              answer
             end
-                
-         
 
-            def query (sql) 
+            def query (sql)
                 Hiera.debug("Executing SQL Query: #{sql}")
 
                 data=[]
@@ -58,21 +61,28 @@ class Hiera
 
                 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")
 
 
                 # Currently we'll just return the first element of each row, a future
-                # enhancement would be to make this easily support arrays so you can do
+                # enhancement would be to make this easily support hashes so you can do
                 # select foo,bar from table
-                res.each do |row|
+                #
+                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
 
                 return data
-
             end
         end
     end

metadata

@@ -1,87 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hiera-mysql
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-07 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hiera
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2013-01-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mysql
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  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
 email: craig@craigdunn.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/hiera/backend/mysql_backend.rb
-has_rdoc: true
 homepage: http://github.com/crayfishx/hiera-mysql
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: MySQL backend for Hiera
 test_files: []
-