Changeset 1159

Show
Ignore:
Timestamp:
01/03/08 13:13:08 (9 months ago)
Author:
wyca..@gmail.com
Message:

Closes #392; Sequel migrations issue

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/merb_sequel/lib/merb/orms/sequel/connection.rb

    r1140 r1159  
    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 

  • trunk/lib/merb/controller.rb

    r1079 r1159  
    106106     
    107107    def dispatch(action=:index) 
    108       start = Time.now 
     108      start = Time.now     
    109109      if self.class.callable_actions[action.to_s] 
    110110        params[:action] ||= action