Ticket #392: nilclass_fix.diff

File nilclass_fix.diff, 0.9 kB (added by lancecarls..@gmail.com, 11 months ago)

This fixes this bug and adds a little more description to the console

  • a/lib/merb/orms/sequel/connection.rb

    old new  
    2929          require "sequel_model" 
    3030 
    3131          if File.exists?(config_file) 
    32             puts "#{Time.now.httpdate}: Connecting to the '#{config[:adapter]}' database '#{config[:hosts]}' ..." 
     32            puts "#{Time.now.httpdate}: Connecting to the '#{config[:database]}' database on '#{config[:host]}' using '#{config[:adapter]}' ..." 
    3333            connection = ::Sequel.connect(config_options(config)) 
    3434            MERB_LOGGER.error("Connection Error: #{e}") unless connection 
     35            connection 
    3536          else 
    3637            copy_sample_config 
    3738            puts "#{Time.now.httpdate}: No database.yml file found in #{MERB_ROOT}/config."