On 2/10/09 21:30, Luke Kanies wrote: > On Oct 2, 2009, at 4:55 AM, Avi Miller wrote: > >> >> Signed-off-by: Avi Miller <[email protected]> >> --- >> lib/puppet/rails.rb | 4 ++++ >> lib/puppet/rails/database/schema.rb | 9 +++++++-- >> lib/puppet/rails/param_value.rb | 4 ++-- >> lib/puppet/rails/resource_tag.rb | 4 ++-- >> 4 files changed, 15 insertions(+), 6 deletions(-) >> >> diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb >> index fc8eacd..ec2d618 100644 >> --- a/lib/puppet/rails.rb >> +++ b/lib/puppet/rails.rb >> @@ -51,6 +51,10 @@ module Puppet::Rails >> >> socket = Puppet[:dbsocket] >> args[:socket] = socket unless socket.empty? >> + when "oracle_enhanced": >> + args[:database] = Puppet[:dbname] unless Puppet[:dbname].empty? >> + args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty? >> + args[:password] = Puppet[:dbpassword] unless >> Puppet[:dbpassword].empty? >> else >> raise ArgumentError, "Invalid db adapter %s" % adapter >> end >> diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/ >> database/schema.rb >> index d8fcbb4..929ebba 100644 >> --- a/lib/puppet/rails/database/schema.rb >> +++ b/lib/puppet/rails/database/schema.rb >> @@ -21,9 +21,10 @@ class Puppet::Rails::Schema >> >> # Thanks, mysql! MySQL requires a length on indexes >> in text fields. >> # So, we provide them for mysql and handle >> everything else specially. >> + # Oracle doesn't index on CLOB fields, so we skip it >> if Puppet[:dbadapter] == "mysql" >> execute "CREATE INDEX typentitle ON resources >> (restype,title(50));" >> - else >> + elseif Puppet[:dbadapter] != "oracle_enhanced"
Shouldn't it be an elsif ? Otherwise, +1 [patch elided] -- Brice Figureau My Blog: http://www.masterzen.fr/ --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
