From b435f04528c1107708f52f6110c7bce63fe6f37e Mon Sep 17 00:00:00 2001 From: Dan Peterson Date: Fri, 23 Nov 2007 21:06:46 -0700 Subject: fix socket argument to AR and add rails spec --- lib/puppet/rails.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/puppet') diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index 55d03b878..e87e22a68 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -45,7 +45,7 @@ module Puppet::Rails args[:username] = Puppet[:dbuser] args[:password] = Puppet[:dbpassword] args[:database] = Puppet[:dbname] - args[:args] = Puppet[:dbsocket] unless Puppet[:dbsocket] == "" + args[:socket] = Puppet[:dbsocket] unless Puppet[:dbsocket] == "" else raise ArgumentError, "Invalid db adapter %s" % Puppet[:dbadapter] end -- cgit From c19d08a37632410b1835350dfaacedde974b1003 Mon Sep 17 00:00:00 2001 From: Dan Peterson Date: Fri, 23 Nov 2007 22:12:15 -0700 Subject: mock all use of Puppet[] in Puppet::Rails.database_arguments --- lib/puppet/rails.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/puppet') 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 -- cgit