diff options
Diffstat (limited to 'lib/puppet/rails.rb')
| -rw-r--r-- | lib/puppet/rails.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index e87e22a68..8140c6a33 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] args[:password] = Puppet[:dbpassword] args[:database] = Puppet[:dbname] - args[:socket] = 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 |