Changeset 1095

Show
Ignore:
Timestamp:
12/13/07 22:37:53 (10 months ago)
Author:
e.@brainspl.at
Message:

patch to merb_sequel connection.rb - fix typo and add password config option closes #354

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1065 r1095  
    4242        def config_options(config = {}) 
    4343          options = {} 
    44           options[:adapter]  = (config[:adaptor]  || "sqlite") 
     44          options[:adapter]  = (config[:adapter]  || "sqlite") 
    4545          options[:host]     = (config[:host]     || "localhost") 
    4646          options[:user]     = (config[:username] || config[:user] || "root") 
     47          options[:password] = config[:password] if config[:password] 
    4748          if (config[:encoding] || config[:charset]) 
    4849            options[:encoding] = (config[:encoding] || config[:charset])