Merge commit 'danp/rails_socket_and_tests'

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index bdb3a3cdc..2af41f9f6 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -35,9 +35,11 @@ module Puppet::Rails
 
     # The arguments for initializing the database connection.
     def self.database_arguments
-        args = {:adapter => Puppet[:dbadapter], :log_level => Puppet[:rails_loglevel]}
+        adapter = Puppet[:dbadapter]
+        
+        args = {:adapter => adapter, :log_level => Puppet[:rails_loglevel]}
 
-        case Puppet[:dbadapter]
+        case adapter
         when "sqlite3":
             args[:dbfile] = Puppet[:dblocation]
         when "mysql", "postgresql":
@@ -45,9 +47,11 @@ module Puppet::Rails
             args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty?
             args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty?
             args[:database] = Puppet[:dbname]
-            args[:args]     = Puppet[:dbsocket] unless Puppet[:dbsocket] == ""
+            
+            socket          = Puppet[:dbsocket]
+            args[:socket]   = socket unless socket.empty?
         else
-            raise ArgumentError, "Invalid db adapter %s" % Puppet[:dbadapter]
+            raise ArgumentError, "Invalid db adapter %s" % adapter
         end
         args
     end