Merge branch '0.25.x'

Conflicts:
	lib/puppet/ssl/host.rb
	spec/spec_helper.rb

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index 34ca58c5a..1e02408b8 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -29,7 +29,9 @@ module Puppet::Rails
         ActiveRecord::Base.verify_active_connections!
 
         begin
-            ActiveRecord::Base.establish_connection(database_arguments())
+            args = database_arguments
+            Puppet.info "Connecting to #{args[:adapter]} database: #{args[:database]}"
+            ActiveRecord::Base.establish_connection(args)
         rescue => detail
             if Puppet[:trace]
                 puts detail.backtrace
@@ -46,12 +48,13 @@ module Puppet::Rails
 
         case adapter
         when "sqlite3"
-            args[:dbfile] = Puppet[:dblocation]
+            args[:database] = Puppet[:dblocation]
         when "mysql", "postgresql"
             args[:host]     = Puppet[:dbserver] unless Puppet[:dbserver].empty?
             args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty?
             args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty?
             args[:database] = Puppet[:dbname]
+            args[:reconnect]= true
 
             socket          = Puppet[:dbsocket]
             args[:socket]   = socket unless socket.empty?